Infer default value from ValueType

Author: s1ck

core/src/main/java/org/neo4j/gds/core/loading/IndexPropertyMappings.java

@@ -49,25 +49,7 @@
 // TODO: should be named LoadablePropertyMappings
 final class IndexPropertyMappings {
 
-    static LoadablePropertyMappings prepareProperties(
-        GraphProjectFromStoreConfig graphProjectConfig,
-        GraphDimensions graphDimensions,
-        TransactionContext transaction
-    ) {
-        Map<NodeLabel, PropertyMappings> storeLoadedProperties = graphProjectConfig
-            .nodeProjections()
-            .projections()
-            .entrySet()
-            .stream()
-            .collect(toMap(
-                Map.Entry::getKey,
-                entry -> entry.getValue().properties()
-            ));
-
-        return prepareLoadableProperties(graphDimensions, transaction, storeLoadedProperties);
-    }
-
-    static Map<NodeLabel, PropertyMappings> propertyMappingsByLabel(GraphProjectFromStoreConfig graphProjectConfig) {
+    static Map<NodeLabel, PropertyMappings> propertyMappings(GraphProjectFromStoreConfig graphProjectConfig) {
         return graphProjectConfig
             .nodeProjections()
             .projections()
@@ -81,6 +63,14 @@ static Map<NodeLabel, PropertyMappings> propertyMappingsByLabel(GraphProjectFrom
             ));
     }
 
+    static LoadablePropertyMappings prepareProperties(
+        GraphProjectFromStoreConfig graphProjectConfig,
+        GraphDimensions graphDimensions,
+        TransactionContext transaction
+    ) {
+        return prepareLoadableProperties(graphDimensions, transaction, propertyMappings(graphProjectConfig));
+    }
+
     private static LoadablePropertyMappings prepareLoadableProperties(
         GraphDimensions dimensions,
         TransactionContext transaction,

core/src/main/java/org/neo4j/gds/core/loading/Nodes.java

@@ -25,6 +25,7 @@
 import org.neo4j.gds.PropertyMapping;
 import org.neo4j.gds.PropertyMappings;
 import org.neo4j.gds.annotation.ValueClass;
+import org.neo4j.gds.api.DefaultValue;
 import org.neo4j.gds.api.IdMap;
 import org.neo4j.gds.api.PropertyState;
 import org.neo4j.gds.api.properties.nodes.ImmutableNodeProperty;
@@ -73,7 +74,7 @@ static Nodes of(
                     var propertySchema = ImmutablePropertySchema.builder()
                         .key(propertyMapping.propertyKey())
                         .valueType(nodePropertyValues.valueType())
-                        .defaultValue(propertyMapping.defaultValue())
+                        .defaultValue(DefaultValue.of(nodePropertyValues.valueType()))
                         .state(propertyState)
                         .build();
 

core/src/main/java/org/neo4j/gds/core/loading/ScanningNodesImporter.java

@@ -90,16 +90,16 @@ public static ScanningNodesImporter scanningNodesImporter(
             );
         }
 
-        var propertyMappings = IndexPropertyMappings.prepareProperties(
+        var propertyMappings = IndexPropertyMappings.propertyMappings(graphProjectConfig);
+
+        var loadablePropertyMappings = IndexPropertyMappings.prepareProperties(
             graphProjectConfig,
             dimensions,
             loadingContext.transactionContext()
         );
 
-        var propertyMappingsByLabel = IndexPropertyMappings.propertyMappingsByLabel(graphProjectConfig);
-
         var nodePropertyImporter = initializeNodePropertyImporter(
-            propertyMappings,
+            loadablePropertyMappings,
             dimensions,
             concurrency
         );
@@ -111,7 +111,7 @@ public static ScanningNodesImporter scanningNodesImporter(
             progressTracker,
             concurrency,
             propertyMappings,
-            propertyMappingsByLabel,
+            loadablePropertyMappings,
             nodePropertyImporter,
             idMapBuilder,
             labelInformationBuilder
@@ -124,8 +124,8 @@ private ScanningNodesImporter(
         GraphDimensions dimensions,
         ProgressTracker progressTracker,
         int concurrency,
-        IndexPropertyMappings.LoadablePropertyMappings propertyMappings,
         Map<NodeLabel, PropertyMappings> propertyMappingsByLabel,
+        IndexPropertyMappings.LoadablePropertyMappings propertyMappings,
         @Nullable NativeNodePropertyImporter nodePropertyImporter,
         IdMapBuilder idMapBuilder,
         LabelInformation.Builder labelInformationBuilder

core/src/test/java/org/neo4j/gds/api/DefaultValueTest.java

@@ -180,14 +180,36 @@ void createUserDefinedValueTypes(Object valueToSet, Function<DefaultValue, ?> fn
         assertThat(fn.apply(defaultValue)).isEqualTo(expectedValue);
     }
 
+    @Test
+    void initFromValueType() {
+        assertThat(DefaultValue.of(ValueType.DOUBLE)).isEqualTo(DefaultValue.forDouble());
+        assertThat(DefaultValue.of(ValueType.LONG)).isEqualTo(DefaultValue.forLong());
+        assertThat(DefaultValue.of(ValueType.LONG_ARRAY)).isEqualTo(DefaultValue.forLongArray());
+        assertThat(DefaultValue.of(ValueType.FLOAT_ARRAY)).isEqualTo(DefaultValue.forFloatArray());
+        assertThat(DefaultValue.of(ValueType.DOUBLE_ARRAY)).isEqualTo(DefaultValue.forDoubleArray());
+        assertThat(DefaultValue.of(ValueType.STRING)).isEqualTo(DefaultValue.of(DEFAULT));
+    }
+
     private static Stream<Arguments> values() {
         return Stream.of(
             Arguments.of(42, (Function<DefaultValue, ?>) DefaultValue::longValue, 42L),
             Arguments.of(42, (Function<DefaultValue, ?>) DefaultValue::doubleValue, 42D),
             Arguments.of(13.37, (Function<DefaultValue, ?>) DefaultValue::doubleValue, 13.37D),
-            Arguments.of(List.of(13.37, 42), (Function<DefaultValue, ?>) DefaultValue::doubleArrayValue, new double[] {13.37D, 42D}),
-            Arguments.of(List.of(1337L, 42L), (Function<DefaultValue, ?>) DefaultValue::longArrayValue, new long[] {1337L, 42L}),
-            Arguments.of(List.of(1337, 42), (Function<DefaultValue, ?>) DefaultValue::longArrayValue, new long[] {1337L, 42L})
+            Arguments.of(
+                List.of(13.37, 42),
+                (Function<DefaultValue, ?>) DefaultValue::doubleArrayValue,
+                new double[]{13.37D, 42D}
+            ),
+            Arguments.of(
+                List.of(1337L, 42L),
+                (Function<DefaultValue, ?>) DefaultValue::longArrayValue,
+                new long[]{1337L, 42L}
+            ),
+            Arguments.of(
+                List.of(1337, 42),
+                (Function<DefaultValue, ?>) DefaultValue::longArrayValue,
+                new long[]{1337L, 42L}
+            )
         );
     }
 

graph-projection-api/src/main/java/org/neo4j/gds/api/DefaultValue.java

@@ -84,6 +84,23 @@ public static DefaultValue of(@Nullable Object defaultValue, ValueType type, boo
         }
     }
 
+    public static DefaultValue of(ValueType type) {
+        switch (type) {
+            case LONG:
+                return DefaultValue.forLong();
+            case DOUBLE:
+                return DefaultValue.forDouble();
+            case DOUBLE_ARRAY:
+                return DefaultValue.forDoubleArray();
+            case FLOAT_ARRAY:
+                return DefaultValue.forFloatArray();
+            case LONG_ARRAY:
+                return DefaultValue.forLongArray();
+            default:
+                return DefaultValue.of(type.fallbackValue());
+        }
+    }
+
     private static DefaultValue ofFallBackValue(@Nullable Object defaultValue) {
         return of(defaultValue, false);
     }