Skip to content

PARQUET-2022: ZstdDecompressorStream should close zstdInputStream #889

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

Merged
gszadovszky merged 1 commit into from
Apr 19, 2021
Merged

PARQUET-2022: ZstdDecompressorStream should close zstdInputStream #889

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
9 changes: 9 additions & 0 deletions parquet-hadoop/src/main/java/org/apache/parquet/hadoop/codec/ZstdDecompressorStream.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,13 @@ public int read() throws IOException {
public void resetState() throws IOException {
// no-opt, doesn't apply to ZSTD
}

@Override
public void close() throws IOException {
try {
zstdInputStream.close();
} finally {
super.close();
}
}
}
9 changes: 4 additions & 5 deletions parquet-hadoop/src/test/java/org/apache/parquet/hadoop/TestZstandardCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ private void testZstd(ZstandardCodec codec, int dataSize) throws IOException {
byte[] data = new byte[dataSize];
(new Random()).nextBytes(data);
BytesInput compressedData = compress(codec, BytesInput.from(data));
BytesInput decompressedData = decompress(codec, compressedData, data.length);
Assert.assertArrayEquals(data, decompressedData.toByteArray());
byte[] decompressedData = decompress(codec, compressedData, data.length);
Assert.assertArrayEquals(data, decompressedData);
}

private BytesInput compress(ZstandardCodec codec, BytesInput bytes) throws IOException {
Expand All @@ -91,10 +91,9 @@ private BytesInput compress(ZstandardCodec codec, BytesInput bytes) throws IOExc
return BytesInput.from(compressedOutBuffer);
}

private BytesInput decompress(ZstandardCodec codec, BytesInput bytes, int uncompressedSize) throws IOException {
BytesInput decompressed;
private byte[] decompress(ZstandardCodec codec, BytesInput bytes, int uncompressedSize) throws IOException {
InputStream is = codec.createInputStream(bytes.toInputStream(), null);
decompressed = BytesInput.from(is, uncompressedSize);
byte[] decompressed = BytesInput.from(is, uncompressedSize).toByteArray();
is.close();
return decompressed;
}
Expand Down