Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions be/src/exec/plain_text_line_reader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -247,9 +247,8 @@ Status PlainTextLineReader::read_line(const uint8_t** ptr, size_t* size, bool* e
} else {
// last loop we meet stream end,
// and now we finished reading file, so we are finished
*size = 0;
*eof = true;
return Status::OK;
// break this loop to see if there is data in buffer
break;
}
}

Expand Down
34 changes: 34 additions & 0 deletions be/test/exec/plain_text_line_reader_gzip_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,40 @@ TEST_F(PlainTextLineReaderTest, gzip_normal_use) {
ASSERT_TRUE(eof);
}

TEST_F(PlainTextLineReaderTest, uncompressed_no_newline) {
LocalFileReader file_reader("./be/test/exec/test_data/plain_text_line_reader/no_newline.csv.gz", 0);
auto st = file_reader.open();
ASSERT_TRUE(st.ok());

Decompressor* decompressor;
st = Decompressor::create_decompressor(CompressType::GZIP, &decompressor);
ASSERT_TRUE(st.ok());

PlainTextLineReader line_reader(&_profile, &file_reader, decompressor, -1, '\n');
const uint8_t* ptr;
size_t size;
bool eof;

// 1,2,3
st = line_reader.read_line(&ptr, &size, &eof);
ASSERT_TRUE(st.ok());
ASSERT_EQ(5, size);
ASSERT_STREQ("1,2,3", std::string((char*)ptr, size).c_str());
ASSERT_FALSE(eof);

// 4,5
st = line_reader.read_line(&ptr, &size, &eof);
ASSERT_TRUE(st.ok());
ASSERT_EQ(3, size);
ASSERT_STREQ("4,5", std::string((char*)ptr, size).c_str());
ASSERT_FALSE(eof);

// Empty
st = line_reader.read_line(&ptr, &size, &eof);
ASSERT_TRUE(st.ok());
ASSERT_TRUE(eof);
}

TEST_F(PlainTextLineReaderTest, gzip_test_limit) {
LocalFileReader file_reader("./be/test/exec/test_data/plain_text_line_reader/limit.csv.gz", 0);
auto st = file_reader.open();
Expand Down
35 changes: 35 additions & 0 deletions be/test/exec/plain_text_line_reader_uncompressed_test.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,41 @@ TEST_F(PlainTextLineReaderTest, uncompressed_normal_use) {
ASSERT_TRUE(eof);
}

TEST_F(PlainTextLineReaderTest, uncompressed_no_newline) {
LocalFileReader file_reader("./be/test/exec/test_data/plain_text_line_reader/no_newline.csv", 0);
auto st = file_reader.open();
ASSERT_TRUE(st.ok());

Decompressor* decompressor;
st = Decompressor::create_decompressor(CompressType::UNCOMPRESSED, &decompressor);
ASSERT_TRUE(st.ok());
ASSERT_TRUE(decompressor == nullptr);

PlainTextLineReader line_reader(&_profile, &file_reader, decompressor, -1, '\n');
const uint8_t* ptr;
size_t size;
bool eof;

// 1,2,3
st = line_reader.read_line(&ptr, &size, &eof);
ASSERT_TRUE(st.ok());
ASSERT_EQ(5, size);
ASSERT_STREQ("1,2,3", std::string((char*)ptr, size).c_str());
ASSERT_FALSE(eof);

// 4,5
st = line_reader.read_line(&ptr, &size, &eof);
ASSERT_TRUE(st.ok());
ASSERT_EQ(3, size);
ASSERT_STREQ("4,5", std::string((char*)ptr, size).c_str());
ASSERT_FALSE(eof);

// Empty
st = line_reader.read_line(&ptr, &size, &eof);
ASSERT_TRUE(st.ok());
ASSERT_TRUE(eof);
}

TEST_F(PlainTextLineReaderTest, uncompressed_test_limit) {
LocalFileReader file_reader("./be/test/exec/test_data/plain_text_line_reader/limit.csv", 0);
auto st = file_reader.open();
Expand Down
2 changes: 2 additions & 0 deletions be/test/exec/test_data/plain_text_line_reader/no_newline.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
1,2,3
4,5
Binary file not shown.