Skip to content

GH-721: Allow using 1GB+ data buffers in variable width vectors #722

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
merged 4 commits into from
Apr 22, 2025
Merged

GH-721: Allow using 1GB+ data buffers in variable width vectors #722

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a53a049
GH-721: Allow using 1GB+ data buffers in variable width vectors
gszadovszky Apr 22, 2025
e84f8b6
fix format issues
gszadovszky Apr 22, 2025
2f93de2
Add unit test
gszadovszky Apr 22, 2025
7961c0a
Fix testing issues due to round ups
gszadovszky Apr 22, 2025
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
7 changes: 5 additions & 2 deletions vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,10 +571,13 @@ public void reallocDataBuffer(long desiredAllocSize) {
return;
}

final long newAllocationSize = CommonUtil.nextPowerOfTwo(desiredAllocSize);
final long newAllocationSize =
Math.min(CommonUtil.nextPowerOfTwo(desiredAllocSize), MAX_BUFFER_SIZE);
assert newAllocationSize >= 1;

checkDataBufferSize(newAllocationSize);
if (newAllocationSize < desiredAllocSize) {
checkDataBufferSize(desiredAllocSize);
}

final ArrowBuf newBuf = allocator.buffer(newAllocationSize);
newBuf.setBytes(0, valueBuffer, 0, valueBuffer.capacity());
Expand Down
14 changes: 10 additions & 4 deletions vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthViewVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,15 +550,18 @@ public void reallocViewBuffer(long desiredAllocSize) {
if (desiredAllocSize == 0) {
return;
}
long newAllocationSize = CommonUtil.nextPowerOfTwo(desiredAllocSize);
long newAllocationSize = Math.min(CommonUtil.nextPowerOfTwo(desiredAllocSize), MAX_BUFFER_SIZE);
assert newAllocationSize >= 1;

checkDataBufferSize(newAllocationSize);
// for each set operation, we have to allocate 16 bytes
// here we are adjusting the desired allocation-based allocation size
// to align with the 16bytes requirement.
newAllocationSize = roundUpToMultipleOf16(newAllocationSize);

if (newAllocationSize < desiredAllocSize) {
checkDataBufferSize(desiredAllocSize);
}

final ArrowBuf newBuf = allocator.buffer(newAllocationSize);
newBuf.setBytes(0, viewBuffer, 0, viewBuffer.capacity());

Expand Down Expand Up @@ -587,10 +590,13 @@ public void reallocViewDataBuffer(long desiredAllocSize) {
return;
}

final long newAllocationSize = CommonUtil.nextPowerOfTwo(desiredAllocSize);
final long newAllocationSize =
Math.min(CommonUtil.nextPowerOfTwo(desiredAllocSize), MAX_BUFFER_SIZE);
assert newAllocationSize >= 1;

checkDataBufferSize(newAllocationSize);
if (newAllocationSize < desiredAllocSize) {
checkDataBufferSize(desiredAllocSize);
}

final ArrowBuf newBuf = allocator.buffer(newAllocationSize);
dataBuffers.add(newBuf);
Expand Down
Loading