Remote Steiner Tree stats

MINOR

Author: IoannisPanagiotas

procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/SteinerTreeResultBuilderForStatsMode.java

@@ -41,18 +41,21 @@ public Stream<SteinerStatsResult> build(
         Optional<SteinerTreeResult> result,
         AlgorithmProcessingTimings timings
     ) {
-        var builder = new SteinerStatsResult.Builder();
+        if (result.isEmpty()) {
+            return Stream.of(SteinerStatsResult.emptyFrom(timings, configuration.toMap()));
+        }
+
+        var spanningTree = result.get();
+        return Stream.of(
+            new SteinerStatsResult(
+            timings.preProcessingMillis,
+            timings.computeMillis,
+            spanningTree.effectiveNodeCount(),
+            spanningTree.effectiveTargetNodesCount(),
+            spanningTree.totalCost(),
+            configuration.toMap()
+        )
+        );
 
-        builder
-            .withConfig(configuration)
-            .withComputeMillis(timings.computeMillis)
-            .withPreProcessingMillis(timings.preProcessingMillis);
-
-        result.ifPresent(r -> builder
-            .withEffectiveNodeCount(r.effectiveNodeCount())
-            .withTotalWeight(r.totalCost())
-            .withEffectiveTargetNodesCount(r.effectiveTargetNodesCount()));
-
-        return Stream.of(builder.build());
     }
 }

procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/SteinerTreeResultBuilderForWriteMode.java

@@ -29,6 +29,7 @@
 import java.util.Optional;
 
 class SteinerTreeResultBuilderForWriteMode implements ResultBuilder<SteinerTreeWriteConfig, SteinerTreeResult, SteinerWriteResult, RelationshipsWritten> {
+
     @Override
     public SteinerWriteResult build(
         Graph graph,
@@ -37,21 +38,22 @@ public SteinerWriteResult build(
         AlgorithmProcessingTimings timings,
         Optional<RelationshipsWritten> metadata
     ) {
-        var builder = new SteinerWriteResult.Builder();
-        builder.withConfig(steinerTreeWriteConfig);
-
-        builder.withPreProcessingMillis(timings.preProcessingMillis);
-        builder.withComputeMillis(timings.computeMillis);
-        builder.withWriteMillis(timings.sideEffectMillis);
+        if (steinerTreeResult.isEmpty()) {
+            return SteinerWriteResult.emptyFrom(timings, steinerTreeWriteConfig.toMap());
+        }
 
-        metadata.ifPresent(rw -> builder.withRelationshipsWritten(rw.value()));
+        var spanningTree = steinerTreeResult.get();
 
-        steinerTreeResult.ifPresent(result -> {
-            builder.withEffectiveNodeCount(result.effectiveNodeCount());
-            builder.withEffectiveTargetNodeCount(result.effectiveTargetNodesCount());
-            builder.withTotalWeight(result.totalCost());
-        });
-
-        return builder.build();
+        return new SteinerWriteResult(
+            timings.preProcessingMillis,
+            timings.computeMillis,
+            timings.sideEffectMillis,
+            spanningTree.effectiveNodeCount(),
+            spanningTree.effectiveTargetNodesCount(),
+            spanningTree.totalCost(),
+            metadata.get().value(),
+            steinerTreeWriteConfig.toMap()
+        );
     }
+
 }

procedures/algorithms-facade/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/stubs/SteinerTreeResultBuilderForMutateMode.java

@@ -38,21 +38,21 @@ public SteinerMutateResult build(
         AlgorithmProcessingTimings timings,
         Optional<RelationshipsWritten> metadata
     ) {
-        var builder = new SteinerMutateResult.Builder();
-        builder.withConfig(steinerTreeMutateConfig);
+        if (steinerTreeResult.isEmpty()) {
+            return SteinerMutateResult.emptyFrom(timings, steinerTreeMutateConfig.toMap());
+        }
 
-        builder.withPreProcessingMillis(timings.preProcessingMillis);
-        builder.withComputeMillis(timings.computeMillis);
-        builder.withMutateMillis(timings.sideEffectMillis);
+        var spanningTree = steinerTreeResult.get();
 
-        metadata.ifPresent(rw -> builder.withRelationshipsWritten(rw.value()));
-
-        steinerTreeResult.ifPresent(result -> {
-            builder.withEffectiveNodeCount(result.effectiveNodeCount());
-            builder.withEffectiveTargetNodeCount(result.effectiveTargetNodesCount());
-            builder.withTotalWeight(result.totalCost());
-        });
-
-        return builder.build();
+        return new SteinerMutateResult(
+            timings.preProcessingMillis,
+            timings.computeMillis,
+            timings.sideEffectMillis,
+            spanningTree.effectiveNodeCount(),
+            spanningTree.effectiveTargetNodesCount(),
+            spanningTree.totalCost(),
+            metadata.get().value(),
+            steinerTreeMutateConfig.toMap()
+        );
     }
 }

procedures/facade-api/path-finding-facade-api/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/SpanningTreeMutateResult.java

@@ -30,14 +30,13 @@ public record SpanningTreeMutateResult(
         long mutateMillis,
         long effectiveNodeCount,
         long relationshipsWritten,
-        double totalCost,
+        double totalWeight,
         Map<String, Object> configuration
     )  implements ModeResult {
 
     public static  SpanningTreeMutateResult emptyFrom(
         AlgorithmProcessingTimings timings,
-        Map<String, Object> configuration
-    )
+        Map<String, Object> configuration)
     {
         return new SpanningTreeMutateResult(
             timings.preProcessingMillis,

procedures/facade-api/path-finding-facade-api/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/SpanningTreeWriteResult.java

@@ -30,14 +30,13 @@ public record SpanningTreeWriteResult(
         long writeMillis,
         long effectiveNodeCount,
         long relationshipsWritten,
-        double totalCost,
+        double totalWeight,
         Map<String, Object> configuration
     ) implements ModeResult {
 
     public static  SpanningTreeWriteResult emptyFrom(
         AlgorithmProcessingTimings timings,
-        Map<String, Object> configuration
-    )
+        Map<String, Object> configuration)
     {
         return new SpanningTreeWriteResult(
             timings.preProcessingMillis,

procedures/facade-api/path-finding-facade-api/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/SteinerMutateResult.java

@@ -19,64 +19,34 @@
  */
 package org.neo4j.gds.procedures.algorithms.pathfinding;
 
-import org.neo4j.gds.result.AbstractResultBuilder;
+import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
+import org.neo4j.gds.procedures.algorithms.results.ModeResult;
 
 import java.util.Map;
 
-public final class SteinerMutateResult extends SteinerStatsResult {
-
-
-    public final long mutateMillis;
-    public final long relationshipsWritten;
-
-    public SteinerMutateResult(
+public record SteinerMutateResult(
         long preProcessingMillis,
         long computeMillis,
         long mutateMillis,
         long effectiveNodeCount,
         long effectiveTargetNodesCount,
-        double totalCost,
+        double totalWeight,
         long relationshipsWritten,
         Map<String, Object> configuration
-    ) {
-        super(preProcessingMillis, computeMillis, effectiveNodeCount, effectiveTargetNodesCount, totalCost, configuration);
-        this.mutateMillis = mutateMillis;
-        this.relationshipsWritten = relationshipsWritten;
+    ) implements ModeResult {
+
+    public static SteinerMutateResult emptyFrom(AlgorithmProcessingTimings timings, Map<String, Object> configuration)
+    {
+        return new SteinerMutateResult(
+            timings.preProcessingMillis,
+            timings.computeMillis,
+            0,
+            0,
+            0,
+            0d,
+            0,
+            configuration
+        );
     }
 
-    public static class Builder extends AbstractResultBuilder<SteinerMutateResult> {
-
-        long effectiveNodeCount;
-        long effectiveTargetNodesCount;
-        double totalWeight;
-
-        public Builder withEffectiveNodeCount(long effectiveNodeCount) {
-            this.effectiveNodeCount = effectiveNodeCount;
-            return this;
-        }
-
-        public Builder withEffectiveTargetNodeCount(long effectiveTargetNodesCount) {
-            this.effectiveTargetNodesCount = effectiveTargetNodesCount;
-            return this;
-        }
-
-        public Builder withTotalWeight(double totalWeight) {
-            this.totalWeight = totalWeight;
-            return this;
-        }
-
-        @Override
-        public SteinerMutateResult build() {
-            return new SteinerMutateResult(
-                preProcessingMillis,
-                computeMillis,
-                mutateMillis,
-                effectiveNodeCount,
-                effectiveTargetNodesCount,
-                totalWeight,
-                relationshipsWritten,
-                config.toMap()
-            );
-        }
-    }
 }

procedures/facade-api/path-finding-facade-api/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/SteinerStatsResult.java

@@ -19,63 +19,29 @@
  */
 package org.neo4j.gds.procedures.algorithms.pathfinding;
 
-import org.neo4j.gds.procedures.algorithms.results.StandardModeResult;
-import org.neo4j.gds.result.AbstractResultBuilder;
+import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
+import org.neo4j.gds.procedures.algorithms.results.ModeResult;
 
 import java.util.Map;
 
-public class SteinerStatsResult extends StandardModeResult {
-
-    public final long effectiveNodeCount;
-    public final long effectiveTargetNodesCount;
-    public final double totalWeight;
-
-    public SteinerStatsResult(
+public record SteinerStatsResult(
         long preProcessingMillis,
         long computeMillis,
         long effectiveNodeCount,
         long effectiveTargetNodesCount,
         double totalWeight,
         Map<String, Object> configuration
-    ) {
-        super(preProcessingMillis, computeMillis, configuration);
-        this.effectiveNodeCount = effectiveNodeCount;
-        this.totalWeight = totalWeight;
-        this.effectiveTargetNodesCount = effectiveTargetNodesCount;
-    }
-
-    public static final class Builder extends AbstractResultBuilder<SteinerStatsResult> {
-
-        private long effectiveNodeCount;
-        private double totalWeight;
-        private long effectiveTargetNodesCount;
-
-        @Override
-        public SteinerStatsResult build() {
-            return new SteinerStatsResult(
-                preProcessingMillis,
-                computeMillis,
-                effectiveNodeCount,
-                effectiveTargetNodesCount,
-                totalWeight,
-                config.toMap()
-            );
-        }
-
-        public Builder withEffectiveNodeCount(long effectiveNodeCount) {
-            this.effectiveNodeCount = effectiveNodeCount;
-            return this;
-        }
-
-        public Builder withTotalWeight(double totalWeight) {
-            this.totalWeight = totalWeight;
-            return this;
-        }
-
-        public Builder withEffectiveTargetNodesCount(long effectiveTargetNodesCount) {
-            this.effectiveTargetNodesCount = effectiveTargetNodesCount;
-            return this;
-        }
-
+    ) implements ModeResult {
+
+    static SteinerStatsResult emptyFrom(AlgorithmProcessingTimings timings, Map<String, Object> configuration)
+    {
+        return  new SteinerStatsResult(
+            timings.preProcessingMillis,
+            timings.computeMillis,
+            0,
+            0,
+            0d,
+            configuration
+        );
     }
 }

procedures/facade-api/path-finding-facade-api/src/main/java/org/neo4j/gds/procedures/algorithms/pathfinding/SteinerWriteResult.java

@@ -19,64 +19,33 @@
  */
 package org.neo4j.gds.procedures.algorithms.pathfinding;
 
-import org.neo4j.gds.result.AbstractResultBuilder;
+import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
+import org.neo4j.gds.procedures.algorithms.results.ModeResult;
 
 import java.util.Map;
 
-public final class SteinerWriteResult extends SteinerStatsResult {
-
-
-    public final long writeMillis;
-    public final long relationshipsWritten;
-
-    public SteinerWriteResult(
+public record SteinerWriteResult(
         long preProcessingMillis,
         long computeMillis,
         long writeMillis,
         long effectiveNodeCount,
         long effectiveTargetNodesCount,
-        double totalCost,
+        double totalWeight,
         long relationshipsWritten,
         Map<String, Object> configuration
-    ) {
-        super(preProcessingMillis, computeMillis, effectiveNodeCount, effectiveTargetNodesCount, totalCost, configuration);
-        this.writeMillis = writeMillis;
-        this.relationshipsWritten = relationshipsWritten;
-    }
-
-    public static class Builder extends AbstractResultBuilder<SteinerWriteResult> {
-
-        long effectiveNodeCount;
-        long effectiveTargetNodesCount;
-        double totalWeight;
-
-        public Builder withEffectiveNodeCount(long effectiveNodeCount) {
-            this.effectiveNodeCount = effectiveNodeCount;
-            return this;
-        }
-
-        public Builder withEffectiveTargetNodeCount(long effectiveTargetNodesCount) {
-            this.effectiveTargetNodesCount = effectiveTargetNodesCount;
-            return this;
-        }
-
-        public Builder withTotalWeight(double totalWeight) {
-            this.totalWeight = totalWeight;
-            return this;
-        }
-
-        @Override
-        public SteinerWriteResult build() {
-            return new SteinerWriteResult(
-                preProcessingMillis,
-                computeMillis,
-                writeMillis,
-                effectiveNodeCount,
-                effectiveTargetNodesCount,
-                totalWeight,
-                relationshipsWritten,
-                config.toMap()
-            );
-        }
+    ) implements ModeResult{
+
+    static SteinerWriteResult emptyFrom(AlgorithmProcessingTimings timings, Map<String, Object> configuration)
+    {
+        return new SteinerWriteResult(
+            timings.preProcessingMillis,
+            timings.computeMillis,
+            0,
+            0,
+            0,
+            0d,
+            0,
+            configuration
+        );
     }
 }