This is an automated email from the ASF dual-hosted git repository.
emkornfield pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow.git
The following commit(s) were added to refs/heads/master by this push:
new e33a2b6 ARROW-5812: [Java] Refactor method name and param type in
BaseIntVector
e33a2b6 is described below
commit e33a2b69a469b0293d1e8a8cbad5cf24218a0b0e
Author: tianchen <[email protected]>
AuthorDate: Tue Jul 2 21:20:02 2019 -0700
ARROW-5812: [Java] Refactor method name and param type in BaseIntVector
Related to [ARROW-5812](https://issues.apache.org/jira/browse/ARROW-5812).
Change to void setWithPossibleTruncate(int index, long value); for better
generality.
Author: tianchen <[email protected]>
Closes #4763 from tianchen92/ARROW-5726-follow and squashes the following
commits:
c26941a77 <tianchen> remove warnings
18b907736 <tianchen> silent truncate
9bbeb3d9b <tianchen> refactor
---
.../src/main/java/org/apache/arrow/vector/BaseIntVector.java | 4 ++--
.../vector/src/main/java/org/apache/arrow/vector/BigIntVector.java | 2 +-
java/vector/src/main/java/org/apache/arrow/vector/IntVector.java | 4 ++--
.../src/main/java/org/apache/arrow/vector/SmallIntVector.java | 6 ++----
.../src/main/java/org/apache/arrow/vector/TinyIntVector.java | 6 ++----
java/vector/src/main/java/org/apache/arrow/vector/UInt1Vector.java | 7 +++----
java/vector/src/main/java/org/apache/arrow/vector/UInt2Vector.java | 6 ++----
java/vector/src/main/java/org/apache/arrow/vector/UInt4Vector.java | 4 ++--
java/vector/src/main/java/org/apache/arrow/vector/UInt8Vector.java | 2 +-
.../java/org/apache/arrow/vector/dictionary/DictionaryEncoder.java | 2 +-
10 files changed, 18 insertions(+), 25 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
index 74387de..6b5b53a 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/BaseIntVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/BaseIntVector.java
@@ -23,7 +23,7 @@ package org.apache.arrow.vector;
public interface BaseIntVector extends ValueVector {
/**
- * set the encoded value from a {@link
org.apache.arrow.vector.dictionary.Dictionary}.
+ * set value at specific index, note this value may need to be need
truncated.
*/
- void setEncodedValue(int index, int value);
+ void setWithPossibleTruncate(int index, long value);
}
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
index 1001cec..2c75a8d 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/BigIntVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/BigIntVector.java
@@ -323,7 +323,7 @@ public class BigIntVector extends BaseFixedWidthVector
implements BaseIntVector
}
@Override
- public void setEncodedValue(int index, int value) {
+ public void setWithPossibleTruncate(int index, long value) {
this.setSafe(index, value);
}
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
index 4ce5e1b..e4deaba 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/IntVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/IntVector.java
@@ -327,8 +327,8 @@ public class IntVector extends BaseFixedWidthVector
implements BaseIntVector {
}
@Override
- public void setEncodedValue(int index, int value) {
- this.setSafe(index, value);
+ public void setWithPossibleTruncate(int index, long value) {
+ this.setSafe(index, (int) value);
}
private class TransferImpl implements TransferPair {
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
index 165b774..f1f064b 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/SmallIntVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/SmallIntVector.java
@@ -20,7 +20,6 @@ package org.apache.arrow.vector;
import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
import org.apache.arrow.memory.BufferAllocator;
-import org.apache.arrow.util.Preconditions;
import org.apache.arrow.vector.complex.impl.SmallIntReaderImpl;
import org.apache.arrow.vector.complex.reader.FieldReader;
import org.apache.arrow.vector.holders.NullableSmallIntHolder;
@@ -355,9 +354,8 @@ public class SmallIntVector extends BaseFixedWidthVector
implements BaseIntVecto
}
@Override
- public void setEncodedValue(int index, int value) {
- Preconditions.checkArgument(value <= Short.MAX_VALUE, "value is overflow:
%s", value);
- this.setSafe(index, value);
+ public void setWithPossibleTruncate(int index, long value) {
+ this.setSafe(index, (int) value);
}
private class TransferImpl implements TransferPair {
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
index 97a0ea1..d74adf2 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/TinyIntVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/TinyIntVector.java
@@ -20,7 +20,6 @@ package org.apache.arrow.vector;
import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
import org.apache.arrow.memory.BufferAllocator;
-import org.apache.arrow.util.Preconditions;
import org.apache.arrow.vector.complex.impl.TinyIntReaderImpl;
import org.apache.arrow.vector.complex.reader.FieldReader;
import org.apache.arrow.vector.holders.NullableTinyIntHolder;
@@ -356,9 +355,8 @@ public class TinyIntVector extends BaseFixedWidthVector
implements BaseIntVector
}
@Override
- public void setEncodedValue(int index, int value) {
- Preconditions.checkArgument(value <= Byte.MAX_VALUE, "value is overflow:
%s", value);
- this.setSafe(index, value);
+ public void setWithPossibleTruncate(int index, long value) {
+ this.setSafe(index, (int) value);
}
private class TransferImpl implements TransferPair {
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
index 5bf843c..8e6d4fe 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/UInt1Vector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/UInt1Vector.java
@@ -20,7 +20,6 @@ package org.apache.arrow.vector;
import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
import org.apache.arrow.memory.BufferAllocator;
-import org.apache.arrow.util.Preconditions;
import org.apache.arrow.vector.complex.impl.UInt1ReaderImpl;
import org.apache.arrow.vector.complex.reader.FieldReader;
import org.apache.arrow.vector.holders.NullableUInt1Holder;
@@ -32,6 +31,7 @@ import org.apache.arrow.vector.util.TransferPair;
import io.netty.buffer.ArrowBuf;
+
/**
* UInt1Vector implements a fixed width (1 bytes) vector of
* integer values which could be null. A validity buffer (bit vector) is
@@ -318,9 +318,8 @@ public class UInt1Vector extends BaseFixedWidthVector
implements BaseIntVector {
}
@Override
- public void setEncodedValue(int index, int value) {
- Preconditions.checkArgument(value <= 0xFF, "value is overflow: %s", value);
- this.setSafe(index, value);
+ public void setWithPossibleTruncate(int index, long value) {
+ this.setSafe(index, (int) value);
}
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
index 7e7c544..53bb167 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/UInt2Vector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/UInt2Vector.java
@@ -20,7 +20,6 @@ package org.apache.arrow.vector;
import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED;
import org.apache.arrow.memory.BufferAllocator;
-import org.apache.arrow.util.Preconditions;
import org.apache.arrow.vector.complex.impl.UInt2ReaderImpl;
import org.apache.arrow.vector.complex.reader.FieldReader;
import org.apache.arrow.vector.holders.NullableUInt2Holder;
@@ -299,9 +298,8 @@ public class UInt2Vector extends BaseFixedWidthVector
implements BaseIntVector {
}
@Override
- public void setEncodedValue(int index, int value) {
- Preconditions.checkArgument(value <= Character.MAX_VALUE, "value is
overflow: %s", value);
- this.setSafe(index, value);
+ public void setWithPossibleTruncate(int index, long value) {
+ this.setSafe(index, (int) value);
}
private class TransferImpl implements TransferPair {
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
index 525d82c..b54b3f7 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/UInt4Vector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/UInt4Vector.java
@@ -288,8 +288,8 @@ public class UInt4Vector extends BaseFixedWidthVector
implements BaseIntVector {
}
@Override
- public void setEncodedValue(int index, int value) {
- this.setSafe(index, value);
+ public void setWithPossibleTruncate(int index, long value) {
+ this.setSafe(index, (int) value);
}
private class TransferImpl implements TransferPair {
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
index 5bd54c0..2451ab5 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/UInt8Vector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/UInt8Vector.java
@@ -289,7 +289,7 @@ public class UInt8Vector extends BaseFixedWidthVector
implements BaseIntVector {
}
@Override
- public void setEncodedValue(int index, int value) {
+ public void setWithPossibleTruncate(int index, long value) {
this.setSafe(index, value);
}
diff --git
a/java/vector/src/main/java/org/apache/arrow/vector/dictionary/DictionaryEncoder.java
b/java/vector/src/main/java/org/apache/arrow/vector/dictionary/DictionaryEncoder.java
index 698191c..b9f547c 100644
---
a/java/vector/src/main/java/org/apache/arrow/vector/dictionary/DictionaryEncoder.java
+++
b/java/vector/src/main/java/org/apache/arrow/vector/dictionary/DictionaryEncoder.java
@@ -78,7 +78,7 @@ public class DictionaryEncoder {
if (encoded == null) {
throw new IllegalArgumentException("Dictionary encoding not defined
for value:" + value);
}
- indices.setEncodedValue(i, encoded);
+ indices.setWithPossibleTruncate(i, encoded);
}
}
