apacheGH-15187: Move supplier and just return new instance of FieldRe…

…ader type when asked for impl
rtadepalli · Jun 17, 2023 · 94fe92d · 94fe92d
1 parent 24deeeb
commit 94fe92d
Show file tree

Hide file tree

Showing 41 changed files with 81 additions and 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
@@ -153,7 +153,7 @@ long computeCombinedBufferSize(int valueCount, int typeWidth) {
    *
    * @return Returns a lambda that initializes a reader when called.
    */
-  protected abstract Supplier<FieldReader> 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
@@ -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<FieldReader> 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
@@ -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<FieldReader> 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
@@ -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<FieldReader> 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
@@ -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<FieldReader> 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
@@ -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<FieldReader> 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
@@ -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<FieldReader> 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
@@ -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<FieldReader> 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
@@ -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<FieldReader> 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
@@ -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<FieldReader> 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
@@ -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<FieldReader> 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
@@ -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<FieldReader> 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
@@ -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<FieldReader> 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
@@ -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<FieldReader> 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
@@ -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<FieldReader> 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
@@ -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<FieldReader> 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
@@ -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<FieldReader> 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
@@ -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<FieldReader> 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
@@ -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<FieldReader> 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
@@ -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<FieldReader> getReaderImpl() {
-    return () -> new TimeMicroReaderImpl(TimeMicroVector.this);
+  protected FieldReader getReaderImpl() {
+    return new TimeMicroReaderImpl(TimeMicroVector.this);
   }
 
   /**