diff --git a/java/vector/src/main/codegen/templates/UnionVector.java b/java/vector/src/main/codegen/templates/UnionVector.java index bd5202977b8..8e5d76f39b8 100644 --- a/java/vector/src/main/codegen/templates/UnionVector.java +++ b/java/vector/src/main/codegen/templates/UnionVector.java @@ -114,11 +114,6 @@ public static UnionVector empty(String name, BufferAllocator allocator) { return new UnionVector(name, allocator, fieldType, null); } - @Deprecated - public UnionVector(String name, BufferAllocator allocator, CallBack callBack) { - this(name, allocator, null, callBack); - } - public UnionVector(String name, BufferAllocator allocator, FieldType fieldType, CallBack callBack) { super(name, allocator, callBack); this.fieldType = fieldType; @@ -522,7 +517,7 @@ private class TransferImpl implements TransferPair { private final UnionVector to; public TransferImpl(String name, BufferAllocator allocator, CallBack callBack) { - to = new UnionVector(name, allocator, callBack); + to = new UnionVector(name, allocator, /* field type */ null, callBack); internalStructVectorTransferPair = internalStruct.makeTransferPair(to.internalStruct); } 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 7fd19196733..cb36481ef5e 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 @@ -1215,17 +1215,6 @@ protected final void setBytes(int index, byte[] value, int start, int length) { valueBuffer.setBytes(startOffset, value, start, length); } - /** - * Gets the starting offset of a record, given its index. - * This method is deprecated. Please use {@link BaseVariableWidthVector#getStartOffset(int)} instead. - * @param index index of the record. - * @return the starting offset of the record. - */ - @Deprecated - protected final int getstartOffset(int index) { - return getStartOffset(index); - } - public final int getStartOffset(int index) { return offsetBuffer.getInt((long) index * OFFSET_WIDTH); } 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 ec73382a0ef..3745c5a75c3 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 @@ -88,16 +88,6 @@ public static void setBit(ArrowBuf validityBuffer, long index) { validityBuffer.setByte(byteIndex, currentByte); } - /** - * Set the bit at provided index to 1. - * - * @deprecated Please use {@link BitVectorHelper#setBit(ArrowBuf, long)} instead.. - */ - @Deprecated - public static void setValidityBitToOne(ArrowBuf validityBuffer, int index) { - setBit(validityBuffer, index); - } - /** * Set the bit at provided index to 0. * 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 c22cba43c56..231ac470f6a 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 @@ -50,7 +50,6 @@ import org.apache.arrow.vector.ipc.message.ArrowFieldNode; import org.apache.arrow.vector.types.Types.MinorType; import org.apache.arrow.vector.types.pojo.ArrowType; -import org.apache.arrow.vector.types.pojo.DictionaryEncoding; import org.apache.arrow.vector.types.pojo.Field; import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.CallBack; @@ -77,20 +76,6 @@ public static FixedSizeListVector empty(String name, int size, BufferAllocator a private int valueCount; private int validityAllocationSizeInBytes; - /** - * Creates a new instance. - * - * @deprecated use FieldType or static constructor instead. - */ - @Deprecated - public FixedSizeListVector(String name, - BufferAllocator allocator, - int listSize, - DictionaryEncoding dictionary, - CallBack schemaChangeCallback) { - this(name, allocator, new FieldType(true, new ArrowType.FixedSizeList(listSize), dictionary), schemaChangeCallback); - } - /** * Creates a new instance. * @@ -407,7 +392,7 @@ public void copyFrom(int fromIndex, int thisIndex, ValueVector from) { @Override public UnionVector promoteToUnion() { - UnionVector vector = new UnionVector(name, allocator, null); + UnionVector vector = new UnionVector(name, allocator, /* field type */ null, /* call-back */ null); this.vector.clear(); this.vector = vector; invalidateReader(); diff --git a/java/vector/src/main/java/org/apache/arrow/vector/complex/LargeListVector.java b/java/vector/src/main/java/org/apache/arrow/vector/complex/LargeListVector.java index 31e30cc44d4..2aef50babd1 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/complex/LargeListVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/complex/LargeListVector.java @@ -541,7 +541,7 @@ protected void replaceDataVector(FieldVector v) { @Override public UnionVector promoteToUnion() { - UnionVector vector = new UnionVector("$data$", allocator, callBack); + UnionVector vector = new UnionVector("$data$", allocator, /* field type */ null, callBack); replaceDataVector(vector); invalidateReader(); if (callBack != null) { 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 7e969263cb9..77d2c684619 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 @@ -50,7 +50,6 @@ import org.apache.arrow.vector.ipc.message.ArrowFieldNode; import org.apache.arrow.vector.types.Types.MinorType; import org.apache.arrow.vector.types.pojo.ArrowType; -import org.apache.arrow.vector.types.pojo.DictionaryEncoding; import org.apache.arrow.vector.types.pojo.Field; import org.apache.arrow.vector.types.pojo.FieldType; import org.apache.arrow.vector.util.CallBack; @@ -84,26 +83,6 @@ public static ListVector empty(String name, BufferAllocator allocator) { */ private int lastSet; - /** - * Creates a ListVector. - * - * @deprecated Use FieldType or static constructor instead. - */ - @Deprecated - public ListVector(String name, BufferAllocator allocator, CallBack callBack) { - this(name, allocator, FieldType.nullable(ArrowType.List.INSTANCE), callBack); - } - - /** - * Creates a ListVector. - * - * @deprecated Use FieldType or static constructor instead. - */ - @Deprecated - public ListVector(String name, BufferAllocator allocator, DictionaryEncoding dictionary, CallBack callBack) { - this(name, allocator, new FieldType(true, ArrowType.List.INSTANCE, dictionary, null), callBack); - } - /** * Constructs a new instance. * @@ -680,7 +659,7 @@ public ArrowBuf[] getBuffers(boolean clear) { @Override public UnionVector promoteToUnion() { - UnionVector vector = new UnionVector("$data$", allocator, callBack); + UnionVector vector = new UnionVector("$data$", allocator, /* field type*/ null, callBack); replaceDataVector(vector); invalidateReader(); if (callBack != null) { diff --git a/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Field.java b/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Field.java index d4fdb9a15ec..2eeb3bea449 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Field.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/types/pojo/Field.java @@ -94,26 +94,6 @@ private Field(String name, FieldType fieldType, List children, TypeLayout this.children = children == null ? Collections.emptyList() : children.stream().collect(Collectors.toList()); } - /** - * Creates a new field. - * - * @deprecated Use FieldType or static constructor instead. - */ - @Deprecated - public Field(String name, boolean nullable, ArrowType type, List children) { - this(name, new FieldType(nullable, type, null, null), children); - } - - /** - * Creates a new field. - * - * @deprecated Use FieldType or static constructor instead. - */ - @Deprecated - public Field(String name, boolean nullable, ArrowType type, DictionaryEncoding dictionary, List children) { - this(name, new FieldType(nullable, type, dictionary, null), children); - } - public Field(String name, FieldType fieldType, List children) { this(name, fieldType, children, fieldType == null ? null : TypeLayout.getTypeLayout(fieldType.getType())); } 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 deleted file mode 100644 index 2faa1ff74c7..00000000000 --- a/java/vector/src/main/java/org/apache/arrow/vector/util/ByteFunctionHelpers.java +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.apache.arrow.vector.util; - -import org.apache.arrow.memory.ArrowBuf; - -/** - * Helper class for comparing byte buffers. - * - * @deprecated This class will be removed. Please use org.apache.arrow.memory.util.ByteFunctionHelpers instead. - */ -@Deprecated -public class ByteFunctionHelpers { - static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(ByteFunctionHelpers.class); - - private ByteFunctionHelpers() {} - - /** - * Helper function to check for equality of bytes in two ArrowBufs. - * - * @param left Left ArrowBuf for comparison - * @param lStart start offset in the buffer - * @param lEnd end offset in the buffer - * @param right Right ArrowBuf for comparison - * @param rStart start offset in the buffer - * @param rEnd end offset in the buffer - * @return 1 if equals, 0 otherwise - */ - @Deprecated - public static final int equal(final ArrowBuf left, int lStart, int lEnd, final ArrowBuf right, int rStart, int rEnd) { - return org.apache.arrow.memory.util.ByteFunctionHelpers.equal(left, lStart, lEnd, right, rStart, rEnd); - } - - /** - * Helper function to compare a set of bytes in two ArrowBufs. - * Function will check data before completing in the case that - * - * @param left Left ArrowBuf to compare - * @param lStart start offset in the buffer - * @param lEnd end offset in the buffer - * @param right Right ArrowBuf to compare - * @param rStart start offset in the buffer - * @param rEnd end offset in the buffer - * @return 1 if left input is greater, -1 if left input is smaller, 0 otherwise - */ - @Deprecated - public static final int compare( - final ArrowBuf left, - int lStart, - int lEnd, - final ArrowBuf right, - int rStart, - int rEnd) { - return org.apache.arrow.memory.util.ByteFunctionHelpers.compare(left, lStart, lEnd, right, rStart, rEnd); - } - - /** - * Helper function to compare a set of bytes in ArrowBuf to a ByteArray. - * - * @param left Left ArrowBuf for comparison purposes - * @param lStart start offset in the buffer - * @param lEnd end offset in the buffer - * @param right second input to be compared - * @param rStart start offset in the byte array - * @param rEnd end offset in the byte array - * @return 1 if left input is greater, -1 if left input is smaller, 0 otherwise - */ - @Deprecated - public static final int compare( - final ArrowBuf left, - int lStart, - int lEnd, - final byte[] right, - int rStart, - final int rEnd) { - return org.apache.arrow.memory.util.ByteFunctionHelpers.compare(left, lStart, lEnd, right, rStart, rEnd); - } - - /** - * Compares the two specified {@code long} values, treating them as unsigned values between - * {@code 0} and {@code 2^64 - 1} inclusive. - * - * @param a the first unsigned {@code long} to compare - * @param b the second unsigned {@code long} to compare - * @return a negative value if {@code a} is less than {@code b}; a positive value if {@code a} is - * greater than {@code b}; or zero if they are equal - */ - @Deprecated - public static int unsignedLongCompare(long a, long b) { - return org.apache.arrow.memory.util.ByteFunctionHelpers.unsignedLongCompare(a, b); - } - - @Deprecated - public static int unsignedIntCompare(int a, int b) { - return org.apache.arrow.memory.util.ByteFunctionHelpers.unsignedIntCompare(a, b); - } -} 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 4b48876ff16..9c7e1979d2b 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 @@ -164,8 +164,8 @@ public void testConcatBits() { final int maxCount = 100; for (int i = 0; i < maxCount; i++) { if (i % 3 == 0) { - BitVectorHelper.setValidityBitToOne(buf1, i); - BitVectorHelper.setValidityBitToOne(buf2, i); + BitVectorHelper.setBit(buf1, i); + BitVectorHelper.setBit(buf2, i); } } @@ -199,8 +199,8 @@ public void testConcatBitsInPlace() { final int maxCount = 100; for (int i = 0; i < maxCount; i++) { if (i % 3 == 0) { - BitVectorHelper.setValidityBitToOne(buf1, i); - BitVectorHelper.setValidityBitToOne(buf2, i); + BitVectorHelper.setBit(buf1, i); + BitVectorHelper.setBit(buf2, i); } } 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 165cb7bad3e..bc6cddf3674 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 @@ -306,8 +306,9 @@ public void testEncodeBinaryVector() { @Test public void testEncodeUnion() { // Create a new value vector - try (final UnionVector vector = new UnionVector("vector", allocator, null); - final UnionVector dictionaryVector = new UnionVector("dict", allocator, null);) { + try (final UnionVector vector = new UnionVector("vector", allocator, /* field type */ null, /* call-back */ null); + final UnionVector dictionaryVector = + new UnionVector("dict", allocator, /* field type */ null, /* call-back */ null);) { final NullableUInt4Holder uintHolder1 = new NullableUInt4Holder(); uintHolder1.value = 10; @@ -494,8 +495,9 @@ public void testStructEquals() { @Test public void testUnionEquals() { - try (final UnionVector vector1 = new UnionVector("union", allocator, null); - final UnionVector vector2 = new UnionVector("union", allocator, null);) { + try (final UnionVector vector1 = new UnionVector("union", allocator, /* field type */ null, /* call-back */ null); + final UnionVector vector2 = + new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);) { final NullableUInt4Holder uInt4Holder = new NullableUInt4Holder(); uInt4Holder.value = 10; diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestFixedSizeListVector.java b/java/vector/src/test/java/org/apache/arrow/vector/TestFixedSizeListVector.java index 365789e04c8..9d7e413a739 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestFixedSizeListVector.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestFixedSizeListVector.java @@ -165,8 +165,10 @@ public void testNestedInList() { @Test public void testTransferPair() { - try (FixedSizeListVector from = new FixedSizeListVector("from", allocator, 2, null, null); - FixedSizeListVector to = new FixedSizeListVector("to", allocator, 2, null, null)) { + try (FixedSizeListVector from = new FixedSizeListVector( + "from", allocator, new FieldType(true, new ArrowType.FixedSizeList(2), null), null); + FixedSizeListVector to = new FixedSizeListVector( + "to", allocator, new FieldType(true, new ArrowType.FixedSizeList(2), null), null)) { Float4Vector nested = (Float4Vector) from.addOrGetVector(FieldType.nullable(MinorType.FLOAT4.getType())) .getVector(); from.allocateNew(); 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 962c233889d..f04998915b6 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 @@ -69,7 +69,8 @@ public void testUnionVector() throws Exception { uInt4Holder.value = 100; uInt4Holder.isSet = 1; - try (UnionVector unionVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null)) { + try (UnionVector unionVector = + new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) { unionVector.allocateNew(); // write some data @@ -96,7 +97,8 @@ public void testUnionVector() throws Exception { @Test public void testUnionVectorMapValue() throws Exception { - try (UnionVector unionVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null)) { + try (UnionVector unionVector = + new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) { unionVector.allocateNew(); UnionWriter writer = (UnionWriter) unionVector.getWriter(); @@ -157,7 +159,8 @@ public void testUnionVectorMapValue() throws Exception { @Test public void testTransfer() throws Exception { - try (UnionVector srcVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null)) { + try (UnionVector srcVector = + new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) { srcVector.allocateNew(); // write some data @@ -171,7 +174,8 @@ public void testTransfer() throws Exception { srcVector.setSafe(5, newBitHolder(false)); srcVector.setValueCount(6); - try (UnionVector destVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null)) { + try (UnionVector destVector = + new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) { TransferPair pair = srcVector.makeTransferPair(destVector); // Creating the transfer should transfer the type of the field at least. @@ -206,7 +210,8 @@ public void testTransfer() throws Exception { @Test public void testSplitAndTransfer() throws Exception { - try (UnionVector sourceVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null)) { + try (UnionVector sourceVector = + new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) { sourceVector.allocateNew(); @@ -256,7 +261,8 @@ public void testSplitAndTransfer() throws Exception { assertEquals(false, sourceVector.isNull(9)); assertEquals(50, sourceVector.getObject(9)); - try (UnionVector toVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null)) { + try (UnionVector toVector = + new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) { final TransferPair transferPair = sourceVector.makeTransferPair(toVector); @@ -286,7 +292,8 @@ public void testSplitAndTransfer() throws Exception { @Test public void testSplitAndTransferWithMixedVectors() throws Exception { - try (UnionVector sourceVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null)) { + try (UnionVector sourceVector = + new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) { sourceVector.allocateNew(); @@ -345,7 +352,8 @@ public void testSplitAndTransferWithMixedVectors() throws Exception { assertEquals(false, sourceVector.isNull(9)); assertEquals(30.5f, sourceVector.getObject(9)); - try (UnionVector toVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null)) { + try (UnionVector toVector = + new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) { final TransferPair transferPair = sourceVector.makeTransferPair(toVector); @@ -410,7 +418,8 @@ public void testGetFieldTypeInfo() throws Exception { @Test public void testGetBufferAddress() throws Exception { - try (UnionVector vector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null)) { + try (UnionVector vector = + new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) { boolean error = false; vector.allocateNew(); @@ -467,7 +476,8 @@ public void testGetBufferAddress() throws Exception { @Test public void testSetGetNull() { - try (UnionVector srcVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null)) { + try (UnionVector srcVector = + new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) { srcVector.allocateNew(); final NullableIntHolder holder = new NullableIntHolder(); 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 0be5e1e963c..7930d843b8c 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 @@ -2646,8 +2646,8 @@ public void testStructVectorEqualsWithDiffChild() { @Test public void testUnionVectorEquals() { - try (final UnionVector vector1 = new UnionVector("union", allocator, null); - final UnionVector vector2 = new UnionVector("union", allocator, null);) { + try (final UnionVector vector1 = new UnionVector("union", allocator, /* field type */ null, /* call-back */ null); + final UnionVector vector2 = new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);) { final NullableUInt4Holder uInt4Holder = new NullableUInt4Holder(); uInt4Holder.value = 10; @@ -2716,7 +2716,8 @@ public void testVariableWidthVectorNullHashCode() { @Test public void testUnionNullHashCode() { - try (UnionVector srcVector = new UnionVector(EMPTY_SCHEMA_PATH, allocator, null)) { + try (UnionVector srcVector = + new UnionVector(EMPTY_SCHEMA_PATH, allocator, /* field type */ null, /* call-back */ null)) { srcVector.allocateNew(); final NullableIntHolder holder = new NullableIntHolder(); diff --git a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReAlloc.java b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReAlloc.java index fae50c9dffc..18bb2c95738 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReAlloc.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/TestVectorReAlloc.java @@ -421,7 +421,7 @@ public void testFixedSizeListVectorClearAndSet() { @Test public void testUnionVectorClearAndSet() { - try (final UnionVector vector = new UnionVector("", allocator, null)) { + try (final UnionVector vector = new UnionVector("", allocator, /* field type */ null, /* call-back */ null)) { vector.allocateNewSafe(); // Initial allocation NullableIntHolder holder = new NullableIntHolder(); 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 adb51960ecd..71009a33375 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 @@ -153,7 +153,7 @@ public void testStructTypeReset() { @Test public void testUnionTypeReset() { - try (final UnionVector vector = new UnionVector("Union", allocator, null); + try (final UnionVector vector = new UnionVector("Union", allocator, /* field type */ null, /* call-back */ null); final IntVector dataVector = new IntVector("Int", allocator) ) { vector.getBufferSize(); diff --git a/java/vector/src/test/java/org/apache/arrow/vector/compare/TestRangeEqualsVisitor.java b/java/vector/src/test/java/org/apache/arrow/vector/compare/TestRangeEqualsVisitor.java index c691f72d308..f622f286a58 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/compare/TestRangeEqualsVisitor.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/compare/TestRangeEqualsVisitor.java @@ -270,8 +270,9 @@ public void testStructVectorRangeEquals() { @Test public void testUnionVectorRangeEquals() { - try (final UnionVector vector1 = new UnionVector("union", allocator, null); - final UnionVector vector2 = new UnionVector("union", allocator, null);) { + try (final UnionVector vector1 = new UnionVector("union", allocator, /* field type */ null, /* call-back */ null); + final UnionVector vector2 = + new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);) { final NullableUInt4Holder uInt4Holder = new NullableUInt4Holder(); uInt4Holder.value = 10; @@ -547,9 +548,9 @@ public void testStructVectorApproxEquals() { @Test public void testUnionVectorApproxEquals() { - try (final UnionVector right = new UnionVector("union", allocator, null); - final UnionVector left1 = new UnionVector("union", allocator, null); - final UnionVector left2 = new UnionVector("union", allocator, null);) { + try (final UnionVector right = new UnionVector("union", allocator, /* field type */ null, /* call-back */ null); + final UnionVector left1 = new UnionVector("union", allocator, /* field type */ null, /* call-back */ null); + final UnionVector left2 = new UnionVector("union", allocator, /* field type */ null, /* call-back */ null);) { final NullableFloat4Holder float4Holder = new NullableFloat4Holder(); float4Holder.value = 1.01f; diff --git a/java/vector/src/test/java/org/apache/arrow/vector/compare/TestTypeEqualsVisitor.java b/java/vector/src/test/java/org/apache/arrow/vector/compare/TestTypeEqualsVisitor.java index 4195c8811ee..c0a3bd89dc1 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/compare/TestTypeEqualsVisitor.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/compare/TestTypeEqualsVisitor.java @@ -127,9 +127,9 @@ public void testStructTypeEquals() { @Test public void testUnionTypeEquals() { - try (final UnionVector right = new UnionVector("union", allocator, null); - final UnionVector left1 = new UnionVector("union", allocator, null); - final UnionVector left2 = new UnionVector("union", allocator, null)) { + try (final UnionVector right = new UnionVector("union", allocator, /* field type */ null, /* call-back */ null); + final UnionVector left1 = new UnionVector("union", allocator, /* field type */ null, /* call-back */ null); + final UnionVector left2 = new UnionVector("union", allocator, /* field type */ null, /* call-back */ null)) { right.addVector(new IntVector("int", allocator)); left1.addVector(new IntVector("int", 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 d44ada2f30f..d4cf6ea8937 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 @@ -604,7 +604,7 @@ private void checkListMap(ListVector listVector) { @Test public void simpleUnion() { - UnionVector vector = new UnionVector("union", allocator, null); + UnionVector vector = new UnionVector("union", allocator, /* field type */ null, /* call-back */ null); UnionWriter unionWriter = new UnionWriter(vector); unionWriter.allocate(); for (int i = 0; i < COUNT; i++) { diff --git a/java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java b/java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java index 8c291e01a36..5cc0d080053 100644 --- a/java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java +++ b/java/vector/src/test/java/org/apache/arrow/vector/pojo/TestConvert.java @@ -144,7 +144,7 @@ public void nestedSchema() { Collections2.asImmutableList( new Field("child5.1", FieldType.nullable(new Timestamp(TimeUnit.MILLISECOND, null)), null), new Field("child5.2", FieldType.nullable(new FloatingPoint(DOUBLE)), Collections.emptyList()), - new Field("child5.3", true, new Timestamp(TimeUnit.MILLISECOND, "UTC"), null) + new Field("child5.3", FieldType.nullable(new Timestamp(TimeUnit.MILLISECOND, "UTC")), null) ))); Schema initialSchema = new Schema(children); run(initialSchema);