Merge pull request #7180 from FlorentinD/fix-import-cypher-rel-import-progress-logging-23

Fix progress logging for cypher projections

Author: FlorentinD

core/src/main/java/org/neo4j/gds/api/CSRGraphStoreFactory.java

@@ -27,6 +27,7 @@
 import org.neo4j.gds.core.loading.GraphStoreBuilder;
 import org.neo4j.gds.core.loading.Nodes;
 import org.neo4j.gds.core.loading.RelationshipImportResult;
+import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
 import org.neo4j.gds.mem.MemoryUsage;
 
 import java.util.Map;
@@ -65,7 +66,9 @@ protected void logLoadingSummary(GraphStore graphStore) {
         var sizeInBytes = MemoryUsage.sizeOf(graphStore);
         if (sizeInBytes >= 0) {
             var memoryUsage = MemoryUsage.humanReadable(sizeInBytes);
-            progressTracker.logInfo(formatWithLocale("Actual memory usage of the loaded graph: %s", memoryUsage));
+            progressTracker().logInfo(formatWithLocale("Actual memory usage of the loaded graph: %s", memoryUsage));
         }
     }
+
+    protected abstract ProgressTracker progressTracker();
 }

core/src/main/java/org/neo4j/gds/api/GraphStoreFactory.java

@@ -24,7 +24,6 @@
 import org.neo4j.gds.core.GraphDimensions;
 import org.neo4j.gds.core.loading.Capabilities;
 import org.neo4j.gds.core.utils.mem.MemoryEstimation;
-import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
 
 /**
  * The Abstract Factory defines the construction of the graph
@@ -46,7 +45,6 @@ public interface Supplier {
     protected final Capabilities capabilities;
     protected final GraphLoaderContext loadingContext;
     protected final GraphDimensions dimensions;
-    protected final ProgressTracker progressTracker;
 
     public GraphStoreFactory(
         CONFIG graphProjectConfig,
@@ -58,7 +56,6 @@ public GraphStoreFactory(
         this.capabilities = capabilities;
         this.loadingContext = loadingContext;
         this.dimensions = dimensions;
-        this.progressTracker = initProgressTracker();
     }
 
     public abstract STORE build();
@@ -79,8 +76,6 @@ public CONFIG graphProjectConfig() {
         return graphProjectConfig;
     }
 
-    protected abstract ProgressTracker initProgressTracker();
-
     @ValueClass
     public interface ImportResult<STORE extends GraphStore> {
         STORE graphStore();

core/src/main/java/org/neo4j/gds/config/GraphProjectFromCypherConfig.java

@@ -80,14 +80,14 @@ default GraphStoreFactory.Supplier graphStoreFactory() {
         return new GraphStoreFactory.Supplier() {
             @Override
             public GraphStoreFactory<? extends GraphStore, ? extends GraphProjectConfig> get(GraphLoaderContext loaderContext) {
-                return new CypherFactory(GraphProjectFromCypherConfig.this, loaderContext);
+                return CypherFactory.createWithDerivedDimensions(GraphProjectFromCypherConfig.this, loaderContext);
             }
 
             @Override
             public GraphStoreFactory<? extends GraphStore, ? extends GraphProjectConfig> getWithDimension(
                 GraphLoaderContext loaderContext, GraphDimensions graphDimensions
             ) {
-                return new CypherFactory(GraphProjectFromCypherConfig.this, loaderContext, graphDimensions);
+                return CypherFactory.createWithBaseDimensions(GraphProjectFromCypherConfig.this, loaderContext, graphDimensions);
             }
         };
     }