FlightMessageRoundTripTest: Inner List Type Should not Have Deephaven…

… Type Metadata (#5504)
deephaven · May 17, 2024 · d498a8e · d498a8e
1 parent 7b94582
commit d498a8e
Showing 1 changed file with 15 additions and 24 deletions.
diff --git a/server/test-utils/src/main/java/io/deephaven/server/test/FlightMessageRoundTripTest.java b/server/test-utils/src/main/java/io/deephaven/server/test/FlightMessageRoundTripTest.java
@@ -1301,19 +1301,24 @@ private void testZonedDateTimeColumnWithFactor(
         }
     }
 
+    private Schema createDoubleArraySchema() {
+        final Field payload = new Field("", new FieldType(false, Types.MinorType.FLOAT8.getType(), null), null);
+
+        final FieldType innerFieldType = new FieldType(true, Types.MinorType.LIST.getType(), null);
+        final Field inner = new Field("", innerFieldType, Collections.singletonList(payload));
+
+        final FieldType outerFieldType = new FieldType(true, Types.MinorType.LIST.getType(), null, Map.of(
+                "deephaven:type", "double[][]"));
+        final Field outer = new Field("data", outerFieldType, Collections.singletonList(inner));
+        return new Schema(Collections.singletonList(outer));
+    }
+
     @Test
     public void testNullNestedPrimitiveArray() {
         final int exportId = nextTicket++;
 
-        final FieldType listType = new FieldType(true, Types.MinorType.LIST.getType(), null, Map.of(
-                "deephaven:type", "double[][]"));
-        final Field payload = new Field("", new FieldType(false, Types.MinorType.FLOAT8.getType(), null), null);
-        final Field inner = new Field("", listType, Collections.singletonList(payload));
-        final Field outer = new Field("data", listType, Collections.singletonList(inner));
-        final Schema schema = new Schema(Collections.singletonList(outer));
-
         try (final RootAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
-                final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+                final VectorSchemaRoot root = VectorSchemaRoot.create(createDoubleArraySchema(), allocator)) {
 
             final ListVector outerVector = (ListVector) root.getVector(0);
             final FlightClient.ClientStreamListener stream = flightClient.startPut(
@@ -1345,15 +1350,8 @@ public void testNullNestedPrimitiveArray() {
     public void testEmptyNestedPrimitiveArray() {
         final int exportId = nextTicket++;
 
-        final FieldType listType = new FieldType(true, Types.MinorType.LIST.getType(), null, Map.of(
-                "deephaven:type", "double[][]"));
-        final Field payload = new Field("", new FieldType(false, Types.MinorType.FLOAT8.getType(), null), null);
-        final Field inner = new Field("", listType, Collections.singletonList(payload));
-        final Field outer = new Field("data", listType, Collections.singletonList(inner));
-        final Schema schema = new Schema(Collections.singletonList(outer));
-
         try (final RootAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
-                final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+                final VectorSchemaRoot root = VectorSchemaRoot.create(createDoubleArraySchema(), allocator)) {
 
             final ListVector outerVector = (ListVector) root.getVector(0);
             final FlightClient.ClientStreamListener stream = flightClient.startPut(
@@ -1389,15 +1387,8 @@ public void testEmptyNestedPrimitiveArray() {
     public void testInterestingNestedPrimitiveArray() {
         final int exportId = nextTicket++;
 
-        final FieldType listType = new FieldType(true, Types.MinorType.LIST.getType(), null, Map.of(
-                "deephaven:type", "double[][]"));
-        final Field payload = new Field("", new FieldType(false, Types.MinorType.FLOAT8.getType(), null), null);
-        final Field inner = new Field("", listType, Collections.singletonList(payload));
-        final Field outer = new Field("data", listType, Collections.singletonList(inner));
-        final Schema schema = new Schema(Collections.singletonList(outer));
-
         try (final RootAllocator allocator = new RootAllocator(Integer.MAX_VALUE);
-                final VectorSchemaRoot root = VectorSchemaRoot.create(schema, allocator)) {
+                final VectorSchemaRoot root = VectorSchemaRoot.create(createDoubleArraySchema(), allocator)) {
 
             final ListVector outerVector = (ListVector) root.getVector(0);
             final FlightClient.ClientStreamListener stream = flightClient.startPut(