From 94fe92d14ba92409e1f8ac286fb9c237c43741f8 Mon Sep 17 00:00:00 2001 From: Ramasai Date: Sat, 17 Jun 2023 15:17:28 -0400 Subject: [PATCH] GH-15187: Move supplier and just return new instance of FieldReader type when asked for impl --- .../java/org/apache/arrow/vector/BaseValueVector.java | 4 ++-- .../main/java/org/apache/arrow/vector/BigIntVector.java | 6 ++---- .../src/main/java/org/apache/arrow/vector/BitVector.java | 6 ++---- .../main/java/org/apache/arrow/vector/DateDayVector.java | 6 ++---- .../java/org/apache/arrow/vector/DateMilliVector.java | 5 ++--- .../java/org/apache/arrow/vector/Decimal256Vector.java | 5 ++--- .../main/java/org/apache/arrow/vector/DecimalVector.java | 5 ++--- .../java/org/apache/arrow/vector/DurationVector.java | 5 ++--- .../org/apache/arrow/vector/ExtensionTypeVector.java | 9 +-------- .../org/apache/arrow/vector/FixedSizeBinaryVector.java | 6 ++---- .../main/java/org/apache/arrow/vector/Float4Vector.java | 6 ++---- .../main/java/org/apache/arrow/vector/Float8Vector.java | 6 ++---- .../src/main/java/org/apache/arrow/vector/IntVector.java | 6 ++---- .../java/org/apache/arrow/vector/IntervalDayVector.java | 5 ++--- .../apache/arrow/vector/IntervalMonthDayNanoVector.java | 5 ++--- .../java/org/apache/arrow/vector/IntervalYearVector.java | 5 ++--- .../org/apache/arrow/vector/LargeVarBinaryVector.java | 6 ++---- .../java/org/apache/arrow/vector/LargeVarCharVector.java | 6 ++---- .../java/org/apache/arrow/vector/SmallIntVector.java | 6 ++---- .../java/org/apache/arrow/vector/TimeMicroVector.java | 6 ++---- .../java/org/apache/arrow/vector/TimeMilliVector.java | 5 ++--- .../java/org/apache/arrow/vector/TimeNanoVector.java | 6 ++---- .../main/java/org/apache/arrow/vector/TimeSecVector.java | 6 ++---- .../org/apache/arrow/vector/TimeStampMicroTZVector.java | 6 ++---- .../org/apache/arrow/vector/TimeStampMicroVector.java | 5 ++--- .../org/apache/arrow/vector/TimeStampMilliTZVector.java | 6 ++---- .../org/apache/arrow/vector/TimeStampMilliVector.java | 5 ++--- .../org/apache/arrow/vector/TimeStampNanoTZVector.java | 6 ++---- .../org/apache/arrow/vector/TimeStampNanoVector.java | 5 ++--- .../org/apache/arrow/vector/TimeStampSecTZVector.java | 6 ++---- .../java/org/apache/arrow/vector/TimeStampSecVector.java | 5 ++--- .../main/java/org/apache/arrow/vector/TinyIntVector.java | 4 ++-- .../main/java/org/apache/arrow/vector/UInt1Vector.java | 6 ++---- .../main/java/org/apache/arrow/vector/UInt2Vector.java | 6 ++---- .../main/java/org/apache/arrow/vector/UInt4Vector.java | 6 ++---- .../main/java/org/apache/arrow/vector/UInt8Vector.java | 5 ++--- .../java/org/apache/arrow/vector/VarBinaryVector.java | 6 ++---- .../main/java/org/apache/arrow/vector/VarCharVector.java | 6 ++---- .../apache/arrow/vector/complex/FixedSizeListVector.java | 5 ++--- .../org/apache/arrow/vector/complex/LargeListVector.java | 5 ++--- .../java/org/apache/arrow/vector/complex/ListVector.java | 5 ++--- 41 files changed, 81 insertions(+), 148 deletions(-) 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 6896a663b5b13..44830c673048a 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 @@ -153,7 +153,7 @@ long computeCombinedBufferSize(int valueCount, int typeWidth) { * * @return Returns a lambda that initializes a reader when called. */ - protected abstract Supplier getReaderImpl(); + protected abstract FieldReader getReaderImpl(); /** * Default implementation to create a reader for the vector. Depends on the individual vector @@ -169,7 +169,7 @@ public FieldReader getReader() { } synchronized (this) { if (fieldReader == null) { - fieldReader = getReaderImpl().get(); + fieldReader = getReaderImpl(); } return fieldReader; 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 a487d2ac28754..b0052e7e33009 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,8 +19,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; -import java.util.function.Supplier; - import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.BigIntReaderImpl; @@ -75,8 +73,8 @@ public BigIntVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new BigIntReaderImpl(BigIntVector.this); + protected FieldReader getReaderImpl() { + return new BigIntReaderImpl(BigIntVector.this); } /** 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 e2de945550198..104819147b109 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,8 +20,6 @@ import static org.apache.arrow.memory.util.LargeMemoryUtil.capAtMaxInt; import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; -import java.util.function.Supplier; - import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.memory.util.ArrowBufPointer; @@ -83,8 +81,8 @@ public BitVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new BitReaderImpl(BitVector.this); + protected FieldReader getReaderImpl() { + return new BitReaderImpl(BitVector.this); } /** 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 eb01d67d8718b..c99c5786058b7 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,8 +19,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; -import java.util.function.Supplier; - import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.DateDayReaderImpl; @@ -76,8 +74,8 @@ public DateDayVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new DateDayReaderImpl(DateDayVector.this); + protected FieldReader getReaderImpl() { + return new DateDayReaderImpl(DateDayVector.this); } /** 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 1b61d5789f1cd..6ab8ac4eed229 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 @@ -20,7 +20,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; import java.time.LocalDateTime; -import java.util.function.Supplier; import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; @@ -77,8 +76,8 @@ public DateMilliVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new DateMilliReaderImpl(DateMilliVector.this); + protected FieldReader getReaderImpl() { + return new DateMilliReaderImpl(DateMilliVector.this); } /** diff --git a/java/vector/src/main/java/org/apache/arrow/vector/Decimal256Vector.java b/java/vector/src/main/java/org/apache/arrow/vector/Decimal256Vector.java index 0791ba8b81639..4ccee50d6805a 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/Decimal256Vector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/Decimal256Vector.java @@ -21,7 +21,6 @@ import java.math.BigDecimal; import java.nio.ByteOrder; -import java.util.function.Supplier; import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; @@ -90,8 +89,8 @@ public Decimal256Vector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new Decimal256ReaderImpl(Decimal256Vector.this); + protected FieldReader getReaderImpl() { + return new Decimal256ReaderImpl(Decimal256Vector.this); } /** 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 09bf4b9a44d3a..db04563df24d7 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,7 +21,6 @@ import java.math.BigDecimal; import java.nio.ByteOrder; -import java.util.function.Supplier; import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; @@ -89,8 +88,8 @@ public DecimalVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new DecimalReaderImpl(DecimalVector.this); + protected FieldReader getReaderImpl() { + return new DecimalReaderImpl(DecimalVector.this); } /** 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 65c18f0f91a6f..1e1db0d1c3c5f 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,7 +21,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; import java.time.Duration; -import java.util.function.Supplier; import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; @@ -72,8 +71,8 @@ public DurationVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new DurationReaderImpl(DurationVector.this); + protected FieldReader getReaderImpl() { + return new DurationReaderImpl(DurationVector.this); } /** 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 e06a77b541fb4..9433719c5b8b2 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 @@ -19,7 +19,6 @@ import java.util.Iterator; import java.util.List; -import java.util.function.Supplier; import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; @@ -132,13 +131,7 @@ public TransferPair makeTransferPair(ValueVector target) { } @Override - protected Supplier getReaderImpl() { - throw new UnsupportedOperationException("Readers for extension types depend on the underlying vector, " + - "asking for a concrete implementation class of the reader type is invalid."); - } - - @Override - public FieldReader getReader() { + protected FieldReader getReaderImpl() { return underlyingVector.getReader(); } 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 d87ccef687199..3ce2bb77ccc55 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 @@ -19,8 +19,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; -import java.util.function.Supplier; - import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.util.Preconditions; @@ -79,8 +77,8 @@ public FixedSizeBinaryVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new FixedSizeBinaryReaderImpl(FixedSizeBinaryVector.this); + protected FieldReader getReaderImpl() { + return new FixedSizeBinaryReaderImpl(FixedSizeBinaryVector.this); } /** 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 36e5ed2741809..4b56a22f2d0c4 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,8 +19,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; -import java.util.function.Supplier; - import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.Float4ReaderImpl; @@ -75,8 +73,8 @@ public Float4Vector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new Float4ReaderImpl(Float4Vector.this); + protected FieldReader getReaderImpl() { + return new Float4ReaderImpl(Float4Vector.this); } /** 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 593297da2eb05..7e4fae7087ba5 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,8 +19,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; -import java.util.function.Supplier; - import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.Float8ReaderImpl; @@ -75,8 +73,8 @@ public Float8Vector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new Float8ReaderImpl(Float8Vector.this); + protected FieldReader getReaderImpl() { + return new Float8ReaderImpl(Float8Vector.this); } /** 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 79b4a065a0216..5c8ef440e8ea4 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,8 +19,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; -import java.util.function.Supplier; - import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.IntReaderImpl; @@ -75,8 +73,8 @@ public IntVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new IntReaderImpl(IntVector.this); + protected FieldReader getReaderImpl() { + return new IntReaderImpl(IntVector.this); } /** 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 4730ae317d2a1..35312ba7c96a1 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 @@ -20,7 +20,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; import java.time.Duration; -import java.util.function.Supplier; import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; @@ -78,8 +77,8 @@ public IntervalDayVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new IntervalDayReaderImpl(IntervalDayVector.this); + protected FieldReader getReaderImpl() { + return new IntervalDayReaderImpl(IntervalDayVector.this); } /** diff --git a/java/vector/src/main/java/org/apache/arrow/vector/IntervalMonthDayNanoVector.java b/java/vector/src/main/java/org/apache/arrow/vector/IntervalMonthDayNanoVector.java index ab17011012a92..73bbc0a2c19f2 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/IntervalMonthDayNanoVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/IntervalMonthDayNanoVector.java @@ -21,7 +21,6 @@ import java.time.Duration; import java.time.Period; -import java.util.function.Supplier; import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; @@ -84,8 +83,8 @@ public IntervalMonthDayNanoVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new IntervalMonthDayNanoReaderImpl(IntervalMonthDayNanoVector.this); + protected FieldReader getReaderImpl() { + return new IntervalMonthDayNanoReaderImpl(IntervalMonthDayNanoVector.this); } /** 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 a407f59b92e0b..7fe572f3ff1f8 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 @@ -20,7 +20,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; import java.time.Period; -import java.util.function.Supplier; import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; @@ -76,8 +75,8 @@ public IntervalYearVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new IntervalYearReaderImpl(IntervalYearVector.this); + protected FieldReader getReaderImpl() { + return new IntervalYearReaderImpl(IntervalYearVector.this); } /** diff --git a/java/vector/src/main/java/org/apache/arrow/vector/LargeVarBinaryVector.java b/java/vector/src/main/java/org/apache/arrow/vector/LargeVarBinaryVector.java index 32a90f1d43590..0063a61da570a 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/LargeVarBinaryVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/LargeVarBinaryVector.java @@ -17,8 +17,6 @@ package org.apache.arrow.vector; -import java.util.function.Supplier; - import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.LargeVarBinaryReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -72,8 +70,8 @@ public LargeVarBinaryVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new LargeVarBinaryReaderImpl(LargeVarBinaryVector.this); + protected FieldReader getReaderImpl() { + return new LargeVarBinaryReaderImpl(LargeVarBinaryVector.this); } /** diff --git a/java/vector/src/main/java/org/apache/arrow/vector/LargeVarCharVector.java b/java/vector/src/main/java/org/apache/arrow/vector/LargeVarCharVector.java index 44c4bdf6d2e21..1f8d9b7d3a85c 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/LargeVarCharVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/LargeVarCharVector.java @@ -17,8 +17,6 @@ package org.apache.arrow.vector; -import java.util.function.Supplier; - import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.LargeVarCharReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -73,8 +71,8 @@ public LargeVarCharVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new LargeVarCharReaderImpl(LargeVarCharVector.this); + protected FieldReader getReaderImpl() { + return new LargeVarCharReaderImpl(LargeVarCharVector.this); } /** 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 f629952fcf145..518ee707396ea 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,8 +19,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; -import java.util.function.Supplier; - import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.SmallIntReaderImpl; @@ -75,8 +73,8 @@ public SmallIntVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new SmallIntReaderImpl(SmallIntVector.this); + protected FieldReader getReaderImpl() { + return new SmallIntReaderImpl(SmallIntVector.this); } /** 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 336c22336fb47..86738cd221ec4 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,8 +19,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; -import java.util.function.Supplier; - import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.TimeMicroReaderImpl; @@ -76,8 +74,8 @@ public TimeMicroVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new TimeMicroReaderImpl(TimeMicroVector.this); + protected FieldReader getReaderImpl() { + return new TimeMicroReaderImpl(TimeMicroVector.this); } /** 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 5968052964121..480add91097bb 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 @@ -20,7 +20,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; import java.time.LocalDateTime; -import java.util.function.Supplier; import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; @@ -77,8 +76,8 @@ public TimeMilliVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new TimeMilliReaderImpl(TimeMilliVector.this); + protected FieldReader getReaderImpl() { + return new TimeMilliReaderImpl(TimeMilliVector.this); } /** 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 7f510828d450d..82609cdc446ed 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,8 +19,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; -import java.util.function.Supplier; - import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.TimeNanoReaderImpl; @@ -75,8 +73,8 @@ public TimeNanoVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new TimeNanoReaderImpl(TimeNanoVector.this); + protected FieldReader getReaderImpl() { + return new TimeNanoReaderImpl(TimeNanoVector.this); } /** 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 e1946ec0a7f34..9b7614e55b6e8 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,8 +19,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; -import java.util.function.Supplier; - import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.TimeSecReaderImpl; @@ -75,8 +73,8 @@ public TimeSecVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new TimeSecReaderImpl(TimeSecVector.this); + protected FieldReader getReaderImpl() { + return new TimeSecReaderImpl(TimeSecVector.this); } /** diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMicroTZVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMicroTZVector.java index f1357a3a1712f..a37b444d1a368 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMicroTZVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMicroTZVector.java @@ -19,8 +19,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; -import java.util.function.Supplier; - import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.TimeStampMicroTZReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -80,8 +78,8 @@ public TimeStampMicroTZVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new TimeStampMicroTZReaderImpl(TimeStampMicroTZVector.this); + protected FieldReader getReaderImpl() { + return new TimeStampMicroTZReaderImpl(TimeStampMicroTZVector.this); } /** diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMicroVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMicroVector.java index eec2dfbc4ac31..88ce27a187ebc 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMicroVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMicroVector.java @@ -20,7 +20,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; import java.time.LocalDateTime; -import java.util.function.Supplier; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.TimeStampMicroReaderImpl; @@ -75,8 +74,8 @@ public TimeStampMicroVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new TimeStampMicroReaderImpl(TimeStampMicroVector.this); + protected FieldReader getReaderImpl() { + return new TimeStampMicroReaderImpl(TimeStampMicroVector.this); } /** diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMilliTZVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMilliTZVector.java index abcb46ee4cd6c..775594ceea640 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMilliTZVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMilliTZVector.java @@ -19,8 +19,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; -import java.util.function.Supplier; - import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.TimeStampMilliTZReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -80,8 +78,8 @@ public TimeStampMilliTZVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new TimeStampMilliTZReaderImpl(TimeStampMilliTZVector.this); + protected FieldReader getReaderImpl() { + return new TimeStampMilliTZReaderImpl(TimeStampMilliTZVector.this); } /** diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMilliVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMilliVector.java index a27fd57379167..a42773269f8b5 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMilliVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampMilliVector.java @@ -20,7 +20,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; import java.time.LocalDateTime; -import java.util.function.Supplier; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.TimeStampMilliReaderImpl; @@ -75,8 +74,8 @@ public TimeStampMilliVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new TimeStampMilliReaderImpl(TimeStampMilliVector.this); + protected FieldReader getReaderImpl() { + return new TimeStampMilliReaderImpl(TimeStampMilliVector.this); } /** diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampNanoTZVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampNanoTZVector.java index 954e04bc5b61e..af43cf6fc9b64 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampNanoTZVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampNanoTZVector.java @@ -19,8 +19,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; -import java.util.function.Supplier; - import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.TimeStampNanoTZReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -80,8 +78,8 @@ public TimeStampNanoTZVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new TimeStampNanoTZReaderImpl(TimeStampNanoTZVector.this); + protected FieldReader getReaderImpl() { + return new TimeStampNanoTZReaderImpl(TimeStampNanoTZVector.this); } /** diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampNanoVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampNanoVector.java index 00c0203332e3b..7b02b1c87d3fb 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampNanoVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampNanoVector.java @@ -20,7 +20,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; import java.time.LocalDateTime; -import java.util.function.Supplier; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.TimeStampNanoReaderImpl; @@ -75,8 +74,8 @@ public TimeStampNanoVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new TimeStampNanoReaderImpl(TimeStampNanoVector.this); + protected FieldReader getReaderImpl() { + return new TimeStampNanoReaderImpl(TimeStampNanoVector.this); } /** diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampSecTZVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampSecTZVector.java index 7e9da06e38724..5837e9d851530 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampSecTZVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampSecTZVector.java @@ -19,8 +19,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; -import java.util.function.Supplier; - import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.TimeStampSecTZReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -80,8 +78,8 @@ public TimeStampSecTZVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new TimeStampSecTZReaderImpl(TimeStampSecTZVector.this); + protected FieldReader getReaderImpl() { + return new TimeStampSecTZReaderImpl(TimeStampSecTZVector.this); } /** diff --git a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampSecVector.java b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampSecVector.java index 651fbcff71c2d..1e249140335d2 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/TimeStampSecVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/TimeStampSecVector.java @@ -20,7 +20,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; import java.time.LocalDateTime; -import java.util.function.Supplier; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.TimeStampSecReaderImpl; @@ -75,8 +74,8 @@ public TimeStampSecVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new TimeStampSecReaderImpl(TimeStampSecVector.this); + protected FieldReader getReaderImpl() { + return new TimeStampSecReaderImpl(TimeStampSecVector.this); } /** 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 d6e4db6b8f7de..ae4a32e769422 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 @@ -75,8 +75,8 @@ public TinyIntVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new TinyIntReaderImpl(TinyIntVector.this); + protected FieldReader getReaderImpl() { + return new TinyIntReaderImpl(TinyIntVector.this); } /** 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 e1f0dfe88b81f..777df3fb1efe7 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,8 +19,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; -import java.util.function.Supplier; - import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.UInt1ReaderImpl; @@ -69,8 +67,8 @@ public UInt1Vector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new UInt1ReaderImpl(UInt1Vector.this); + protected FieldReader getReaderImpl() { + return new UInt1ReaderImpl(UInt1Vector.this); } @Override 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 32c3317cd751b..e5b95be191df1 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,8 +19,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; -import java.util.function.Supplier; - import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.UInt2ReaderImpl; @@ -65,8 +63,8 @@ public UInt2Vector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new UInt2ReaderImpl(UInt2Vector.this); + protected FieldReader getReaderImpl() { + return new UInt2ReaderImpl(UInt2Vector.this); } @Override 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 0658f35a82d6c..bda98b12005ce 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,8 +19,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; -import java.util.function.Supplier; - import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.UInt4ReaderImpl; @@ -70,8 +68,8 @@ public UInt4Vector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new UInt4ReaderImpl(UInt4Vector.this); + protected FieldReader getReaderImpl() { + return new UInt4ReaderImpl(UInt4Vector.this); } @Override 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 cc66032e60fe3..5e7c18902f0ae 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 @@ -20,7 +20,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; import java.math.BigInteger; -import java.util.function.Supplier; import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; @@ -66,8 +65,8 @@ public UInt8Vector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new UInt8ReaderImpl(UInt8Vector.this); + protected FieldReader getReaderImpl() { + return new UInt8ReaderImpl(UInt8Vector.this); } @Override 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 cf38036a6188e..34e072aaa8324 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 @@ -19,8 +19,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; -import java.util.function.Supplier; - import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.VarBinaryReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -73,8 +71,8 @@ public VarBinaryVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new VarBinaryReaderImpl(VarBinaryVector.this); + protected FieldReader getReaderImpl() { + return new VarBinaryReaderImpl(VarBinaryVector.this); } /** 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 72afa8c14a360..bc5c68b29f310 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 @@ -19,8 +19,6 @@ import static org.apache.arrow.vector.NullCheckingForGet.NULL_CHECKING_ENABLED; -import java.util.function.Supplier; - import org.apache.arrow.memory.BufferAllocator; import org.apache.arrow.vector.complex.impl.VarCharReaderImpl; import org.apache.arrow.vector.complex.reader.FieldReader; @@ -72,8 +70,8 @@ public VarCharVector(Field field, BufferAllocator allocator) { } @Override - protected Supplier getReaderImpl() { - return () -> new VarCharReaderImpl(VarCharVector.this); + protected FieldReader getReaderImpl() { + return new VarCharReaderImpl(VarCharVector.this); } /** 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 f6716ef44ef02..0f78829181142 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,7 +29,6 @@ import java.util.Iterator; import java.util.List; import java.util.Objects; -import java.util.function.Supplier; import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; @@ -184,8 +183,8 @@ public List getFieldInnerVectors() { } @Override - protected Supplier getReaderImpl() { - return () -> new UnionFixedSizeListReader(this); + protected FieldReader getReaderImpl() { + return new UnionFixedSizeListReader(this); } @Override 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 af4af2d2d042c..6ef5f994fc6f4 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 @@ -27,7 +27,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.function.Supplier; import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; @@ -697,8 +696,8 @@ public void copyValueSafe(int from, int to) { } @Override - protected Supplier getReaderImpl() { - return () -> new UnionLargeListReader(this); + protected FieldReader getReaderImpl() { + return new UnionLargeListReader(this); } @Override 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 386fc12df882c..52e5307e13908 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,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; -import java.util.function.Supplier; import org.apache.arrow.memory.ArrowBuf; import org.apache.arrow.memory.BufferAllocator; @@ -568,8 +567,8 @@ public void copyValueSafe(int from, int to) { } @Override - protected Supplier getReaderImpl() { - return () -> new UnionListReader(this); + protected FieldReader getReaderImpl() { + return new UnionListReader(this); } @Override