ARROW-15382: [Java] fix SplitAndTransfer throws for (0,0) if vector e…

…mpty
apache · Jan 25, 2022 · cc266e4 · cc266e4
1 parent 443d095
commit cc266e4
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 28 deletions.
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BaseLargeVariableWidthVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BaseLargeVariableWidthVector.java
@@ -701,16 +701,14 @@ public void transferTo(BaseLargeVariableWidthVector target) {
  */
  public void splitAndTransferTo(int startIndex, int length,
  BaseLargeVariableWidthVector target) {
- Preconditions.checkArgument(startIndex >= 0 && startIndex < valueCount,
- "Invalid startIndex: %s", startIndex);
- Preconditions.checkArgument(startIndex + length <= valueCount,
- "Invalid length: %s", length);
+ Preconditions.checkArgument(startIndex >= 0 && length >= 0 && startIndex + length <= valueCount,
+ "Invalid parameters startIndex: %s, length: %s for valueCount: %s", startIndex, length, valueCount);
  compareTypes(target, "splitAndTransferTo");
  target.clear();
- splitAndTransferValidityBuffer(startIndex, length, target);
- splitAndTransferOffsetBuffer(startIndex, length, target);
- target.setLastSet(length - 1);
  if (length > 0) {
+ splitAndTransferValidityBuffer(startIndex, length, target);
+ splitAndTransferOffsetBuffer(startIndex, length, target);
+ target.setLastSet(length - 1);
  target.setValueCount(length);
  }
  }

diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java
@@ -725,10 +725,10 @@ public void splitAndTransferTo(int startIndex, int length,
  "Invalid parameters startIndex: %s, length: %s for valueCount: %s", startIndex, length, valueCount);
  compareTypes(target, "splitAndTransferTo");
  target.clear();
- splitAndTransferValidityBuffer(startIndex, length, target);
- splitAndTransferOffsetBuffer(startIndex, length, target);
- target.setLastSet(length - 1);
  if (length > 0) {
+ splitAndTransferValidityBuffer(startIndex, length, target);
+ splitAndTransferOffsetBuffer(startIndex, length, target);
+ target.setLastSet(length - 1);
  target.setValueCount(length);
  }
  }

diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java
@@ -481,21 +481,23 @@ public void transfer() {
  public void splitAndTransfer(int startIndex, int length) {
  Preconditions.checkArgument(startIndex >= 0 && length >= 0 && startIndex + length <= valueCount,
  "Invalid parameters startIndex: %s, length: %s for valueCount: %s", startIndex, length, valueCount);
- final int startPoint = offsetBuffer.getInt(startIndex * OFFSET_WIDTH);
- final int sliceLength = offsetBuffer.getInt((startIndex + length) * OFFSET_WIDTH) - startPoint;
  to.clear();
- to.allocateOffsetBuffer((length + 1) * OFFSET_WIDTH);
- /* splitAndTransfer offset buffer */
- for (int i = 0; i < length + 1; i++) {
- final int relativeOffset = offsetBuffer.getInt((startIndex + i) * OFFSET_WIDTH) - startPoint;
- to.offsetBuffer.setInt(i * OFFSET_WIDTH, relativeOffset);
+ if (length > 0) {
+ final int startPoint = offsetBuffer.getInt(startIndex * OFFSET_WIDTH);
+ final int sliceLength = offsetBuffer.getInt((startIndex + length) * OFFSET_WIDTH) - startPoint;
+ to.allocateOffsetBuffer((length + 1) * OFFSET_WIDTH);
+ /* splitAndTransfer offset buffer */
+ for (int i = 0; i < length + 1; i++) {
+ final int relativeOffset = offsetBuffer.getInt((startIndex + i) * OFFSET_WIDTH) - startPoint;
+ to.offsetBuffer.setInt(i * OFFSET_WIDTH, relativeOffset);
+ }
+ /* splitAndTransfer validity buffer */
+ splitAndTransferValidityBuffer(startIndex, length, to);
+ /* splitAndTransfer data buffer */
+ dataTransferPair.splitAndTransfer(startPoint, sliceLength);
+ to.lastSet = length - 1;
+ to.setValueCount(length);
  }
- /* splitAndTransfer validity buffer */
- splitAndTransferValidityBuffer(startIndex, length, to);
- /* splitAndTransfer data buffer */
- dataTransferPair.splitAndTransfer(startPoint, sliceLength);
- to.lastSet = length - 1;
- to.setValueCount(length);
  }
 
  /*

diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestSplitAndTransfer.java b/java/vector/src/test/java/org/apache/arrow/vector/TestSplitAndTransfer.java
@@ -46,7 +46,7 @@ public class TestSplitAndTransfer {
  public void init() {
  allocator = new RootAllocator(Long.MAX_VALUE);
  }
- 
+
  @After
  public void terminate() throws Exception {
  allocator.close();
@@ -62,21 +62,58 @@ private void populateVarcharVector(final VarCharVector vector, int valueCount, S
  }
  vector.setValueCount(valueCount);
  }
-
+
+ @Test
+ public void testWithEmptyVector() {
+ // MapVector use TransferImpl from ListVector
+ ListVector listVector = ListVector.empty("", allocator);
+ TransferPair transferPair = listVector.getTransferPair(allocator);
+ transferPair.splitAndTransfer(0, 0);
+ assertEquals(0, transferPair.getTo().getValueCount());
+ // BaseFixedWidthVector
+ IntVector intVector = new IntVector("", allocator);
+ transferPair = intVector.getTransferPair(allocator);
+ transferPair.splitAndTransfer(0, 0);
+ assertEquals(0, transferPair.getTo().getValueCount());
+ // BaseVariableWidthVector
+ VarCharVector varCharVector = new VarCharVector("", allocator);
+ transferPair = varCharVector.getTransferPair(allocator);
+ transferPair.splitAndTransfer(0, 0);
+ assertEquals(0, transferPair.getTo().getValueCount());
+ // BaseLargeVariableWidthVector
+ LargeVarCharVector largeVarCharVector = new LargeVarCharVector("", allocator);
+ transferPair = largeVarCharVector.getTransferPair(allocator);
+ transferPair.splitAndTransfer(0, 0);
+ assertEquals(0, transferPair.getTo().getValueCount());
+
+ StructVector structVector = StructVector.empty("", allocator);
+ transferPair = structVector.getTransferPair(allocator);
+ transferPair.splitAndTransfer(0, 0);
+ assertEquals(0, transferPair.getTo().getValueCount());
+ FixedSizeListVector fixedSizeListVector = FixedSizeListVector.empty("", 0, allocator);
+ transferPair = fixedSizeListVector.getTransferPair(allocator);
+ transferPair.splitAndTransfer(0, 0);
+ assertEquals(0, transferPair.getTo().getValueCount());
+ FixedSizeBinaryVector fixedSizeBinaryVector = new FixedSizeBinaryVector("", allocator, 4);
+ transferPair = fixedSizeBinaryVector.getTransferPair(allocator);
+ transferPair.splitAndTransfer(0, 0);
+ assertEquals(0, transferPair.getTo().getValueCount());
+ }
+
  @Test /* VarCharVector */
  public void test() throws Exception {
  try (final VarCharVector varCharVector = new VarCharVector("myvector", allocator)) {
  varCharVector.allocateNew(10000, 1000);
 
  final int valueCount = 500;
  final String[] compareArray = new String[valueCount];
- 
+
  populateVarcharVector(varCharVector, valueCount, compareArray);
- 
+
  final TransferPair tp = varCharVector.getTransferPair(allocator);
  final VarCharVector newVarCharVector = (VarCharVector) tp.getTo();
  final int[][] startLengths = {{0, 201}, {201, 0}, {201, 200}, {401, 99}};
- 
+
  for (final int[] startLength : startLengths) {
  final int start = startLength[0];
  final int length = startLength[1];