diff --git a/java/vector/src/main/codegen/templates/NullableValueVectors.java b/java/vector/src/main/codegen/templates/NullableValueVectors.java index 5b993678012..624ba9d2cec 100644 --- a/java/vector/src/main/codegen/templates/NullableValueVectors.java +++ b/java/vector/src/main/codegen/templates/NullableValueVectors.java @@ -44,9 +44,10 @@ * NB: this class is automatically generated from ${.template_name} and ValueVectorTypes.tdd using FreeMarker. */ @SuppressWarnings("unused") -public final class ${className} extends BaseDataValueVector implements <#if type.major == "VarLen">VariableWidth<#else>FixedWidthVector, NullableVector, FieldVector { +public final class ${className} extends BaseValueVector implements <#if type.major == "VarLen">VariableWidth<#else>FixedWidthVector, NullableVector, FieldVector { private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(${className}.class); +protected final static byte[] emptyByteArray = new byte[]{}; private final FieldReader reader = new ${minor.class}ReaderImpl(${className}.this); private final String bitsField = "$bits$"; @@ -217,7 +218,6 @@ public int getBufferSizeFor(final int valueCount) { + bits.getBufferSizeFor(valueCount); } - @Override public ArrowBuf getBuffer() { return values.getBuffer(); } @@ -286,7 +286,6 @@ public void reset() { bits.zeroVector(); mutator.reset(); accessor.reset(); - super.reset(); } @Override @@ -314,12 +313,10 @@ public void allocateNew(int valueCount) { accessor.reset(); } - @Override public void reset() { bits.zeroVector(); mutator.reset(); accessor.reset(); - super.reset(); } /** @@ -332,6 +329,11 @@ public void zeroVector() { } + @Override + public TransferPair getTransferPair(String ref, BufferAllocator allocator, CallBack callBack) { + return getTransferPair(ref, allocator); + } + @Override public TransferPair getTransferPair(BufferAllocator allocator){ return new TransferImpl(name, allocator); diff --git a/java/vector/src/main/java/org/apache/arrow/vector/BaseDataValueVector.java b/java/vector/src/main/java/org/apache/arrow/vector/BaseDataValueVector.java index 6d7d3f04a6d..0fea719da88 100644 --- a/java/vector/src/main/java/org/apache/arrow/vector/BaseDataValueVector.java +++ b/java/vector/src/main/java/org/apache/arrow/vector/BaseDataValueVector.java @@ -30,8 +30,6 @@ public abstract class BaseDataValueVector extends BaseValueVector implements BufferBacked { - protected final static byte[] emptyByteArray = new byte[]{}; // Nullable vectors use this - public static void load(ArrowFieldNode fieldNode, List vectors, List buffers) { int expectedSize = vectors.size(); if (buffers.size() != expectedSize) {