Skip to content

Commit 04d797f

Browse files
committed
maps are not nullable yet
1 parent e8359b3 commit 04d797f

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

java/vector/src/main/java/org/apache/arrow/vector/complex/MapVector.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232
import org.apache.arrow.vector.BaseValueVector;
3333
import org.apache.arrow.vector.BufferBacked;
3434
import org.apache.arrow.vector.FieldVector;
35-
import org.apache.arrow.vector.UInt1Vector;
3635
import org.apache.arrow.vector.ValueVector;
3736
import org.apache.arrow.vector.complex.impl.SingleMapReaderImpl;
3837
import org.apache.arrow.vector.complex.reader.FieldReader;
@@ -61,8 +60,7 @@ public class MapVector extends AbstractMapVector implements FieldVector {
6160
int valueCount;
6261

6362
// TODO: validity vector
64-
private final UInt1Vector bits = new UInt1Vector("$bits$", allocator);
65-
private final List<BufferBacked> innerVectors = Collections.unmodifiableList(Arrays.<BufferBacked>asList(bits));
63+
private final List<BufferBacked> innerVectors = Collections.unmodifiableList(Arrays.<BufferBacked>asList());
6664

6765
public MapVector(String name, BufferAllocator allocator, CallBack callBack){
6866
super(name, allocator, callBack);
@@ -307,7 +305,6 @@ public void clear() {
307305
for (final ValueVector v : getChildren()) {
308306
v.clear();
309307
}
310-
bits.clear();
311308
valueCount = 0;
312309
}
313310

@@ -332,7 +329,6 @@ public void close() {
332329
v.close();
333330
}
334331
vectors.clear();
335-
bits.close();
336332

337333
valueCount = 0;
338334

java/vector/src/main/java/org/apache/arrow/vector/schema/TypeLayout.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,8 @@ public static TypeLayout getTypeLayout(final ArrowType arrowType) {
8888

8989
@Override public TypeLayout visit(Tuple type) {
9090
List<VectorLayout> vectors = asList(
91-
validityVector()
91+
// TODO: add validity vector in Map
92+
// validityVector()
9293
);
9394
return new TypeLayout(vectors);
9495
}

0 commit comments

Comments
 (0)