fix

apache · Jul 16, 2019 · 26d30be · 26d30be
1 parent e65473c
commit 26d30be
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 26 deletions.
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BaseIntVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BaseIntVector.java
@@ -28,8 +28,9 @@ public interface BaseIntVector extends ValueVector {
   void setWithPossibleTruncate(int index, long value);
 
   /**
-   * Gets the value at index, note this value may haven been extended to long and will throw Exception if
-   * the value is null.
+   * Gets the value at index.
+   * This value may have been extended to long and will throw {@link NullPointerException}
+   * if the value is null. Note null check could be turned off via {@link NullCheckingForGet}.
    */
   long getValueAsLong(int index);
 }
diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BigIntVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BigIntVector.java
@@ -109,9 +109,6 @@ public MinorType getMinorType() {
    * @return element at given index
    */
   public long get(int index) throws IllegalStateException {
-    if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
-      throw new IllegalStateException("Value at index is null");
-    }
     return valueBuffer.getLong(index * TYPE_WIDTH);
   }
 

diff --git a/java/vector/src/main/java/org/apache/arrow/vector/IntVector.java b/java/vector/src/main/java/org/apache/arrow/vector/IntVector.java
@@ -333,9 +333,6 @@ public void setWithPossibleTruncate(int index, long value) {
 
   @Override
   public long getValueAsLong(int index) {
-    if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
-      throw new IllegalStateException("Value at index is null");
-    }
     return this.get(index);
   }
 

diff --git a/java/vector/src/main/java/org/apache/arrow/vector/SmallIntVector.java b/java/vector/src/main/java/org/apache/arrow/vector/SmallIntVector.java
@@ -360,9 +360,6 @@ public void setWithPossibleTruncate(int index, long value) {
 
   @Override
   public long getValueAsLong(int index) {
-    if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
-      throw new IllegalStateException("Value at index is null");
-    }
     return this.get(index);
   }
 

diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TinyIntVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TinyIntVector.java
@@ -361,9 +361,6 @@ public void setWithPossibleTruncate(int index, long value) {
 
   @Override
   public long getValueAsLong(int index) {
-    if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
-      throw new IllegalStateException("Value at index is null");
-    }
     return this.get(index);
   }
 

diff --git a/java/vector/src/main/java/org/apache/arrow/vector/UInt1Vector.java b/java/vector/src/main/java/org/apache/arrow/vector/UInt1Vector.java
@@ -324,9 +324,6 @@ public void setWithPossibleTruncate(int index, long value) {
 
   @Override
   public long getValueAsLong(int index) {
-    if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
-      throw new IllegalStateException("Value at index is null");
-    }
     return this.get(index);
   }
 

diff --git a/java/vector/src/main/java/org/apache/arrow/vector/UInt2Vector.java b/java/vector/src/main/java/org/apache/arrow/vector/UInt2Vector.java
@@ -304,9 +304,6 @@ public void setWithPossibleTruncate(int index, long value) {
 
   @Override
   public long getValueAsLong(int index) {
-    if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
-      throw new IllegalStateException("Value at index is null");
-    }
     return this.get(index);
   }
 

diff --git a/java/vector/src/main/java/org/apache/arrow/vector/UInt4Vector.java b/java/vector/src/main/java/org/apache/arrow/vector/UInt4Vector.java
@@ -294,9 +294,6 @@ public void setWithPossibleTruncate(int index, long value) {
 
   @Override
   public long getValueAsLong(int index) {
-    if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
-      throw new IllegalStateException("Value at index is null");
-    }
     return this.get(index);
   }
 

diff --git a/java/vector/src/main/java/org/apache/arrow/vector/UInt8Vector.java b/java/vector/src/main/java/org/apache/arrow/vector/UInt8Vector.java
@@ -295,9 +295,6 @@ public void setWithPossibleTruncate(int index, long value) {
 
   @Override
   public long getValueAsLong(int index) {
-    if (NULL_CHECKING_ENABLED && isSet(index) == 0) {
-      throw new IllegalStateException("Value at index is null");
-    }
     return this.get(index);
   }