Align Nodes building in Scanning and Arrow

Co-authored-by: Sören Reichardt <soren.reichardt@neotechnology.com>

Author: s1ck

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

@@ -20,11 +20,20 @@
 package org.neo4j.gds.core.loading;
 
 import org.immutables.value.Value;
+import org.neo4j.gds.NodeLabel;
+import org.neo4j.gds.PropertyMapping;
+import org.neo4j.gds.PropertyMappings;
 import org.neo4j.gds.annotation.ValueClass;
 import org.neo4j.gds.api.IdMap;
+import org.neo4j.gds.api.PropertyState;
+import org.neo4j.gds.api.properties.nodes.ImmutableNodeProperty;
 import org.neo4j.gds.api.properties.nodes.NodePropertyStore;
+import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
+import org.neo4j.gds.api.schema.ImmutablePropertySchema;
 import org.neo4j.gds.api.schema.NodeSchema;
 
+import java.util.Map;
+
 @ValueClass
 public interface Nodes {
 
@@ -37,4 +46,42 @@ default NodePropertyStore properties() {
         return NodePropertyStore.empty();
     }
 
+    static Nodes of(
+        IdMap idMap,
+        Map<NodeLabel, PropertyMappings> propertyMappings,
+        Map<PropertyMapping, NodePropertyValues> propertyValues,
+        PropertyState propertyState
+    ) {
+        var nodeSchema = NodeSchema.empty();
+        var nodePropertyStoreBuilder = NodePropertyStore.builder();
+
+        propertyMappings.forEach(((nodeLabel, mappings) -> {
+            if (mappings.mappings().isEmpty()) {
+                nodeSchema.addLabel(nodeLabel);
+            } else {
+                mappings.mappings().forEach(propertyMapping -> {
+                    var nodePropertyValues = propertyValues.get(propertyMapping);
+                    // The default value is either overridden by the user
+                    // or inferred from the actual property value.
+                    var defaultValue = propertyMapping.defaultValue().isUserDefined()
+                        ? propertyMapping.defaultValue()
+                        : nodePropertyValues.valueType().fallbackValue();
+                    var propertySchema = ImmutablePropertySchema.builder()
+                        .key(propertyMapping.propertyKey())
+                        .valueType(nodePropertyValues.valueType())
+                        .defaultValue(defaultValue)
+                        .state(propertyState)
+                        .build();
+
+                    nodeSchema.addProperty(nodeLabel, propertySchema.key(), propertySchema);
+                    nodePropertyStoreBuilder.putProperty(
+                        propertySchema.key(),
+                        ImmutableNodeProperty.of(nodePropertyValues, propertySchema)
+                    );
+                });
+            }
+        }));
+
+        return ImmutableNodes.of(nodeSchema, idMap, nodePropertyStoreBuilder.build());
+    }
 }

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

@@ -27,11 +27,7 @@
 import org.neo4j.gds.api.GraphLoaderContext;
 import org.neo4j.gds.api.IdMap;
 import org.neo4j.gds.api.PropertyState;
-import org.neo4j.gds.api.properties.nodes.ImmutableNodeProperty;
-import org.neo4j.gds.api.properties.nodes.NodePropertyStore;
 import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
-import org.neo4j.gds.api.schema.ImmutablePropertySchema;
-import org.neo4j.gds.api.schema.NodeSchema;
 import org.neo4j.gds.config.GraphProjectFromStoreConfig;
 import org.neo4j.gds.core.GraphDimensions;
 import org.neo4j.gds.core.IdMapBehaviorServiceProvider;
@@ -203,37 +199,7 @@ public Nodes build() {
             importPropertiesFromIndex(idMap, nodeProperties);
         }
 
-        var nodeSchema = NodeSchema.empty();
-        var nodePropertyStoreBuilder = NodePropertyStore.builder();
-
-        this.propertyMappingsByLabel.forEach(((nodeLabel, mappings) -> {
-            if (mappings.mappings().isEmpty()) {
-                nodeSchema.addLabel(nodeLabel);
-            } else {
-                mappings.mappings().forEach(propertyMapping -> {
-                    var nodePropertyValues = nodeProperties.get(propertyMapping);
-                    // The default value is either overridden by the user
-                    // or inferred from the actual property value.
-                    var defaultValue = propertyMapping.defaultValue().isUserDefined()
-                        ? propertyMapping.defaultValue()
-                        : nodePropertyValues.valueType().fallbackValue();
-                    var propertySchema = ImmutablePropertySchema.builder()
-                        .key(propertyMapping.propertyKey())
-                        .valueType(nodePropertyValues.valueType())
-                        .defaultValue(defaultValue)
-                        .state(PropertyState.PERSISTENT)
-                        .build();
-
-                    nodeSchema.addProperty(nodeLabel, propertySchema.key(), propertySchema);
-                    nodePropertyStoreBuilder.putProperty(
-                        propertySchema.key(),
-                        ImmutableNodeProperty.of(nodePropertyValues, propertySchema)
-                    );
-                });
-            }
-        }));
-
-        return ImmutableNodes.of(nodeSchema, idMap, nodePropertyStoreBuilder.build());
+        return Nodes.of(idMap, this.propertyMappingsByLabel, nodeProperties, PropertyState.PERSISTENT);
     }
 
     private void importPropertiesFromIndex(