diff --git a/java/format/pom.xml b/java/format/pom.xml index b05e47b9570..415af20b538 100644 --- a/java/format/pom.xml +++ b/java/format/pom.xml @@ -15,7 +15,7 @@ arrow-java-root org.apache.arrow - 0.8.0 + siren-0.8.1-SNAPSHOT arrow-format diff --git a/java/memory/pom.xml b/java/memory/pom.xml index 7ab4fbb29c7..f5882499359 100644 --- a/java/memory/pom.xml +++ b/java/memory/pom.xml @@ -14,14 +14,13 @@ org.apache.arrow arrow-java-root - 0.8.0 + siren-0.8.1-SNAPSHOT arrow-memory - siren-0.8.0 Arrow Memory - siren-4.1.17.Final + siren-4.1.27-3 diff --git a/java/pom.xml b/java/pom.xml index ba0a0f2057b..fe80a2980e1 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -20,19 +20,19 @@ org.apache.arrow arrow-java-root - 0.8.0 + siren-0.8.1-SNAPSHOT pom Apache Arrow Java Root POM Apache Arrow is open source, in-memory columnar data structures and low-overhead messaging - http://arrow.apache.org/ + https://arrow.apache.org/ ${project.basedir}/target/generated-sources 4.11 1.7.25 18.0 - siren-4.1.17.Final + siren-4.1.27-3 2.7.9 2.7.1 1.2.0-3f79e055 @@ -53,20 +53,20 @@ dev-subscribe@arrow.apache.org dev-unsubscribe@arrow.apache.org dev@arrow.apache.org - http://mail-archives.apache.org/mod_mbox/arrow-dev/ + https://mail-archives.apache.org/mod_mbox/arrow-dev/ Commits List commits-subscribe@arrow.apache.org commits-unsubscribe@arrow.apache.org commits@arrow.apache.org - http://mail-archives.apache.org/mod_mbox/arrow-commits/ + https://mail-archives.apache.org/mod_mbox/arrow-commits/ Issues List issues-subscribe@arrow.apache.org issues-unsubscribe@arrow.apache.org - http://mail-archives.apache.org/mod_mbox/arrow-issues/ + https://mail-archives.apache.org/mod_mbox/arrow-issues/ @@ -155,7 +155,7 @@ org.apache.arrow ${username} - http://arrow.apache.org/ + https://arrow.apache.org/ diff --git a/java/tools/pom.xml b/java/tools/pom.xml index 9e9d80843d8..da3529dd06d 100644 --- a/java/tools/pom.xml +++ b/java/tools/pom.xml @@ -14,7 +14,7 @@ org.apache.arrow arrow-java-root - 0.8.0 + siren-0.8.1-SNAPSHOT arrow-tools Arrow Tools diff --git a/java/vector/pom.xml b/java/vector/pom.xml index 05c4efbb9b1..31deeb828c4 100644 --- a/java/vector/pom.xml +++ b/java/vector/pom.xml @@ -14,7 +14,7 @@ org.apache.arrow arrow-java-root - 0.8.0 + siren-0.8.1-SNAPSHOT arrow-vector Arrow Vectors @@ -65,6 +65,7 @@ io.netty netty-buffer + test io.netty diff --git a/java/vector/src/main/codegen/includes/vv_imports.ftl b/java/vector/src/main/codegen/includes/vv_imports.ftl index a55304d7335..7da4fe7a0d0 100644 --- a/java/vector/src/main/codegen/includes/vv_imports.ftl +++ b/java/vector/src/main/codegen/includes/vv_imports.ftl @@ -20,7 +20,7 @@ import com.google.common.collect.ObjectArrays; import com.google.flatbuffers.FlatBufferBuilder; import com.google.common.base.Preconditions; -import io.netty.buffer.*; +import siren.io.netty.buffer.*; import org.apache.arrow.memory.*; import org.apache.arrow.vector.types.Types; diff --git a/java/vector/src/main/codegen/templates/UnionVector.java b/java/vector/src/main/codegen/templates/UnionVector.java index 9377bd0da21..e7112063426 100644 --- a/java/vector/src/main/codegen/templates/UnionVector.java +++ b/java/vector/src/main/codegen/templates/UnionVector.java @@ -25,7 +25,7 @@ <#include "/@includes/vv_imports.ftl" /> import com.google.common.collect.ImmutableList; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BaseDataValueVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BaseDataValueVector.java index 80675135e3c..03ce8ebacda 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/BaseDataValueVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/BaseDataValueVector.java @@ -24,7 +24,7 @@ import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.ipc.message.ArrowFieldNode; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.vector.util.CallBack; import org.apache.arrow.vector.util.TransferPair; 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 77026d4e5a1..4b2c448837a 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 @@ -18,7 +18,7 @@ package org.apache.arrow.vector; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import java.nio.ByteBuffer; import java.util.ArrayList; @@ -394,7 +394,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 siren.io.netty.buffer.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 6418ea4f8a0..802929f988b 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 @@ -32,7 +32,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Iterators; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; public abstract class BaseValueVector implements ValueVector { private static final Logger logger = LoggerFactory.getLogger(BaseValueVector.class); 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 fbadb35d755..0b752c87594 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 @@ -19,7 +19,7 @@ package org.apache.arrow.vector; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.OutOfMemoryException; import org.apache.arrow.memory.BaseAllocator; @@ -585,7 +585,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 siren.io.netty.buffer.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 ccf0c3067e0..4597cf4bbbc 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 @@ -18,7 +18,7 @@ package org.apache.arrow.vector; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.BigIntReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; 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 3887da4a618..5afde9cd4d5 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 @@ -18,7 +18,7 @@ package org.apache.arrow.vector; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.BitReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; 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 8322a1ac8fc..13909fddd73 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 @@ -18,7 +18,7 @@ package org.apache.arrow.vector; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.ipc.message.ArrowFieldNode; 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 332ca228a43..a875bfa5627 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 @@ -20,7 +20,7 @@ import org.apache.arrow.vector.ipc.message.ArrowFieldNode; -import io.netty.buffer.ArrowBuf; +import siren.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 ed8956c1eaa..098740be3b6 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 @@ -18,7 +18,7 @@ package org.apache.arrow.vector; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.DateDayReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; 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 f21b58f85fb..8509ce8f1d1 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 @@ -18,7 +18,7 @@ package org.apache.arrow.vector; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.DateMilliReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; 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 71a74cb9f33..b7beff4fe29 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 @@ -18,7 +18,7 @@ package org.apache.arrow.vector; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.DecimalReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; 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 509eeda7500..97447014487 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 @@ -23,7 +23,7 @@ import org.apache.arrow.vector.ipc.message.ArrowFieldNode; import org.apache.arrow.vector.types.pojo.Field; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; /** * A vector corresponding to a Field in the schema 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 dc78bfde2a2..d60c5fa4eab 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 @@ -18,7 +18,7 @@ package org.apache.arrow.vector; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.Float4ReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; 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 1b410b86879..77c2d0b3534 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 @@ -18,7 +18,7 @@ package org.apache.arrow.vector; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.Float8ReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; 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 2364310e6d5..1c5d53066e5 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 @@ -18,7 +18,7 @@ package org.apache.arrow.vector; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.IntReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; 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 481a66f4e7b..8200230b7a0 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 @@ -18,7 +18,7 @@ package org.apache.arrow.vector; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.IntervalDayReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; 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 859e62dbb8b..f8912589e90 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 @@ -18,7 +18,7 @@ package org.apache.arrow.vector; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.SmallIntReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; 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 604cedffd42..43f094a4472 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 @@ -18,7 +18,7 @@ package org.apache.arrow.vector; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.TimeMicroReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; 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 c3d100c5b61..bb414e88e64 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 @@ -18,7 +18,7 @@ package org.apache.arrow.vector; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.TimeMilliReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; 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 97401ec8aaa..48d367a797a 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 @@ -18,7 +18,7 @@ package org.apache.arrow.vector; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.TimeNanoReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; 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 a7823a916f3..2c786110dc4 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 @@ -18,7 +18,7 @@ package org.apache.arrow.vector; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.TimeSecReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; 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 4c70b819cbf..25f0159b37d 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 @@ -18,7 +18,7 @@ package org.apache.arrow.vector; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.TransferPair; diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TinyIntVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TinyIntVector.java index 306437f0fe9..3811c4970e9 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 @@ -18,7 +18,7 @@ package org.apache.arrow.vector; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.TinyIntReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; 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 e77c1b12703..0a1160e22c8 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 @@ -28,7 +28,7 @@ import org.apache.arrow.vector.util.CallBack; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; /** * An abstraction that is used to store a sequence of values in an individual column. @@ -166,7 +166,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 siren.io.netty.buffer.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/VarBinaryVector.java b/java/vector/src/main/java/org/apache/arrow/vector/VarBinaryVector.java index 893ad7cb594..dd70b9f66d3 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/VarBinaryVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/VarBinaryVector.java @@ -18,7 +18,7 @@ package org.apache.arrow.vector; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.VarBinaryReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; diff --git a/java/vector/src/main/java/org/apache/arrow/vector/VarCharVector.java b/java/vector/src/main/java/org/apache/arrow/vector/VarCharVector.java index 8a38b1d455d..8cae2870428 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/VarCharVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/VarCharVector.java @@ -18,7 +18,7 @@ package org.apache.arrow.vector; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.VarCharReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; 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 c933d149f8d..062b4fa77f8 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 @@ -30,7 +30,7 @@ import com.google.common.collect.Iterators; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; /** * Loads buffers into vectors diff --git a/java/vector/src/main/java/org/apache/arrow/vector/VectorTrimmer.java b/java/vector/src/main/java/org/apache/arrow/vector/VectorTrimmer.java index ada471e63e7..18a8979bc9d 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/VectorTrimmer.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/VectorTrimmer.java @@ -18,8 +18,8 @@ package org.apache.arrow.vector; -import io.netty.buffer.ByteBuf; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ByteBuf; +import siren.io.netty.buffer.ArrowBuf; public class VectorTrimmer { static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(VectorTrimmer.class); 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 94981ef02f6..25758e9be5c 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 @@ -21,7 +21,7 @@ import java.util.ArrayList; import java.util.List; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.vector.BufferLayout.BufferType; import org.apache.arrow.vector.ipc.message.ArrowFieldNode; import org.apache.arrow.vector.ipc.message.ArrowRecordBatch; diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ZeroVector.java b/java/vector/src/main/java/org/apache/arrow/vector/ZeroVector.java index 962a1c94707..93eadf0e30e 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/ZeroVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/ZeroVector.java @@ -36,7 +36,7 @@ import org.apache.arrow.vector.util.CallBack; import org.apache.arrow.vector.util.TransferPair; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; public class ZeroVector implements FieldVector { public final static ZeroVector INSTANCE = new ZeroVector(); diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/AbstractMapVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/AbstractMapVector.java index 1b20b09d81b..52cbbdbfade 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/AbstractMapVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/AbstractMapVector.java @@ -34,7 +34,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; /* * Base class for MapVectors. Currently used by RepeatedMapVector and MapVector 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 a9221f2f6ea..4fefc4d72ad 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 @@ -38,7 +38,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ObjectArrays; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; public abstract class BaseRepeatedValueVector extends BaseValueVector implements RepeatedValueVector { 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 93a8127cfd3..ec673be523c 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 @@ -27,7 +27,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ObjectArrays; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BaseAllocator; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.OutOfMemoryException; 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 d50d4c447fe..9421cdd2787 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,7 +27,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ObjectArrays; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BaseAllocator; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.OutOfMemoryException; @@ -521,7 +521,7 @@ public void clear() { * * @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 siren.io.netty.buffer.ArrowBuf buffers} that is used by this * vector instance. */ @Override diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/MapVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/MapVector.java index e13084588ce..be6f0e91972 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/MapVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/MapVector.java @@ -32,7 +32,7 @@ import com.google.common.collect.Ordering; import com.google.common.primitives.Ints; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.*; diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/NullableMapVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/NullableMapVector.java index d887b730646..2668870d3c1 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/NullableMapVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/NullableMapVector.java @@ -27,7 +27,7 @@ import com.google.common.collect.ObjectArrays; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BaseAllocator; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.*; @@ -264,7 +264,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 siren.io.netty.buffer.ArrowBuf buffers} that is used by this * vector instance. */ @Override diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/UnionListReader.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/UnionListReader.java index 62bc271257f..4f6bb863f5a 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/UnionListReader.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/impl/UnionListReader.java @@ -19,7 +19,7 @@ package org.apache.arrow.vector.complex.impl; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.vector.ValueVector; import org.apache.arrow.vector.complex.ListVector; import org.apache.arrow.vector.complex.reader.FieldReader; 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 d0a9b9e18b8..a31895646a3 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 @@ -36,7 +36,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.*; import org.apache.arrow.vector.dictionary.Dictionary; 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 6eb76a7a147..62843dc8be3 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 @@ -29,7 +29,7 @@ import java.util.Set; import com.google.common.collect.ImmutableList; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.vector.*; import org.apache.arrow.vector.dictionary.Dictionary; import org.apache.arrow.vector.dictionary.DictionaryProvider; 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 395fd7db597..0ee482464d9 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 @@ -25,7 +25,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; public class ReadChannel implements AutoCloseable { 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 da500aa97be..9bcab636fd7 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 @@ -24,7 +24,7 @@ import com.google.flatbuffers.FlatBufferBuilder; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.vector.ipc.message.FBSerializable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; 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 6c6481e74dd..35d75966290 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 @@ -29,7 +29,7 @@ import com.google.flatbuffers.FlatBufferBuilder; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; public class ArrowRecordBatch implements ArrowMessage { 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 5bc3e1fff6f..425416f1e28 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 @@ -19,7 +19,7 @@ package org.apache.arrow.vector.ipc.message; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.flatbuf.Message; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.ipc.ReadChannel; diff --git a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageReader.java b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageReader.java index b277c582950..aa02338bc85 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageReader.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/ipc/message/MessageReader.java @@ -19,7 +19,7 @@ package org.apache.arrow.vector.ipc.message; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.flatbuf.Message; import org.apache.arrow.memory.BufferAllocator; 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 e2f8f7d9a8d..3ca822dffb1 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 @@ -37,7 +37,7 @@ import com.google.flatbuffers.FlatBufferBuilder; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; /** * Utility class for serializing Messages. Messages are all serialized a similar way. 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 5fe556a5527..93cfaf0f756 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 @@ -19,7 +19,7 @@ package org.apache.arrow.vector.util; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import io.netty.util.internal.PlatformDependent; import org.apache.arrow.memory.BoundsChecking; 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 c6d734d18d8..d935dfb6edd 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 @@ -18,7 +18,7 @@ package org.apache.arrow.vector.util; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.vector.types.pojo.ArrowType; import java.math.BigDecimal; 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 febd59fba74..d94a6b00286 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 @@ -21,7 +21,7 @@ import org.apache.arrow.memory.BufferManager; import org.apache.arrow.memory.RootAllocator; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; /** * Root allocator that returns buffers pre-filled with a given value.
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 1acce7e0b66..64422ab89e9 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 @@ -39,7 +39,7 @@ import java.util.ArrayList; import java.util.List; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; public class TestListVector { 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 aec7d0f3273..c03732920dc 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 @@ -37,7 +37,7 @@ import org.junit.Before; import org.junit.Test; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; public class TestUnionVector { private final static 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 601b2062ff6..e3bdbd24dde 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 @@ -47,7 +47,7 @@ import org.junit.Before; import org.junit.Test; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; public class TestValueVector { 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 439a62725e4..6caa3f573fb 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 @@ -28,7 +28,7 @@ import java.util.Collections; import java.util.List; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.vector.complex.MapVector; 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 29d39aabe6b..379e423c0d2 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 @@ -24,7 +24,7 @@ import java.util.List; import java.util.Set; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.vector.SchemaChangeCallBack; 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 9eb55c9bbda..b05306831eb 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 @@ -68,7 +68,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import static org.apache.arrow.vector.TestUtils.newVarCharVector; 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 239d3034ad1..19f89ff7436 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 @@ -30,7 +30,7 @@ import java.util.Collections; import java.util.List; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.RootAllocator; import org.apache.arrow.vector.ipc.message.MessageSerializer; 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 bf42fbb83c8..9ff6632c808 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 @@ -54,7 +54,7 @@ import org.junit.Before; import org.junit.Test; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; public class TestArrowReaderWriter { diff --git a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowStream.java b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowStream.java index f87a0ebd54a..4332a74c733 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowStream.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/ipc/TestArrowStream.java @@ -26,7 +26,7 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; -import io.netty.buffer.ArrowBuf; +import siren.io.netty.buffer.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.TinyIntVector; import org.apache.arrow.vector.VectorSchemaRoot; diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000000..e69de29bb2d