Fix bug with zero-length values in varbinary vectors

apache · Jul 26, 2022 · 52ae3bb · 52ae3bb
1 parent 0e80e0e
commit 52ae3bb
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/VarBinaryBinder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/VarBinaryBinder.java
@@ -56,7 +56,7 @@ public void bind(PreparedStatement statement, int parameterIndex, int rowIndex)
       throw new RuntimeException(message);
     }
     byte[] binaryData = new byte[(int) element.getLength()];
-    element.getBuf().getBytes(0, binaryData);
+    element.getBuf().getBytes(element.getOffset(), binaryData);
     statement.setBytes(parameterIndex, binaryData);
   }
 }
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/VarCharBinder.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/binder/VarCharBinder.java
@@ -57,7 +57,7 @@ public void bind(PreparedStatement statement, int parameterIndex, int rowIndex)
       throw new RuntimeException(message);
     }
     byte[] utf8Bytes = new byte[(int) element.getLength()];
-    element.getBuf().getBytes(0, utf8Bytes);
+    element.getBuf().getBytes(element.getOffset(), utf8Bytes);
     statement.setString(parameterIndex, new String(utf8Bytes, StandardCharsets.UTF_8));
   }
 }
diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcParameterBinderTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/JdbcParameterBinderTest.java
@@ -422,13 +422,22 @@ <T, V extends FieldVector> void testSimpleType(ArrowType arrowType, int jdbcType
 
       setNull.accept(vector, 0);
       setValue.accept(vector, 1, values.get(2));
-      root.setRowCount(2);
+      setValue.accept(vector, 2, values.get(0));
+      setValue.accept(vector, 3, values.get(2));
+      setValue.accept(vector, 4, values.get(1));
+      root.setRowCount(5);
 
       assertThat(binder.next()).isTrue();
       assertThat(statement.getParamValue(1)).isNull();
       assertThat(statement.getParamType(1)).isEqualTo(jdbcType);
       assertThat(binder.next()).isTrue();
       assertThat(statement.getParamValue(1)).isEqualTo(values.get(2));
+      assertThat(binder.next()).isTrue();
+      assertThat(statement.getParamValue(1)).isEqualTo(values.get(0));
+      assertThat(binder.next()).isTrue();
+      assertThat(statement.getParamValue(1)).isEqualTo(values.get(2));
+      assertThat(binder.next()).isTrue();
+      assertThat(statement.getParamValue(1)).isEqualTo(values.get(1));
       assertThat(binder.next()).isFalse();
     }
 
@@ -454,11 +463,23 @@ <T, V extends FieldVector> void testSimpleType(ArrowType arrowType, int jdbcType
 
       binder.reset();
 
-      setValue.accept(vector, 0, values.get(2));
-      root.setRowCount(1);
+      setValue.accept(vector, 0, values.get(0));
+      setValue.accept(vector, 1, values.get(2));
+      setValue.accept(vector, 2, values.get(0));
+      setValue.accept(vector, 3, values.get(2));
+      setValue.accept(vector, 4, values.get(1));
+      root.setRowCount(5);
 
+      assertThat(binder.next()).isTrue();
+      assertThat(statement.getParamValue(1)).isEqualTo(values.get(0));
+      assertThat(binder.next()).isTrue();
+      assertThat(statement.getParamValue(1)).isEqualTo(values.get(2));
+      assertThat(binder.next()).isTrue();
+      assertThat(statement.getParamValue(1)).isEqualTo(values.get(0));
       assertThat(binder.next()).isTrue();
       assertThat(statement.getParamValue(1)).isEqualTo(values.get(2));
+      assertThat(binder.next()).isTrue();
+      assertThat(statement.getParamValue(1)).isEqualTo(values.get(1));
       assertThat(binder.next()).isFalse();
     }
   }