update

g31pranjal · g31pranjal · commit 0e56d68e3534 · 2025-06-12T22:07:27.000+01:00
diff --git a/fdb-relational-api/src/main/java/com/apple/foundationdb/relational/api/RelationalArrayMetaData.java b/fdb-relational-api/src/main/java/com/apple/foundationdb/relational/api/RelationalArrayMetaData.java
@@ -42,11 +42,16 @@ public final class RelationalArrayMetaData implements ArrayMetaData {
 
     private final Supplier<Integer> hashCodeSupplier;
 
-    public RelationalArrayMetaData(@Nonnull DataType.ArrayType type) {
+    private RelationalArrayMetaData(@Nonnull DataType.ArrayType type) {
         this.type = type;
         this.hashCodeSupplier = Suppliers.memoize(this::calculateHashCode);
     }
 
+    @Nonnull
+    public static RelationalArrayMetaData of(@Nonnull DataType.ArrayType type) {
+        return new RelationalArrayMetaData(type);
+    }
+
     @Override
     public int isElementNullable() {
         if (type.getElementType().isNullable()) {
@@ -80,11 +85,11 @@ public String getElementTypeName() {
      * @throws SQLException if the type of the column is not a struct, or if something else goes wrong.
      */
     @Override
-    public RelationalStructMetaData getElementStructMetaData() throws SQLException {
+    public StructMetaData getElementStructMetaData() throws SQLException {
         if (type.getElementType().getCode() != DataType.Code.STRUCT) {
             throw new RelationalException("Element is not of STRUCT type", ErrorCode.CANNOT_CONVERT_TYPE).toSqlException();
         }
-        return new RelationalStructMetaData((DataType.StructType) type.getElementType());
+        return RelationalStructMetaData.of((DataType.StructType) type.getElementType());
     }
 
     /**
@@ -100,7 +105,7 @@ public ArrayMetaData getElementArrayMetaData() throws SQLException {
         if (type.getElementType().getCode() != DataType.Code.ARRAY) {
             throw new RelationalException("Element is not of ARRAY type", ErrorCode.CANNOT_CONVERT_TYPE).toSqlException();
         }
-        return new RelationalArrayMetaData((DataType.ArrayType) type.getElementType());
+        return RelationalArrayMetaData.of((DataType.ArrayType) type.getElementType());
     }
 
     @Nonnull
diff --git a/fdb-relational-api/src/main/java/com/apple/foundationdb/relational/api/RelationalStructMetaData.java b/fdb-relational-api/src/main/java/com/apple/foundationdb/relational/api/RelationalStructMetaData.java
@@ -48,12 +48,17 @@ public class RelationalStructMetaData implements StructMetaData {
     private final int leadingPhantomColumnOffset;
     private final Supplier<Integer> hashCodeSupplier;
 
-    public RelationalStructMetaData(@Nonnull DataType.StructType type) {
+    private RelationalStructMetaData(@Nonnull DataType.StructType type) {
         this.type = type;
         this.leadingPhantomColumnOffset = countLeadingPhantomColumns();
         this.hashCodeSupplier = Suppliers.memoize(this::calculateHashCode);
     }
 
+    @Nonnull
+    public static RelationalStructMetaData of(@Nonnull DataType.StructType type) {
+        return new RelationalStructMetaData(type);
+    }
+
     @Override
     public String getTypeName() {
         return type.getName();
@@ -115,7 +120,7 @@ public String getColumnTypeName(int oneBasedColumn) throws SQLException {
     public StructMetaData getStructMetaData(int oneBasedColumn) throws SQLException {
         final DataType type = getField(oneBasedColumn).getType();
         if (type.getCode() == DataType.Code.STRUCT) {
-            return new RelationalStructMetaData((DataType.StructType) type);
+            return RelationalStructMetaData.of((DataType.StructType) type);
         }
         throw new InvalidColumnReferenceException("Position <" + oneBasedColumn + "> is not a struct type").toSqlException();
     }
@@ -124,7 +129,7 @@ public StructMetaData getStructMetaData(int oneBasedColumn) throws SQLException
     public ArrayMetaData getArrayMetaData(int oneBasedColumn) throws SQLException {
         final DataType type = getField(oneBasedColumn).getType();
         if (type.getCode() == DataType.Code.ARRAY) {
-            return new RelationalArrayMetaData((DataType.ArrayType) type);
+            return RelationalArrayMetaData.of((DataType.ArrayType) type);
         }
         throw new InvalidColumnReferenceException("Position <" + oneBasedColumn + "> is not an array type").toSqlException();
     }
@@ -150,7 +155,7 @@ public boolean isWrapperFor(Class<?> iface) {
     }
 
     @Nonnull
-    public List<DataType.StructType.Field> getFields() {
+    private List<DataType.StructType.Field> getFields() {
         return ImmutableList.copyOf(type.getFields());
     }
 
diff --git a/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/api/EmbeddedRelationalArray.java b/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/api/EmbeddedRelationalArray.java
@@ -57,9 +57,9 @@ private Builder(@Nonnull DataType elementType) {
         @Override
         public EmbeddedRelationalArray build() throws SQLException {
             if (elementType == null) {
-                return new RowArray(List.of(), new RelationalArrayMetaData(DataType.ArrayType.from(DataType.Primitives.NULL.type())));
+                return new RowArray(List.of(), RelationalArrayMetaData.of(DataType.ArrayType.from(DataType.Primitives.NULL.type())));
             }
-            return new RowArray(elements, new RelationalArrayMetaData(DataType.ArrayType.from(elementType, false)));
+            return new RowArray(elements, RelationalArrayMetaData.of(DataType.ArrayType.from(elementType, false)));
         }
 
         @Override
diff --git a/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/api/EmbeddedRelationalStruct.java b/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/api/EmbeddedRelationalStruct.java
@@ -49,7 +49,7 @@ public EmbeddedRelationalStruct build() {
             // between the two - rather than confusing the downstream planner.
             final var name = "ANONYMOUS_STRUCT_" + UUID.randomUUID().toString().replace("-", "_");
             final var type = DataType.StructType.from(name, fields, false);
-            return new ImmutableRowStruct(new ArrayRow(elements.toArray()), new RelationalStructMetaData(type));
+            return new ImmutableRowStruct(new ArrayRow(elements.toArray()), RelationalStructMetaData.of(type));
         }
 
         @Override
diff --git a/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/api/RowArray.java b/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/api/RowArray.java
@@ -74,7 +74,7 @@ public RelationalResultSet getResultSet(long oneBasedIndex, int count) throws SQ
                 DataType.StructType.Field.from("INDEX", DataType.Primitives.INTEGER.type(), 0),
                 DataType.StructType.Field.from("VALUE", arrayMetaData.getRelationalDataType().getElementType(), 1)
         ), true);
-        return new IteratorResultSet(new RelationalStructMetaData(type), slice.iterator(), 0);
+        return new IteratorResultSet(RelationalStructMetaData.of(type), slice.iterator(), 0);
     }
 
     @Override
diff --git a/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/CatalogMetaData.java b/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/CatalogMetaData.java
@@ -96,7 +96,7 @@ public RelationalResultSet getSchemas(String catalogStr, String schemaPattern) t
                         DataType.StructType.Field.from("TABLE_CATALOG", DataType.Primitives.NULLABLE_STRING.type(), 0),
                         DataType.StructType.Field.from("TABLE_SCHEM", DataType.Primitives.NULLABLE_STRING.type(), 1)
                 ), true);
-                return new IteratorResultSet(new RelationalStructMetaData(schemasStructType), simplifiedRows.iterator(), 0);
+                return new IteratorResultSet(RelationalStructMetaData.of(schemasStructType), simplifiedRows.iterator(), 0);
             } catch (SQLException sqle) {
                 throw new RelationalException(sqle);
             }
@@ -142,7 +142,7 @@ public RelationalResultSet getTables(String database, String schema, String tabl
                     DataType.StructType.Field.from("TABLE_VERSION", DataType.Primitives.NULLABLE_LONG.type(), 3)
 
             ), true);
-            return new IteratorResultSet(new RelationalStructMetaData(tablesStructType), tableList.iterator(), 0);
+            return new IteratorResultSet(RelationalStructMetaData.of(tablesStructType), tableList.iterator(), 0);
         });
     }
 
@@ -171,7 +171,7 @@ public RelationalResultSet getPrimaryKeys(String database, String schema, String
                     DataType.StructType.Field.from("KEY_SEQ", DataType.Primitives.NULLABLE_INTEGER.type(), 4),
                     DataType.StructType.Field.from("PK_NAME", DataType.Primitives.NULLABLE_STRING.type(), 5)
             ), true);
-            return new IteratorResultSet(new RelationalStructMetaData(primaryKeysStructType), rows.iterator(), 0);
+            return new IteratorResultSet(RelationalStructMetaData.of(primaryKeysStructType), rows.iterator(), 0);
         });
     }
 
@@ -265,7 +265,7 @@ public RelationalResultSet getColumns(String database, String schema, String tab
                     DataType.StructType.Field.from("IS_AUTOINCREMENT", DataType.Primitives.NULLABLE_STRING.type(), 22),
                     DataType.StructType.Field.from("IS_GENERATEDCOLUMN", DataType.Primitives.NULLABLE_STRING.type(), 23)
             ), true);
-            return new IteratorResultSet(new RelationalStructMetaData(columnsStructType), columnDefs.iterator(), 0);
+            return new IteratorResultSet(RelationalStructMetaData.of(columnsStructType), columnDefs.iterator(), 0);
         });
     }
 
@@ -334,7 +334,7 @@ public RelationalResultSet getIndexInfo(String database, String schema, String t
                     DataType.StructType.Field.from("PAGES", DataType.Primitives.NULLABLE_INTEGER.type(), 11),
                     DataType.StructType.Field.from("FILTER_CONDITION", DataType.Primitives.NULLABLE_STRING.type(), 12)
             ), true);
-            return new IteratorResultSet(new RelationalStructMetaData(indexInfoStructType), indexDefs.iterator(), 0);
+            return new IteratorResultSet(RelationalStructMetaData.of(indexInfoStructType), indexDefs.iterator(), 0);
         });
     }
 
diff --git a/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/EmbeddedRelationalConnection.java b/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/EmbeddedRelationalConnection.java
@@ -363,7 +363,7 @@ public SQLWarning getWarnings() throws SQLException {
     public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
         final var dataType = SqlTypeNamesSupport.getDataTypeFromSqlTypeName(typeName);
         if (dataType != null) {
-            return new RowArray(Arrays.stream(elements).collect(Collectors.toList()), new RelationalArrayMetaData(DataType.ArrayType.from(dataType, false)));
+            return new RowArray(Arrays.stream(elements).collect(Collectors.toList()), RelationalArrayMetaData.of(DataType.ArrayType.from(dataType, false)));
         } else if (elements.length == 0) {
             throw new RelationalException("Cannot determine the complete component type of array of struct since it has no elements!", ErrorCode.INTERNAL_ERROR).toSqlException();
         } else {
@@ -373,7 +373,7 @@ public Array createArrayOf(String typeName, Object[] elements) throws SQLExcepti
             } else if (elementType.getJdbcSqlCode() != SqlTypeNamesSupport.getSqlTypeCode(typeName)) {
                 throw new RelationalException("Element of the array is expected to be of type " + typeName, ErrorCode.DATATYPE_MISMATCH).toSqlException();
             }
-            return new RowArray(Arrays.stream(elements).collect(Collectors.toList()), new RelationalArrayMetaData(DataType.ArrayType.from(elementType, false)));
+            return new RowArray(Arrays.stream(elements).collect(Collectors.toList()), RelationalArrayMetaData.of(DataType.ArrayType.from(elementType, false)));
         }
     }
 
diff --git a/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/RecordStoreIndex.java b/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/RecordStoreIndex.java
@@ -74,7 +74,7 @@ public StructMetaData getMetaData() throws RelationalException {
         final RecordType recType = table.loadRecordType(Options.NONE);
         final List<Descriptors.FieldDescriptor> fields = indexStruct.validate(recType.getDescriptor());
         final Type.Record record = ProtobufDdlUtil.recordFromFieldDescriptors(fields);
-        return new RelationalStructMetaData((DataType.StructType) DataTypeUtils.toRelationalType(record));
+        return RelationalStructMetaData.of((DataType.StructType) DataTypeUtils.toRelationalType(record));
     }
 
     @Override
diff --git a/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/RecordTypeTable.java b/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/RecordTypeTable.java
@@ -124,7 +124,7 @@ public StructMetaData getMetaData() throws RelationalException {
         });
         orderedFieldMap.putAll(descriptorLookupMap);
         final Type.Record record = Type.Record.fromFieldDescriptorsMap(orderedFieldMap);
-        return new RelationalStructMetaData((DataType.StructType) DataTypeUtils.toRelationalType(record));
+        return RelationalStructMetaData.of((DataType.StructType) DataTypeUtils.toRelationalType(record));
     }
 
     @Override
@@ -198,7 +198,7 @@ public static Message toDynamicMessage(RelationalStruct struct, Descriptors.Desc
                         Assert.thatUnchecked(valueDescriptor != null, ErrorCode.CANNOT_CONVERT_TYPE, "Invalid enum value: %s", maybeEnumValue);
                         builder.setField(fd, valueDescriptor);
                     }
-                    break;
+                    continue;
                 }
                 switch (field.getType().getCode()) {
                     case BOOLEAN:
@@ -240,7 +240,7 @@ public static Message toDynamicMessage(RelationalStruct struct, Descriptors.Desc
                             if (fd.getType() == Descriptors.FieldDescriptor.Type.MESSAGE) {
                                 Assert.thatUnchecked(NullableArrayUtils.isWrappedArrayDescriptor(fd.getMessageType()));
                                 // wrap array in a struct and call toDynamicMessage again
-                                final var wrapper = new ImmutableRowStruct(new ArrayRow(array), new RelationalStructMetaData(
+                                final var wrapper = new ImmutableRowStruct(new ArrayRow(array), RelationalStructMetaData.of(
                                         DataType.StructType.from("STRUCT", List.of(
                                                 DataType.StructType.Field.from(NullableArrayUtils.REPEATED_FIELD_NAME, array.getMetaData().getRelationalDataType(), 0)
                                         ), true)));
diff --git a/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/catalog/RecordLayerStoreCatalog.java b/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/catalog/RecordLayerStoreCatalog.java
@@ -410,7 +410,7 @@ private void putSchema(@Nonnull final RecordLayerSchema schema, @Nonnull final F
     }
 
     private static StructMetaData getMetaData(Descriptors.Descriptor descriptor) throws RelationalException {
-        return new RelationalStructMetaData((DataType.StructType) DataTypeUtils.toRelationalType(ProtobufDdlUtil.recordFromDescriptor(descriptor)));
+        return RelationalStructMetaData.of((DataType.StructType) DataTypeUtils.toRelationalType(ProtobufDdlUtil.recordFromDescriptor(descriptor)));
     }
 
     @Nonnull
diff --git a/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/catalog/RecordLayerStoreSchemaTemplateCatalog.java b/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/catalog/RecordLayerStoreSchemaTemplateCatalog.java
@@ -245,7 +245,7 @@ public RelationalResultSet listTemplates(@Nonnull Transaction txn) {
                             ContinuationImpl.BEGIN.getExecutionState(), ScanProperties.FORWARD_SCAN);
             Descriptors.Descriptor d = recordStore.getRecordMetaData().getRecordMetaData()
                     .getRecordType(SchemaTemplateSystemTable.TABLE_NAME).getDescriptor();
-            final var structMetaData = new RelationalStructMetaData((DataType.StructType) DataTypeUtils.toRelationalType(ProtobufDdlUtil.recordFromDescriptor(d)));
+            final var structMetaData = RelationalStructMetaData.of((DataType.StructType) DataTypeUtils.toRelationalType(ProtobufDdlUtil.recordFromDescriptor(d)));
             return new RecordLayerResultSet(structMetaData,
                     RecordLayerIterator.create(cursor, this::transformSchemaTemplates),
                     null /* caller is responsible for managing tx state */);
diff --git a/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/ddl/RecordLayerCatalogQueryFactory.java b/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/ddl/RecordLayerCatalogQueryFactory.java
@@ -81,7 +81,7 @@ public RelationalResultSet executeAction(Transaction txn) throws RelationalExcep
                         DataType.StructType.Field.from("TABLES", DataType.ArrayType.from(DataType.Primitives.STRING.type()), 2),
                         DataType.StructType.Field.from("INDEXES", DataType.ArrayType.from(DataType.Primitives.STRING.type()), 3)
                 ), true);
-                return new IteratorResultSet(new RelationalStructMetaData(describeSchemaStructType), Collections.singleton(tuple).iterator(), 0);
+                return new IteratorResultSet(RelationalStructMetaData.of(describeSchemaStructType), Collections.singleton(tuple).iterator(), 0);
             }
         };
     }
@@ -115,12 +115,12 @@ public RelationalResultSet executeAction(Transaction txn) throws RelationalExcep
                 for (var table : schemaTemplate.getTables()) {
                     final var columnStructs = new ArrayList<>();
                     for (var col : table.getColumns()) {
-                        columnStructs.add(new ImmutableRowStruct(new ArrayRow(col.getName(), col.getDatatype().getJdbcSqlCode()), new RelationalStructMetaData(columnType)));
+                        columnStructs.add(new ImmutableRowStruct(new ArrayRow(col.getName(), col.getDatatype().getJdbcSqlCode()), RelationalStructMetaData.of(columnType)));
                     }
-                    tableStructs.add(new ImmutableRowStruct(new ArrayRow(table.getName(), columnStructs), new RelationalStructMetaData(tableType)));
+                    tableStructs.add(new ImmutableRowStruct(new ArrayRow(table.getName(), columnStructs), RelationalStructMetaData.of(tableType)));
                 }
                 final Row tuple = new ArrayRow(schemaTemplate.getName(), tableStructs);
-                return new IteratorResultSet(new RelationalStructMetaData(describeSchemaType), Collections.singleton(tuple).iterator(), 0);
+                return new IteratorResultSet(RelationalStructMetaData.of(describeSchemaType), Collections.singleton(tuple).iterator(), 0);
             }
         };
     }
diff --git a/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/query/QueryPlan.java b/fdb-relational-core/src/main/java/com/apple/foundationdb/relational/recordlayer/query/QueryPlan.java
@@ -306,7 +306,7 @@ private RelationalResultSet executeExplain(@Nonnull ContinuationImpl parsedConti
                             parsedContinuation.getExecutionState(),
                             parsedContinuation.getVersion(),
                             parsedContinuation.getCompiledStatement() == null ? null : parsedContinuation.getCompiledStatement().getPlanSerializationMode()
-                    ), new RelationalStructMetaData(continuationStructType));
+                    ), RelationalStructMetaData.of(continuationStructType));
 
             final Struct plannerMetrics;
             if (plannerStatsMaps == null) {
@@ -332,11 +332,11 @@ private RelationalResultSet executeExplain(@Nonnull ContinuationImpl parsedConti
                                 insertIntoMemoStats.map(s -> s.getCount(Debugger.Location.REUSED)).orElse(0L),
                                 parsedContinuation.getVersion(),
                                 parsedContinuation.getCompiledStatement() == null ? null : parsedContinuation.getCompiledStatement().getPlanSerializationMode()
-                        ), new RelationalStructMetaData(plannerMetricsStructType));
+                        ), RelationalStructMetaData.of(plannerMetricsStructType));
             }
 
             final var plannerGraph = Objects.requireNonNull(recordQueryPlan.acceptPropertyVisitor(PlannerGraphProperty.forExplain()));
-            return new IteratorResultSet(new RelationalStructMetaData(explainStructType), Collections.singleton(new ArrayRow(
+            return new IteratorResultSet(RelationalStructMetaData.of(explainStructType), Collections.singleton(new ArrayRow(
                     explain(),
                     planHashSupplier.get(),
                     PlannerGraphProperty.exportToDot(plannerGraph),
@@ -374,7 +374,7 @@ private RelationalResultSet executePhysicalPlan(@Nonnull final RecordLayerSchema
             final var dataType = (DataType.StructType) DataTypeUtils.toRelationalType(type);
             return executionContext.metricCollector.clock(RelationalMetric.RelationalEvent.CREATE_RESULT_SET_ITERATOR, () -> {
                 final ResumableIterator<Row> iterator = RecordLayerIterator.create(cursor, messageFDBQueriedRecord -> new MessageTuple(messageFDBQueriedRecord.getMessage()));
-                return new RecordLayerResultSet(new RelationalStructMetaData(dataType), iterator, connection,
+                return new RecordLayerResultSet(RelationalStructMetaData.of(dataType), iterator, connection,
                         (continuation, reason) -> enrichContinuation(continuation, fdbRecordStore.getRecordMetaData(),
                                 currentPlanHashMode, reason, getContinuationsContainsCompiledStatements(options)));
             });
diff --git a/fdb-relational-core/src/test/java/com/apple/foundationdb/relational/autotest/datagen/SchemaGenerator.java b/fdb-relational-core/src/test/java/com/apple/foundationdb/relational/autotest/datagen/SchemaGenerator.java
@@ -103,7 +103,7 @@ private Map.Entry<TableDescription, String> generateTable(List<NonnullPair<Strin
                 fields.add(DataType.StructType.Field.from(col.name, col.type, i));
             }
         }
-        TableDescription tableDef = new TableDescription(new RelationalStructMetaData(DataType.StructType.from(typeName, fields, true)), pkColumns);
+        TableDescription tableDef = new TableDescription(RelationalStructMetaData.of(DataType.StructType.from(typeName, fields, true)), pkColumns);
         return new AbstractMap.SimpleEntry<>(tableDef, sb);
     }
 
diff --git a/fdb-relational-core/src/test/java/com/apple/foundationdb/relational/memory/InMemorySchemaTemplateCatalog.java b/fdb-relational-core/src/test/java/com/apple/foundationdb/relational/memory/InMemorySchemaTemplateCatalog.java
diff --git a/fdb-relational-core/src/test/java/com/apple/foundationdb/relational/memory/InMemoryTable.java b/fdb-relational-core/src/test/java/com/apple/foundationdb/relational/memory/InMemoryTable.java
diff --git a/fdb-relational-core/src/test/java/com/apple/foundationdb/relational/recordlayer/InsertTest.java b/fdb-relational-core/src/test/java/com/apple/foundationdb/relational/recordlayer/InsertTest.java
diff --git a/fdb-relational-core/src/test/java/com/apple/foundationdb/relational/recordlayer/IteratorResultSetTest.java b/fdb-relational-core/src/test/java/com/apple/foundationdb/relational/recordlayer/IteratorResultSetTest.java
diff --git a/fdb-relational-core/src/test/java/com/apple/foundationdb/relational/recordlayer/RecordLayerResultSetTest.java b/fdb-relational-core/src/test/java/com/apple/foundationdb/relational/recordlayer/RecordLayerResultSetTest.java
diff --git a/fdb-relational-core/src/test/java/com/apple/foundationdb/relational/recordlayer/RowStructTest.java b/fdb-relational-core/src/test/java/com/apple/foundationdb/relational/recordlayer/RowStructTest.java
diff --git a/fdb-relational-core/src/test/java/com/apple/foundationdb/relational/recordlayer/query/StandardQueryTests.java b/fdb-relational-core/src/test/java/com/apple/foundationdb/relational/recordlayer/query/StandardQueryTests.java

Original file line number	Diff line number	Diff line change
`@@ -48,12 +48,17 @@ public class RelationalStructMetaData implements StructMetaData {`
`48`	`48`	`private final int leadingPhantomColumnOffset;`
`49`	`49`	`private final Supplier<Integer> hashCodeSupplier;`
`50`	`50`
`51`		`- public RelationalStructMetaData(@Nonnull DataType.StructType type) {`
	`51`	`+ private RelationalStructMetaData(@Nonnull DataType.StructType type) {`
`52`	`52`	`this.type = type;`
`53`	`53`	`this.leadingPhantomColumnOffset = countLeadingPhantomColumns();`
`54`	`54`	`this.hashCodeSupplier = Suppliers.memoize(this::calculateHashCode);`
`55`	`55`	`}`
`56`	`56`
	`57`	`+ @Nonnull`
	`58`	`+ public static RelationalStructMetaData of(@Nonnull DataType.StructType type) {`
	`59`	`+ return new RelationalStructMetaData(type);`
	`60`	`+ }`
	`61`	`+`
`57`	`62`	`@Override`
`58`	`63`	`public String getTypeName() {`
`59`	`64`	`return type.getName();`
`@@ -115,7 +120,7 @@ public String getColumnTypeName(int oneBasedColumn) throws SQLException {`
`115`	`120`	`public StructMetaData getStructMetaData(int oneBasedColumn) throws SQLException {`
`116`	`121`	`final DataType type = getField(oneBasedColumn).getType();`
`117`	`122`	`if (type.getCode() == DataType.Code.STRUCT) {`
`118`		`- return new RelationalStructMetaData((DataType.StructType) type);`
	`123`	`+ return RelationalStructMetaData.of((DataType.StructType) type);`
`119`	`124`	`}`
`120`	`125`	`throw new InvalidColumnReferenceException("Position <" + oneBasedColumn + "> is not a struct type").toSqlException();`
`121`	`126`	`}`
`@@ -124,7 +129,7 @@ public StructMetaData getStructMetaData(int oneBasedColumn) throws SQLException`
`124`	`129`	`public ArrayMetaData getArrayMetaData(int oneBasedColumn) throws SQLException {`
`125`	`130`	`final DataType type = getField(oneBasedColumn).getType();`
`126`	`131`	`if (type.getCode() == DataType.Code.ARRAY) {`
`127`		`- return new RelationalArrayMetaData((DataType.ArrayType) type);`
	`132`	`+ return RelationalArrayMetaData.of((DataType.ArrayType) type);`
`128`	`133`	`}`
`129`	`134`	`throw new InvalidColumnReferenceException("Position <" + oneBasedColumn + "> is not an array type").toSqlException();`
`130`	`135`	`}`
`@@ -150,7 +155,7 @@ public boolean isWrapperFor(Class<?> iface) {`
`150`	`155`	`}`
`151`	`156`
`152`	`157`	`@Nonnull`
`153`		`- public List<DataType.StructType.Field> getFields() {`
	`158`	`+ private List<DataType.StructType.Field> getFields() {`
`154`	`159`	`return ImmutableList.copyOf(type.getFields());`
`155`	`160`	`}`
`156`	`161`
Original file line number	Diff line number	Diff line change
`@@ -57,9 +57,9 @@ private Builder(@Nonnull DataType elementType) {`
`57`	`57`	`@Override`
`58`	`58`	`public EmbeddedRelationalArray build() throws SQLException {`
`59`	`59`	`if (elementType == null) {`
`60`		`- return new RowArray(List.of(), new RelationalArrayMetaData(DataType.ArrayType.from(DataType.Primitives.NULL.type())));`
	`60`	`+ return new RowArray(List.of(), RelationalArrayMetaData.of(DataType.ArrayType.from(DataType.Primitives.NULL.type())));`
`61`	`61`	`}`
`62`		`- return new RowArray(elements, new RelationalArrayMetaData(DataType.ArrayType.from(elementType, false)));`
	`62`	`+ return new RowArray(elements, RelationalArrayMetaData.of(DataType.ArrayType.from(elementType, false)));`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public EmbeddedRelationalStruct build() {`
`49`	`49`	`// between the two - rather than confusing the downstream planner.`
`50`	`50`	`final var name = "ANONYMOUS_STRUCT_" + UUID.randomUUID().toString().replace("-", "_");`
`51`	`51`	`final var type = DataType.StructType.from(name, fields, false);`
`52`		`- return new ImmutableRowStruct(new ArrayRow(elements.toArray()), new RelationalStructMetaData(type));`
	`52`	`+ return new ImmutableRowStruct(new ArrayRow(elements.toArray()), RelationalStructMetaData.of(type));`
`53`	`53`	`}`
`54`	`54`
`55`	`55`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public RelationalResultSet getResultSet(long oneBasedIndex, int count) throws SQ`
`74`	`74`	`DataType.StructType.Field.from("INDEX", DataType.Primitives.INTEGER.type(), 0),`
`75`	`75`	`DataType.StructType.Field.from("VALUE", arrayMetaData.getRelationalDataType().getElementType(), 1)`
`76`	`76`	`), true);`
`77`		`- return new IteratorResultSet(new RelationalStructMetaData(type), slice.iterator(), 0);`
	`77`	`+ return new IteratorResultSet(RelationalStructMetaData.of(type), slice.iterator(), 0);`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -363,7 +363,7 @@ public SQLWarning getWarnings() throws SQLException {`
`363`	`363`	`public Array createArrayOf(String typeName, Object[] elements) throws SQLException {`
`364`	`364`	`final var dataType = SqlTypeNamesSupport.getDataTypeFromSqlTypeName(typeName);`
`365`	`365`	`if (dataType != null) {`
`366`		`- return new RowArray(Arrays.stream(elements).collect(Collectors.toList()), new RelationalArrayMetaData(DataType.ArrayType.from(dataType, false)));`
	`366`	`+ return new RowArray(Arrays.stream(elements).collect(Collectors.toList()), RelationalArrayMetaData.of(DataType.ArrayType.from(dataType, false)));`
`367`	`367`	`} else if (elements.length == 0) {`
`368`	`368`	`throw new RelationalException("Cannot determine the complete component type of array of struct since it has no elements!", ErrorCode.INTERNAL_ERROR).toSqlException();`
`369`	`369`	`} else {`
`@@ -373,7 +373,7 @@ public Array createArrayOf(String typeName, Object[] elements) throws SQLExcepti`
`373`	`373`	`} else if (elementType.getJdbcSqlCode() != SqlTypeNamesSupport.getSqlTypeCode(typeName)) {`
`374`	`374`	`throw new RelationalException("Element of the array is expected to be of type " + typeName, ErrorCode.DATATYPE_MISMATCH).toSqlException();`
`375`	`375`	`}`
`376`		`- return new RowArray(Arrays.stream(elements).collect(Collectors.toList()), new RelationalArrayMetaData(DataType.ArrayType.from(elementType, false)));`
	`376`	`+ return new RowArray(Arrays.stream(elements).collect(Collectors.toList()), RelationalArrayMetaData.of(DataType.ArrayType.from(elementType, false)));`
`377`	`377`	`}`
`378`	`378`	`}`
`379`	`379`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public StructMetaData getMetaData() throws RelationalException {`
`74`	`74`	`final RecordType recType = table.loadRecordType(Options.NONE);`
`75`	`75`	`final List<Descriptors.FieldDescriptor> fields = indexStruct.validate(recType.getDescriptor());`
`76`	`76`	`final Type.Record record = ProtobufDdlUtil.recordFromFieldDescriptors(fields);`
`77`		`- return new RelationalStructMetaData((DataType.StructType) DataTypeUtils.toRelationalType(record));`
	`77`	`+ return RelationalStructMetaData.of((DataType.StructType) DataTypeUtils.toRelationalType(record));`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -410,7 +410,7 @@ private void putSchema(@Nonnull final RecordLayerSchema schema, @Nonnull final F`
`410`	`410`	`}`
`411`	`411`
`412`	`412`	`private static StructMetaData getMetaData(Descriptors.Descriptor descriptor) throws RelationalException {`
`413`		`- return new RelationalStructMetaData((DataType.StructType) DataTypeUtils.toRelationalType(ProtobufDdlUtil.recordFromDescriptor(descriptor)));`
	`413`	`+ return RelationalStructMetaData.of((DataType.StructType) DataTypeUtils.toRelationalType(ProtobufDdlUtil.recordFromDescriptor(descriptor)));`
`414`	`414`	`}`
`415`	`415`
`416`	`416`	`@Nonnull`