Skip to content

GH-469: Unify ValueVector.getObject and VariableWidthFieldVector.get behavior about null value #486

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
lidavidm merged 4 commits into from
Jan 14, 2025
Merged

GH-469: Unify ValueVector.getObject and VariableWidthFieldVector.get behavior about null value #486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2f34ff6
unify `ValueVector.getObject` and `VariableWidthFieldVector.get` beha…
aqni Jan 6, 2025
b9bffb4
format
aqni Jan 6, 2025
d42d14c
throw exception rather 'return null'
aqni Jan 6, 2025
5a2b461
Revert "throw exception rather 'return null'"
aqni Jan 6, 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
5 changes: 4 additions & 1 deletion vector/src/main/java/org/apache/arrow/vector/FixedSizeBinaryVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,10 @@ public void get(int index, NullableFixedSizeBinaryHolder holder) {
*/
@Override
public byte[] getObject(int index) {
return get(index);
if (isSet(index) == 0) {
return null;
}
return get(valueBuffer, index, byteWidth);
}

public int getByteWidth() {
Expand Down
13 changes: 11 additions & 2 deletions vector/src/main/java/org/apache/arrow/vector/LargeVarBinaryVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
*/
package org.apache.arrow.vector;

import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;

import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.ReusableBuffer;
import org.apache.arrow.vector.complex.impl.LargeVarBinaryReaderImpl;
Expand Down Expand Up @@ -95,7 +97,7 @@ public MinorType getMinorType() {
*/
public byte[] get(int index) {
assert index >= 0;
if (isSet(index) == 0) {
if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
return null;
}
final long startOffset = getStartOffset(index);
Expand Down Expand Up @@ -127,7 +129,14 @@ public void read(int index, ReusableBuffer<?> buffer) {
*/
@Override
public byte[] getObject(int index) {
return get(index);
if (isSet(index) == 0) {
return null;
}
final long startOffset = getStartOffset(index);
final long dataLength = getEndOffset(index) - startOffset;
final byte[] result = new byte[(int) dataLength];
valueBuffer.getBytes(startOffset, result, 0, (int) dataLength);
return result;
}

/**
Expand Down
4 changes: 2 additions & 2 deletions vector/src/main/java/org/apache/arrow/vector/LargeVarCharVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public Types.MinorType getMinorType() {
@Override
public byte[] get(int index) {
assert index >= 0;
if (isSet(index) == 0) {
if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
return null;
}
final long startOffset = getStartOffset(index);
Expand All @@ -120,7 +120,7 @@ public byte[] get(int index) {
@Override
public Text getObject(int index) {
assert index >= 0;
if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
if (isSet(index) == 0) {
return null;
}

Expand Down
2 changes: 1 addition & 1 deletion vector/src/main/java/org/apache/arrow/vector/ValueVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ public interface ValueVector extends Closeable, Iterable<ValueVector> {
* Get friendly type object from the vector.
*
* @param index index of object to get
* @return friendly type object
* @return friendly type object, null if value is unset
*/
Object getObject(int index);

Expand Down
10 changes: 9 additions & 1 deletion vector/src/main/java/org/apache/arrow/vector/VarBinaryVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,15 @@ public void read(int index, ReusableBuffer<?> buffer) {
*/
@Override
public byte[] getObject(int index) {
return get(index);
if (isSet(index) == 0) {
return null;
}

final int startOffset = getStartOffset(index);
final int dataLength = getEndOffset(index) - startOffset;
final byte[] result = new byte[dataLength];
valueBuffer.getBytes(startOffset, result, 0, dataLength);
return result;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion vector/src/main/java/org/apache/arrow/vector/VarCharVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ public byte[] get(int index) {
@Override
public Text getObject(int index) {
assert index >= 0;
if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
if (isSet(index) == 0) {
return null;
}

Expand Down
5 changes: 4 additions & 1 deletion vector/src/main/java/org/apache/arrow/vector/ViewVarBinaryVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,10 @@ public void read(int index, ReusableBuffer<?> buffer) {
*/
@Override
public byte[] getObject(int index) {
return get(index);
if (isSet(index) == 0) {
return null;
}
return getData(index);
}

/**
Expand Down
2 changes: 1 addition & 1 deletion vector/src/main/java/org/apache/arrow/vector/ViewVarCharVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public byte[] get(int index) {
@Override
public Text getObject(int index) {
assert index >= 0;
if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
if (isSet(index) == 0) {
return null;
}

Expand Down
Loading