From 09e1b2462fe66f0d8687fd5282eb20c1566c4304 Mon Sep 17 00:00:00 2001 From: liyafan82 Date: Thu, 26 Mar 2020 21:23:31 +0800 Subject: [PATCH] ARROW-8229: [Java] Move ArrowBuf into the Arrow package --- .../arrow/adapter/jdbc/consumer/BinaryConsumer.java | 2 +- .../arrow/adapter/jdbc/consumer/ClobConsumer.java | 2 +- .../arrow/adapter/jdbc/h2/JdbcToArrowArrayTest.java | 3 +-- .../apache/arrow/adapter/orc/OrcReferenceManager.java | 3 +-- .../org/apache/arrow/adapter/orc/OrcStripeReader.java | 3 +-- .../algorithm/deduplicate/DeduplicationUtils.java | 3 +-- .../algorithm/deduplicate/VectorRunDeduplicator.java | 3 +-- .../sort/FixedWidthOutOfPlaceVectorSorter.java | 2 +- .../sort/VariableWidthOutOfPlaceVectorSorter.java | 2 +- .../algorithm/deduplicate/TestDeduplicationUtils.java | 3 +-- .../java/org/apache/arrow/flight/ArrowMessage.java | 2 +- .../java/org/apache/arrow/flight/FlightClient.java | 2 +- .../java/org/apache/arrow/flight/FlightProducer.java | 3 +-- .../java/org/apache/arrow/flight/FlightService.java | 2 +- .../java/org/apache/arrow/flight/FlightStream.java | 2 +- .../main/java/org/apache/arrow/flight/PutResult.java | 3 +-- .../java/org/apache/arrow/flight/SyncPutListener.java | 3 +-- .../java/org/apache/arrow/flight/example/Stream.java | 3 +-- .../example/integration/IntegrationTestClient.java | 3 +-- .../apache/arrow/flight/grpc/GetReadableBuffer.java | 3 ++- .../apache/arrow/flight/TestApplicationMetadata.java | 3 +-- .../org/apache/arrow/gandiva/evaluator/Filter.java | 3 +-- .../org/apache/arrow/gandiva/evaluator/Projector.java | 3 +-- .../arrow/gandiva/evaluator/SelectionVector.java | 3 +-- .../arrow/gandiva/evaluator/SelectionVectorInt16.java | 3 +-- .../arrow/gandiva/evaluator/SelectionVectorInt32.java | 3 +-- .../arrow/gandiva/evaluator/BaseEvaluatorTest.java | 3 +-- .../arrow/gandiva/evaluator/FilterProjectTest.java | 3 +-- .../org/apache/arrow/gandiva/evaluator/FilterTest.java | 3 +-- .../apache/arrow/gandiva/evaluator/ProjectorTest.java | 3 +-- .../src/main/java/io/netty/buffer/NettyArrowBuf.java | 1 + .../org/apache/arrow/memory/AllocationReservation.java | 2 -- .../buffer => org/apache/arrow/memory}/ArrowBuf.java | 10 +++------- .../java/org/apache/arrow/memory/BaseAllocator.java | 2 -- .../java/org/apache/arrow/memory/BufferAllocator.java | 1 - .../java/org/apache/arrow/memory/BufferLedger.java | 1 - .../java/org/apache/arrow/memory/BufferManager.java | 2 -- .../org/apache/arrow/memory/OwnershipTransferNOOP.java | 2 -- .../apache/arrow/memory/OwnershipTransferResult.java | 2 -- .../java/org/apache/arrow/memory/ReferenceManager.java | 3 --- .../org/apache/arrow/memory/util/ArrowBufPointer.java | 5 ++--- .../apache/arrow/memory/util/ByteFunctionHelpers.java | 2 +- .../apache/arrow/memory/util/hash/ArrowBufHasher.java | 2 +- .../apache/arrow/memory/util/hash/MurmurHasher.java | 2 +- .../apache/arrow/memory/util/hash/SimpleHasher.java | 2 +- .../test/java/io/netty/buffer/TestNettyArrowBuf.java | 1 + .../apache/arrow/memory}/TestArrowBuf.java | 2 +- .../org/apache/arrow/memory/TestBaseAllocator.java | 1 - .../apache/arrow/memory/util/TestArrowBufPointer.java | 3 +-- .../arrow/memory/util/TestByteFunctionHelpers.java | 3 +-- .../arrow/memory/util/hash/TestArrowBufHasher.java | 3 +-- .../org/apache/arrow/memory/AllocatorBenchmarks.java | 3 +-- .../apache/arrow/memory}/ArrowBufBenchmarks.java | 4 +--- .../arrow/memory/util/ArrowBufPointerBenchmarks.java | 3 +-- .../memory/util/ByteFunctionHelpersBenchmarks.java | 3 +-- .../apache/arrow/vector/BitVectorHelperBenchmarks.java | 3 +-- .../apache/arrow/vector/DecimalVectorBenchmarks.java | 3 +-- .../arrow/vector/VariableWidthVectorBenchmarks.java | 3 +-- .../templates/AbstractPromotableFieldWriter.java | 2 +- .../src/main/codegen/templates/DenseUnionVector.java | 3 +-- .../codegen/templates/UnionFixedSizeListWriter.java | 2 +- .../src/main/codegen/templates/UnionListWriter.java | 2 +- .../src/main/codegen/templates/UnionMapWriter.java | 2 +- .../vector/src/main/codegen/templates/UnionVector.java | 4 ++-- .../org/apache/arrow/vector/BaseFixedWidthVector.java | 4 ++-- .../java/org/apache/arrow/vector/BaseValueVector.java | 3 +-- .../apache/arrow/vector/BaseVariableWidthVector.java | 5 ++--- .../java/org/apache/arrow/vector/BigIntVector.java | 3 +-- .../main/java/org/apache/arrow/vector/BitVector.java | 3 +-- .../java/org/apache/arrow/vector/BitVectorHelper.java | 2 +- .../java/org/apache/arrow/vector/BufferBacked.java | 3 +-- .../java/org/apache/arrow/vector/DateDayVector.java | 3 +-- .../java/org/apache/arrow/vector/DateMilliVector.java | 3 +-- .../java/org/apache/arrow/vector/DecimalVector.java | 2 +- .../java/org/apache/arrow/vector/DurationVector.java | 3 +-- .../org/apache/arrow/vector/ExtensionTypeVector.java | 3 +-- .../main/java/org/apache/arrow/vector/FieldVector.java | 3 +-- .../org/apache/arrow/vector/FixedSizeBinaryVector.java | 3 +-- .../java/org/apache/arrow/vector/Float4Vector.java | 3 +-- .../java/org/apache/arrow/vector/Float8Vector.java | 3 +-- .../main/java/org/apache/arrow/vector/IntVector.java | 3 +-- .../org/apache/arrow/vector/IntervalDayVector.java | 3 +-- .../org/apache/arrow/vector/IntervalYearVector.java | 3 +-- .../main/java/org/apache/arrow/vector/NullVector.java | 3 +-- .../java/org/apache/arrow/vector/SmallIntVector.java | 3 +-- .../java/org/apache/arrow/vector/TimeMicroVector.java | 3 +-- .../java/org/apache/arrow/vector/TimeMilliVector.java | 3 +-- .../java/org/apache/arrow/vector/TimeNanoVector.java | 3 +-- .../java/org/apache/arrow/vector/TimeSecVector.java | 3 +-- .../java/org/apache/arrow/vector/TimeStampVector.java | 3 +-- .../java/org/apache/arrow/vector/TinyIntVector.java | 3 +-- .../main/java/org/apache/arrow/vector/UInt1Vector.java | 4 +--- .../main/java/org/apache/arrow/vector/UInt2Vector.java | 3 +-- .../main/java/org/apache/arrow/vector/UInt4Vector.java | 3 +-- .../main/java/org/apache/arrow/vector/UInt8Vector.java | 3 +-- .../main/java/org/apache/arrow/vector/ValueVector.java | 5 ++--- .../java/org/apache/arrow/vector/VectorLoader.java | 3 +-- .../java/org/apache/arrow/vector/VectorUnloader.java | 3 +-- .../arrow/vector/complex/AbstractStructVector.java | 3 +-- .../arrow/vector/complex/BaseRepeatedValueVector.java | 3 +-- .../arrow/vector/complex/FixedSizeListVector.java | 3 +-- .../org/apache/arrow/vector/complex/ListVector.java | 5 ++--- .../arrow/vector/complex/NonNullableStructVector.java | 3 +-- .../org/apache/arrow/vector/complex/StructVector.java | 5 ++--- .../arrow/vector/complex/impl/PromotableWriter.java | 3 +-- .../org/apache/arrow/vector/ipc/ArrowStreamReader.java | 3 +-- .../org/apache/arrow/vector/ipc/JsonFileReader.java | 3 +-- .../org/apache/arrow/vector/ipc/JsonFileWriter.java | 3 +-- .../java/org/apache/arrow/vector/ipc/ReadChannel.java | 3 +-- .../java/org/apache/arrow/vector/ipc/WriteChannel.java | 3 +-- .../arrow/vector/ipc/message/ArrowRecordBatch.java | 3 +-- .../arrow/vector/ipc/message/MessageChannelReader.java | 3 +-- .../apache/arrow/vector/ipc/message/MessageResult.java | 3 +-- .../arrow/vector/ipc/message/MessageSerializer.java | 3 +-- .../apache/arrow/vector/util/ByteFunctionHelpers.java | 2 +- .../org/apache/arrow/vector/util/DecimalUtility.java | 3 ++- .../org/apache/arrow/vector/DirtyRootAllocator.java | 3 +-- .../org/apache/arrow/vector/TestBitVectorHelper.java | 2 +- .../org/apache/arrow/vector/TestDecimalVector.java | 3 +-- .../org/apache/arrow/vector/TestDenseUnionVector.java | 3 +-- .../org/apache/arrow/vector/TestDictionaryVector.java | 3 +-- .../apache/arrow/vector/TestFixedSizeBinaryVector.java | 3 +-- .../java/org/apache/arrow/vector/TestListVector.java | 3 +-- .../java/org/apache/arrow/vector/TestMapVector.java | 3 +-- .../java/org/apache/arrow/vector/TestUnionVector.java | 3 +-- .../java/org/apache/arrow/vector/TestValueVector.java | 3 +-- .../org/apache/arrow/vector/TestVarCharListVector.java | 3 +-- .../java/org/apache/arrow/vector/TestVectorReset.java | 3 +-- .../org/apache/arrow/vector/TestVectorUnloadLoad.java | 3 +-- .../arrow/vector/complex/writer/TestComplexWriter.java | 3 +-- .../java/org/apache/arrow/vector/ipc/BaseFileTest.java | 3 +-- .../apache/arrow/vector/ipc/MessageSerializerTest.java | 3 +-- .../apache/arrow/vector/ipc/TestArrowReaderWriter.java | 3 +-- .../apache/arrow/vector/util/DecimalUtilityTest.java | 3 +-- 134 files changed, 136 insertions(+), 251 deletions(-) rename java/memory/src/main/java/{io/netty/buffer => org/apache/arrow/memory}/ArrowBuf.java (99%) rename java/memory/src/test/java/{io/netty/buffer => org/apache/arrow/memory}/TestArrowBuf.java (99%) rename java/performance/src/test/java/{io/netty/buffer => org/apache/arrow/memory}/ArrowBufBenchmarks.java (95%) diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BinaryConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BinaryConsumer.java index 2eb5fc0d607..7d7f741222c 100644 --- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BinaryConsumer.java +++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/BinaryConsumer.java @@ -22,10 +22,10 @@ import java.sql.ResultSet; import java.sql.SQLException; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.vector.BitVectorHelper; import org.apache.arrow.vector.VarBinaryVector; -import io.netty.buffer.ArrowBuf; import io.netty.util.internal.PlatformDependent; /** diff --git a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ClobConsumer.java b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ClobConsumer.java index ff90e3c3e70..4694f1c7e39 100644 --- a/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ClobConsumer.java +++ b/java/adapter/jdbc/src/main/java/org/apache/arrow/adapter/jdbc/consumer/ClobConsumer.java @@ -22,10 +22,10 @@ import java.sql.ResultSet; import java.sql.SQLException; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.vector.BitVectorHelper; import org.apache.arrow.vector.VarCharVector; -import io.netty.buffer.ArrowBuf; import io.netty.util.internal.PlatformDependent; /** diff --git a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowArrayTest.java b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowArrayTest.java index e0f8ad957d3..31f7db549e9 100644 --- a/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowArrayTest.java +++ b/java/adapter/jdbc/src/test/java/org/apache/arrow/adapter/jdbc/h2/JdbcToArrowArrayTest.java @@ -36,6 +36,7 @@ import org.apache.arrow.adapter.jdbc.JdbcToArrowConfig; import org.apache.arrow.adapter.jdbc.JdbcToArrowConfigBuilder; import org.apache.arrow.adapter.jdbc.JdbcToArrowUtils; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.vector.Float4Vector; import org.apache.arrow.vector.IntVector; @@ -46,8 +47,6 @@ import org.junit.Before; import org.junit.Test; -import io.netty.buffer.ArrowBuf; - public class JdbcToArrowArrayTest { private Connection conn = null; diff --git a/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReferenceManager.java b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReferenceManager.java index 02dd7d18d7c..5c79c8c4e6f 100644 --- a/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReferenceManager.java +++ b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcReferenceManager.java @@ -19,13 +19,12 @@ import java.util.concurrent.atomic.AtomicInteger; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.OwnershipTransferResult; import org.apache.arrow.memory.ReferenceManager; import org.apache.arrow.util.Preconditions; -import io.netty.buffer.ArrowBuf; - /** * A simple reference manager implementation for memory allocated by native code. * The underlying memory will be released when reference count reach zero. diff --git a/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcStripeReader.java b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcStripeReader.java index 0e37a463b25..1c2ff62578e 100644 --- a/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcStripeReader.java +++ b/java/adapter/orc/src/main/java/org/apache/arrow/adapter/orc/OrcStripeReader.java @@ -21,6 +21,7 @@ import java.util.ArrayList; import java.util.stream.Collectors; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.ipc.ArrowReader; import org.apache.arrow.vector.ipc.ReadChannel; @@ -32,8 +33,6 @@ import org.apache.arrow.vector.types.pojo.Schema; import org.apache.arrow.vector.util.ByteArrayReadableSeekableByteChannel; -import io.netty.buffer.ArrowBuf; - /** * Orc stripe that load data into ArrowRecordBatch. */ 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 f2ae06a5e3f..01bbaeb0e7e 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 @@ -17,6 +17,7 @@ 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; @@ -25,8 +26,6 @@ import org.apache.arrow.vector.compare.Range; import org.apache.arrow.vector.compare.RangeEqualsVisitor; -import io.netty.buffer.ArrowBuf; - /** * 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 0ec3d9bbb49..8eb990b31bc 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 @@ -17,6 +17,7 @@ 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; @@ -24,8 +25,6 @@ import org.apache.arrow.vector.IntVector; import org.apache.arrow.vector.ValueVector; -import io.netty.buffer.ArrowBuf; - /** * Remove adjacent equal elements from a vector. * If the vector is sorted, it removes all duplicated values in the vector. diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/FixedWidthOutOfPlaceVectorSorter.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/FixedWidthOutOfPlaceVectorSorter.java index 5a13e19391d..97a3df47579 100644 --- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/FixedWidthOutOfPlaceVectorSorter.java +++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/FixedWidthOutOfPlaceVectorSorter.java @@ -17,11 +17,11 @@ package org.apache.arrow.algorithm.sort; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.vector.BaseFixedWidthVector; import org.apache.arrow.vector.BitVectorHelper; import org.apache.arrow.vector.IntVector; -import io.netty.buffer.ArrowBuf; import io.netty.util.internal.PlatformDependent; /** diff --git a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/VariableWidthOutOfPlaceVectorSorter.java b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/VariableWidthOutOfPlaceVectorSorter.java index 0103fb39f18..dbb097bb53d 100644 --- a/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/VariableWidthOutOfPlaceVectorSorter.java +++ b/java/algorithm/src/main/java/org/apache/arrow/algorithm/sort/VariableWidthOutOfPlaceVectorSorter.java @@ -17,11 +17,11 @@ package org.apache.arrow.algorithm.sort; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.vector.BaseVariableWidthVector; import org.apache.arrow.vector.BitVectorHelper; import org.apache.arrow.vector.IntVector; -import io.netty.buffer.ArrowBuf; import io.netty.util.internal.PlatformDependent; /** 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 52340f52624..5068fb82716 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 @@ -20,6 +20,7 @@ import static org.junit.Assert.assertEquals; 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; @@ -30,8 +31,6 @@ import org.junit.Before; import org.junit.Test; -import io.netty.buffer.ArrowBuf; - /** * Test cases for {@link DeduplicationUtils}. */ diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ArrowMessage.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ArrowMessage.java index 9612f8169df..fd59dd57b49 100644 --- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ArrowMessage.java +++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/ArrowMessage.java @@ -31,6 +31,7 @@ import org.apache.arrow.flight.grpc.GetReadableBuffer; import org.apache.arrow.flight.impl.Flight.FlightData; import org.apache.arrow.flight.impl.Flight.FlightDescriptor; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.util.AutoCloseables; import org.apache.arrow.util.Preconditions; @@ -52,7 +53,6 @@ import io.grpc.MethodDescriptor; import io.grpc.MethodDescriptor.Marshaller; import io.grpc.protobuf.ProtoUtils; -import io.netty.buffer.ArrowBuf; import io.netty.buffer.ByteBuf; import io.netty.buffer.ByteBufInputStream; import io.netty.buffer.CompositeByteBuf; diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightClient.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightClient.java index 3d8fbabaa44..93f89f9e4ed 100644 --- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightClient.java +++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightClient.java @@ -38,6 +38,7 @@ import org.apache.arrow.flight.impl.FlightServiceGrpc; import org.apache.arrow.flight.impl.FlightServiceGrpc.FlightServiceBlockingStub; import org.apache.arrow.flight.impl.FlightServiceGrpc.FlightServiceStub; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.util.Preconditions; import org.apache.arrow.vector.VectorSchemaRoot; @@ -59,7 +60,6 @@ import io.grpc.stub.ClientCalls; import io.grpc.stub.ClientResponseObserver; import io.grpc.stub.StreamObserver; -import io.netty.buffer.ArrowBuf; import io.netty.channel.EventLoopGroup; import io.netty.channel.ServerChannel; import io.netty.handler.ssl.SslContextBuilder; diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightProducer.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightProducer.java index f73c26fc1b5..ee064adab61 100644 --- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightProducer.java +++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightProducer.java @@ -19,11 +19,10 @@ import java.util.Map; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.vector.VectorSchemaRoot; import org.apache.arrow.vector.dictionary.DictionaryProvider; -import io.netty.buffer.ArrowBuf; - /** * API to Implement an Arrow Flight producer. */ diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightService.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightService.java index 736068eb3f4..955d51fe7d5 100644 --- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightService.java +++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightService.java @@ -33,6 +33,7 @@ import org.apache.arrow.flight.grpc.StatusUtils; import org.apache.arrow.flight.impl.Flight; import org.apache.arrow.flight.impl.FlightServiceGrpc.FlightServiceImplBase; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.util.Preconditions; import org.apache.arrow.vector.VectorSchemaRoot; @@ -45,7 +46,6 @@ import io.grpc.Status; import io.grpc.stub.ServerCallStreamObserver; import io.grpc.stub.StreamObserver; -import io.netty.buffer.ArrowBuf; /** * GRPC service implementation for a flight server. diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightStream.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightStream.java index 844d9712fe7..23022308fa7 100644 --- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightStream.java +++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/FlightStream.java @@ -27,6 +27,7 @@ import org.apache.arrow.flight.ArrowMessage.HeaderType; import org.apache.arrow.flight.grpc.StatusUtils; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.util.AutoCloseables; import org.apache.arrow.vector.FieldVector; @@ -43,7 +44,6 @@ import com.google.common.util.concurrent.SettableFuture; import io.grpc.stub.StreamObserver; -import io.netty.buffer.ArrowBuf; /** * An adaptor between protobuf streams and flight data streams. diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/PutResult.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/PutResult.java index 11848690d07..862401312b4 100644 --- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/PutResult.java +++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/PutResult.java @@ -18,13 +18,12 @@ package org.apache.arrow.flight; import org.apache.arrow.flight.impl.Flight; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.ReferenceManager; import com.google.protobuf.ByteString; -import io.netty.buffer.ArrowBuf; - /** * A message from the server during a DoPut operation. * diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SyncPutListener.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SyncPutListener.java index da317ba95e2..730cf4924b3 100644 --- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SyncPutListener.java +++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/SyncPutListener.java @@ -23,8 +23,7 @@ import java.util.concurrent.TimeUnit; import org.apache.arrow.flight.grpc.StatusUtils; - -import io.netty.buffer.ArrowBuf; +import org.apache.arrow.memory.ArrowBuf; /** * A listener for server-sent application metadata messages during a Flight DoPut. This class wraps the messages in a diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/example/Stream.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/example/Stream.java index 35f191570c6..0bc35798d37 100644 --- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/example/Stream.java +++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/example/Stream.java @@ -25,6 +25,7 @@ import java.util.function.Consumer; import org.apache.arrow.flight.FlightProducer.ServerStreamListener; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.util.AutoCloseables; import org.apache.arrow.vector.VectorLoader; @@ -36,8 +37,6 @@ import com.google.common.base.Throwables; import com.google.common.collect.ImmutableList; -import io.netty.buffer.ArrowBuf; - /** * A collection of Arrow record batches. */ diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/example/integration/IntegrationTestClient.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/example/integration/IntegrationTestClient.java index 1b28b2d86a3..fc0081369f9 100644 --- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/example/integration/IntegrationTestClient.java +++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/example/integration/IntegrationTestClient.java @@ -33,6 +33,7 @@ import org.apache.arrow.flight.FlightStream; import org.apache.arrow.flight.Location; import org.apache.arrow.flight.PutResult; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.vector.VectorLoader; @@ -48,8 +49,6 @@ import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; -import io.netty.buffer.ArrowBuf; - /** * An Example Flight Server that provides access to the InMemoryStore. */ diff --git a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/GetReadableBuffer.java b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/GetReadableBuffer.java index a5edfb9c240..5f8a71576c3 100644 --- a/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/GetReadableBuffer.java +++ b/java/flight/flight-core/src/main/java/org/apache/arrow/flight/grpc/GetReadableBuffer.java @@ -21,11 +21,12 @@ import java.io.InputStream; import java.lang.reflect.Field; +import org.apache.arrow.memory.ArrowBuf; + import com.google.common.base.Throwables; import com.google.common.io.ByteStreams; import io.grpc.internal.ReadableBuffer; -import io.netty.buffer.ArrowBuf; /** * Enable access to ReadableBuffer directly to copy data from a BufferInputStream into a target diff --git a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestApplicationMetadata.java b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestApplicationMetadata.java index 44c739b9bd0..099b1589b46 100644 --- a/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestApplicationMetadata.java +++ b/java/flight/flight-core/src/test/java/org/apache/arrow/flight/TestApplicationMetadata.java @@ -24,6 +24,7 @@ import java.util.function.BiConsumer; import org.apache.arrow.flight.FlightClient.PutListener; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.vector.IntVector; @@ -35,8 +36,6 @@ import org.junit.Ignore; import org.junit.Test; -import io.netty.buffer.ArrowBuf; - /** * Tests for application-specific metadata support in Flight. */ diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/Filter.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/Filter.java index 4e9abedadf0..bc05acf1e7e 100644 --- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/Filter.java +++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/Filter.java @@ -25,14 +25,13 @@ import org.apache.arrow.gandiva.expression.ArrowTypeHelper; import org.apache.arrow.gandiva.expression.Condition; import org.apache.arrow.gandiva.ipc.GandivaTypes; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.vector.ipc.message.ArrowBuffer; import org.apache.arrow.vector.ipc.message.ArrowRecordBatch; import org.apache.arrow.vector.types.pojo.Schema; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.buffer.ArrowBuf; - /** * This class provides a mechanism to filter a RecordBatch by evaluating a condition expression. * Follow these steps to use this class: 1) Use the static method make() to create an instance of diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/Projector.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/Projector.java index 08bd3831f9b..2de19b8db9d 100644 --- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/Projector.java +++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/Projector.java @@ -27,6 +27,7 @@ import org.apache.arrow.gandiva.expression.ExpressionTree; import org.apache.arrow.gandiva.ipc.GandivaTypes; import org.apache.arrow.gandiva.ipc.GandivaTypes.SelectionVectorType; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.vector.BaseVariableWidthVector; import org.apache.arrow.vector.FixedWidthVector; import org.apache.arrow.vector.ValueVector; @@ -35,8 +36,6 @@ import org.apache.arrow.vector.ipc.message.ArrowRecordBatch; import org.apache.arrow.vector.types.pojo.Schema; -import io.netty.buffer.ArrowBuf; - /** * This class provides a mechanism to evaluate a set of expressions against a RecordBatch. * Follow these steps to use this class: diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVector.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVector.java index 3e3bcc72a31..2af88b52636 100644 --- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVector.java +++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVector.java @@ -20,8 +20,7 @@ import static org.apache.arrow.memory.util.LargeMemoryUtil.capAtMaxInt; import org.apache.arrow.gandiva.ipc.GandivaTypes.SelectionVectorType; - -import io.netty.buffer.ArrowBuf; +import org.apache.arrow.memory.ArrowBuf; /** * A selection vector contains the indexes of "selected" records in a row batch. It is backed by an diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVectorInt16.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVectorInt16.java index d03280fd5eb..476a2fca2e1 100644 --- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVectorInt16.java +++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVectorInt16.java @@ -18,8 +18,7 @@ package org.apache.arrow.gandiva.evaluator; import org.apache.arrow.gandiva.ipc.GandivaTypes.SelectionVectorType; - -import io.netty.buffer.ArrowBuf; +import org.apache.arrow.memory.ArrowBuf; /** * Selection vector with records of arrow type INT16. diff --git a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVectorInt32.java b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVectorInt32.java index 36c26dc103f..c938f669111 100644 --- a/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVectorInt32.java +++ b/java/gandiva/src/main/java/org/apache/arrow/gandiva/evaluator/SelectionVectorInt32.java @@ -18,8 +18,7 @@ package org.apache.arrow.gandiva.evaluator; import org.apache.arrow.gandiva.ipc.GandivaTypes.SelectionVectorType; - -import io.netty.buffer.ArrowBuf; +import org.apache.arrow.memory.ArrowBuf; /** * Selection vector with records of arrow type INT32. diff --git a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/BaseEvaluatorTest.java b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/BaseEvaluatorTest.java index 1f4ab7661ad..4c7825c9aee 100644 --- a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/BaseEvaluatorTest.java +++ b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/BaseEvaluatorTest.java @@ -27,6 +27,7 @@ import org.apache.arrow.gandiva.exceptions.GandivaException; import org.apache.arrow.gandiva.expression.Condition; import org.apache.arrow.gandiva.expression.ExpressionTree; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.vector.DecimalVector; @@ -41,8 +42,6 @@ import org.junit.After; import org.junit.Before; -import io.netty.buffer.ArrowBuf; - class BaseEvaluatorTest { interface BaseEvaluator { diff --git a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/FilterProjectTest.java b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/FilterProjectTest.java index 68407471ab7..51fc1c2915e 100644 --- a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/FilterProjectTest.java +++ b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/FilterProjectTest.java @@ -28,6 +28,7 @@ import org.apache.arrow.gandiva.expression.ExpressionTree; import org.apache.arrow.gandiva.expression.TreeBuilder; import org.apache.arrow.gandiva.ipc.GandivaTypes.SelectionVectorType; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.vector.IntVector; import org.apache.arrow.vector.ValueVector; import org.apache.arrow.vector.ipc.message.ArrowFieldNode; @@ -38,8 +39,6 @@ import com.google.common.collect.Lists; -import io.netty.buffer.ArrowBuf; - public class FilterProjectTest extends BaseEvaluatorTest { @Test diff --git a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/FilterTest.java b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/FilterTest.java index 8f631587b90..3666f23065a 100644 --- a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/FilterTest.java +++ b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/FilterTest.java @@ -23,6 +23,7 @@ import org.apache.arrow.gandiva.exceptions.GandivaException; import org.apache.arrow.gandiva.expression.Condition; import org.apache.arrow.gandiva.expression.TreeBuilder; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.vector.ipc.message.ArrowFieldNode; import org.apache.arrow.vector.ipc.message.ArrowRecordBatch; import org.apache.arrow.vector.types.pojo.Field; @@ -32,8 +33,6 @@ import com.google.common.collect.Lists; -import io.netty.buffer.ArrowBuf; - public class FilterTest extends BaseEvaluatorTest { private int[] selectionVectorToArray(SelectionVector vector) { diff --git a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/ProjectorTest.java b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/ProjectorTest.java index 45c5bb1e829..5b52b55a74c 100644 --- a/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/ProjectorTest.java +++ b/java/gandiva/src/test/java/org/apache/arrow/gandiva/evaluator/ProjectorTest.java @@ -35,6 +35,7 @@ import org.apache.arrow.gandiva.expression.ExpressionTree; import org.apache.arrow.gandiva.expression.TreeBuilder; import org.apache.arrow.gandiva.expression.TreeNode; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.vector.BigIntVector; import org.apache.arrow.vector.BitVector; import org.apache.arrow.vector.Float8Vector; @@ -58,8 +59,6 @@ import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import io.netty.buffer.ArrowBuf; - public class ProjectorTest extends BaseEvaluatorTest { private Charset utf8Charset = Charset.forName("UTF-8"); diff --git a/java/memory/src/main/java/io/netty/buffer/NettyArrowBuf.java b/java/memory/src/main/java/io/netty/buffer/NettyArrowBuf.java index c179c56b86e..17434c44ac1 100644 --- a/java/memory/src/main/java/io/netty/buffer/NettyArrowBuf.java +++ b/java/memory/src/main/java/io/netty/buffer/NettyArrowBuf.java @@ -28,6 +28,7 @@ import java.nio.channels.GatheringByteChannel; import java.nio.channels.ScatteringByteChannel; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.ArrowByteBufAllocator; import org.apache.arrow.memory.BoundsChecking; import org.apache.arrow.util.Preconditions; diff --git a/java/memory/src/main/java/org/apache/arrow/memory/AllocationReservation.java b/java/memory/src/main/java/org/apache/arrow/memory/AllocationReservation.java index bd59785546c..4331eb20ca3 100644 --- a/java/memory/src/main/java/org/apache/arrow/memory/AllocationReservation.java +++ b/java/memory/src/main/java/org/apache/arrow/memory/AllocationReservation.java @@ -17,8 +17,6 @@ package org.apache.arrow.memory; -import io.netty.buffer.ArrowBuf; - /** * Supports cumulative allocation reservation. Clients may increase the size of the reservation * repeatedly until they diff --git a/java/memory/src/main/java/io/netty/buffer/ArrowBuf.java b/java/memory/src/main/java/org/apache/arrow/memory/ArrowBuf.java similarity index 99% rename from java/memory/src/main/java/io/netty/buffer/ArrowBuf.java rename to java/memory/src/main/java/org/apache/arrow/memory/ArrowBuf.java index 1938e12af99..a813f3365c2 100644 --- a/java/memory/src/main/java/io/netty/buffer/ArrowBuf.java +++ b/java/memory/src/main/java/org/apache/arrow/memory/ArrowBuf.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package io.netty.buffer; +package org.apache.arrow.memory; import static org.apache.arrow.memory.util.LargeMemoryUtil.checkedCastToInt; @@ -27,17 +27,13 @@ import java.nio.ReadOnlyBufferException; import java.util.concurrent.atomic.AtomicLong; -import org.apache.arrow.memory.AllocationManager; -import org.apache.arrow.memory.BaseAllocator; import org.apache.arrow.memory.BaseAllocator.Verbosity; -import org.apache.arrow.memory.BoundsChecking; -import org.apache.arrow.memory.BufferLedger; -import org.apache.arrow.memory.BufferManager; -import org.apache.arrow.memory.ReferenceManager; import org.apache.arrow.memory.util.HistoricalLog; import org.apache.arrow.memory.util.MemoryUtil; import org.apache.arrow.util.Preconditions; +import io.netty.buffer.NettyArrowBuf; + /** * ArrowBuf serves as a facade over underlying memory by providing * several access APIs to read/write data into a chunk of direct diff --git a/java/memory/src/main/java/org/apache/arrow/memory/BaseAllocator.java b/java/memory/src/main/java/org/apache/arrow/memory/BaseAllocator.java index 84a8f63e591..57ee58b0169 100644 --- a/java/memory/src/main/java/org/apache/arrow/memory/BaseAllocator.java +++ b/java/memory/src/main/java/org/apache/arrow/memory/BaseAllocator.java @@ -32,8 +32,6 @@ import org.apache.arrow.util.Preconditions; import org.immutables.value.Value; -import io.netty.buffer.ArrowBuf; - /** * A base-class that implements all functionality of {@linkplain BufferAllocator}s. * diff --git a/java/memory/src/main/java/org/apache/arrow/memory/BufferAllocator.java b/java/memory/src/main/java/org/apache/arrow/memory/BufferAllocator.java index d1f765cc3fe..d7beb51242a 100644 --- a/java/memory/src/main/java/org/apache/arrow/memory/BufferAllocator.java +++ b/java/memory/src/main/java/org/apache/arrow/memory/BufferAllocator.java @@ -19,7 +19,6 @@ import java.util.Collection; -import io.netty.buffer.ArrowBuf; import io.netty.buffer.ByteBufAllocator; /** diff --git a/java/memory/src/main/java/org/apache/arrow/memory/BufferLedger.java b/java/memory/src/main/java/org/apache/arrow/memory/BufferLedger.java index d1091f1f471..a6938072d86 100644 --- a/java/memory/src/main/java/org/apache/arrow/memory/BufferLedger.java +++ b/java/memory/src/main/java/org/apache/arrow/memory/BufferLedger.java @@ -26,7 +26,6 @@ import org.apache.arrow.memory.util.HistoricalLog; import org.apache.arrow.util.Preconditions; -import io.netty.buffer.ArrowBuf; import io.netty.buffer.UnsafeDirectLittleEndian; /** diff --git a/java/memory/src/main/java/org/apache/arrow/memory/BufferManager.java b/java/memory/src/main/java/org/apache/arrow/memory/BufferManager.java index 7ad3d75120c..6b622e71927 100644 --- a/java/memory/src/main/java/org/apache/arrow/memory/BufferManager.java +++ b/java/memory/src/main/java/org/apache/arrow/memory/BufferManager.java @@ -17,8 +17,6 @@ package org.apache.arrow.memory; -import io.netty.buffer.ArrowBuf; - /** * Manages a list of {@link ArrowBuf}s that can be reallocated as needed. Upon * re-allocation the old buffer will be freed. Managing a list of these buffers diff --git a/java/memory/src/main/java/org/apache/arrow/memory/OwnershipTransferNOOP.java b/java/memory/src/main/java/org/apache/arrow/memory/OwnershipTransferNOOP.java index 964a2c428f3..d4fed8448bf 100644 --- a/java/memory/src/main/java/org/apache/arrow/memory/OwnershipTransferNOOP.java +++ b/java/memory/src/main/java/org/apache/arrow/memory/OwnershipTransferNOOP.java @@ -17,8 +17,6 @@ package org.apache.arrow.memory; -import io.netty.buffer.ArrowBuf; - /** * An {@link OwnershipTransferResult} indicating no transfer needed. */ diff --git a/java/memory/src/main/java/org/apache/arrow/memory/OwnershipTransferResult.java b/java/memory/src/main/java/org/apache/arrow/memory/OwnershipTransferResult.java index c94393a9a71..ef857d827a6 100644 --- a/java/memory/src/main/java/org/apache/arrow/memory/OwnershipTransferResult.java +++ b/java/memory/src/main/java/org/apache/arrow/memory/OwnershipTransferResult.java @@ -17,8 +17,6 @@ package org.apache.arrow.memory; -import io.netty.buffer.ArrowBuf; - /** * The result of transferring an {@link ArrowBuf} between {@linkplain BufferAllocator}s. */ diff --git a/java/memory/src/main/java/org/apache/arrow/memory/ReferenceManager.java b/java/memory/src/main/java/org/apache/arrow/memory/ReferenceManager.java index 74776ceabe6..00ae274b744 100644 --- a/java/memory/src/main/java/org/apache/arrow/memory/ReferenceManager.java +++ b/java/memory/src/main/java/org/apache/arrow/memory/ReferenceManager.java @@ -17,9 +17,6 @@ package org.apache.arrow.memory; - -import io.netty.buffer.ArrowBuf; - /** * Reference Manager manages one or more ArrowBufs that share the * reference count for the underlying memory chunk. diff --git a/java/memory/src/main/java/org/apache/arrow/memory/util/ArrowBufPointer.java b/java/memory/src/main/java/org/apache/arrow/memory/util/ArrowBufPointer.java index f3c91a27534..fa1cfbdb293 100644 --- a/java/memory/src/main/java/org/apache/arrow/memory/util/ArrowBufPointer.java +++ b/java/memory/src/main/java/org/apache/arrow/memory/util/ArrowBufPointer.java @@ -17,14 +17,13 @@ package org.apache.arrow.memory.util; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.util.hash.ArrowBufHasher; import org.apache.arrow.memory.util.hash.SimpleHasher; import org.apache.arrow.util.Preconditions; -import io.netty.buffer.ArrowBuf; - /** - * Pointer to a memory region within an {@link io.netty.buffer.ArrowBuf}. + * Pointer to a memory region within an {@link ArrowBuf}. * It will be used as the basis for calculating hash code within a vector, and equality determination. */ public final class ArrowBufPointer { diff --git a/java/memory/src/main/java/org/apache/arrow/memory/util/ByteFunctionHelpers.java b/java/memory/src/main/java/org/apache/arrow/memory/util/ByteFunctionHelpers.java index 84332506573..efd73052ec5 100644 --- a/java/memory/src/main/java/org/apache/arrow/memory/util/ByteFunctionHelpers.java +++ b/java/memory/src/main/java/org/apache/arrow/memory/util/ByteFunctionHelpers.java @@ -17,11 +17,11 @@ package org.apache.arrow.memory.util; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BoundsChecking; import org.apache.arrow.memory.util.hash.ArrowBufHasher; import org.apache.arrow.memory.util.hash.SimpleHasher; -import io.netty.buffer.ArrowBuf; import io.netty.util.internal.PlatformDependent; /** diff --git a/java/memory/src/main/java/org/apache/arrow/memory/util/hash/ArrowBufHasher.java b/java/memory/src/main/java/org/apache/arrow/memory/util/hash/ArrowBufHasher.java index 366f2b6969c..0de8e62a4a4 100644 --- a/java/memory/src/main/java/org/apache/arrow/memory/util/hash/ArrowBufHasher.java +++ b/java/memory/src/main/java/org/apache/arrow/memory/util/hash/ArrowBufHasher.java @@ -17,7 +17,7 @@ package org.apache.arrow.memory.util.hash; -import io.netty.buffer.ArrowBuf; +import org.apache.arrow.memory.ArrowBuf; /** * Utility for calculating the hash code for a consecutive memory region. diff --git a/java/memory/src/main/java/org/apache/arrow/memory/util/hash/MurmurHasher.java b/java/memory/src/main/java/org/apache/arrow/memory/util/hash/MurmurHasher.java index eceb42c676b..67a22ceaaa7 100644 --- a/java/memory/src/main/java/org/apache/arrow/memory/util/hash/MurmurHasher.java +++ b/java/memory/src/main/java/org/apache/arrow/memory/util/hash/MurmurHasher.java @@ -20,7 +20,7 @@ import static io.netty.util.internal.PlatformDependent.getByte; import static io.netty.util.internal.PlatformDependent.getInt; -import io.netty.buffer.ArrowBuf; +import org.apache.arrow.memory.ArrowBuf; /** * Implementation of the Murmur hashing algorithm. diff --git a/java/memory/src/main/java/org/apache/arrow/memory/util/hash/SimpleHasher.java b/java/memory/src/main/java/org/apache/arrow/memory/util/hash/SimpleHasher.java index 63a7b688400..c653415baa9 100644 --- a/java/memory/src/main/java/org/apache/arrow/memory/util/hash/SimpleHasher.java +++ b/java/memory/src/main/java/org/apache/arrow/memory/util/hash/SimpleHasher.java @@ -21,7 +21,7 @@ import static io.netty.util.internal.PlatformDependent.getInt; import static io.netty.util.internal.PlatformDependent.getLong; -import io.netty.buffer.ArrowBuf; +import org.apache.arrow.memory.ArrowBuf; /** * A simple hasher that calculates the hash code of integers as is, diff --git a/java/memory/src/test/java/io/netty/buffer/TestNettyArrowBuf.java b/java/memory/src/test/java/io/netty/buffer/TestNettyArrowBuf.java index afbfef54aad..842f99eaa6d 100644 --- a/java/memory/src/test/java/io/netty/buffer/TestNettyArrowBuf.java +++ b/java/memory/src/test/java/io/netty/buffer/TestNettyArrowBuf.java @@ -19,6 +19,7 @@ import java.nio.ByteBuffer; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.ArrowByteBufAllocator; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; diff --git a/java/memory/src/test/java/io/netty/buffer/TestArrowBuf.java b/java/memory/src/test/java/org/apache/arrow/memory/TestArrowBuf.java similarity index 99% rename from java/memory/src/test/java/io/netty/buffer/TestArrowBuf.java rename to java/memory/src/test/java/org/apache/arrow/memory/TestArrowBuf.java index 67716089e6b..2da8b736b73 100644 --- a/java/memory/src/test/java/io/netty/buffer/TestArrowBuf.java +++ b/java/memory/src/test/java/org/apache/arrow/memory/TestArrowBuf.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package io.netty.buffer; +package org.apache.arrow.memory; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/java/memory/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java b/java/memory/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java index cdd5612ec9d..62cbe8bf80a 100644 --- a/java/memory/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java +++ b/java/memory/src/test/java/org/apache/arrow/memory/TestBaseAllocator.java @@ -40,7 +40,6 @@ import org.junit.Test; import org.junit.jupiter.api.Assertions; -import io.netty.buffer.ArrowBuf; import sun.misc.Unsafe; public class TestBaseAllocator { diff --git a/java/memory/src/test/java/org/apache/arrow/memory/util/TestArrowBufPointer.java b/java/memory/src/test/java/org/apache/arrow/memory/util/TestArrowBufPointer.java index 7e7bbd5118d..c3ed0d05705 100644 --- a/java/memory/src/test/java/org/apache/arrow/memory/util/TestArrowBufPointer.java +++ b/java/memory/src/test/java/org/apache/arrow/memory/util/TestArrowBufPointer.java @@ -21,6 +21,7 @@ import static junit.framework.TestCase.assertTrue; import static org.junit.jupiter.api.Assertions.assertFalse; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.memory.util.hash.ArrowBufHasher; @@ -29,8 +30,6 @@ import org.junit.Before; import org.junit.Test; -import io.netty.buffer.ArrowBuf; - /** * Test cases for {@link ArrowBufPointer}. */ diff --git a/java/memory/src/test/java/org/apache/arrow/memory/util/TestByteFunctionHelpers.java b/java/memory/src/test/java/org/apache/arrow/memory/util/TestByteFunctionHelpers.java index 56c18ec8288..84763ebed33 100644 --- a/java/memory/src/test/java/org/apache/arrow/memory/util/TestByteFunctionHelpers.java +++ b/java/memory/src/test/java/org/apache/arrow/memory/util/TestByteFunctionHelpers.java @@ -19,14 +19,13 @@ import static org.junit.Assert.assertEquals; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.junit.After; import org.junit.Before; import org.junit.Test; -import io.netty.buffer.ArrowBuf; - public class TestByteFunctionHelpers { private BufferAllocator allocator; diff --git a/java/memory/src/test/java/org/apache/arrow/memory/util/hash/TestArrowBufHasher.java b/java/memory/src/test/java/org/apache/arrow/memory/util/hash/TestArrowBufHasher.java index 3a373958412..a8707e6ca93 100644 --- a/java/memory/src/test/java/org/apache/arrow/memory/util/hash/TestArrowBufHasher.java +++ b/java/memory/src/test/java/org/apache/arrow/memory/util/hash/TestArrowBufHasher.java @@ -23,6 +23,7 @@ import java.util.Arrays; import java.util.Collection; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.junit.After; @@ -31,8 +32,6 @@ import org.junit.runner.RunWith; import org.junit.runners.Parameterized; -import io.netty.buffer.ArrowBuf; - /** * Test cases for {@link ArrowBufHasher} and its subclasses. */ diff --git a/java/performance/src/test/java/org/apache/arrow/memory/AllocatorBenchmarks.java b/java/performance/src/test/java/org/apache/arrow/memory/AllocatorBenchmarks.java index 3193c4e0608..88fcf73f030 100644 --- a/java/performance/src/test/java/org/apache/arrow/memory/AllocatorBenchmarks.java +++ b/java/performance/src/test/java/org/apache/arrow/memory/AllocatorBenchmarks.java @@ -19,6 +19,7 @@ import java.util.concurrent.TimeUnit; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.rounding.RoundingPolicy; import org.apache.arrow.memory.rounding.SegmentRoundingPolicy; import org.openjdk.jmh.annotations.Benchmark; @@ -30,8 +31,6 @@ import org.openjdk.jmh.runner.options.Options; import org.openjdk.jmh.runner.options.OptionsBuilder; -import io.netty.buffer.ArrowBuf; - /** * Benchmarks for allocators. */ diff --git a/java/performance/src/test/java/io/netty/buffer/ArrowBufBenchmarks.java b/java/performance/src/test/java/org/apache/arrow/memory/ArrowBufBenchmarks.java similarity index 95% rename from java/performance/src/test/java/io/netty/buffer/ArrowBufBenchmarks.java rename to java/performance/src/test/java/org/apache/arrow/memory/ArrowBufBenchmarks.java index 947b02e76cd..ef4da582829 100644 --- a/java/performance/src/test/java/io/netty/buffer/ArrowBufBenchmarks.java +++ b/java/performance/src/test/java/org/apache/arrow/memory/ArrowBufBenchmarks.java @@ -15,12 +15,10 @@ * limitations under the License. */ -package io.netty.buffer; +package org.apache.arrow.memory; import java.util.concurrent.TimeUnit; -import org.apache.arrow.memory.BufferAllocator; -import org.apache.arrow.memory.RootAllocator; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; import org.openjdk.jmh.annotations.Mode; diff --git a/java/performance/src/test/java/org/apache/arrow/memory/util/ArrowBufPointerBenchmarks.java b/java/performance/src/test/java/org/apache/arrow/memory/util/ArrowBufPointerBenchmarks.java index 4c6c5e6c82e..8e2c9cc51a3 100644 --- a/java/performance/src/test/java/org/apache/arrow/memory/util/ArrowBufPointerBenchmarks.java +++ b/java/performance/src/test/java/org/apache/arrow/memory/util/ArrowBufPointerBenchmarks.java @@ -19,6 +19,7 @@ import java.util.concurrent.TimeUnit; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.openjdk.jmh.annotations.Benchmark; @@ -34,8 +35,6 @@ import org.openjdk.jmh.runner.options.Options; import org.openjdk.jmh.runner.options.OptionsBuilder; -import io.netty.buffer.ArrowBuf; - /** * Benchmarks for {@link ArrowBufPointer}. */ diff --git a/java/performance/src/test/java/org/apache/arrow/memory/util/ByteFunctionHelpersBenchmarks.java b/java/performance/src/test/java/org/apache/arrow/memory/util/ByteFunctionHelpersBenchmarks.java index 5eb55ee6350..4d0dfcb5da8 100644 --- a/java/performance/src/test/java/org/apache/arrow/memory/util/ByteFunctionHelpersBenchmarks.java +++ b/java/performance/src/test/java/org/apache/arrow/memory/util/ByteFunctionHelpersBenchmarks.java @@ -19,6 +19,7 @@ import java.util.concurrent.TimeUnit; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.openjdk.jmh.annotations.Benchmark; @@ -35,8 +36,6 @@ import org.openjdk.jmh.runner.options.Options; import org.openjdk.jmh.runner.options.OptionsBuilder; -import io.netty.buffer.ArrowBuf; - /** * Benchmarks for {@link ByteFunctionHelpers}. */ diff --git a/java/performance/src/test/java/org/apache/arrow/vector/BitVectorHelperBenchmarks.java b/java/performance/src/test/java/org/apache/arrow/vector/BitVectorHelperBenchmarks.java index ec3d5fbdc87..003ade745ba 100644 --- a/java/performance/src/test/java/org/apache/arrow/vector/BitVectorHelperBenchmarks.java +++ b/java/performance/src/test/java/org/apache/arrow/vector/BitVectorHelperBenchmarks.java @@ -19,6 +19,7 @@ import java.util.concurrent.TimeUnit; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.vector.ipc.message.ArrowFieldNode; @@ -36,8 +37,6 @@ import org.openjdk.jmh.runner.options.Options; import org.openjdk.jmh.runner.options.OptionsBuilder; -import io.netty.buffer.ArrowBuf; - /** * Benchmarks for {@link BitVectorHelper}. */ diff --git a/java/performance/src/test/java/org/apache/arrow/vector/DecimalVectorBenchmarks.java b/java/performance/src/test/java/org/apache/arrow/vector/DecimalVectorBenchmarks.java index 366f517cfa5..72f5659907a 100644 --- a/java/performance/src/test/java/org/apache/arrow/vector/DecimalVectorBenchmarks.java +++ b/java/performance/src/test/java/org/apache/arrow/vector/DecimalVectorBenchmarks.java @@ -20,6 +20,7 @@ import java.math.BigDecimal; import java.util.concurrent.TimeUnit; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.openjdk.jmh.annotations.Benchmark; @@ -35,8 +36,6 @@ import org.openjdk.jmh.runner.options.Options; import org.openjdk.jmh.runner.options.OptionsBuilder; -import io.netty.buffer.ArrowBuf; - /** * Benchmarks for {@link DecimalVector}. */ diff --git a/java/performance/src/test/java/org/apache/arrow/vector/VariableWidthVectorBenchmarks.java b/java/performance/src/test/java/org/apache/arrow/vector/VariableWidthVectorBenchmarks.java index 543f5f85d0e..7eee981f133 100644 --- a/java/performance/src/test/java/org/apache/arrow/vector/VariableWidthVectorBenchmarks.java +++ b/java/performance/src/test/java/org/apache/arrow/vector/VariableWidthVectorBenchmarks.java @@ -19,6 +19,7 @@ import java.util.concurrent.TimeUnit; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.vector.holders.NullableVarCharHolder; @@ -35,8 +36,6 @@ import org.openjdk.jmh.runner.options.Options; import org.openjdk.jmh.runner.options.OptionsBuilder; -import io.netty.buffer.ArrowBuf; - /** * Benchmarks for {@link BaseVariableWidthVector}. */ diff --git a/java/vector/src/main/codegen/templates/AbstractPromotableFieldWriter.java b/java/vector/src/main/codegen/templates/AbstractPromotableFieldWriter.java index 92b9cd2c0b1..5566c808258 100644 --- a/java/vector/src/main/codegen/templates/AbstractPromotableFieldWriter.java +++ b/java/vector/src/main/codegen/templates/AbstractPromotableFieldWriter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -import io.netty.buffer.ArrowBuf; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.vector.types.Types; import org.apache.arrow.vector.types.pojo.ArrowType; import org.apache.drill.common.types.TypeProtos.MinorType; diff --git a/java/vector/src/main/codegen/templates/DenseUnionVector.java b/java/vector/src/main/codegen/templates/DenseUnionVector.java index 95bf30ac33f..7a805bb9a32 100644 --- a/java/vector/src/main/codegen/templates/DenseUnionVector.java +++ b/java/vector/src/main/codegen/templates/DenseUnionVector.java @@ -15,7 +15,7 @@ * limitations under the License. */ -import io.netty.buffer.ArrowBuf; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.ReferenceManager; import org.apache.arrow.util.DataSizeRoundingUtil; @@ -47,7 +47,6 @@ package org.apache.arrow.vector.complex; <#include "/@includes/vv_imports.ftl" /> -import io.netty.buffer.ArrowBuf; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; diff --git a/java/vector/src/main/codegen/templates/UnionFixedSizeListWriter.java b/java/vector/src/main/codegen/templates/UnionFixedSizeListWriter.java index d41094e22ce..3a10d15d714 100644 --- a/java/vector/src/main/codegen/templates/UnionFixedSizeListWriter.java +++ b/java/vector/src/main/codegen/templates/UnionFixedSizeListWriter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -import io.netty.buffer.ArrowBuf; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.vector.complex.writer.DecimalWriter; import org.apache.arrow.vector.holders.DecimalHolder; diff --git a/java/vector/src/main/codegen/templates/UnionListWriter.java b/java/vector/src/main/codegen/templates/UnionListWriter.java index d00dfc7d195..5ab6a15d400 100644 --- a/java/vector/src/main/codegen/templates/UnionListWriter.java +++ b/java/vector/src/main/codegen/templates/UnionListWriter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -import io.netty.buffer.ArrowBuf; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.vector.complex.writer.DecimalWriter; import org.apache.arrow.vector.holders.DecimalHolder; diff --git a/java/vector/src/main/codegen/templates/UnionMapWriter.java b/java/vector/src/main/codegen/templates/UnionMapWriter.java index df9d1d12ee1..01b371329a9 100644 --- a/java/vector/src/main/codegen/templates/UnionMapWriter.java +++ b/java/vector/src/main/codegen/templates/UnionMapWriter.java @@ -15,7 +15,7 @@ * limitations under the License. */ -import io.netty.buffer.ArrowBuf; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.vector.complex.writer.DecimalWriter; import org.apache.arrow.vector.holders.DecimalHolder; diff --git a/java/vector/src/main/codegen/templates/UnionVector.java b/java/vector/src/main/codegen/templates/UnionVector.java index 177ef3317e2..2b3b5ab780f 100644 --- a/java/vector/src/main/codegen/templates/UnionVector.java +++ b/java/vector/src/main/codegen/templates/UnionVector.java @@ -15,7 +15,7 @@ * limitations under the License. */ -import io.netty.buffer.ArrowBuf; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.ReferenceManager; import org.apache.arrow.memory.util.hash.ArrowBufHasher; @@ -40,10 +40,10 @@ package org.apache.arrow.vector.complex; <#include "/@includes/vv_imports.ftl" /> -import io.netty.buffer.ArrowBuf; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.vector.compare.VectorVisitor; import org.apache.arrow.vector.complex.impl.ComplexCopier; import org.apache.arrow.vector.util.CallBack; diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BaseFixedWidthVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BaseFixedWidthVector.java index a4e94bcac09..63d462f9946 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/BaseFixedWidthVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/BaseFixedWidthVector.java @@ -24,6 +24,7 @@ import java.util.Collections; import java.util.List; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.util.ArrowBufPointer; import org.apache.arrow.memory.util.ByteFunctionHelpers; @@ -36,7 +37,6 @@ import org.apache.arrow.vector.util.OversizedAllocationException; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; import io.netty.util.internal.PlatformDependent; /** @@ -389,7 +389,7 @@ public Field getField() { * * @param clear Whether to clear vector before returning; the buffers will still be refcounted * but the returned array will be the only reference to them - * @return The underlying {@link io.netty.buffer.ArrowBuf buffers} that is used by this + * @return The underlying {@link ArrowBuf buffers} that is used by this * vector instance. */ @Override 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 ede382110de..1cef161480e 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 @@ -20,6 +20,7 @@ import java.util.Collections; import java.util.Iterator; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BaseAllocator; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.ReferenceManager; @@ -30,8 +31,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.buffer.ArrowBuf; - /** * Base class for other Arrow Vector Types. Provides basic functionality around * memory management. diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java index e1e4ceee3c3..6e55be72d6e 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java @@ -24,6 +24,7 @@ import java.util.Collections; import java.util.List; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BaseAllocator; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.OutOfMemoryException; @@ -38,8 +39,6 @@ import org.apache.arrow.vector.util.OversizedAllocationException; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * BaseVariableWidthVector is a base class providing functionality for strings/bytes types. */ @@ -632,7 +631,7 @@ public Field getField() { * * @param clear Whether to clear vector before returning; the buffers will still be refcounted * but the returned array will be the only reference to them - * @return The underlying {@link io.netty.buffer.ArrowBuf buffers} that is used by this + * @return The underlying {@link ArrowBuf buffers} that is used by this * vector instance. */ @Override 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 ac2015ea4ef..8823870cd59 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 @@ -19,6 +19,7 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.BigIntReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -29,8 +30,6 @@ import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * BigIntVector implements a fixed width vector (8 bytes) of * integer values which could be null. A validity buffer (bit vector) is diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BitVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BitVector.java index eb4e6f3c47c..5d91641e7fc 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/BitVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/BitVector.java @@ -20,6 +20,7 @@ import static org.apache.arrow.memory.util.LargeMemoryUtil.capAtMaxInt; import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.util.ArrowBufPointer; import org.apache.arrow.memory.util.hash.ArrowBufHasher; @@ -34,8 +35,6 @@ import org.apache.arrow.vector.util.OversizedAllocationException; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * BitVector implements a fixed width (1 bit) vector of * boolean values which could be null. Each value in the vector corresponds 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 fd165c419ae..b4b4887bc42 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 @@ -21,12 +21,12 @@ import static io.netty.util.internal.PlatformDependent.getInt; import static io.netty.util.internal.PlatformDependent.getLong; +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 io.netty.buffer.ArrowBuf; import io.netty.util.internal.PlatformDependent; /** diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BufferBacked.java b/java/vector/src/main/java/org/apache/arrow/vector/BufferBacked.java index 6ece165b27f..ccba5b26c3a 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/BufferBacked.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/BufferBacked.java @@ -17,10 +17,9 @@ package org.apache.arrow.vector; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.vector.ipc.message.ArrowFieldNode; -import io.netty.buffer.ArrowBuf; - /** * Content is backed by a buffer and can be loaded/unloaded. */ diff --git a/java/vector/src/main/java/org/apache/arrow/vector/DateDayVector.java b/java/vector/src/main/java/org/apache/arrow/vector/DateDayVector.java index 9448a1a1453..9c863c36d0e 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/DateDayVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/DateDayVector.java @@ -19,6 +19,7 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.DateDayReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -29,8 +30,6 @@ import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * DateDayVector implements a fixed width (4 bytes) vector of * date values which could be null. A validity buffer (bit vector) is diff --git a/java/vector/src/main/java/org/apache/arrow/vector/DateMilliVector.java b/java/vector/src/main/java/org/apache/arrow/vector/DateMilliVector.java index d893ba4f331..578708ad8e7 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/DateMilliVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/DateMilliVector.java @@ -21,6 +21,7 @@ import java.time.LocalDateTime; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.DateMilliReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -32,8 +33,6 @@ import org.apache.arrow.vector.util.DateUtility; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * DateMilliVector implements a fixed width vector (8 bytes) of * date values which could be null. A validity buffer (bit vector) is diff --git a/java/vector/src/main/java/org/apache/arrow/vector/DecimalVector.java b/java/vector/src/main/java/org/apache/arrow/vector/DecimalVector.java index 0dc1bdd3fb4..b7b4e5e373f 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/DecimalVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/DecimalVector.java @@ -21,6 +21,7 @@ import java.math.BigDecimal; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.DecimalReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -33,7 +34,6 @@ import org.apache.arrow.vector.util.DecimalUtility; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; import io.netty.util.internal.PlatformDependent; /** diff --git a/java/vector/src/main/java/org/apache/arrow/vector/DurationVector.java b/java/vector/src/main/java/org/apache/arrow/vector/DurationVector.java index 533d331de95..1fa3fd81f32 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/DurationVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/DurationVector.java @@ -21,6 +21,7 @@ import java.time.Duration; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.DurationReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -33,8 +34,6 @@ import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * DurationVector implements a fixed width vector (8 bytes) of * a configurable TimeUnit granularity duration values which could be null. diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ExtensionTypeVector.java b/java/vector/src/main/java/org/apache/arrow/vector/ExtensionTypeVector.java index cc4bfe57cf3..15e4cf91b81 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/ExtensionTypeVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/ExtensionTypeVector.java @@ -20,6 +20,7 @@ import java.util.Iterator; import java.util.List; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.OutOfMemoryException; import org.apache.arrow.vector.compare.VectorVisitor; @@ -30,8 +31,6 @@ import org.apache.arrow.vector.util.CallBack; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * A vector that wraps an underlying vector, used to help implement extension types. * @param The wrapped vector type. diff --git a/java/vector/src/main/java/org/apache/arrow/vector/FieldVector.java b/java/vector/src/main/java/org/apache/arrow/vector/FieldVector.java index 8ecec93dd62..2723fd71f76 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/FieldVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/FieldVector.java @@ -19,11 +19,10 @@ import java.util.List; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.vector.ipc.message.ArrowFieldNode; import org.apache.arrow.vector.types.pojo.Field; -import io.netty.buffer.ArrowBuf; - /** * A vector corresponding to a Field in the schema. * It has inner vectors backed by buffers (validity, offsets, data, ...) diff --git a/java/vector/src/main/java/org/apache/arrow/vector/FixedSizeBinaryVector.java b/java/vector/src/main/java/org/apache/arrow/vector/FixedSizeBinaryVector.java index aad185b58c5..4c8e2c92074 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/FixedSizeBinaryVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/FixedSizeBinaryVector.java @@ -17,6 +17,7 @@ package org.apache.arrow.vector; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.util.Preconditions; import org.apache.arrow.vector.complex.impl.FixedSizeBinaryReaderImpl; @@ -29,8 +30,6 @@ import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * FixedSizeBinaryVector implements a fixed width vector of * binary values which could be null. A validity buffer (bit vector) is diff --git a/java/vector/src/main/java/org/apache/arrow/vector/Float4Vector.java b/java/vector/src/main/java/org/apache/arrow/vector/Float4Vector.java index 74fbc32ca86..f470a6447dd 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/Float4Vector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/Float4Vector.java @@ -19,6 +19,7 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.Float4ReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -29,8 +30,6 @@ import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * Float4Vector implements a fixed width vector (4 bytes) of * float values which could be null. A validity buffer (bit vector) is diff --git a/java/vector/src/main/java/org/apache/arrow/vector/Float8Vector.java b/java/vector/src/main/java/org/apache/arrow/vector/Float8Vector.java index 9ca40616982..0739aba101e 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/Float8Vector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/Float8Vector.java @@ -19,6 +19,7 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.Float8ReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -29,8 +30,6 @@ import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * Float8Vector implements a fixed width vector (8 bytes) of * double values which could be null. A validity buffer (bit vector) is 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 e91e0eaa0e2..18b4059fad2 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 @@ -19,6 +19,7 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.IntReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -29,8 +30,6 @@ import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * IntVector implements a fixed width (4 bytes) vector of * integer values which could be null. A validity buffer (bit vector) is diff --git a/java/vector/src/main/java/org/apache/arrow/vector/IntervalDayVector.java b/java/vector/src/main/java/org/apache/arrow/vector/IntervalDayVector.java index b67d697b989..b50e81e77c3 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/IntervalDayVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/IntervalDayVector.java @@ -21,6 +21,7 @@ import java.time.Duration; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.IntervalDayReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -31,8 +32,6 @@ import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * IntervalDayVector implements a fixed width vector (8 bytes) of * interval (days and milliseconds) values which could be null. diff --git a/java/vector/src/main/java/org/apache/arrow/vector/IntervalYearVector.java b/java/vector/src/main/java/org/apache/arrow/vector/IntervalYearVector.java index 25c7535c005..1a126f0f206 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/IntervalYearVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/IntervalYearVector.java @@ -21,6 +21,7 @@ import java.time.Period; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.IntervalYearReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -31,8 +32,6 @@ import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * IntervalYearVector implements a fixed width (4 bytes) vector of * interval (years and months) values which could be null. A validity buffer diff --git a/java/vector/src/main/java/org/apache/arrow/vector/NullVector.java b/java/vector/src/main/java/org/apache/arrow/vector/NullVector.java index 91cff587d3f..80d1f4f2ea4 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/NullVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/NullVector.java @@ -23,6 +23,7 @@ import java.util.Iterator; import java.util.List; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.OutOfMemoryException; import org.apache.arrow.memory.util.hash.ArrowBufHasher; @@ -38,8 +39,6 @@ import org.apache.arrow.vector.util.CallBack; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * A null type vector. */ 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 724daf59f15..74ae8c02603 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 @@ -19,6 +19,7 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.SmallIntReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -29,8 +30,6 @@ import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * SmallIntVector implements a fixed width (2 bytes) vector of * short values which could be null. A validity buffer (bit vector) is diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeMicroVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeMicroVector.java index b1ab36a6824..9b4d299d766 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/TimeMicroVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeMicroVector.java @@ -19,6 +19,7 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.TimeMicroReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -29,8 +30,6 @@ import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * TimeMicroVector implements a fixed width vector (8 bytes) of * time (microsecond resolution) values which could be null. diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeMilliVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeMilliVector.java index 8c7943dfd0d..c515fb6e00f 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/TimeMilliVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeMilliVector.java @@ -21,6 +21,7 @@ import java.time.LocalDateTime; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.TimeMilliReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -32,8 +33,6 @@ import org.apache.arrow.vector.util.DateUtility; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * TimeMilliVector implements a fixed width (4 bytes) vector of * time (millisecond resolution) values which could be null. A validity buffer diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeNanoVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeNanoVector.java index b711131e177..6cb222498ad 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/TimeNanoVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeNanoVector.java @@ -19,6 +19,7 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.TimeNanoReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -29,8 +30,6 @@ import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * TimeNanoVector implements a fixed width vector (8 bytes) of * time (nanosecond resolution) values which could be null. A validity buffer diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeSecVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeSecVector.java index 69e96b94084..dee0f8da4d2 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/TimeSecVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeSecVector.java @@ -19,6 +19,7 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.TimeSecReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -29,8 +30,6 @@ import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * TimeSecVector implements a fixed width (4 bytes) vector of * time (seconds resolution) values which could be null. A validity buffer (bit vector) is diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampVector.java index 271fdb5ee0c..e94f59944a0 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampVector.java @@ -19,13 +19,12 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.types.pojo.Field; import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * TimeStampVector is an abstract interface for fixed width vector (8 bytes) * of timestamp values which could be null. A validity buffer (bit vector) is 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 08f75dc89a1..f08b0e02f81 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 @@ -19,6 +19,7 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.TinyIntReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -29,8 +30,6 @@ import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * TinyIntVector implements a fixed width (1 bytes) vector of * byte values which could be null. A validity buffer (bit vector) is 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 af1c57ea460..1ad3f9bb016 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 @@ -19,6 +19,7 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.UInt1ReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -29,9 +30,6 @@ import org.apache.arrow.vector.types.pojo.FieldType; 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 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 349a50a69a6..7048ed0ba3a 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 @@ -19,6 +19,7 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.UInt2ReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -29,8 +30,6 @@ import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * UInt2Vector implements a fixed width (2 bytes) vector of * integer values which could be null. A validity buffer (bit vector) is 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 a747026a176..b8365fc49b7 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 @@ -19,6 +19,7 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.UInt4ReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -29,8 +30,6 @@ import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * UInt4Vector implements a fixed width (4 bytes) vector of * integer values which could be null. A validity buffer (bit vector) is 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 19d761b7857..d793b96393f 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 @@ -21,6 +21,7 @@ import java.math.BigInteger; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.UInt8ReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -31,8 +32,6 @@ import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * UInt8Vector implements a fixed width vector (8 bytes) of * integer values which could be null. A validity buffer (bit vector) is diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ValueVector.java b/java/vector/src/main/java/org/apache/arrow/vector/ValueVector.java index b8710673b5b..aa29c29314e 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/ValueVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/ValueVector.java @@ -19,6 +19,7 @@ import java.io.Closeable; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.OutOfMemoryException; import org.apache.arrow.memory.util.hash.ArrowBufHasher; @@ -29,8 +30,6 @@ import org.apache.arrow.vector.util.CallBack; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * An abstraction that is used to store a sequence of values in an individual column. * @@ -180,7 +179,7 @@ public interface ValueVector extends Closeable, Iterable { * * @param clear Whether to clear vector before returning; the buffers will still be refcounted; * but the returned array will be the only reference to them - * @return The underlying {@link io.netty.buffer.ArrowBuf buffers} that is used by this vector instance. + * @return The underlying {@link ArrowBuf buffers} that is used by this vector instance. */ ArrowBuf[] getBuffers(boolean clear); diff --git a/java/vector/src/main/java/org/apache/arrow/vector/VectorLoader.java b/java/vector/src/main/java/org/apache/arrow/vector/VectorLoader.java index f483c7db94e..2720219767a 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/VectorLoader.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/VectorLoader.java @@ -23,13 +23,12 @@ import java.util.Iterator; import java.util.List; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.util.Collections2; import org.apache.arrow.vector.ipc.message.ArrowFieldNode; import org.apache.arrow.vector.ipc.message.ArrowRecordBatch; import org.apache.arrow.vector.types.pojo.Field; -import io.netty.buffer.ArrowBuf; - /** * Loads buffers into vectors. */ diff --git a/java/vector/src/main/java/org/apache/arrow/vector/VectorUnloader.java b/java/vector/src/main/java/org/apache/arrow/vector/VectorUnloader.java index 8c936aa0ba9..62d063b0fd8 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/VectorUnloader.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/VectorUnloader.java @@ -20,11 +20,10 @@ import java.util.ArrayList; import java.util.List; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.vector.ipc.message.ArrowFieldNode; import org.apache.arrow.vector.ipc.message.ArrowRecordBatch; -import io.netty.buffer.ArrowBuf; - /** * Helper class that handles converting a {@link VectorSchemaRoot} * to a {@link ArrowRecordBatch}. diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/AbstractStructVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/AbstractStructVector.java index c6a14e0b86c..828ab087a92 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/AbstractStructVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/AbstractStructVector.java @@ -23,6 +23,7 @@ import java.util.List; import java.util.stream.Collectors; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.util.Preconditions; import org.apache.arrow.vector.BitVectorHelper; @@ -33,8 +34,6 @@ import org.apache.arrow.vector.util.MapWithOrdinal; import org.apache.arrow.vector.util.ValueVectorUtility; -import io.netty.buffer.ArrowBuf; - /** * Base class for StructVectors. Currently used by NonNullableStructVector */ diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueVector.java index 9f6a5ee61e7..5b409ca0ae3 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/BaseRepeatedValueVector.java @@ -25,6 +25,7 @@ import java.util.Iterator; import java.util.List; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BaseAllocator; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.util.Preconditions; @@ -44,8 +45,6 @@ import org.apache.arrow.vector.util.OversizedAllocationException; import org.apache.arrow.vector.util.SchemaChangeRuntimeException; -import io.netty.buffer.ArrowBuf; - /** Base class for Vectors that contain repeated values. */ public abstract class BaseRepeatedValueVector extends BaseValueVector implements RepeatedValueVector, BaseListVector { diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/FixedSizeListVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/FixedSizeListVector.java index 8fa43fb06b7..00c1cf2a5da 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/FixedSizeListVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/FixedSizeListVector.java @@ -29,6 +29,7 @@ import java.util.List; import java.util.Objects; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BaseAllocator; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.OutOfMemoryException; @@ -58,8 +59,6 @@ import org.apache.arrow.vector.util.SchemaChangeRuntimeException; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** A ListVector where every list value is of the same size. */ public class FixedSizeListVector extends BaseValueVector implements BaseListVector, PromotableVector { diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java index 66c8a3f4323..f96f384eb55 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/ListVector.java @@ -27,6 +27,7 @@ import java.util.Collections; import java.util.List; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BaseAllocator; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.OutOfMemoryException; @@ -57,8 +58,6 @@ import org.apache.arrow.vector.util.OversizedAllocationException; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * A list vector contains lists of a specific type of elements. Its structure contains 3 elements. *
    @@ -655,7 +654,7 @@ public void reset() { * * @param clear Whether to clear vector before returning; the buffers will still be refcounted * but the returned array will be the only reference to them - * @return The underlying {@link io.netty.buffer.ArrowBuf buffers} that is used by this + * @return The underlying {@link ArrowBuf buffers} that is used by this * vector instance. */ @Override diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/NonNullableStructVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/NonNullableStructVector.java index fbd51235892..d902bc399a1 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/NonNullableStructVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/NonNullableStructVector.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.Map; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.util.ByteFunctionHelpers; import org.apache.arrow.memory.util.hash.ArrowBufHasher; @@ -44,8 +45,6 @@ import org.apache.arrow.vector.util.JsonStringHashMap; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * A struct vector that has no null values (and no validity buffer). * Child Vectors are handled in {@link AbstractStructVector}. diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/StructVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/StructVector.java index 7b22835963a..246248d63c1 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/StructVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/StructVector.java @@ -24,6 +24,7 @@ import java.util.Arrays; import java.util.List; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BaseAllocator; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.util.ArrowBufPointer; @@ -46,8 +47,6 @@ import org.apache.arrow.vector.util.OversizedAllocationException; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * A Struct vector consists of nullability/validity buffer and children vectors * that make up the struct's fields. The children vectors are handled by the @@ -289,7 +288,7 @@ public int getValueCapacity() { * * @param clear Whether to clear vector before returning; the buffers will still be refcounted * but the returned array will be the only reference to them - * @return The underlying {@link io.netty.buffer.ArrowBuf buffers} that is used by this + * @return The underlying {@link ArrowBuf buffers} that is used by this * vector instance. */ @Override diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/PromotableWriter.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/PromotableWriter.java index 6e8089c5447..883afa03329 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/PromotableWriter.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/PromotableWriter.java @@ -19,6 +19,7 @@ import java.math.BigDecimal; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.vector.FieldVector; import org.apache.arrow.vector.NullVector; import org.apache.arrow.vector.ValueVector; @@ -35,8 +36,6 @@ import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; - /** * This FieldWriter implementation delegates all FieldWriter API calls to an inner FieldWriter. This inner field writer * can start as a specific type, and this class will promote the writer to a UnionWriter if a call is made that the diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowStreamReader.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowStreamReader.java index 43dbb2962f0..1786f05a162 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowStreamReader.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/ArrowStreamReader.java @@ -23,6 +23,7 @@ import java.nio.channels.ReadableByteChannel; import org.apache.arrow.flatbuf.MessageHeader; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.FieldVector; import org.apache.arrow.vector.ipc.message.ArrowDictionaryBatch; @@ -33,8 +34,6 @@ import org.apache.arrow.vector.types.pojo.DictionaryEncoding; import org.apache.arrow.vector.types.pojo.Schema; -import io.netty.buffer.ArrowBuf; - /** * This class reads from an input stream and produces ArrowRecordBatches. */ diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileReader.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileReader.java index 2e37e835058..d6716ec7c24 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileReader.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileReader.java @@ -33,6 +33,7 @@ import java.util.Map; import java.util.Objects; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.util.Preconditions; import org.apache.arrow.vector.BigIntVector; @@ -64,8 +65,6 @@ import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.MappingJsonFactory; -import io.netty.buffer.ArrowBuf; - /** * A reader for JSON files that translates them into vectors. This reader is used for integration tests. * diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileWriter.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileWriter.java index 7d253775b81..a6b8b5f2e55 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileWriter.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/JsonFileWriter.java @@ -28,6 +28,7 @@ import java.util.List; import java.util.Set; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.util.Preconditions; import org.apache.arrow.vector.BaseVariableWidthVector; import org.apache.arrow.vector.BigIntVector; @@ -79,8 +80,6 @@ import com.fasterxml.jackson.core.util.DefaultPrettyPrinter.NopIndenter; import com.fasterxml.jackson.databind.MappingJsonFactory; -import io.netty.buffer.ArrowBuf; - /** * A writer that converts binary Vectors into a JSON format suitable * for integration testing. diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/ReadChannel.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/ReadChannel.java index 221679d2852..cf114a11750 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/ReadChannel.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/ReadChannel.java @@ -21,11 +21,10 @@ import java.nio.ByteBuffer; import java.nio.channels.ReadableByteChannel; +import org.apache.arrow.memory.ArrowBuf; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.buffer.ArrowBuf; - /** * Adapter around {@link ReadableByteChannel} that reads into {@linkplain ArrowBuf}s. */ diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/WriteChannel.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/WriteChannel.java index f4d89c72f32..1504e3d94d2 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/WriteChannel.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/WriteChannel.java @@ -21,6 +21,7 @@ import java.nio.ByteBuffer; import java.nio.channels.WritableByteChannel; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.vector.ipc.message.FBSerializable; import org.apache.arrow.vector.ipc.message.MessageSerializer; import org.slf4j.Logger; @@ -28,8 +29,6 @@ import com.google.flatbuffers.FlatBufferBuilder; -import io.netty.buffer.ArrowBuf; - /** * Wrapper around a WritableByteChannel that maintains the position as well adding * some common serialization utilities. 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 ec71dd1d57d..2087cb6dbf5 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 @@ -24,6 +24,7 @@ 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.slf4j.Logger; @@ -31,8 +32,6 @@ import com.google.flatbuffers.FlatBufferBuilder; -import io.netty.buffer.ArrowBuf; - /** * POJO representation of a RecordBatch IPC message (https://arrow.apache.org/docs/format/IPC.html). */ diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageChannelReader.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageChannelReader.java index 2135dec3485..f827292a53c 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageChannelReader.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageChannelReader.java @@ -20,11 +20,10 @@ import java.io.IOException; import org.apache.arrow.flatbuf.Message; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.ipc.ReadChannel; -import io.netty.buffer.ArrowBuf; - /** * Reads a sequence of messages using a ReadChannel. */ diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageResult.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageResult.java index ffd4de5bf3a..591fbf1063d 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageResult.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageResult.java @@ -18,8 +18,7 @@ package org.apache.arrow.vector.ipc.message; import org.apache.arrow.flatbuf.Message; - -import io.netty.buffer.ArrowBuf; +import org.apache.arrow.memory.ArrowBuf; /** * Class to hold the Message metadata and body data when reading messages through a diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageSerializer.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageSerializer.java index 29c68b64d5c..59000317e62 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageSerializer.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageSerializer.java @@ -31,6 +31,7 @@ import org.apache.arrow.flatbuf.MessageHeader; import org.apache.arrow.flatbuf.MetadataVersion; import org.apache.arrow.flatbuf.RecordBatch; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.util.Preconditions; import org.apache.arrow.vector.ipc.ReadChannel; @@ -39,8 +40,6 @@ import com.google.flatbuffers.FlatBufferBuilder; -import io.netty.buffer.ArrowBuf; - /** * Utility class for serializing Messages. Messages are all serialized a similar way. * 1. 4 byte little endian message header prefix diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/ByteFunctionHelpers.java b/java/vector/src/main/java/org/apache/arrow/vector/util/ByteFunctionHelpers.java index e2b2d7bff68..2faa1ff74c7 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/util/ByteFunctionHelpers.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/util/ByteFunctionHelpers.java @@ -17,7 +17,7 @@ package org.apache.arrow.vector.util; -import io.netty.buffer.ArrowBuf; +import org.apache.arrow.memory.ArrowBuf; /** * Helper class for comparing byte buffers. diff --git a/java/vector/src/main/java/org/apache/arrow/vector/util/DecimalUtility.java b/java/vector/src/main/java/org/apache/arrow/vector/util/DecimalUtility.java index 2703d261219..95305f98df2 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/util/DecimalUtility.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/util/DecimalUtility.java @@ -21,7 +21,8 @@ import java.math.BigInteger; import java.nio.ByteBuffer; -import io.netty.buffer.ArrowBuf; +import org.apache.arrow.memory.ArrowBuf; + import io.netty.util.internal.PlatformDependent; /** diff --git a/java/vector/src/test/java/org/apache/arrow/vector/DirtyRootAllocator.java b/java/vector/src/test/java/org/apache/arrow/vector/DirtyRootAllocator.java index 3dcc65d5707..27b8ac75263 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/DirtyRootAllocator.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/DirtyRootAllocator.java @@ -17,11 +17,10 @@ package org.apache.arrow.vector; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferManager; import org.apache.arrow.memory.RootAllocator; -import io.netty.buffer.ArrowBuf; - /** * Root allocator that returns buffers pre-filled with a given value.
    * Useful for testing if value vectors are properly zeroing their buffers. diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestBitVectorHelper.java b/java/vector/src/test/java/org/apache/arrow/vector/TestBitVectorHelper.java index e9057781840..a55f6caa0a8 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestBitVectorHelper.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestBitVectorHelper.java @@ -21,11 +21,11 @@ import static org.junit.Assert.assertTrue; import static org.junit.jupiter.api.Assertions.assertFalse; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.ReferenceManager; import org.apache.arrow.memory.RootAllocator; import org.junit.Test; -import io.netty.buffer.ArrowBuf; import io.netty.buffer.PooledByteBufAllocatorL; import io.netty.util.internal.PlatformDependent; diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestDecimalVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestDecimalVector.java index ee4d3844f27..fc75ee965be 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestDecimalVector.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestDecimalVector.java @@ -24,14 +24,13 @@ import java.math.BigDecimal; import java.math.BigInteger; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.types.pojo.ArrowType; import org.junit.After; import org.junit.Before; import org.junit.Test; -import io.netty.buffer.ArrowBuf; - public class TestDecimalVector { private static long[] intValues; diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestDenseUnionVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestDenseUnionVector.java index 763fb4f320e..e5825a61516 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestDenseUnionVector.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestDenseUnionVector.java @@ -27,6 +27,7 @@ import java.util.List; import java.util.Map; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.DenseUnionVector; import org.apache.arrow.vector.complex.StructVector; @@ -47,8 +48,6 @@ import org.junit.Before; import org.junit.Test; -import io.netty.buffer.ArrowBuf; - public class TestDenseUnionVector { private static final String EMPTY_SCHEMA_PATH = ""; diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestDictionaryVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestDictionaryVector.java index ee51bbf6dee..c69f2a41320 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestDictionaryVector.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestDictionaryVector.java @@ -30,6 +30,7 @@ import java.util.Iterator; import java.util.Map; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.FixedSizeListVector; import org.apache.arrow.vector.complex.ListVector; @@ -55,8 +56,6 @@ import org.junit.Before; import org.junit.Test; -import io.netty.buffer.ArrowBuf; - public class TestDictionaryVector { private BufferAllocator allocator; diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestFixedSizeBinaryVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestFixedSizeBinaryVector.java index 2e370a96fe8..363821e9839 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestFixedSizeBinaryVector.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestFixedSizeBinaryVector.java @@ -20,6 +20,7 @@ import static org.junit.Assert.*; import static org.junit.jupiter.api.Assertions.assertThrows; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.holders.FixedSizeBinaryHolder; import org.apache.arrow.vector.holders.NullableFixedSizeBinaryHolder; @@ -27,8 +28,6 @@ import org.junit.Before; import org.junit.Test; -import io.netty.buffer.ArrowBuf; - public class TestFixedSizeBinaryVector { private static final int numValues = 123; private static final int typeWidth = 9; diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestListVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestListVector.java index 289ebdacc00..814b6a03057 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestListVector.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestListVector.java @@ -26,6 +26,7 @@ import java.util.Arrays; import java.util.List; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.BaseRepeatedValueVector; import org.apache.arrow.vector.complex.ListVector; @@ -41,8 +42,6 @@ import org.junit.Before; import org.junit.Test; -import io.netty.buffer.ArrowBuf; - public class TestListVector { private BufferAllocator allocator; diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestMapVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestMapVector.java index 423cd7ada97..3b85ed6fe69 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestMapVector.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestMapVector.java @@ -25,6 +25,7 @@ import java.util.ArrayList; import java.util.Map; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.MapVector; import org.apache.arrow.vector.complex.StructVector; @@ -41,8 +42,6 @@ import org.junit.Before; import org.junit.Test; -import io.netty.buffer.ArrowBuf; - public class TestMapVector { private BufferAllocator allocator; diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestUnionVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestUnionVector.java index 724b353f93d..e37ff01f9e1 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestUnionVector.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestUnionVector.java @@ -26,6 +26,7 @@ import java.util.List; import java.util.Map; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.UnionVector; import org.apache.arrow.vector.holders.NullableBitHolder; @@ -42,8 +43,6 @@ import org.junit.Before; import org.junit.Test; -import io.netty.buffer.ArrowBuf; - public class TestUnionVector { private static final String EMPTY_SCHEMA_PATH = ""; diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java index 65bc963acb5..6c9d300c325 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestValueVector.java @@ -35,6 +35,7 @@ import java.util.Collections; import java.util.List; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BaseAllocator; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; @@ -65,8 +66,6 @@ import org.junit.Before; import org.junit.Test; -import io.netty.buffer.ArrowBuf; - public class TestValueVector { private static final String EMPTY_SCHEMA_PATH = ""; diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestVarCharListVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestVarCharListVector.java index 5dd2a9835e5..24c7e175588 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestVarCharListVector.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestVarCharListVector.java @@ -17,6 +17,7 @@ package org.apache.arrow.vector; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.ListVector; import org.apache.arrow.vector.complex.impl.UnionListWriter; @@ -27,8 +28,6 @@ import org.junit.Before; import org.junit.Test; -import io.netty.buffer.ArrowBuf; - public class TestVarCharListVector { private BufferAllocator allocator; diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReset.java b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReset.java index 881cb8e4300..5cfbf51bfe9 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReset.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReset.java @@ -22,6 +22,7 @@ import java.nio.charset.StandardCharsets; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.vector.complex.FixedSizeListVector; @@ -37,8 +38,6 @@ import org.junit.Before; import org.junit.Test; -import io.netty.buffer.ArrowBuf; - public class TestVectorReset { private BufferAllocator allocator; diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorUnloadLoad.java b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorUnloadLoad.java index f00c983960e..8fadac92c4c 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorUnloadLoad.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorUnloadLoad.java @@ -27,6 +27,7 @@ import java.util.Collections; import java.util.List; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.vector.complex.NonNullableStructVector; @@ -48,8 +49,6 @@ import org.junit.Before; import org.junit.Test; -import io.netty.buffer.ArrowBuf; - public class TestVectorUnloadLoad { private BufferAllocator allocator; diff --git a/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java b/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java index 1616f4018ca..48b7bbd47e9 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/complex/writer/TestComplexWriter.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.Set; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.util.AutoCloseables; @@ -76,8 +77,6 @@ import org.junit.Before; import org.junit.Test; -import io.netty.buffer.ArrowBuf; - public class TestComplexWriter { private BufferAllocator allocator; diff --git a/java/vector/src/test/java/org/apache/arrow/vector/ipc/BaseFileTest.java b/java/vector/src/test/java/org/apache/arrow/vector/ipc/BaseFileTest.java index 73efafa40b6..cb14a850534 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/ipc/BaseFileTest.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/ipc/BaseFileTest.java @@ -33,6 +33,7 @@ import java.util.Arrays; import java.util.List; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.util.Collections2; @@ -89,8 +90,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.buffer.ArrowBuf; - /** * Helps testing the file formats. */ diff --git a/java/vector/src/test/java/org/apache/arrow/vector/ipc/MessageSerializerTest.java b/java/vector/src/test/java/org/apache/arrow/vector/ipc/MessageSerializerTest.java index e23c4b95e0a..028e52e8c0b 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/ipc/MessageSerializerTest.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/ipc/MessageSerializerTest.java @@ -32,6 +32,7 @@ import java.util.Collections; import java.util.List; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.vector.ipc.message.ArrowFieldNode; @@ -47,8 +48,6 @@ import org.junit.Test; import org.junit.rules.ExpectedException; -import io.netty.buffer.ArrowBuf; - public class MessageSerializerTest { public static ArrowBuf buf(BufferAllocator alloc, byte[] bytes) { diff --git a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowReaderWriter.java b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowReaderWriter.java index 365a3aa79eb..0804856d1d0 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowReaderWriter.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowReaderWriter.java @@ -44,6 +44,7 @@ import org.apache.arrow.flatbuf.FieldNode; import org.apache.arrow.flatbuf.Message; import org.apache.arrow.flatbuf.RecordBatch; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.util.AutoCloseables; @@ -77,8 +78,6 @@ import org.junit.Before; import org.junit.Test; -import io.netty.buffer.ArrowBuf; - public class TestArrowReaderWriter { private BufferAllocator allocator; diff --git a/java/vector/src/test/java/org/apache/arrow/vector/util/DecimalUtilityTest.java b/java/vector/src/test/java/org/apache/arrow/vector/util/DecimalUtilityTest.java index 1840b4e707a..667e9624ed8 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/util/DecimalUtilityTest.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/util/DecimalUtilityTest.java @@ -20,13 +20,12 @@ import java.math.BigDecimal; import java.math.BigInteger; +import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.junit.Assert; import org.junit.Test; -import io.netty.buffer.ArrowBuf; - public class DecimalUtilityTest { private static final BigInteger MAX_BIG_INT = java.math.BigInteger.valueOf(10).pow(38) .subtract(java.math.BigInteger.ONE);