Skip to content

GH-3558: Bump hadoop to 3.4.3 and properly close buffers for vectored IO #3620

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
nastra wants to merge 2 commits into
base: master
Choose a base branch
from
+28 −3
Open

GH-3558: Bump hadoop to 3.4.3 and properly close buffers for vectored IO #3620

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b2456b7
GH-3558: Properly close buffers for vectored IO
nastra Jun 19, 2026
676f1be
Update pom.xml
nastra Jun 19, 2026
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
29 changes: 27 additions & 2 deletions parquet-hadoop/src/main/java/org/apache/parquet/hadoop/ParquetFileReader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
import org.apache.parquet.HadoopReadOptions;
import org.apache.parquet.ParquetReadOptions;
import org.apache.parquet.Preconditions;
import org.apache.parquet.bytes.ByteBufferAllocator;
import org.apache.parquet.bytes.ByteBufferInputStream;
import org.apache.parquet.bytes.ByteBufferReleaser;
import org.apache.parquet.bytes.BytesInput;
Expand Down Expand Up @@ -1361,8 +1362,32 @@ private void readVectored(List<ConsecutivePartList> allParts, ChunkListBuilder b
totalSize += len;
}
LOG.debug("Reading {} bytes of data with vectored IO in {} ranges", totalSize, ranges.size());
// Request a vectored read;
f.readVectored(ranges, options.getAllocator());
// Wrap the allocator to track buffers allocated during the vectored read.
// Hadoop's vectored IO may merge ranges and return slices of merged buffers,
// so the buffers returned via CompletableFuture may differ from those originally
// allocated. We track the originals here to ensure they are properly released.
ByteBufferAllocator baseAllocator = options.getAllocator();
List<ByteBuffer> allocatedBuffers = new ArrayList<>();
ByteBufferAllocator trackingAllocator = new ByteBufferAllocator() {
@Override
public ByteBuffer allocate(int size) {
ByteBuffer buf = baseAllocator.allocate(size);
allocatedBuffers.add(buf);
return buf;
}

@Override
public void release(ByteBuffer b) {
baseAllocator.release(b);
}

@Override
public boolean isDirect() {
return baseAllocator.isDirect();
}
};
f.readVectored(ranges, trackingAllocator);
builder.addBuffersToRelease(allocatedBuffers);
int k = 0;
for (ConsecutivePartList consecutivePart : allParts) {
ParquetFileRange currRange = ranges.get(k++);
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
<spotless.version>2.46.1</spotless.version>
<shade.prefix>shaded.parquet</shade.prefix>
<!-- Guarantees no newer classes/methods/constants are used by parquet. -->
<hadoop.version>3.3.0</hadoop.version>
<hadoop.version>3.4.3</hadoop.version>
<parquet.format.version>2.13.0</parquet.format.version>
<previous.version>1.17.0</previous.version>
<thrift.executable>thrift</thrift.executable>
Expand Down