-
Notifications
You must be signed in to change notification settings - Fork 2.9k
Parquet: close zstd input stream early to avoid memory pressure #5681
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.
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
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
101 changes: 101 additions & 0 deletions
101
parquet/src/main/java/org/apache/iceberg/parquet/ParquetCodecFactory.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you under the Apache License, Version 2.0 (the | ||
| * "License"); you may not use this file except in compliance | ||
| * with the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| package org.apache.iceberg.parquet; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
| import java.nio.ByteBuffer; | ||
| import org.apache.hadoop.conf.Configuration; | ||
| import org.apache.hadoop.io.compress.CodecPool; | ||
| import org.apache.hadoop.io.compress.CompressionCodec; | ||
| import org.apache.hadoop.io.compress.Decompressor; | ||
| import org.apache.parquet.bytes.BytesInput; | ||
| import org.apache.parquet.hadoop.CodecFactory; | ||
| import org.apache.parquet.hadoop.codec.ZstandardCodec; | ||
| import org.apache.parquet.hadoop.metadata.CompressionCodecName; | ||
|
|
||
| /** | ||
| * This class implements a codec factory that is used when reading from Parquet. It adds a | ||
| * workaround for memory issues encountered when reading from zstd-compressed files. | ||
| */ | ||
| public class ParquetCodecFactory extends CodecFactory { | ||
|
|
||
| public ParquetCodecFactory(Configuration configuration, int pageSize) { | ||
| super(configuration, pageSize); | ||
| } | ||
|
|
||
| /** Copied and modified from CodecFactory.HeapBytesDecompressor */ | ||
| class HeapBytesDecompressor extends BytesDecompressor { | ||
|
|
||
| private final CompressionCodec codec; | ||
| private final Decompressor decompressor; | ||
|
|
||
| HeapBytesDecompressor(CompressionCodecName codecName) { | ||
| this.codec = getCodec(codecName); | ||
| if (codec != null) { | ||
| decompressor = CodecPool.getDecompressor(codec); | ||
| } else { | ||
| decompressor = null; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public BytesInput decompress(BytesInput bytes, int uncompressedSize) throws IOException { | ||
| final BytesInput decompressed; | ||
| if (codec != null) { | ||
| if (decompressor != null) { | ||
| decompressor.reset(); | ||
| } | ||
| if (codec instanceof ZstandardCodec) { | ||
| // we need to close the zstd input stream ASAP to free up native resources, so | ||
| // read everything into a buffer and then close it | ||
| try (InputStream is = codec.createInputStream(bytes.toInputStream(), decompressor)) { | ||
| decompressed = BytesInput.copy(BytesInput.from(is, uncompressedSize)); | ||
| } | ||
| } else { | ||
| InputStream is = codec.createInputStream(bytes.toInputStream(), decompressor); | ||
| decompressed = BytesInput.from(is, uncompressedSize); | ||
| } | ||
| } else { | ||
| decompressed = bytes; | ||
| } | ||
| return decompressed; | ||
| } | ||
|
|
||
| @Override | ||
| public void decompress( | ||
| ByteBuffer input, int compressedSize, ByteBuffer output, int uncompressedSize) | ||
| throws IOException { | ||
| ByteBuffer decompressed = decompress(BytesInput.from(input), uncompressedSize).toByteBuffer(); | ||
| output.put(decompressed); | ||
| } | ||
|
|
||
| @Override | ||
| public void release() { | ||
| if (decompressor != null) { | ||
| CodecPool.returnDecompressor(decompressor); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| protected BytesDecompressor createDecompressor(CompressionCodecName codecName) { | ||
| return new HeapBytesDecompressor(codecName); | ||
| } | ||
| } |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it safe to pass
0for page size? How is that option used?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The page size isn't used for decompressors according to this comment. This is what is currently being set by default in the options builder.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I added comments to make that more clear
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Idea: Maybe making this a named constant, like
UNUSED_PARQUET_DECOMPRESSOR_PAGE_SIZEor something would be a good way of indicating that?Given this solution is temporary, I don’t have a strong feeling either way, but I do like avoiding magic numbers.
Maybe a link to the upstream parquet-mr PR or an Iceberg issue related to zstd decompression would be more informative than just mentioning that page size is essentially ignored? The decompressor class itself might be sufficient documentation though.