Skip to content

GH-704: Fix initialization of offset buffer when exporting VarChar vectors through C Data Interface #705

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 2 commits into from
Apr 8, 2025
Merged

GH-704: Fix initialization of offset buffer when exporting VarChar vectors through C Data Interface #705

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6d04679
Fix initializing offset buffer when exporting StringArrays through C …
Kontinuation Apr 7, 2025
47129f5
Fix test cases to make sure that the exported vectors have 0-capacity…
Kontinuation Apr 7, 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
25 changes: 25 additions & 0 deletions c/src/test/java/org/apache/arrow/c/RoundtripTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
import org.apache.arrow.memory.util.hash.ArrowBufHasher;
import org.apache.arrow.vector.BaseLargeVariableWidthVector;
import org.apache.arrow.vector.BaseVariableWidthVector;
import org.apache.arrow.vector.BigIntVector;
import org.apache.arrow.vector.BitVector;
import org.apache.arrow.vector.DateDayVector;
Expand Down Expand Up @@ -77,6 +79,7 @@
import org.apache.arrow.vector.ValueVector;
import org.apache.arrow.vector.VarBinaryVector;
import org.apache.arrow.vector.VarCharVector;
import org.apache.arrow.vector.VariableWidthVector;
Copy link
Copy Markdown
Member

@lidavidm lidavidm Apr 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unintentional import? This is failing the build

Copy link
Copy Markdown
Member Author

@Kontinuation Kontinuation Apr 7, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed. Other test failures seems to be unrelated to this PR.

import org.apache.arrow.vector.VectorSchemaRoot;
import org.apache.arrow.vector.ViewVarBinaryVector;
import org.apache.arrow.vector.ViewVarCharVector;
Expand Down Expand Up @@ -181,6 +184,12 @@ boolean roundtrip(FieldVector vector, Class<?> clazz) {
clazz.isInstance(imported),
String.format("expected %s but was %s", clazz, imported.getClass()));
result = VectorEqualsVisitor.vectorEquals(vector, imported);

if (imported instanceof BaseVariableWidthVector || imported instanceof BaseLargeVariableWidthVector) {
ArrowBuf offsetBuffer = imported.getOffsetBuffer();
assertTrue(offsetBuffer.capacity() > 0);
assertEquals(0, offsetBuffer.getInt(0));
}
}

// Check that the ref counts of the buffers are the same after the roundtrip
Expand Down Expand Up @@ -602,6 +611,14 @@ public void testVarCharVector() {
}
}

@Test
public void testEmptyVarCharVector() {
try (final VarCharVector vector = new VarCharVector("v", allocator)) {
setVector(vector, new String[] {});
assertTrue(roundtrip(vector, VarCharVector.class));
}
}

@Test
public void testLargeVarBinaryVector() {
try (final LargeVarBinaryVector vector = new LargeVarBinaryVector("", allocator)) {
Expand Down Expand Up @@ -635,6 +652,14 @@ public void testLargeVarCharVector() {
}
}

@Test
public void testEmptyLargeVarCharVector() {
try (final LargeVarCharVector vector = new LargeVarCharVector("v", allocator)) {
setVector(vector, new String[] {});
assertTrue(roundtrip(vector, LargeVarCharVector.class));
}
}

@Test
public void testListVector() {
try (final ListVector vector = ListVector.empty("v", allocator)) {
Expand Down
2 changes: 1 addition & 1 deletion vector/src/main/java/org/apache/arrow/vector/BaseLargeVariableWidthVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ private void allocateBytes(final long valueBufferSize, final int valueCount) {
private ArrowBuf allocateOffsetBuffer(final long size) {
ArrowBuf offsetBuffer = allocator.buffer(size);
offsetBuffer.readerIndex(0);
initOffsetBuffer();
offsetBuffer.setZero(0, offsetBuffer.capacity());
return offsetBuffer;
}

Expand Down
2 changes: 1 addition & 1 deletion 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 @@ -514,7 +514,7 @@ private ArrowBuf allocateOffsetBuffer(final long size) {
final int curSize = (int) size;
ArrowBuf offsetBuffer = allocator.buffer(curSize);
offsetBuffer.readerIndex(0);
initOffsetBuffer();
offsetBuffer.setZero(0, offsetBuffer.capacity());
return offsetBuffer;
}

Expand Down
Loading