Skip to content

GH-470: [Vector] Fix ListViewVector.getElementEndIndex(index) method #1019

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
jbonofre merged 2 commits into from
Feb 17, 2026
Merged

GH-470: [Vector] Fix ListViewVector.getElementEndIndex(index) method #1019

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
109daf3
GH-470: [Vector] Fix ListViewVector.getElementEndIndex(index) method
axreldable Feb 15, 2026
ade73e5
GH-470: [Vector] Fix bug of usage sizeBuffer with OFFSET_WIDTH (hashC…
axreldable Feb 15, 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
68 changes: 38 additions & 30 deletions vector/src/main/java/org/apache/arrow/vector/complex/ListViewVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,8 +226,8 @@ private void setReaderAndWriterIndex() {
sizeBuffer.writerIndex(0);
} else {
validityBuffer.writerIndex(BitVectorHelper.getValidityBufferSizeFromCount(valueCount));
offsetBuffer.writerIndex(valueCount * OFFSET_WIDTH);
sizeBuffer.writerIndex(valueCount * SIZE_WIDTH);
offsetBuffer.writerIndex((long) valueCount * OFFSET_WIDTH);
sizeBuffer.writerIndex((long) valueCount * SIZE_WIDTH);
}
}

Expand Down Expand Up @@ -445,14 +445,22 @@ public int hashCode(int index, ArrowBufHasher hasher) {
return ArrowBufPointer.NULL_HASH_CODE;
}
int hash = 0;
final int start = offsetBuffer.getInt(index * OFFSET_WIDTH);
final int end = sizeBuffer.getInt(index * OFFSET_WIDTH);
final int start = getElementStartIndex(index);
final int end = getElementEndIndex(index);
for (int i = start; i < end; i++) {
hash = ByteFunctionHelpers.combineHash(hash, vector.hashCode(i, hasher));
}
return hash;
}

private void setElementOffsetBuffer(int index, int value) {
offsetBuffer.setInt((long) index * OFFSET_WIDTH, value);
}

private void setElementSizeBuffer(int index, int value) {
sizeBuffer.setInt((long) index * SIZE_WIDTH, value);
}

private class TransferImpl implements TransferPair {

ListViewVector to;
Expand Down Expand Up @@ -498,7 +506,6 @@ public void splitAndTransfer(int startIndex, int length) {
valueCount);
to.clear();
if (length > 0) {
final int startPoint = offsetBuffer.getInt((long) startIndex * OFFSET_WIDTH);
// we have to scan by index since there are out-of-order offsets
to.offsetBuffer = to.allocateBuffers((long) length * OFFSET_WIDTH);
to.sizeBuffer = to.allocateBuffers((long) length * SIZE_WIDTH);
Expand All @@ -507,9 +514,9 @@ public void splitAndTransfer(int startIndex, int length) {
int maxOffsetAndSizeSum = -1;
int minOffsetValue = -1;
for (int i = 0; i < length; i++) {
final int offsetValue = offsetBuffer.getInt((long) (startIndex + i) * OFFSET_WIDTH);
final int sizeValue = sizeBuffer.getInt((long) (startIndex + i) * SIZE_WIDTH);
to.sizeBuffer.setInt((long) i * SIZE_WIDTH, sizeValue);
final int offsetValue = getElementStartIndex(startIndex + i);
final int sizeValue = getElementSize(startIndex + i);
to.setElementSizeBuffer(i, sizeValue);
if (maxOffsetAndSizeSum < offsetValue + sizeValue) {
maxOffsetAndSizeSum = offsetValue + sizeValue;
}
Expand All @@ -520,9 +527,9 @@ public void splitAndTransfer(int startIndex, int length) {

/* splitAndTransfer the offset buffer */
for (int i = 0; i < length; i++) {
final int offsetValue = offsetBuffer.getInt((long) (startIndex + i) * OFFSET_WIDTH);
final int offsetValue = getElementStartIndex(startIndex + i);
final int relativeOffset = offsetValue - minOffsetValue;
to.offsetBuffer.setInt((long) i * OFFSET_WIDTH, relativeOffset);
to.setElementOffsetBuffer(i, relativeOffset);
}

/* splitAndTransfer the validity buffer */
Expand Down Expand Up @@ -678,8 +685,8 @@ public List<?> getObject(int index) {
if (isSet(index) == 0) {
return null;
}
final int start = offsetBuffer.getInt(index * OFFSET_WIDTH);
final int end = start + sizeBuffer.getInt((index) * SIZE_WIDTH);
final int start = getElementStartIndex(index);
final int end = getElementEndIndex(index);
final ValueVector vv = getDataVector();
final List<Object> vals = new JsonStringArrayList<>(end - start);
for (int i = start; i < end; i++) {
Expand Down Expand Up @@ -711,7 +718,7 @@ public boolean isEmpty(int index) {
if (isNull(index)) {
return true;
} else {
return sizeBuffer.getInt(index * SIZE_WIDTH) == 0;
return getElementSize(index) == 0;
}
}

Expand All @@ -722,10 +729,7 @@ public boolean isEmpty(int index) {
* @return 1 if element at given index is not null, 0 otherwise
*/
public int isSet(int index) {
final int byteIndex = index >> 3;
final byte b = validityBuffer.getByte(byteIndex);
final int bitIndex = index & 7;
return (b >> bitIndex) & 0x01;
return BitVectorHelper.get(validityBuffer, index);
}

/**
Expand Down Expand Up @@ -775,8 +779,8 @@ public void setNull(int index) {
reallocValidityAndSizeAndOffsetBuffers();
}

offsetBuffer.setInt(index * OFFSET_WIDTH, 0);
sizeBuffer.setInt(index * SIZE_WIDTH, 0);
setElementOffsetBuffer(index, 0);
setElementSizeBuffer(index, 0);
BitVectorHelper.unsetBit(validityBuffer, index);
}

Expand All @@ -794,11 +798,11 @@ public int startNewValue(int index) {

if (index > 0) {
final int prevOffset = getMaxViewEndChildVectorByIndex(index);
offsetBuffer.setInt(index * OFFSET_WIDTH, prevOffset);
setElementOffsetBuffer(index, prevOffset);
}

BitVectorHelper.setBit(validityBuffer, index);
return offsetBuffer.getInt(index * OFFSET_WIDTH);
return getElementStartIndex(index);
}

/**
Expand Down Expand Up @@ -836,9 +840,9 @@ private void validateInvariants(int offset, int size) {
* @param value value to set
*/
public void setOffset(int index, int value) {
validateInvariants(value, sizeBuffer.getInt(index * SIZE_WIDTH));
validateInvariants(value, getElementSize(index));

offsetBuffer.setInt(index * OFFSET_WIDTH, value);
setElementOffsetBuffer(index, value);
}

/**
Expand All @@ -848,9 +852,9 @@ public void setOffset(int index, int value) {
* @param value value to set
*/
public void setSize(int index, int value) {
validateInvariants(offsetBuffer.getInt(index * SIZE_WIDTH), value);
validateInvariants(getElementStartIndex(index), value);

sizeBuffer.setInt(index * SIZE_WIDTH, value);
setElementSizeBuffer(index, value);
}

/**
Expand Down Expand Up @@ -886,12 +890,16 @@ public void setValueCount(int valueCount) {

@Override
public int getElementStartIndex(int index) {
return offsetBuffer.getInt(index * OFFSET_WIDTH);
return offsetBuffer.getInt((long) index * OFFSET_WIDTH);
}

private int getElementSize(int index) {
return sizeBuffer.getInt((long) index * SIZE_WIDTH);
}

@Override
public int getElementEndIndex(int index) {
return sizeBuffer.getInt(index * OFFSET_WIDTH);
return getElementStartIndex(index) + getElementSize(index);
}

@Override
Expand Down Expand Up @@ -948,8 +956,8 @@ public double getDensity() {
@Override
public void validate() {
for (int i = 0; i < valueCount; i++) {
final int offset = offsetBuffer.getInt(i * OFFSET_WIDTH);
final int size = sizeBuffer.getInt(i * SIZE_WIDTH);
final int offset = getElementStartIndex(i);
final int size = getElementSize(i);
validateInvariants(offset, size);
}
}
Expand All @@ -961,6 +969,6 @@ public void validate() {
* @param size number of elements in the list that was written
*/
public void endValue(int index, int size) {
sizeBuffer.setInt(index * SIZE_WIDTH, size);
setElementSizeBuffer(index, size);
}
}
Loading
Loading