Remote Spanning Tree stats

Author: IoannisPanagiotas

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

@@ -41,20 +41,20 @@ public Stream<SpanningTreeStatsResult> build(
         Optional<SpanningTree> result,
         AlgorithmProcessingTimings timings
     ) {
-        var builder = new SpanningTreeStatsResult.Builder();
 
         if (result.isEmpty()) {
-            return Stream.of(builder.build());
+            return Stream.of(SpanningTreeStatsResult.emptyFrom(timings, configuration.toMap()));
         }
 
         var spanningTree = result.get();
 
-        builder.withEffectiveNodeCount(spanningTree.effectiveNodeCount());
-        builder.withTotalWeight(spanningTree.totalWeight());
-
-        builder.withComputeMillis(timings.computeMillis);
-        builder.withPreProcessingMillis(timings.preProcessingMillis);
-        builder.withConfig(configuration);
-        return Stream.of(builder.build());
+        var statsResult = new SpanningTreeStatsResult(
+            timings.preProcessingMillis,
+            timings.computeMillis,
+            spanningTree.effectiveNodeCount(),
+            spanningTree.totalWeight(),
+            configuration.toMap()
+        );
+        return Stream.of(statsResult);
     }
 }

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

@@ -37,26 +37,20 @@ public SpanningTreeWriteResult build(
         AlgorithmProcessingTimings timings,
         Optional<RelationshipsWritten> metadata
     ) {
-        var builder = new SpanningTreeWriteResult.Builder();
-
         if (result.isEmpty()) {
-            return builder.build();
+            return SpanningTreeWriteResult.emptyFrom(timings, configuration.toMap());
         }
 
         var spanningTree = result.get();
 
-        builder
-            .withEffectiveNodeCount(spanningTree.effectiveNodeCount())
-            .withTotalWeight(spanningTree.totalWeight());
-
-        builder.withComputeMillis(timings.computeMillis);
-        builder.withPreProcessingMillis(timings.preProcessingMillis);
-        builder.withWriteMillis(timings.sideEffectMillis);
-
-        metadata.ifPresent(rw -> builder.withRelationshipsWritten(rw.value()));
-
-        builder.withConfig(configuration);
-
-        return builder.build();
+        return new SpanningTreeWriteResult(
+            timings.preProcessingMillis,
+            timings.computeMillis,
+            timings.sideEffectMillis,
+            spanningTree.effectiveNodeCount(),
+            metadata.get().value(),
+            spanningTree.totalWeight(),
+            configuration.toMap()
+        );
     }
 }

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

@@ -38,25 +38,22 @@ public SpanningTreeMutateResult build(
         AlgorithmProcessingTimings timings,
         Optional<RelationshipsWritten> metadata
     ) {
-        var builder = new SpanningTreeMutateResult.Builder();
 
         if (result.isEmpty()) {
-            return builder.build();
+            return SpanningTreeMutateResult.emptyFrom(timings, configuration.toMap());
         }
 
         var spanningTree = result.get();
 
-        builder.withEffectiveNodeCount(spanningTree.effectiveNodeCount());
-        builder.withTotalWeight(spanningTree.totalWeight());
+        return new SpanningTreeMutateResult(
+            timings.preProcessingMillis,
+            timings.computeMillis,
+            timings.sideEffectMillis,
+            spanningTree.effectiveNodeCount(),
+            metadata.get().value(),
+            spanningTree.totalWeight(),
+            configuration.toMap()
+        );
 
-        builder.withComputeMillis(timings.computeMillis);
-        builder.withPreProcessingMillis(timings.preProcessingMillis);
-        builder.withMutateMillis(timings.sideEffectMillis);
-
-        metadata.ifPresent(rw -> builder.withRelationshipsWritten(rw.value()));
-
-        builder.withConfig(configuration);
-
-        return builder.build();
     }
 }

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

@@ -19,51 +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 SpanningTreeMutateResult extends SpanningTreeStatsResult {
-    public final long mutateMillis;
-    public final long relationshipsWritten;
-
-    public SpanningTreeMutateResult(
+public record SpanningTreeMutateResult(
         long preProcessingMillis,
         long computeMillis,
         long mutateMillis,
         long effectiveNodeCount,
         long relationshipsWritten,
         double totalCost,
         Map<String, Object> configuration
-    ) {
-        super(preProcessingMillis, computeMillis, effectiveNodeCount, totalCost, configuration);
-        this.mutateMillis = mutateMillis;
-        this.relationshipsWritten = relationshipsWritten;
-    }
-
-    public static class Builder extends AbstractResultBuilder<SpanningTreeMutateResult> {
-        long effectiveNodeCount;
-        double totalWeight;
+    )  implements ModeResult {
 
-        public void withEffectiveNodeCount(long effectiveNodeCount) {
-            this.effectiveNodeCount = effectiveNodeCount;
-        }
-
-        public void withTotalWeight(double totalWeight) {
-            this.totalWeight = totalWeight;
-        }
-
-        @Override
-        public SpanningTreeMutateResult build() {
-            return new SpanningTreeMutateResult(
-                preProcessingMillis,
-                computeMillis,
-                mutateMillis,
-                effectiveNodeCount,
-                relationshipsWritten,
-                totalWeight,
-                config.toMap()
-            );
-        }
+    public static  SpanningTreeMutateResult emptyFrom(
+        AlgorithmProcessingTimings timings,
+        Map<String, Object> configuration
+    )
+    {
+        return new SpanningTreeMutateResult(
+            timings.preProcessingMillis,
+            timings.computeMillis,
+            0,
+            0,
+            0,
+            0,
+            configuration
+        );
     }
 }

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

@@ -19,50 +19,28 @@
  */
 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 SpanningTreeStatsResult extends StandardModeResult {
-    public final long effectiveNodeCount;
-    public final double totalWeight;
-
-    public SpanningTreeStatsResult(
+public record SpanningTreeStatsResult(
         long preProcessingMillis,
         long computeMillis,
         long effectiveNodeCount,
         double totalWeight,
         Map<String, Object> configuration
-    ) {
-        super(preProcessingMillis, computeMillis, configuration);
-        this.effectiveNodeCount = effectiveNodeCount;
-        this.totalWeight = totalWeight;
-    }
-
-    public static final class Builder extends AbstractResultBuilder<SpanningTreeStatsResult> {
-        private long effectiveNodeCount;
-        private double totalWeight;
-
-        @Override
-        public SpanningTreeStatsResult build() {
-            return new SpanningTreeStatsResult(
-                preProcessingMillis,
-                computeMillis,
-                effectiveNodeCount,
-                totalWeight,
-                config.toMap()
-            );
-        }
-
-        public Builder withEffectiveNodeCount(long effectiveNodeCount) {
-            this.effectiveNodeCount = effectiveNodeCount;
-            return this;
-        }
-
-        public Builder withTotalWeight(double totalWeight) {
-            this.totalWeight = totalWeight;
-            return this;
-        }
+    ) implements ModeResult {
+
+
+    static  SpanningTreeStatsResult emptyFrom(AlgorithmProcessingTimings timings, Map<String, Object> configuration)
+    {
+        return  new SpanningTreeStatsResult(
+            timings.preProcessingMillis,
+            timings.computeMillis,
+            0,
+            0,
+            configuration
+        );
     }
 }

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

@@ -19,53 +19,35 @@
  */
 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 SpanningTreeWriteResult extends SpanningTreeStatsResult {
-    public final long writeMillis;
-    public final long relationshipsWritten;
-
-    private SpanningTreeWriteResult(
+public record SpanningTreeWriteResult(
         long preProcessingMillis,
         long computeMillis,
         long writeMillis,
         long effectiveNodeCount,
         long relationshipsWritten,
         double totalCost,
         Map<String, Object> configuration
-    ) {
-        super(preProcessingMillis, computeMillis, effectiveNodeCount, totalCost, configuration);
-        this.writeMillis = writeMillis;
-        this.relationshipsWritten = relationshipsWritten;
-    }
-
-    public static class Builder extends AbstractResultBuilder<SpanningTreeWriteResult> {
-
-        long effectiveNodeCount;
-        double totalWeight;
+    ) implements ModeResult {
 
-        public Builder withEffectiveNodeCount(long effectiveNodeCount) {
-            this.effectiveNodeCount = effectiveNodeCount;
-            return this;
-        }
-
-        public void withTotalWeight(double totalWeight) {
-            this.totalWeight = totalWeight;
-        }
-
-        @Override
-        public SpanningTreeWriteResult build() {
-            return new SpanningTreeWriteResult(
-                preProcessingMillis,
-                computeMillis,
-                writeMillis,
-                effectiveNodeCount,
-                relationshipsWritten,
-                totalWeight,
-                config.toMap()
-            );
-        }
+    public static  SpanningTreeWriteResult emptyFrom(
+        AlgorithmProcessingTimings timings,
+        Map<String, Object> configuration
+    )
+    {
+        return new SpanningTreeWriteResult(
+            timings.preProcessingMillis,
+            timings.computeMillis,
+            0,
+            0,
+            0,
+            0,
+            configuration
+        );
     }
+
 }