This is an automated email from the ASF dual-hosted git repository.
liyafan 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 b3992ea ARROW-10333: [Java] Get rid of org.apache.arrow.util in vector
b3992ea is described below
commit b3992eab266be0a5498f5a85ac8dec1d7129856f
Author: Benjamin Wilhelm <[email protected]>
AuthorDate: Fri Oct 23 11:11:48 2020 +0800
ARROW-10333: [Java] Get rid of org.apache.arrow.util in vector
The package `org.apache.arrow.util` was present in the artifacts
arrow-vector and arrow-vector-memory-core. Split packages are a problem for
OSGI and the Java 9+ modules (JPMS).
This PR moves the classes `AutoClosables` and `Collections2` to
arrow-memory-core because they are generally useful and have no coupling with
arrow-vector.
The class `DataSizeRoundingUtil` is tighter coupled with arrow-vector and
is therefore moved to the package `org.apache.arrow.vector.util`.
Closes #8483 from HedgehogCode/fix-split-packages
Authored-by: Benjamin Wilhelm <[email protected]>
Signed-off-by: liyafan82 <[email protected]>
---
.../org/apache/arrow/algorithm/deduplicate/DeduplicationUtils.java | 2 +-
.../org/apache/arrow/algorithm/deduplicate/VectorRunDeduplicator.java | 2 +-
.../org/apache/arrow/algorithm/deduplicate/TestDeduplicationUtils.java | 2 +-
.../src/main/java/org/apache/arrow/util/AutoCloseables.java | 0
.../memory-core}/src/main/java/org/apache/arrow/util/Collections2.java | 0
java/vector/src/main/codegen/templates/DenseUnionVector.java | 3 +--
java/vector/src/main/codegen/templates/UnionVector.java | 3 +--
java/vector/src/main/java/org/apache/arrow/vector/BaseValueVector.java | 2 +-
java/vector/src/main/java/org/apache/arrow/vector/BitVectorHelper.java | 2 +-
.../java/org/apache/arrow/vector/ipc/message/ArrowRecordBatch.java | 2 +-
.../java/org/apache/arrow/{ => vector}/util/DataSizeRoundingUtil.java | 2 +-
.../src/test/java/org/apache/arrow/vector/TestVectorReAlloc.java | 2 +-
.../org/apache/arrow/{ => vector}/util/TestDataSizeRoundingUtil.java | 2 +-
13 files changed, 11 insertions(+), 13 deletions(-)
diff --git
a/java/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/DeduplicationUtils.java
b/java/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/DeduplicationUtils.java
index 01bbaeb..8811e43 100644
---
a/java/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/DeduplicationUtils.java
+++
b/java/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/DeduplicationUtils.java
@@ -18,13 +18,13 @@
package org.apache.arrow.algorithm.deduplicate;
import org.apache.arrow.memory.ArrowBuf;
-import org.apache.arrow.util.DataSizeRoundingUtil;
import org.apache.arrow.util.Preconditions;
import org.apache.arrow.vector.BitVectorHelper;
import org.apache.arrow.vector.IntVector;
import org.apache.arrow.vector.ValueVector;
import org.apache.arrow.vector.compare.Range;
import org.apache.arrow.vector.compare.RangeEqualsVisitor;
+import org.apache.arrow.vector.util.DataSizeRoundingUtil;
/**
* Utilities for vector deduplication.
diff --git
a/java/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/VectorRunDeduplicator.java
b/java/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/VectorRunDeduplicator.java
index 8eb990b..5ef03cb 100644
---
a/java/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/VectorRunDeduplicator.java
+++
b/java/algorithm/src/main/java/org/apache/arrow/algorithm/deduplicate/VectorRunDeduplicator.java
@@ -19,11 +19,11 @@ package org.apache.arrow.algorithm.deduplicate;
import org.apache.arrow.memory.ArrowBuf;
import org.apache.arrow.memory.BufferAllocator;
-import org.apache.arrow.util.DataSizeRoundingUtil;
import org.apache.arrow.util.Preconditions;
import org.apache.arrow.vector.BitVectorHelper;
import org.apache.arrow.vector.IntVector;
import org.apache.arrow.vector.ValueVector;
+import org.apache.arrow.vector.util.DataSizeRoundingUtil;
/**
* Remove adjacent equal elements from a vector.
diff --git
a/java/algorithm/src/test/java/org/apache/arrow/algorithm/deduplicate/TestDeduplicationUtils.java
b/java/algorithm/src/test/java/org/apache/arrow/algorithm/deduplicate/TestDeduplicationUtils.java
index 5068fb8..def83fb 100644
---
a/java/algorithm/src/test/java/org/apache/arrow/algorithm/deduplicate/TestDeduplicationUtils.java
+++
b/java/algorithm/src/test/java/org/apache/arrow/algorithm/deduplicate/TestDeduplicationUtils.java
@@ -23,10 +23,10 @@ import static
org.junit.jupiter.api.Assertions.assertArrayEquals;
import org.apache.arrow.memory.ArrowBuf;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
-import org.apache.arrow.util.DataSizeRoundingUtil;
import org.apache.arrow.vector.BitVectorHelper;
import org.apache.arrow.vector.IntVector;
import org.apache.arrow.vector.VarCharVector;
+import org.apache.arrow.vector.util.DataSizeRoundingUtil;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
diff --git
a/java/vector/src/main/java/org/apache/arrow/util/AutoCloseables.java
b/java/memory/memory-core/src/main/java/org/apache/arrow/util/AutoCloseables.java
similarity index 100%
rename from java/vector/src/main/java/org/apache/arrow/util/AutoCloseables.java
rename to
java/memory/memory-core/src/main/java/org/apache/arrow/util/AutoCloseables.java
diff --git a/java/vector/src/main/java/org/apache/arrow/util/Collections2.java
b/java/memory/memory-core/src/main/java/org/apache/arrow/util/Collections2.java
similarity index 100%
rename from java/vector/src/main/java/org/apache/arrow/util/Collections2.java
rename to
java/memory/memory-core/src/main/java/org/apache/arrow/util/Collections2.java
diff --git a/java/vector/src/main/codegen/templates/DenseUnionVector.java
b/java/vector/src/main/codegen/templates/DenseUnionVector.java
index 8902f29..d2154a3 100644
--- a/java/vector/src/main/codegen/templates/DenseUnionVector.java
+++ b/java/vector/src/main/codegen/templates/DenseUnionVector.java
@@ -19,7 +19,6 @@ import org.apache.arrow.memory.ArrowBuf;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.ReferenceManager;
import org.apache.arrow.memory.util.CommonUtil;
-import org.apache.arrow.util.DataSizeRoundingUtil;
import org.apache.arrow.util.Preconditions;
import org.apache.arrow.vector.BaseValueVector;
import org.apache.arrow.vector.BitVectorHelper;
@@ -37,6 +36,7 @@ import org.apache.arrow.vector.types.pojo.ArrowType;
import org.apache.arrow.vector.types.pojo.Field;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.util.CallBack;
+import org.apache.arrow.vector.util.DataSizeRoundingUtil;
import org.apache.arrow.vector.util.TransferPair;
import java.util.Arrays;
@@ -63,7 +63,6 @@ import org.apache.arrow.vector.util.CallBack;
import org.apache.arrow.vector.ipc.message.ArrowFieldNode;
import org.apache.arrow.vector.BaseValueVector;
import org.apache.arrow.vector.util.OversizedAllocationException;
-import org.apache.arrow.util.DataSizeRoundingUtil;
import org.apache.arrow.util.Preconditions;
import static org.apache.arrow.vector.types.UnionMode.Dense;
diff --git a/java/vector/src/main/codegen/templates/UnionVector.java
b/java/vector/src/main/codegen/templates/UnionVector.java
index b63aa87..59a90ce 100644
--- a/java/vector/src/main/codegen/templates/UnionVector.java
+++ b/java/vector/src/main/codegen/templates/UnionVector.java
@@ -20,7 +20,6 @@ import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.ReferenceManager;
import org.apache.arrow.memory.util.CommonUtil;
import org.apache.arrow.memory.util.hash.ArrowBufHasher;
-import org.apache.arrow.util.DataSizeRoundingUtil;
import org.apache.arrow.util.Preconditions;
import org.apache.arrow.vector.BaseValueVector;
import org.apache.arrow.vector.BitVectorHelper;
@@ -37,6 +36,7 @@ import org.apache.arrow.vector.types.pojo.ArrowType;
import org.apache.arrow.vector.types.pojo.Field;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.util.CallBack;
+import org.apache.arrow.vector.util.DataSizeRoundingUtil;
<@pp.dropOutputFile />
<@pp.changeOutputFile name="/org/apache/arrow/vector/complex/UnionVector.java"
/>
@@ -55,7 +55,6 @@ import org.apache.arrow.memory.util.CommonUtil;
import org.apache.arrow.vector.compare.VectorVisitor;
import org.apache.arrow.vector.complex.impl.ComplexCopier;
import org.apache.arrow.vector.util.CallBack;
-import org.apache.arrow.util.DataSizeRoundingUtil;
import org.apache.arrow.vector.util.ValueVectorUtility;
import org.apache.arrow.vector.ipc.message.ArrowFieldNode;
import org.apache.arrow.memory.util.ArrowBufPointer;
diff --git
a/java/vector/src/main/java/org/apache/arrow/vector/BaseValueVector.java
b/java/vector/src/main/java/org/apache/arrow/vector/BaseValueVector.java
index 516030a..0af9461 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/BaseValueVector.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/BaseValueVector.java
@@ -24,8 +24,8 @@ import org.apache.arrow.memory.ArrowBuf;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.ReferenceManager;
import org.apache.arrow.memory.util.CommonUtil;
-import org.apache.arrow.util.DataSizeRoundingUtil;
import org.apache.arrow.util.Preconditions;
+import org.apache.arrow.vector.util.DataSizeRoundingUtil;
import org.apache.arrow.vector.util.TransferPair;
import org.apache.arrow.vector.util.ValueVectorUtility;
import org.slf4j.Logger;
diff --git
a/java/vector/src/main/java/org/apache/arrow/vector/BitVectorHelper.java
b/java/vector/src/main/java/org/apache/arrow/vector/BitVectorHelper.java
index d731b02..ec73382 100644
--- a/java/vector/src/main/java/org/apache/arrow/vector/BitVectorHelper.java
+++ b/java/vector/src/main/java/org/apache/arrow/vector/BitVectorHelper.java
@@ -25,8 +25,8 @@ import static
org.apache.arrow.memory.util.LargeMemoryUtil.checkedCastToInt;
import org.apache.arrow.memory.ArrowBuf;
import org.apache.arrow.memory.BoundsChecking;
import org.apache.arrow.memory.BufferAllocator;
-import org.apache.arrow.util.DataSizeRoundingUtil;
import org.apache.arrow.vector.ipc.message.ArrowFieldNode;
+import org.apache.arrow.vector.util.DataSizeRoundingUtil;
import io.netty.util.internal.PlatformDependent;
diff --git
a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowRecordBatch.java
b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowRecordBatch.java
index 085b49d..6fa2fb1 100644
---
a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowRecordBatch.java
+++
b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/ArrowRecordBatch.java
@@ -25,9 +25,9 @@ import java.util.stream.Collectors;
import org.apache.arrow.flatbuf.RecordBatch;
import org.apache.arrow.memory.ArrowBuf;
import org.apache.arrow.memory.BufferAllocator;
-import org.apache.arrow.util.DataSizeRoundingUtil;
import org.apache.arrow.util.Preconditions;
import org.apache.arrow.vector.compression.NoCompressionCodec;
+import org.apache.arrow.vector.util.DataSizeRoundingUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/java/vector/src/main/java/org/apache/arrow/util/DataSizeRoundingUtil.java
b/java/vector/src/main/java/org/apache/arrow/vector/util/DataSizeRoundingUtil.java
similarity index 98%
rename from
java/vector/src/main/java/org/apache/arrow/util/DataSizeRoundingUtil.java
rename to
java/vector/src/main/java/org/apache/arrow/vector/util/DataSizeRoundingUtil.java
index 2946503..3af2c98 100644
--- a/java/vector/src/main/java/org/apache/arrow/util/DataSizeRoundingUtil.java
+++
b/java/vector/src/main/java/org/apache/arrow/vector/util/DataSizeRoundingUtil.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.arrow.util;
+package org.apache.arrow.vector.util;
/**
* Utilities for rounding data size.
diff --git
a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReAlloc.java
b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReAlloc.java
index e8a51f9..2d3f82d 100644
--- a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReAlloc.java
+++ b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReAlloc.java
@@ -23,7 +23,6 @@ import java.nio.charset.StandardCharsets;
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.memory.RootAllocator;
-import org.apache.arrow.util.DataSizeRoundingUtil;
import org.apache.arrow.vector.complex.DenseUnionVector;
import org.apache.arrow.vector.complex.FixedSizeListVector;
import org.apache.arrow.vector.complex.ListVector;
@@ -37,6 +36,7 @@ import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.types.pojo.ArrowType;
import org.apache.arrow.vector.types.pojo.Field;
import org.apache.arrow.vector.types.pojo.FieldType;
+import org.apache.arrow.vector.util.DataSizeRoundingUtil;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git
a/java/vector/src/test/java/org/apache/arrow/util/TestDataSizeRoundingUtil.java
b/java/vector/src/test/java/org/apache/arrow/vector/util/TestDataSizeRoundingUtil.java
similarity index 98%
rename from
java/vector/src/test/java/org/apache/arrow/util/TestDataSizeRoundingUtil.java
rename to
java/vector/src/test/java/org/apache/arrow/vector/util/TestDataSizeRoundingUtil.java
index a04a957..4138ea9 100644
---
a/java/vector/src/test/java/org/apache/arrow/util/TestDataSizeRoundingUtil.java
+++
b/java/vector/src/test/java/org/apache/arrow/vector/util/TestDataSizeRoundingUtil.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.arrow.util;
+package org.apache.arrow.vector.util;
import static org.junit.Assert.assertEquals;
