From ee1d4f4211a5eaf07b268a44b7f463ec82f24167 Mon Sep 17 00:00:00 2001
From: David Li
Date: Thu, 2 Jan 2025 20:42:38 -0500
Subject: [PATCH] GH-447: Port fix from apache/arrow that was missed
https://github.com/apache/arrow/commit/ded148c2ef5dd441a3b6ab9496d0ed0aeb940f71
was merged after the migration.
Fixes #447.
---
.../java/org/apache/arrow/dataset/TestAllTypes.java | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/dataset/src/test/java/org/apache/arrow/dataset/TestAllTypes.java b/dataset/src/test/java/org/apache/arrow/dataset/TestAllTypes.java
index 0edc428254..79800f3570 100644
--- a/dataset/src/test/java/org/apache/arrow/dataset/TestAllTypes.java
+++ b/dataset/src/test/java/org/apache/arrow/dataset/TestAllTypes.java
@@ -95,10 +95,9 @@ private VectorSchemaRoot generateAllTypesVector(BufferAllocator allocator) {
// DenseUnion
List childFields = new ArrayList<>();
childFields.add(
- new Field("int-child", new FieldType(true, new ArrowType.Int(32, true), null, null), null));
+ new Field("int-child", FieldType.notNullable(new ArrowType.Int(32, true)), null));
Field structField =
- new Field(
- "struct", new FieldType(true, ArrowType.Struct.INSTANCE, null, null), childFields);
+ new Field("struct", FieldType.nullable(ArrowType.Struct.INSTANCE), childFields);
Field[] fields =
new Field[] {
Field.nullablePrimitive("null", ArrowType.Null.INSTANCE),
@@ -238,7 +237,11 @@ private VectorSchemaRoot generateAllTypesVector(BufferAllocator allocator) {
largeListWriter.integer().writeInt(1);
largeListWriter.endList();
- ((StructVector) root.getVector("struct")).getChild("int-child", IntVector.class).set(1, 1);
+ IntVector intChildVector =
+ ((StructVector) root.getVector("struct")).getChild("int-child", IntVector.class);
+ // Non-nullable vector, make sure to fill all slots
+ intChildVector.set(0, 0);
+ intChildVector.set(1, 1);
return root;
}