Skip to content

Commit d919538

Browse files
ARROW-276: Nullable Vectors should extend BaseValueVector and not BaseDataValueVector
1 parent 2eeaa95 commit d919538

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,10 @@
4444
* NB: this class is automatically generated from ${.template_name} and ValueVectorTypes.tdd using FreeMarker.
4545
*/
4646
@SuppressWarnings("unused")
47-
public final class ${className} extends BaseDataValueVector implements <#if type.major == "VarLen">VariableWidth<#else>FixedWidth</#if>Vector, NullableVector, FieldVector {
47+
public final class ${className} extends BaseValueVector implements <#if type.major == "VarLen">VariableWidth<#else>FixedWidth</#if>Vector, NullableVector, FieldVector {
4848
private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(${className}.class);
4949

50+
protected final static byte[] emptyByteArray = new byte[]{};
5051
private final FieldReader reader = new ${minor.class}ReaderImpl(${className}.this);
5152

5253
private final String bitsField = "$bits$";
@@ -217,7 +218,6 @@ public int getBufferSizeFor(final int valueCount) {
217218
+ bits.getBufferSizeFor(valueCount);
218219
}
219220

220-
@Override
221221
public ArrowBuf getBuffer() {
222222
return values.getBuffer();
223223
}
@@ -286,7 +286,6 @@ public void reset() {
286286
bits.zeroVector();
287287
mutator.reset();
288288
accessor.reset();
289-
super.reset();
290289
}
291290

292291
@Override
@@ -314,12 +313,10 @@ public void allocateNew(int valueCount) {
314313
accessor.reset();
315314
}
316315

317-
@Override
318316
public void reset() {
319317
bits.zeroVector();
320318
mutator.reset();
321319
accessor.reset();
322-
super.reset();
323320
}
324321

325322
/**
@@ -332,6 +329,11 @@ public void zeroVector() {
332329
}
333330
</#if>
334331

332+
@Override
333+
public TransferPair getTransferPair(String ref, BufferAllocator allocator, CallBack callBack) {
334+
return getTransferPair(ref, allocator);
335+
}
336+
335337
@Override
336338
public TransferPair getTransferPair(BufferAllocator allocator){
337339
return new TransferImpl(name, allocator);

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030

3131
public abstract class BaseDataValueVector extends BaseValueVector implements BufferBacked {
3232

33-
protected final static byte[] emptyByteArray = new byte[]{}; // Nullable vectors use this
34-
3533
public static void load(ArrowFieldNode fieldNode, List<BufferBacked> vectors, List<ArrowBuf> buffers) {
3634
int expectedSize = vectors.size();
3735
if (buffers.size() != expectedSize) {

0 commit comments

Comments
 (0)