Skip to content

fix(TextReader): Fix incorrect handling of \r not followed by \n #15330

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(TextReader): Fix incorrect handling of \r not followed by \n #15330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions velox/dwio/text/reader/TextReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -709,6 +709,7 @@ char TextRowReader::getByteUncheckedOptimized(DelimType& delim) {
if (skipLF) {
if (v != '\n') {
pos_--;
unreadIdx_--;
return '\n';
}
} else {
Expand Down
30 changes: 30 additions & 0 deletions velox/dwio/text/tests/reader/TextReaderTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1910,6 +1910,36 @@ INSTANTIATE_TEST_SUITE_P(
testing::ValuesIn(params),
[](const auto& paramInfo) { return paramInfo.param.compression; });

TEST_F(TextReaderTest, CRNotFollowedByLF) {
auto expected = makeRowVector({
makeFlatVector<int64_t>({1, 2}),
makeFlatVector<std::string>({"a", "b"}),
});

const std::string data =
"1,a\r"
"2,b";

auto type = ROW({{"col_bigint", BIGINT()}, {"col_string", VARCHAR()}});
auto serDeOptions = dwio::common::SerDeOptions(',');
auto readerOptions = dwio::common::ReaderOptions(pool());
readerOptions.setFileSchema(type);
readerOptions.setSerDeOptions(serDeOptions);
auto factory = dwio::common::getReaderFactory(dwio::common::FileFormat::TEXT);
auto input = std::make_unique<dwio::common::BufferedInput>(
std::make_shared<InMemoryReadFile>(data), poolRef());
auto reader = factory->createReader(std::move(input), readerOptions);
dwio::common::RowReaderOptions rowReaderOptions;
setScanSpec(*type, rowReaderOptions);
auto rowReader = reader->createRowReader(rowReaderOptions);

VectorPtr result;
ASSERT_EQ(rowReader->next(2, result), 2);
for (int i = 0; i < 2; ++i) {
EXPECT_TRUE(result->equalValueAt(expected.get(), i, i));
}
}

} // namespace

} // namespace facebook::velox::text
Loading