Use Nodes#nodeSchema in native factory

Co-authored-by: Martin Junghanns <martin.junghanns@neotechnology.com>

Author: soerenreichardt

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

@@ -46,6 +46,7 @@
 import static java.util.stream.Collectors.toMap;
 import static org.neo4j.gds.core.GraphDimensions.ANY_LABEL;
 
+// TODO: should be named LoadablePropertyMappings
 final class IndexPropertyMappings {
 
     static LoadablePropertyMappings prepareProperties(
@@ -66,6 +67,20 @@ static LoadablePropertyMappings prepareProperties(
         return prepareLoadableProperties(graphDimensions, transaction, storeLoadedProperties);
     }
 
+    static Map<NodeLabel, PropertyMappings> propertyMappingsByLabel(GraphProjectFromStoreConfig graphProjectConfig) {
+        return graphProjectConfig
+            .nodeProjections()
+            .projections()
+            .entrySet()
+            .stream()
+            .collect(toMap(
+                Map.Entry::getKey,
+                entry -> entry
+                    .getValue()
+                    .properties()
+            ));
+    }
+
     private static LoadablePropertyMappings prepareLoadableProperties(
         GraphDimensions dimensions,
         TransactionContext transaction,

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

@@ -20,14 +20,17 @@
 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.NodeProperty;
 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;
@@ -72,6 +75,36 @@ static Nodes of(IdMap idMap, NodeSchema nodeSchema, Map<String, NodePropertyValu
         return ImmutableNodes.of(nodeSchema, idMap, nodePropertyStoreBuilder.build());
     }
 
+    static Nodes of(
+        IdMap idMap,
+        Map<NodeLabel, PropertyMappings> propertyMappingsByLabel,
+        Map<PropertyMapping, NodePropertyValues> properties,
+        PropertyState propertyState
+    ) {
+        var nodeSchema = NodeSchema.empty();
+        var nodePropertyStoreBuilder = NodePropertyStore.builder();
+        propertyMappingsByLabel.forEach(((nodeLabel, propertyMappings) -> {
+            if (propertyMappings.mappings().isEmpty()) {
+                nodeSchema.addLabel(nodeLabel);
+            } else {
+                propertyMappings.mappings().forEach(propertyMapping -> {
+                    var nodePropertyValues = properties.get(propertyMapping);
+                    var propertySchema = ImmutablePropertySchema.builder()
+                        .key(propertyMapping.propertyKey())
+                        .valueType(nodePropertyValues.valueType())
+                        .defaultValue(propertyMapping.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());
+    }
+
     static Nodes of(IdMap idMap, Map<PropertyMapping, NodePropertyValues> properties, PropertyState propertyState) {
         NodePropertyStore.Builder builder = NodePropertyStore.builder();
         properties.forEach((mapping, nodeProperties) -> builder.putProperty(

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

@@ -21,7 +21,9 @@
 
 import org.immutables.builder.Builder;
 import org.jetbrains.annotations.Nullable;
+import org.neo4j.gds.NodeLabel;
 import org.neo4j.gds.PropertyMapping;
+import org.neo4j.gds.PropertyMappings;
 import org.neo4j.gds.api.GraphLoaderContext;
 import org.neo4j.gds.api.IdMap;
 import org.neo4j.gds.api.PropertyState;
@@ -50,6 +52,7 @@
 public final class ScanningNodesImporter extends ScanningRecordsImporter<NodeReference, Nodes> {
 
     private final IndexPropertyMappings.LoadablePropertyMappings propertyMappings;
+    private final Map<NodeLabel, PropertyMappings> propertyMappingsByLabel;
     private final TerminationFlag terminationFlag;
     private final IdMapBuilder idMapBuilder;
     private final LabelInformation.Builder labelInformationBuilder;
@@ -93,6 +96,8 @@ public static ScanningNodesImporter scanningNodesImporter(
             loadingContext.transactionContext()
         );
 
+        var propertyMappingsByLabel = IndexPropertyMappings.propertyMappingsByLabel(graphProjectConfig);
+
         var nodePropertyImporter = initializeNodePropertyImporter(
             propertyMappings,
             dimensions,
@@ -106,6 +111,7 @@ public static ScanningNodesImporter scanningNodesImporter(
             progressTracker,
             concurrency,
             propertyMappings,
+            propertyMappingsByLabel,
             nodePropertyImporter,
             idMapBuilder,
             labelInformationBuilder
@@ -119,6 +125,7 @@ private ScanningNodesImporter(
         ProgressTracker progressTracker,
         int concurrency,
         IndexPropertyMappings.LoadablePropertyMappings propertyMappings,
+        Map<NodeLabel, PropertyMappings> propertyMappingsByLabel,
         @Nullable NativeNodePropertyImporter nodePropertyImporter,
         IdMapBuilder idMapBuilder,
         LabelInformation.Builder labelInformationBuilder
@@ -133,6 +140,7 @@ private ScanningNodesImporter(
 
         this.terminationFlag = loadingContext.terminationFlag();
         this.propertyMappings = propertyMappings;
+        this.propertyMappingsByLabel = propertyMappingsByLabel;
         this.nodePropertyImporter = nodePropertyImporter;
         this.idMapBuilder = idMapBuilder;
         this.labelInformationBuilder = labelInformationBuilder;
@@ -191,7 +199,7 @@ public Nodes build() {
             importPropertiesFromIndex(idMap, nodeProperties);
         }
 
-        return Nodes.of(idMap, nodeProperties, PropertyState.PERSISTENT);
+        return Nodes.of(idMap, propertyMappingsByLabel, nodeProperties, PropertyState.PERSISTENT);
     }
 
     private void importPropertiesFromIndex(