Use Nodes directly in FileToGraphStoreImporter

Author: s1ck

io/core/src/main/java/org/neo4j/gds/core/io/file/FileToGraphStoreImporter.java

@@ -32,10 +32,9 @@
 import org.neo4j.gds.core.concurrency.Pools;
 import org.neo4j.gds.core.io.GraphStoreGraphPropertyVisitor;
 import org.neo4j.gds.core.io.GraphStoreRelationshipVisitor;
-import org.neo4j.gds.core.loading.CSRGraphStoreUtil;
 import org.neo4j.gds.core.loading.GraphStoreBuilder;
-import org.neo4j.gds.core.loading.ImmutableNodes;
 import org.neo4j.gds.core.loading.ImmutableStaticCapabilities;
+import org.neo4j.gds.core.loading.Nodes;
 import org.neo4j.gds.core.loading.RelationshipImportResult;
 import org.neo4j.gds.core.loading.construction.GraphFactory;
 import org.neo4j.gds.core.loading.construction.NodesBuilder;
@@ -138,11 +137,11 @@ private void importGraphStore(FileInput fileInput) {
         graphStoreBuilder.capabilities(fileInput.capabilities());
 
         var nodes = importNodes(fileInput);
-        importRelationships(fileInput, nodes);
+        importRelationships(fileInput, nodes.idMap());
         importGraphProperties(fileInput);
     }
 
-    private IdMap importNodes(FileInput fileInput) {
+    private Nodes importNodes(FileInput fileInput) {
         progressTracker.beginSubTask();
         NodeSchema nodeSchema = fileInput.nodeSchema();
         graphSchemaBuilder.nodeSchema(nodeSchema);
@@ -165,19 +164,12 @@ private IdMap importNodes(FileInput fileInput) {
         ParallelUtil.run(tasks, Pools.DEFAULT);
 
         var nodes = nodesBuilder.build();
-        var nodeImportResultBuilder = ImmutableNodes.builder().idMap(nodes.idMap());
 
-        var schemaProperties = nodeSchema.unionProperties();
-        CSRGraphStoreUtil.extractNodeProperties(
-            nodeImportResultBuilder,
-            schemaProperties::get,
-            nodes.properties().propertyValues()
-        );
+        this.graphStoreBuilder.nodes(nodes);
 
-        graphStoreBuilder.nodes(nodeImportResultBuilder.build());
+        this.progressTracker.endSubTask();
 
-        progressTracker.endSubTask();
-        return nodes.idMap();
+        return nodes;
     }
 
     private void importRelationships(FileInput fileInput, IdMap nodes) {