Skip to content

ARROW-12169: [C++] Fix decompressing file with empty stream at the end #9864

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

Closed
pitrou wants to merge 1 commit into from
Closed

ARROW-12169: [C++] Fix decompressing file with empty stream at the end #9864

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
2 changes: 1 addition & 1 deletion cpp/src/arrow/io/compressed.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ class CompressedInputStream::Impl {
RETURN_NOT_OK(EnsureCompressedData());
if (compressed_pos_ == compressed_->size()) {
// No more data to decompress
if (!fresh_decompressor_) {
if (!fresh_decompressor_ && !decompressor_->IsFinished()) {
return Status::IOError("Truncated compressed stream");
}
*has_data = false;
Expand Down
21 changes: 18 additions & 3 deletions cpp/src/arrow/io/compressed_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,13 +210,28 @@ TEST_P(CompressedInputStreamTest, ConcatenatedStreams) {
auto data2 = MakeCompressibleData(200);
auto compressed1 = CompressDataOneShot(codec.get(), data1);
auto compressed2 = CompressDataOneShot(codec.get(), data2);
std::vector<uint8_t> expected;
std::copy(data1.begin(), data1.end(), std::back_inserter(expected));
std::copy(data2.begin(), data2.end(), std::back_inserter(expected));

ASSERT_OK_AND_ASSIGN(auto concatenated, ConcatenateBuffers({compressed1, compressed2}));
std::vector<uint8_t> decompressed, expected;
std::vector<uint8_t> decompressed;
ASSERT_OK(RunCompressedInputStream(codec.get(), concatenated, &decompressed));
std::copy(data1.begin(), data1.end(), std::back_inserter(expected));
std::copy(data2.begin(), data2.end(), std::back_inserter(expected));
ASSERT_EQ(decompressed.size(), expected.size());
ASSERT_EQ(decompressed, expected);

// Same, but with an empty decompressed stream in the middle
auto compressed_empty = CompressDataOneShot(codec.get(), {});
ASSERT_OK_AND_ASSIGN(concatenated,
ConcatenateBuffers({compressed1, compressed_empty, compressed2}));
ASSERT_OK(RunCompressedInputStream(codec.get(), concatenated, &decompressed));
ASSERT_EQ(decompressed.size(), expected.size());
ASSERT_EQ(decompressed, expected);

// Same, but with an empty decompressed stream at the end
ASSERT_OK_AND_ASSIGN(concatenated,
ConcatenateBuffers({compressed1, compressed2, compressed_empty}));
ASSERT_OK(RunCompressedInputStream(codec.get(), concatenated, &decompressed));
ASSERT_EQ(decompressed.size(), expected.size());
ASSERT_EQ(decompressed, expected);
}
Expand Down