Merge pull request #10308 from IoannisPanagiotas/remote-scale-props

Remote scale props

Author: IoannisPanagiotas

pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/CollapsePathStub.java

@@ -26,6 +26,6 @@
 
 public class CollapsePathStub extends AbstractStub<CollapsePathConfig, CollapsePathMutateResult> {
     protected MutateStub<CollapsePathConfig, CollapsePathMutateResult> stub(AlgorithmsProcedureFacade facade) {
-        return facade.miscellaneous().collapsePathMutateStub();
+        return facade.miscellaneous().stubs().collapsePath();
     }
 }

pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/IndexInverseStub.java

@@ -26,6 +26,6 @@
 
 public class IndexInverseStub extends AbstractStub<InverseRelationshipsConfig, IndexInverseMutateResult> {
     protected MutateStub<InverseRelationshipsConfig, IndexInverseMutateResult> stub(AlgorithmsProcedureFacade facade) {
-        return facade.miscellaneous().indexInverseMutateStub();
+        return facade.miscellaneous().stubs().indexInverse();
     }
 }

pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/ScalePropertiesStub.java

@@ -26,6 +26,6 @@
 
 public class ScalePropertiesStub extends AbstractStub<ScalePropertiesMutateConfig, ScalePropertiesMutateResult> {
     protected MutateStub<ScalePropertiesMutateConfig, ScalePropertiesMutateResult> stub(AlgorithmsProcedureFacade facade) {
-        return facade.miscellaneous().scalePropertiesMutateStub();
+        return facade.miscellaneous().stubs().scaleProperties();
     }
 }

pipeline/src/main/java/org/neo4j/gds/ml/pipeline/stubs/ToUndirectedStub.java

@@ -26,6 +26,6 @@
 
 public class ToUndirectedStub extends AbstractStub<ToUndirectedConfig, ToUndirectedMutateResult> {
     protected MutateStub<ToUndirectedConfig, ToUndirectedMutateResult> stub(AlgorithmsProcedureFacade facade) {
-        return facade.miscellaneous().toUndirectedMutateStub();
+        return facade.miscellaneous().stubs().toUndirected();
     }
 }

proc/misc/src/main/java/org/neo4j/gds/indexInverse/IndexInverseProc.java

@@ -46,7 +46,7 @@ public Stream<IndexInverseMutateResult> mutate(
         @Name(value = "graphName") String graphName,
         @Name(value = "configuration", defaultValue = "{}") Map<String, Object> configuration
     ) {
-        return facade.algorithms().miscellaneous().indexInverseMutateStub().execute(graphName, configuration);
+        return facade.algorithms().miscellaneous().indexInverse(graphName, configuration);
     }
 
     @Internal // waiting for PM decision
@@ -56,6 +56,6 @@ public Stream<MemoryEstimateResult> estimate(
         @Name(value = "graphNameOrConfiguration") Object graphNameOrConfiguration,
         @Name(value = "algoConfiguration") Map<String, Object> algoConfiguration
     ) {
-        return facade.algorithms().miscellaneous().indexInverseMutateStub().estimate(graphNameOrConfiguration, algoConfiguration);
+        return facade.algorithms().miscellaneous().indexInverseEstimate(graphNameOrConfiguration, algoConfiguration);
     }
 }

proc/misc/src/main/java/org/neo4j/gds/scaling/ScalePropertiesMutateProc.java

@@ -45,7 +45,7 @@ public Stream<ScalePropertiesMutateResult> mutate(
         @Name(value = "graphName") String graphName,
         @Name(value = "configuration", defaultValue = "{}") Map<String, Object> configuration
     ) {
-        return facade.algorithms().miscellaneous().scalePropertiesMutateStub().execute(graphName, configuration);
+        return facade.algorithms().miscellaneous().scalePropertiesMutate(graphName, configuration);
     }
 
     @Procedure(value = "gds.scaleProperties.mutate.estimate", mode = READ)
@@ -54,7 +54,7 @@ public Stream<MemoryEstimateResult> estimate(
         @Name(value = "graphNameOrConfiguration") Object graphName,
         @Name(value = "algoConfiguration") Map<String, Object> configuration
     ) {
-        return facade.algorithms().miscellaneous().scalePropertiesMutateStub().estimate(graphName, configuration);
+        return facade.algorithms().miscellaneous().scalePropertiesMutateEstimate(graphName, configuration);
     }
 
     @Internal
@@ -67,6 +67,6 @@ public Stream<ScalePropertiesMutateResult> alphaMutate(
     ) {
         facade.deprecatedProcedures().called("gds.alpha.scaleProperties.mutate");
 
-        return facade.algorithms().miscellaneous().alphaScalePropertiesMutateStub().execute(graphName, configuration);
+        return facade.algorithms().miscellaneous().alphaScalePropertiesMutate(graphName, configuration);
     }
 }

proc/misc/src/main/java/org/neo4j/gds/undirected/ToUndirectedProc.java

@@ -63,7 +63,7 @@ public Stream<ToUndirectedMutateResult> mutate(
         @Name(value = "graphName") String graphName,
         @Name(value = "configuration", defaultValue = "{}") Map<String, Object> configuration
     ) {
-        return facade.algorithms().miscellaneous().toUndirectedMutateStub().execute(graphName, configuration);
+        return facade.algorithms().miscellaneous().toUndirected(graphName, configuration);
     }
 
     @Internal
@@ -90,6 +90,6 @@ public Stream<MemoryEstimateResult> estimate(
         @Name(value = "graphNameOrConfiguration") Object graphNameOrConfiguration,
         @Name(value = "algoConfiguration") Map<String, Object> algoConfiguration
     ) {
-        return facade.algorithms().miscellaneous().toUndirectedMutateStub().estimate(graphNameOrConfiguration, algoConfiguration);
+        return facade.algorithms().miscellaneous().toUndirectedEstimate(graphNameOrConfiguration, algoConfiguration);
     }
 }

proc/misc/src/main/java/org/neo4j/gds/walking/CollapsePathMutateProc.java

@@ -43,7 +43,7 @@ public Stream<CollapsePathMutateResult> mutate(
         @Name(value = "graphName") String graphName,
         @Name(value = "configuration", defaultValue = "{}") Map<String, Object> configuration
     ) {
-        return facade.algorithms().miscellaneous().collapsePathMutateStub().execute(graphName, configuration);
+        return facade.algorithms().miscellaneous().collapsePathMutate(graphName, configuration);
     }
 
     @Procedure(name = "gds.beta.collapsePath.mutate", mode = READ, deprecatedBy = "gds.collapsePath.mutate")

procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/miscellaneous/LocalMiscellaneousProcedureFacade.java

@@ -28,14 +28,11 @@
 import org.neo4j.gds.applications.algorithms.miscellaneous.MiscellaneousApplicationsStreamModeBusinessFacade;
 import org.neo4j.gds.applications.algorithms.miscellaneous.MiscellaneousApplicationsWriteModeBusinessFacade;
 import org.neo4j.gds.procedures.algorithms.configuration.UserSpecificConfigurationParser;
-import org.neo4j.gds.procedures.algorithms.miscellaneous.stubs.CollapsePathMutateStub;
-import org.neo4j.gds.procedures.algorithms.miscellaneous.stubs.IndexInverseMutateStub;
 import org.neo4j.gds.procedures.algorithms.miscellaneous.stubs.LocalCollapsePathMutateStub;
 import org.neo4j.gds.procedures.algorithms.miscellaneous.stubs.LocalIndexInverseMutateStub;
 import org.neo4j.gds.procedures.algorithms.miscellaneous.stubs.LocalScalePropertiesMutateStub;
 import org.neo4j.gds.procedures.algorithms.miscellaneous.stubs.LocalToUndirectedMutateStub;
-import org.neo4j.gds.procedures.algorithms.miscellaneous.stubs.ScalePropertiesMutateStub;
-import org.neo4j.gds.procedures.algorithms.miscellaneous.stubs.ToUndirectedMutateStub;
+import org.neo4j.gds.procedures.algorithms.miscellaneous.stubs.MiscellaneousStubs;
 import org.neo4j.gds.procedures.algorithms.stubs.GenericStub;
 import org.neo4j.gds.scaleproperties.AlphaScalePropertiesMutateConfig;
 import org.neo4j.gds.scaleproperties.AlphaScalePropertiesStreamConfig;
@@ -51,11 +48,7 @@ public final class LocalMiscellaneousProcedureFacade implements MiscellaneousPro
     private final ProcedureReturnColumns procedureReturnColumns;
 
     //stubs
-    private final ScalePropertiesMutateStub alphaScalePropertiesMutateStub;
-    private final CollapsePathMutateStub collapsePathMutateStub;
-    private final IndexInverseMutateStub indexInverseMutateStub;
-    private final ScalePropertiesMutateStub scalePropertiesMutateStub;
-    private final ToUndirectedMutateStub toUndirectedMutateStub;
+    private final MiscellaneousStubs stubs;
 
     //
     private final MiscellaneousApplicationsEstimationModeBusinessFacade estimationModeBusinessFacade;
@@ -68,23 +61,15 @@ public final class LocalMiscellaneousProcedureFacade implements MiscellaneousPro
 
     private LocalMiscellaneousProcedureFacade(
         ProcedureReturnColumns procedureReturnColumns,
-        ScalePropertiesMutateStub alphaScalePropertiesMutateStub,
-        CollapsePathMutateStub collapsePathMutateStub,
-        IndexInverseMutateStub indexInverseMutateStub,
-        ScalePropertiesMutateStub scalePropertiesMutateStub,
-        ToUndirectedMutateStub toUndirectedMutateStub,
+        MiscellaneousStubs stubs,
         MiscellaneousApplicationsEstimationModeBusinessFacade estimationModeBusinessFacade,
         MiscellaneousApplicationsStatsModeBusinessFacade statsModeBusinessFacade,
         MiscellaneousApplicationsStreamModeBusinessFacade streamModeBusinessFacade,
         MiscellaneousApplicationsWriteModeBusinessFacade writeModeBusinessFacade,
         UserSpecificConfigurationParser configurationParser
     ) {
         this.procedureReturnColumns = procedureReturnColumns;
-        this.alphaScalePropertiesMutateStub = alphaScalePropertiesMutateStub;
-        this.collapsePathMutateStub = collapsePathMutateStub;
-        this.indexInverseMutateStub = indexInverseMutateStub;
-        this.scalePropertiesMutateStub = scalePropertiesMutateStub;
-        this.toUndirectedMutateStub = toUndirectedMutateStub;
+        this.stubs = stubs;
         this.estimationModeBusinessFacade = estimationModeBusinessFacade;
         this.statsModeBusinessFacade = statsModeBusinessFacade;
         this.streamModeBusinessFacade = streamModeBusinessFacade;
@@ -129,13 +114,17 @@ public static LocalMiscellaneousProcedureFacade create(
             applicationsFacade.miscellaneous().mutate()
         );
 
-        return new LocalMiscellaneousProcedureFacade(
-            procedureReturnColumns,
-            alphaScalePropertiesMutateStub,
+        var stubs =  new MiscellaneousStubs(
             collapsePathMutateStub,
             indexInverseMutateStub,
+            alphaScalePropertiesMutateStub,
             scalePropertiesMutateStub,
-            toUndirectedMutateStub,
+            toUndirectedMutateStub
+        );
+
+        return new LocalMiscellaneousProcedureFacade(
+            procedureReturnColumns,
+            stubs,
             applicationsFacade.miscellaneous().estimate(),
             applicationsFacade.miscellaneous().stats(),
             applicationsFacade.miscellaneous().stream(),
@@ -144,9 +133,10 @@ public static LocalMiscellaneousProcedureFacade create(
         );
     }
 
+
     @Override
-    public ScalePropertiesMutateStub alphaScalePropertiesMutateStub() {
-        return alphaScalePropertiesMutateStub;
+    public MiscellaneousStubs stubs() {
+        return stubs;
     }
 
     @Override
@@ -164,19 +154,18 @@ public Stream<ScalePropertiesStreamResult> alphaScalePropertiesStream(
     }
 
     @Override
-    public CollapsePathMutateStub collapsePathMutateStub() {
-        return collapsePathMutateStub;
+    public Stream<ScalePropertiesMutateResult> alphaScalePropertiesMutate(
+        String graphName,
+        Map<String, Object> configuration
+    ) {
+        return  stubs.alphaScaleProperties().execute(graphName,configuration);
     }
 
     @Override
-    public IndexInverseMutateStub indexInverseMutateStub() {
-        return indexInverseMutateStub;
+    public Stream<CollapsePathMutateResult> collapsePathMutate(String graphName, Map<String, Object> configuration) {
+        return stubs.collapsePath().execute(graphName,configuration);
     }
 
-    @Override
-    public ScalePropertiesMutateStub scalePropertiesMutateStub() {
-        return scalePropertiesMutateStub;
-    }
 
     @Override
     public Stream<ScalePropertiesStatsResult> scalePropertiesStats(
@@ -238,6 +227,22 @@ public Stream<MemoryEstimateResult> scalePropertiesStreamEstimate(
         return Stream.of(result);
     }
 
+    @Override
+    public Stream<ScalePropertiesMutateResult> scalePropertiesMutate(
+        String graphName,
+        Map<String, Object> configuration
+    ) {
+        return stubs.scaleProperties().execute(graphName,configuration);
+    }
+
+    @Override
+    public Stream<MemoryEstimateResult> scalePropertiesMutateEstimate(
+        Object graphNameOrConfiguration,
+        Map<String, Object> algorithmConfiguration
+    ) {
+        return stubs.scaleProperties().estimate(graphNameOrConfiguration,algorithmConfiguration);
+    }
+
     @Override
     public Stream<ScalePropertiesWriteResult> scalePropertiesWrite(
         String graphName,
@@ -267,7 +272,29 @@ public Stream<MemoryEstimateResult> scalePropertiesWriteEstimate(
     }
 
     @Override
-    public ToUndirectedMutateStub toUndirectedMutateStub() {
-        return toUndirectedMutateStub;
+    public Stream<ToUndirectedMutateResult> toUndirected(String graphName, Map<String, Object> configuration) {
+        return stubs.toUndirected().execute(graphName,configuration);
+    }
+
+    @Override
+    public Stream<MemoryEstimateResult> toUndirectedEstimate(
+        Object graphNameOrConfiguration,
+        Map<String, Object> algorithmConfiguration
+    ) {
+        return stubs.toUndirected().estimate(graphNameOrConfiguration,algorithmConfiguration);
     }
+
+    @Override
+    public Stream<IndexInverseMutateResult> indexInverse(String graphName, Map<String, Object> configuration) {
+        return stubs.indexInverse().execute(graphName,configuration);
+    }
+
+    @Override
+    public Stream<MemoryEstimateResult> indexInverseEstimate(
+        Object graphNameOrConfiguration,
+        Map<String, Object> algorithmConfiguration
+    ) {
+        return stubs.indexInverse().estimate(graphNameOrConfiguration,algorithmConfiguration);
+    }
+
 }

procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/miscellaneous/ScalePropertiesResultBuilderForStreamMode.java

@@ -48,7 +48,7 @@ public Stream<ScalePropertiesStreamResult> build(
 
         return LongStream
             .range(0, graph.nodeCount())
-            .mapToObj(nodeId -> new ScalePropertiesStreamResult(
+            .mapToObj(nodeId ->  ScalePropertiesStreamResult.create(
                 graph.toOriginalNodeId(nodeId),
                 nodeProperties.doubleArrayValue(nodeId)
             ));