Skip to content

Commit

Permalink
Format
Browse files Browse the repository at this point in the history
Signed-off-by: Jin Hai <[email protected]>
  • Loading branch information
JinHai-CN committed Oct 6, 2024
1 parent 8cd8e81 commit 4fcf01d
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 34 deletions.
13 changes: 6 additions & 7 deletions src/unit_test/storage/io/byte_slice_write_read.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class ByteSliceReaderWriterTest : public BaseTest {
delete[] buffer;
}

u8 *GetData(const ByteSliceList* list) {
u8 *GetData(const ByteSliceList *list) {
u8 *buffer = new u8[list->GetTotalSize()];
SizeT n = 0;
ByteSlice *slice = list->GetHead();
Expand All @@ -56,15 +56,15 @@ class ByteSliceReaderWriterTest : public BaseTest {
return buffer;
}

bool CheckListEq(const ByteSliceList* list_1, const ByteSliceList* list_2) {
if(list_1->GetTotalSize() != list_2->GetTotalSize()) {
bool CheckListEq(const ByteSliceList *list_1, const ByteSliceList *list_2) {
if (list_1->GetTotalSize() != list_2->GetTotalSize()) {
return false;
}
auto buffer_1 = GetData(list_1);
auto buffer_2 = GetData(list_2);

bool eq = memcmp(buffer_1, buffer_2, list_1->GetTotalSize()) == 0;

delete[] buffer_1;
delete[] buffer_2;
return eq;
Expand Down Expand Up @@ -170,20 +170,19 @@ TEST_F(ByteSliceReaderWriterTest, TestDataConsistency) {
// using namespace infinity;
// LocalFileSystem local_file_system;
// String path = String(GetFullTmpDir()) + "/test_byteslice_dump";


// ByteSliceWriter writer;

// i64 i = 0;
// for (i = 0; i < 10000; i++) {
// writer.WriteVLong(i);
// }

// auto filewriter = MakeShared<FileWriter>(local_file_system, path, 128);

// std::cout << writer.GetSize() << std::endl;

// writer.Dump(filewriter);
// writer.Dump(filewriter);
// filewriter->Sync();

// ByteSliceWriter loader;
Expand Down
29 changes: 14 additions & 15 deletions src/unit_test/storage/io/file_write_read.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ TEST_F(FileWriteReadTest, test1) {
LocalStore::DeleteFile(path);
}

//write vint then read vint
// write vint then read vint
TEST_F(FileWriteReadTest, test2) {
using namespace infinity;
String path = String(GetFullTmpDir()) + "/test_file2.abc";
Expand All @@ -73,7 +73,7 @@ TEST_F(FileWriteReadTest, test2) {
LocalStore::DeleteFile(path);
}

//hybrid datatype
// hybrid datatype
TEST_F(FileWriteReadTest, test3) {
using namespace infinity;
String path = String(GetFullTmpDir()) + "/test_file3.abc";
Expand Down Expand Up @@ -107,15 +107,14 @@ TEST_F(FileWriteReadTest, test3) {
LocalStore::DeleteFile(path);
}


//test total written bytes and GetFileSize()
//plus exceed case for reader/writer buffer
// test total written bytes and GetFileSize()
// plus exceed case for reader/writer buffer
TEST_F(FileWriteReadTest, TestExceedWriterTotalSize) {
using namespace infinity;
String path = String(GetFullTmpDir()) + "/test_file_write_bytes.abc";
FileWriter file_writer(path, 128);

for(i32 i = 0; i < 1024; ++i) {
for (i32 i = 0; i < 1024; ++i) {
file_writer.WriteInt(i);
}

Expand All @@ -137,23 +136,23 @@ TEST_F(FileWriteReadTest, TestExceedWriterTotalSize) {
EXPECT_EQ(file_writer.TotalWrittenBytes(), 4 * 1024 + buffer.size());
}

//write byte in '0', '1'...'1023'
//read to '254', get pointer a, finish the read
//seek a, finish
// write byte in '0', '1'...'1023'
// read to '254', get pointer a, finish the read
// seek a, finish
TEST_F(FileWriteReadTest, TestFilePointerSeek) {
using namespace infinity;
String path = String(GetFullTmpDir()) + "/test_file_write_bytes.abc";
FileWriter file_writer(path, 128);

for(i32 i = 0; i < 1024; i++) {
for (i32 i = 0; i < 1024; i++) {
file_writer.WriteInt(i);
}
file_writer.Sync();

FileReader file_reader(path, 128);
u64 a;
for (i32 i = 0; i < 1024; ++i) {
if(i == 254) {
if (i == 254) {
a = file_reader.GetFilePointer();
}
EXPECT_EQ(file_reader.ReadInt(), i);
Expand All @@ -162,21 +161,21 @@ TEST_F(FileWriteReadTest, TestFilePointerSeek) {

file_reader.Seek(a);
i32 exp = 254;
while(!file_reader.Finished()) {
while (!file_reader.Finished()) {
EXPECT_EQ(file_reader.ReadInt(), exp);
exp++;
}
EXPECT_EQ(exp, 1024);
}

//test if ReFill works fine.
// test if ReFill works fine.
TEST_F(FileWriteReadTest, TestFileReadOverflowBuffer) {
using namespace infinity;
String path = String(GetFullTmpDir()) + "/test_file_write_bytes.abc";
FileWriter file_writer(path, 128);

String s;
for(i32 i = 0; i < 1000; i++) {
for (i32 i = 0; i < 1000; i++) {
s += "abc";
}

Expand All @@ -191,7 +190,7 @@ TEST_F(FileWriteReadTest, TestFileReadOverflowBuffer) {
EXPECT_STREQ(s.c_str(), read_s.c_str());
}

//test all types of data of reader and writer
// test all types of data of reader and writer
TEST_F(FileWriteReadTest, TestFileIODataTypes) {

using namespace infinity;
Expand Down
8 changes: 4 additions & 4 deletions src/unit_test/storage/io/stream_reader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ TEST_F(StreamReaderTest, TestBasicStreamIO) {
FileWriter file_writer(path, 128);

String lines[5];
lines[0] = "hahahahha";
lines[0] = "hahahahha";
lines[1] = "xixixixiix";
lines[2] = "huhuhuhu";
lines[3]= "xuxuxuxuxxu";
lines[3] = "xuxuxuxuxxu";
lines[4] = "ddddd";

for(i64 i = 0; i < 5; i++) {
for (i64 i = 0; i < 5; i++) {
file_writer.Write(lines[i].c_str(), lines[i].size());
file_writer.Write("\n", 1);
}
Expand All @@ -38,7 +38,7 @@ TEST_F(StreamReaderTest, TestBasicStreamIO) {
UniquePtr<StreamReader> stream = LocalStore::OpenStreamReader(path);
i32 i = 0;
String line;
while(stream->ReadLine(line)) {
while (stream->ReadLine(line)) {
EXPECT_STREQ(line.c_str(), lines[i].c_str());
i++;
}
Expand Down
12 changes: 4 additions & 8 deletions src/unit_test/storage/io/virtual_store.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,7 @@ TEST_F(VirtualStoreTest, TestAppend) {
String dst_path = String(GetFullTmpDir()) + "/test_file_append_dst.abc";
String src_path = String(GetFullTmpDir()) + "/test_file_append_src.abc";

auto [src_handler, src_status] =
LocalStore::Open(src_path, FileAccessMode::kWrite);
auto [src_handler, src_status] = LocalStore::Open(src_path, FileAccessMode::kWrite);
if (!src_status.ok()) {
UnrecoverableError(src_status.message());
}
Expand All @@ -194,8 +193,7 @@ TEST_F(VirtualStoreTest, TestAppend) {
src_handler->Append(src_data.get(), src_len);
src_handler->Sync();

auto [dst_handler, dst_status] =
LocalStore::Open(dst_path, FileAccessMode::kWrite);
auto [dst_handler, dst_status] = LocalStore::Open(dst_path, FileAccessMode::kWrite);
if (!dst_status.ok()) {
UnrecoverableError(dst_status.message());
}
Expand Down Expand Up @@ -241,8 +239,7 @@ TEST_F(VirtualStoreTest, TestCleanDir) {

LocalStore::MakeDirectory(dir);

auto [file_handler1, status1] =
LocalStore::Open(file_path1, FileAccessMode::kWrite);
auto [file_handler1, status1] = LocalStore::Open(file_path1, FileAccessMode::kWrite);
if (!status1.ok()) {
UnrecoverableError(status1.message());
}
Expand All @@ -254,8 +251,7 @@ TEST_F(VirtualStoreTest, TestCleanDir) {
file_handler1->Append(data_array1.get(), len1);
file_handler1->Sync();

auto [file_handler2, status2] =
LocalStore::Open(file_path2, FileAccessMode::kWrite);
auto [file_handler2, status2] = LocalStore::Open(file_path2, FileAccessMode::kWrite);
if (!status2.ok()) {
UnrecoverableError(status2.message());
}
Expand Down

0 comments on commit 4fcf01d

Please sign in to comment.