Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line numberDiff line numberDiff line change
Expand Up@@ -116,6 +116,7 @@
import org.apache.arrow.vector.complex.impl.UnionLargeListViewWriter;
import org.apache.arrow.vector.complex.impl.UnionLargeListWriter;
import org.apache.arrow.vector.complex.impl.UnionListWriter;
import org.apache.arrow.vector.complex.impl.UnionMapWriter;
import org.apache.arrow.vector.complex.impl.UnionWriter;
import org.apache.arrow.vector.complex.impl.VarBinaryWriterImpl;
import org.apache.arrow.vector.complex.impl.VarCharWriterImpl;
Expand DownExpand Up@@ -721,7 +722,7 @@ public FieldVector getNewVector(

@Override
public FieldWriter getNewFieldWriter(ValueVector vector) {
return new UnionListWriter((MapVector) vector);
return new UnionMapWriter((MapVector) vector);
}
},
TIMESTAMPSECTZ(null) {
Expand Down
22 changes: 22 additions & 0 deletions vector/src/test/java/org/apache/arrow/vector/TestMapVector.java
Original file line numberDiff line numberDiff line change
Expand Up@@ -35,6 +35,7 @@
import org.apache.arrow.vector.complex.reader.FieldReader;
import org.apache.arrow.vector.complex.writer.BaseWriter.ListWriter;
import org.apache.arrow.vector.complex.writer.BaseWriter.MapWriter;
import org.apache.arrow.vector.complex.writer.FieldWriter;
import org.apache.arrow.vector.types.Types.MinorType;
import org.apache.arrow.vector.types.pojo.ArrowType;
import org.apache.arrow.vector.types.pojo.Field;
Expand DownExpand Up@@ -1241,4 +1242,25 @@ public void testMakeTransferPairPreserveNullability() {
assertEquals(intField, vec.getField().getChildren().get(0));
assertEquals(intField, res.getField().getChildren().get(0));
}

@Test
public void testMapTypeReturnsSupportedMapWriter() {
try (final MapVector vector = MapVector.empty("map", allocator, false)) {
vector.allocateNew();
FieldWriter mapWriter = MinorType.MAP.getNewFieldWriter(vector);

mapWriter.startMap();
mapWriter.startEntry();
mapWriter.key().bigInt().writeBigInt(1);
mapWriter.value().integer().writeInt(11);
mapWriter.endEntry();
mapWriter.endMap();

Object result = vector.getObject(0);
ArrayList<?> resultSet = (ArrayList<?>) result;
Map<?, ?> resultStruct = (Map<?, ?>) resultSet.get(0);
assertEquals(1L, getResultKey(resultStruct));
assertEquals(11, getResultValue(resultStruct));
}
}
}