Skip to content

ARROW-9284: [Java] fix getMinorTypeForArrowType with dense unions #7599

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lidavidm wants to merge 1 commit into from
Closed

ARROW-9284: [Java] fix getMinorTypeForArrowType with dense unions #7599

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 8 additions & 1 deletion java/vector/src/main/java/org/apache/arrow/vector/types/Types.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,7 +809,14 @@ public MinorType visit(FixedSizeList type) {

@Override
public MinorType visit(Union type) {
return MinorType.UNION;
switch (type.getMode()) {
case Sparse:
return MinorType.UNION;
case Dense:
return MinorType.DENSEUNION;
default:
throw new IllegalArgumentException("Unknown union mode: " + type.getMode());
}
}

@Override
Expand Down
33 changes: 33 additions & 0 deletions java/vector/src/test/java/org/apache/arrow/vector/TestDenseUnionVector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import static org.junit.Assert.assertTrue;

import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
Expand All @@ -31,6 +32,7 @@
import org.apache.arrow.memory.BufferAllocator;
import org.apache.arrow.vector.complex.DenseUnionVector;
import org.apache.arrow.vector.complex.StructVector;
import org.apache.arrow.vector.complex.UnionVector;
import org.apache.arrow.vector.holders.NullableBigIntHolder;
import org.apache.arrow.vector.holders.NullableBitHolder;
import org.apache.arrow.vector.holders.NullableFloat4Holder;
Expand All @@ -43,6 +45,7 @@
import org.apache.arrow.vector.types.pojo.ArrowType;
import org.apache.arrow.vector.types.pojo.Field;
import org.apache.arrow.vector.types.pojo.FieldType;
import org.apache.arrow.vector.types.pojo.Schema;
import org.apache.arrow.vector.util.JsonStringHashMap;
import org.apache.arrow.vector.util.Text;
import org.apache.arrow.vector.util.TransferPair;
Expand Down Expand Up @@ -613,6 +616,36 @@ public void testChildVectorValueCounts() {
}
}

@Test
public void testDenseUnionFromMinorType() {
final Field denseField = new Field(
"union",
new FieldType(
/* nullable */ false,
new ArrowType.Union(UnionMode.Dense, new int[]{0}),
/* dictionary */ null),
Collections.emptyList());
final Field sparseField = new Field(
"union",
new FieldType(
/* nullable */ false,
new ArrowType.Union(UnionMode.Sparse, new int[]{0}),
/* dictionary */ null),
Collections.emptyList());
final Schema denseSchema = new Schema(Collections.singletonList(denseField));
final Schema sparseSchema = new Schema(Collections.singletonList(sparseField));
try (final VectorSchemaRoot root = VectorSchemaRoot.create(sparseSchema, allocator)) {
assertTrue(root.getVector("union") instanceof UnionVector);
}
try (final VectorSchemaRoot root = VectorSchemaRoot.create(denseSchema, allocator)) {
assertTrue(root.getVector("union") instanceof DenseUnionVector);
}
assertEquals(MinorType.DENSEUNION,
Types.getMinorTypeForArrowType(new ArrowType.Union(UnionMode.Dense, new int[]{0})));
assertEquals(MinorType.UNION,
Types.getMinorTypeForArrowType(new ArrowType.Union(UnionMode.Sparse, new int[]{0})));
}

private static NullableIntHolder newIntHolder(int value) {
final NullableIntHolder holder = new NullableIntHolder();
holder.isSet = 1;
Expand Down