ARROW-6709: [JAVA] Jdbc adapter currentIndex should increment when va…

…lue is null
kszucs · Sep 26, 2019 · b1e9d5a · b1e9d5a
1 parent 35b6d07
commit b1e9d5a
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 12 deletions.
diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BigIntConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BigIntConsumer.java
@@ -45,8 +45,9 @@ public BigIntConsumer(BigIntVector vector, int index) {
   public void consume(ResultSet resultSet) throws SQLException {
     long value = resultSet.getLong(columnIndexInResultSet);
     if (!resultSet.wasNull()) {
-      vector.setSafe(currentIndex++, value);
+      vector.setSafe(currentIndex, value);
     }
+    currentIndex++;
   }
 
   @Override

diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BitConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BitConsumer.java
@@ -45,8 +45,9 @@ public BitConsumer(BitVector vector, int index) {
   public void consume(ResultSet resultSet) throws SQLException {
     boolean value = resultSet.getBoolean(columnIndexInResultSet);
     if (!resultSet.wasNull()) {
-      vector.setSafe(currentIndex++, value ? 1 : 0);
+      vector.setSafe(currentIndex, value ? 1 : 0);
     }
+    currentIndex++;
   }
 
   @Override

diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DateConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DateConsumer.java
@@ -57,8 +57,9 @@ public void consume(ResultSet resultSet) throws SQLException {
     Date date = calendar == null ? resultSet.getDate(columnIndexInResultSet) :
         resultSet.getDate(columnIndexInResultSet, calendar);
     if (!resultSet.wasNull()) {
-      vector.setSafe(currentIndex++, date.getTime());
+      vector.setSafe(currentIndex, date.getTime());
     }
+    currentIndex++;
   }
 
   @Override

diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DecimalConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DecimalConsumer.java
@@ -46,8 +46,9 @@ public DecimalConsumer(DecimalVector vector, int index) {
   public void consume(ResultSet resultSet) throws SQLException {
     BigDecimal value = resultSet.getBigDecimal(columnIndexInResultSet);
     if (!resultSet.wasNull()) {
-      vector.setSafe(currentIndex++, value);
+      vector.setSafe(currentIndex, value);
     }
+    currentIndex++;
   }
 
   @Override

diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DoubleConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/DoubleConsumer.java
@@ -45,8 +45,9 @@ public DoubleConsumer(Float8Vector vector, int index) {
   public void consume(ResultSet resultSet) throws SQLException {
     double value = resultSet.getDouble(columnIndexInResultSet);
     if (!resultSet.wasNull()) {
-      vector.setSafe(currentIndex++, value);
+      vector.setSafe(currentIndex, value);
     }
+    currentIndex++;
   }
 
   @Override

diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/FloatConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/FloatConsumer.java
@@ -45,8 +45,9 @@ public FloatConsumer(Float4Vector vector, int index) {
   public void consume(ResultSet resultSet) throws SQLException {
     float value = resultSet.getFloat(columnIndexInResultSet);
     if (!resultSet.wasNull()) {
-      vector.setSafe(currentIndex++, value);
+      vector.setSafe(currentIndex, value);
     }
+    currentIndex++;
   }
 
   @Override

diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/IntConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/IntConsumer.java
@@ -45,8 +45,9 @@ public IntConsumer(IntVector vector, int index) {
   public void consume(ResultSet resultSet) throws SQLException {
     int value = resultSet.getInt(columnIndexInResultSet);
     if (!resultSet.wasNull()) {
-      vector.setSafe(currentIndex++, value);
+      vector.setSafe(currentIndex, value);
     }
+    currentIndex++;
   }
 
   @Override

diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/SmallIntConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/SmallIntConsumer.java
@@ -45,8 +45,9 @@ public SmallIntConsumer(SmallIntVector vector, int index) {
   public void consume(ResultSet resultSet) throws SQLException {
     short value = resultSet.getShort(columnIndexInResultSet);
     if (!resultSet.wasNull()) {
-      vector.setSafe(currentIndex++, value);
+      vector.setSafe(currentIndex, value);
     }
+    currentIndex++;
   }
 
   @Override

diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimeConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimeConsumer.java
@@ -57,8 +57,9 @@ public void consume(ResultSet resultSet) throws SQLException {
     Time time = calendar == null ? resultSet.getTime(columnIndexInResultSet) :
         resultSet.getTime(columnIndexInResultSet, calendar);
     if (!resultSet.wasNull()) {
-      vector.setSafe(currentIndex++, (int) time.getTime());
+      vector.setSafe(currentIndex, (int) time.getTime());
     }
+    currentIndex++;
   }
 
   @Override

diff --git a/.../adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimestampConsumer.java b/.../adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TimestampConsumer.java
@@ -57,8 +57,9 @@ public void consume(ResultSet resultSet) throws SQLException {
     Timestamp timestamp = calendar == null ? resultSet.getTimestamp(columnIndexInResultSet) :
         resultSet.getTimestamp(columnIndexInResultSet, calendar);
     if (!resultSet.wasNull()) {
-      vector.setSafe(currentIndex++, timestamp.getTime());
+      vector.setSafe(currentIndex, timestamp.getTime());
     }
+    currentIndex++;
   }
 
   @Override

diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TinyIntConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/TinyIntConsumer.java
@@ -45,8 +45,9 @@ public TinyIntConsumer(TinyIntVector vector, int index) {
   public void consume(ResultSet resultSet) throws SQLException {
     byte value = resultSet.getByte(columnIndexInResultSet);
     if (!resultSet.wasNull()) {
-      vector.setSafe(currentIndex++, value);
+      vector.setSafe(currentIndex, value);
     }
+    currentIndex++;
   }
 
   @Override

diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/VarCharConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/VarCharConsumer.java
@@ -48,8 +48,9 @@ public void consume(ResultSet resultSet) throws SQLException {
     if (!resultSet.wasNull()) {
       byte[] bytes = value.getBytes(StandardCharsets.UTF_8);
 
-      vector.setSafe(currentIndex++, bytes);
+      vector.setSafe(currentIndex, bytes);
     }
+    currentIndex++;
   }
 
   @Override