Skip to content

Commit 8663ffc

Browse files
committed
Move ExtensionFactory to TransferPair
1 parent 7fe36d7 commit 8663ffc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+356
-76
lines changed

vector/src/main/codegen/templates/DenseUnionVector.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -707,6 +707,11 @@ public ValueVector getTo() {
707707
public void copyValueSafe(int from, int to) {
708708
this.to.copyFrom(from, to, DenseUnionVector.this);
709709
}
710+
711+
@Override
712+
public void copyValueSafe(int from, int to, ExtensionTypeWriterFactory writerFactory) {
713+
this.to.copyFrom(from, to, DenseUnionVector.this, writerFactory);
714+
}
710715
}
711716
712717
@Override

vector/src/main/codegen/templates/UnionVector.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -620,6 +620,11 @@ public ValueVector getTo() {
620620
public void copyValueSafe(int from, int to) {
621621
this.to.copyFrom(from, to, UnionVector.this);
622622
}
623+
624+
@Override
625+
public void copyValueSafe(int from, int to, ExtensionTypeWriterFactory writerFactory) {
626+
this.to.copyFrom(from, to, UnionVector.this, writerFactory);
627+
}
623628
}
624629
625630
@Override

vector/src/main/java/org/apache/arrow/vector/BaseFixedWidthVector.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import org.apache.arrow.memory.util.hash.ArrowBufHasher;
3131
import org.apache.arrow.util.Preconditions;
3232
import org.apache.arrow.vector.compare.VectorVisitor;
33-
import org.apache.arrow.vector.complex.impl.ExtensionTypeWriterFactory;
3433
import org.apache.arrow.vector.ipc.message.ArrowFieldNode;
3534
import org.apache.arrow.vector.types.pojo.Field;
3635
import org.apache.arrow.vector.util.CallBack;
@@ -902,10 +901,4 @@ public int hashCode(int index, ArrowBufHasher hasher) {
902901
public <OUT, IN> OUT accept(VectorVisitor<OUT, IN> visitor, IN value) {
903902
return visitor.visit(this, value);
904903
}
905-
906-
@Override
907-
public TransferPair makeTransferPair(
908-
ValueVector target, ExtensionTypeWriterFactory writerFactory) {
909-
throw new UnsupportedOperationException();
910-
}
911904
}

vector/src/main/java/org/apache/arrow/vector/BaseValueVector.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -384,10 +384,4 @@ protected void allocateValidityBuffer(long byteSizeTarget) {
384384
validityBuffer.readerIndex(0);
385385
validityBuffer.setZero(0, validityBuffer.capacity());
386386
}
387-
388-
@Override
389-
public TransferPair makeTransferPair(
390-
ValueVector target, ExtensionTypeWriterFactory writerFactory) {
391-
throw new UnsupportedOperationException();
392-
}
393387
}

vector/src/main/java/org/apache/arrow/vector/BaseVariableWidthVector.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import org.apache.arrow.memory.util.hash.ArrowBufHasher;
3232
import org.apache.arrow.util.Preconditions;
3333
import org.apache.arrow.vector.compare.VectorVisitor;
34-
import org.apache.arrow.vector.complex.impl.ExtensionTypeWriterFactory;
3534
import org.apache.arrow.vector.ipc.message.ArrowFieldNode;
3635
import org.apache.arrow.vector.types.pojo.Field;
3736
import org.apache.arrow.vector.util.CallBack;
@@ -1444,10 +1443,4 @@ public <OUT, IN> OUT accept(VectorVisitor<OUT, IN> visitor, IN value) {
14441443
public final int getEndOffset(int index) {
14451444
return offsetBuffer.getInt((long) (index + 1) * OFFSET_WIDTH);
14461445
}
1447-
1448-
@Override
1449-
public TransferPair makeTransferPair(
1450-
ValueVector target, ExtensionTypeWriterFactory writerFactory) {
1451-
throw new UnsupportedOperationException();
1452-
}
14531446
}

vector/src/main/java/org/apache/arrow/vector/BigIntVector.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.apache.arrow.memory.ArrowBuf;
2222
import org.apache.arrow.memory.BufferAllocator;
2323
import org.apache.arrow.vector.complex.impl.BigIntReaderImpl;
24+
import org.apache.arrow.vector.complex.impl.ExtensionTypeWriterFactory;
2425
import org.apache.arrow.vector.complex.reader.FieldReader;
2526
import org.apache.arrow.vector.holders.BigIntHolder;
2627
import org.apache.arrow.vector.holders.NullableBigIntHolder;
@@ -350,5 +351,11 @@ public void splitAndTransfer(int startIndex, int length) {
350351
public void copyValueSafe(int fromIndex, int toIndex) {
351352
to.copyFromSafe(fromIndex, toIndex, BigIntVector.this);
352353
}
354+
355+
@Override
356+
public void copyValueSafe(
357+
int fromIndex, int toIndex, ExtensionTypeWriterFactory writerFactory) {
358+
copyValueSafe(fromIndex, toIndex);
359+
}
353360
}
354361
}

vector/src/main/java/org/apache/arrow/vector/BitVector.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import org.apache.arrow.memory.util.hash.ArrowBufHasher;
2626
import org.apache.arrow.util.Preconditions;
2727
import org.apache.arrow.vector.complex.impl.BitReaderImpl;
28+
import org.apache.arrow.vector.complex.impl.ExtensionTypeWriterFactory;
2829
import org.apache.arrow.vector.complex.reader.FieldReader;
2930
import org.apache.arrow.vector.holders.BitHolder;
3031
import org.apache.arrow.vector.holders.NullableBitHolder;
@@ -592,5 +593,11 @@ public void splitAndTransfer(int startIndex, int length) {
592593
public void copyValueSafe(int fromIndex, int toIndex) {
593594
to.copyFromSafe(fromIndex, toIndex, BitVector.this);
594595
}
596+
597+
@Override
598+
public void copyValueSafe(
599+
int fromIndex, int toIndex, ExtensionTypeWriterFactory writerFactory) {
600+
copyValueSafe(fromIndex, toIndex);
601+
}
595602
}
596603
}

vector/src/main/java/org/apache/arrow/vector/DateDayVector.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import org.apache.arrow.memory.ArrowBuf;
2222
import org.apache.arrow.memory.BufferAllocator;
2323
import org.apache.arrow.vector.complex.impl.DateDayReaderImpl;
24+
import org.apache.arrow.vector.complex.impl.ExtensionTypeWriterFactory;
2425
import org.apache.arrow.vector.complex.reader.FieldReader;
2526
import org.apache.arrow.vector.holders.DateDayHolder;
2627
import org.apache.arrow.vector.holders.NullableDateDayHolder;
@@ -336,5 +337,11 @@ public void splitAndTransfer(int startIndex, int length) {
336337
public void copyValueSafe(int fromIndex, int toIndex) {
337338
to.copyFromSafe(fromIndex, toIndex, DateDayVector.this);
338339
}
340+
341+
@Override
342+
public void copyValueSafe(
343+
int fromIndex, int toIndex, ExtensionTypeWriterFactory writerFactory) {
344+
copyValueSafe(fromIndex, toIndex);
345+
}
339346
}
340347
}

vector/src/main/java/org/apache/arrow/vector/DateMilliVector.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.apache.arrow.memory.ArrowBuf;
2323
import org.apache.arrow.memory.BufferAllocator;
2424
import org.apache.arrow.vector.complex.impl.DateMilliReaderImpl;
25+
import org.apache.arrow.vector.complex.impl.ExtensionTypeWriterFactory;
2526
import org.apache.arrow.vector.complex.reader.FieldReader;
2627
import org.apache.arrow.vector.holders.DateMilliHolder;
2728
import org.apache.arrow.vector.holders.NullableDateMilliHolder;
@@ -338,5 +339,11 @@ public void splitAndTransfer(int startIndex, int length) {
338339
public void copyValueSafe(int fromIndex, int toIndex) {
339340
to.copyFromSafe(fromIndex, toIndex, DateMilliVector.this);
340341
}
342+
343+
@Override
344+
public void copyValueSafe(
345+
int fromIndex, int toIndex, ExtensionTypeWriterFactory writerFactory) {
346+
copyValueSafe(fromIndex, toIndex);
347+
}
341348
}
342349
}

vector/src/main/java/org/apache/arrow/vector/Decimal256Vector.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import org.apache.arrow.memory.BufferAllocator;
2525
import org.apache.arrow.memory.util.MemoryUtil;
2626
import org.apache.arrow.vector.complex.impl.Decimal256ReaderImpl;
27+
import org.apache.arrow.vector.complex.impl.ExtensionTypeWriterFactory;
2728
import org.apache.arrow.vector.complex.reader.FieldReader;
2829
import org.apache.arrow.vector.holders.Decimal256Holder;
2930
import org.apache.arrow.vector.holders.NullableDecimal256Holder;
@@ -601,5 +602,11 @@ public void splitAndTransfer(int startIndex, int length) {
601602
public void copyValueSafe(int fromIndex, int toIndex) {
602603
to.copyFromSafe(fromIndex, toIndex, Decimal256Vector.this);
603604
}
605+
606+
@Override
607+
public void copyValueSafe(
608+
int fromIndex, int toIndex, ExtensionTypeWriterFactory writerFactory) {
609+
copyValueSafe(fromIndex, toIndex);
610+
}
604611
}
605612
}

0 commit comments

Comments
 (0)