Merge pull request #10287 from vnickolov/remote-community-stats

remote community stats

Author: vnickolov

procedures/facade-api/community-facade-api/src/main/java/org/neo4j/gds/procedures/algorithms/community/K1ColoringStatsResult.java

@@ -24,34 +24,15 @@
 import java.util.Map;
 import java.util.stream.Stream;
 
-public class K1ColoringStatsResult {
-    public final long preProcessingMillis;
-    public final long computeMillis;
-
-    public final long nodeCount;
-    public final long colorCount;
-    public final long ranIterations;
-    public final boolean didConverge;
-
-    public Map<String, Object> configuration;
-
-    public K1ColoringStatsResult(
-        long preProcessingMillis,
-        long computeMillis,
-        long nodeCount,
-        long colorCount,
-        long ranIterations,
-        boolean didConverge,
-        Map<String, Object> configuration
-    ) {
-        this.preProcessingMillis = preProcessingMillis;
-        this.computeMillis = computeMillis;
-        this.nodeCount = nodeCount;
-        this.colorCount = colorCount;
-        this.ranIterations = ranIterations;
-        this.didConverge = didConverge;
-        this.configuration = configuration;
-    }
+public record K1ColoringStatsResult(
+    long preProcessingMillis,
+    long computeMillis,
+    long nodeCount,
+    long colorCount,
+    long ranIterations,
+    boolean didConverge,
+    Map<String, Object> configuration
+) {
 
     static Stream<K1ColoringStatsResult> emptyFrom(
         AlgorithmProcessingTimings timings,

procedures/facade-api/community-facade-api/src/main/java/org/neo4j/gds/procedures/algorithms/community/LeidenStatsResult.java

@@ -20,24 +20,25 @@
 package org.neo4j.gds.procedures.algorithms.community;
 
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
+import org.neo4j.gds.procedures.algorithms.results.StatsResult;
 
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 
 public record LeidenStatsResult(
-        long ranLevels,
-        boolean didConverge,
-        long nodeCount,
-        long communityCount,
-        Map<String, Object> communityDistribution,
-        double modularity,
-        List<Double> modularities,
-        long preProcessingMillis,
-        long computeMillis,
-        long postProcessingMillis,
-        Map<String, Object> configuration
-    ) {
+    long ranLevels,
+    boolean didConverge,
+    long nodeCount,
+    long communityCount,
+    Map<String, Object> communityDistribution,
+    double modularity,
+    List<Double> modularities,
+    long preProcessingMillis,
+    long computeMillis,
+    long postProcessingMillis,
+    Map<String, Object> configuration
+) implements StatsResult {
 
     static LeidenStatsResult emptyFrom(AlgorithmProcessingTimings timings, Map<String, Object> configurationMap) {
         return new LeidenStatsResult(

procedures/facade-api/community-facade-api/src/main/java/org/neo4j/gds/procedures/algorithms/community/LocalClusteringCoefficientMutateResult.java

@@ -20,36 +20,40 @@
 package org.neo4j.gds.procedures.algorithms.community;
 
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
-import org.neo4j.gds.result.AbstractResultBuilder;
+import org.neo4j.gds.procedures.algorithms.results.MutateNodePropertiesResult;
 
 import java.util.Map;
 
-public final class LocalClusteringCoefficientMutateResult extends LocalClusteringCoefficientStatsResult {
-    public long mutateMillis;
-    public long nodePropertiesWritten;
+public record LocalClusteringCoefficientMutateResult(
+    double averageClusteringCoefficient,
+    long nodeCount,
+    long preProcessingMillis,
+    long computeMillis,
+    long mutateMillis,
+    long nodePropertiesWritten,
+    Map<String, Object> configuration,
+    long postProcessingMillis
+) implements MutateNodePropertiesResult {
 
     public LocalClusteringCoefficientMutateResult(
         double averageClusteringCoefficient,
-        long nodeCount,
+        long size,
         long preProcessingMillis,
         long computeMillis,
         long mutateMillis,
         long nodePropertiesWritten,
         Map<String, Object> configuration
     ) {
-        super(
+        this(
             averageClusteringCoefficient,
-            nodeCount,
+            size,
             preProcessingMillis,
             computeMillis,
-            configuration
+            mutateMillis,
+            nodePropertiesWritten,
+            configuration,
+            0
         );
-        this.mutateMillis = mutateMillis;
-        this.nodePropertiesWritten = nodePropertiesWritten;
-    }
-
-    public static Builder builder() {
-        return new Builder();
     }
 
     public static LocalClusteringCoefficientMutateResult emptyFrom(
@@ -63,30 +67,8 @@ public static LocalClusteringCoefficientMutateResult emptyFrom(
             timings.computeMillis,
             timings.sideEffectMillis,
             0,
-            configurationMap
+            configurationMap,
+            0
         );
     }
-
-    public static class Builder extends AbstractResultBuilder<LocalClusteringCoefficientMutateResult> {
-
-        double averageClusteringCoefficient = 0;
-
-        public Builder withAverageClusteringCoefficient(double averageClusteringCoefficient) {
-            this.averageClusteringCoefficient = averageClusteringCoefficient;
-            return this;
-        }
-
-        @Override
-        public LocalClusteringCoefficientMutateResult build() {
-            return new LocalClusteringCoefficientMutateResult(
-                averageClusteringCoefficient,
-                nodeCount,
-                preProcessingMillis,
-                computeMillis,
-                mutateMillis,
-                nodePropertiesWritten,
-                config.toMap()
-            );
-        }
-    }
 }

procedures/facade-api/community-facade-api/src/main/java/org/neo4j/gds/procedures/algorithms/community/LocalClusteringCoefficientStatsResult.java

@@ -20,35 +20,33 @@
 package org.neo4j.gds.procedures.algorithms.community;
 
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
-import org.neo4j.gds.result.AbstractResultBuilder;
+import org.neo4j.gds.procedures.algorithms.results.StatsResult;
 
 import java.util.Map;
 
-public class LocalClusteringCoefficientStatsResult {
-    public final double averageClusteringCoefficient;
-    public final long nodeCount;
-    public final long preProcessingMillis;
-    public final long computeMillis;
-    public final Map<String, Object> configuration;
-    public final long postProcessingMillis;
-
+public record LocalClusteringCoefficientStatsResult(
+    double averageClusteringCoefficient,
+    long nodeCount,
+    long preProcessingMillis,
+    long computeMillis,
+    Map<String, Object> configuration,
+    long postProcessingMillis
+) implements StatsResult {
     public LocalClusteringCoefficientStatsResult(
         double averageClusteringCoefficient,
-        long nodeCount,
+        long size,
         long preProcessingMillis,
         long computeMillis,
         Map<String, Object> configuration
     ) {
-        this.averageClusteringCoefficient = averageClusteringCoefficient;
-        this.nodeCount = nodeCount;
-        this.postProcessingMillis = 0;  // post-processing is instant for TC
-        this.preProcessingMillis = preProcessingMillis;
-        this.computeMillis = computeMillis;
-        this.configuration = configuration;
-    }
-
-    public static Builder statsBuilder() {
-        return new Builder();
+        this(
+            averageClusteringCoefficient,
+            size,
+            preProcessingMillis,
+            computeMillis,
+            configuration,
+            0
+        );
     }
 
     static LocalClusteringCoefficientStatsResult emptyFrom(
@@ -60,28 +58,8 @@ static LocalClusteringCoefficientStatsResult emptyFrom(
             0,
             timings.preProcessingMillis,
             timings.computeMillis,
-            configurationMap
+            configurationMap,
+            0
         );
     }
-
-    public static class Builder extends AbstractResultBuilder<LocalClusteringCoefficientStatsResult> {
-
-        double averageClusteringCoefficient = 0;
-
-        public Builder withAverageClusteringCoefficient(double averageClusteringCoefficient) {
-            this.averageClusteringCoefficient = averageClusteringCoefficient;
-            return this;
-        }
-
-        @Override
-        public LocalClusteringCoefficientStatsResult build() {
-            return new LocalClusteringCoefficientStatsResult(
-                averageClusteringCoefficient,
-                nodeCount,
-                preProcessingMillis,
-                computeMillis,
-                config.toMap()
-            );
-        }
-    }
 }

procedures/facade-api/community-facade-api/src/main/java/org/neo4j/gds/procedures/algorithms/community/LocalClusteringCoefficientWriteResult.java

@@ -20,13 +20,20 @@
 package org.neo4j.gds.procedures.algorithms.community;
 
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
-import org.neo4j.gds.result.AbstractResultBuilder;
+import org.neo4j.gds.procedures.algorithms.results.WriteNodePropertiesResult;
 
 import java.util.Map;
 
-public final class LocalClusteringCoefficientWriteResult extends LocalClusteringCoefficientStatsResult {
-    public long writeMillis;
-    public long nodePropertiesWritten;
+public record LocalClusteringCoefficientWriteResult(
+    double averageClusteringCoefficient,
+    long nodeCount,
+    long preProcessingMillis,
+    long computeMillis,
+    long writeMillis,
+    long nodePropertiesWritten,
+    Map<String, Object> configuration,
+    long postProcessingMillis
+) implements WriteNodePropertiesResult {
 
     public LocalClusteringCoefficientWriteResult(
         double averageClusteringCoefficient,
@@ -37,48 +44,31 @@ public LocalClusteringCoefficientWriteResult(
         long nodePropertiesWritten,
         Map<String, Object> configuration
     ) {
-        super(
+        this(
             averageClusteringCoefficient,
             nodeCount,
             preProcessingMillis,
             computeMillis,
-            configuration
+            writeMillis,
+            nodePropertiesWritten,
+            configuration,
+            0
         );
-        this.writeMillis = writeMillis;
-        this.nodePropertiesWritten = nodePropertiesWritten;
     }
 
-    static LocalClusteringCoefficientWriteResult emptyFrom(AlgorithmProcessingTimings timings, Map<String, Object> configurationMap) {
+    static LocalClusteringCoefficientWriteResult emptyFrom(
+        AlgorithmProcessingTimings timings,
+        Map<String, Object> configurationMap
+    ) {
         return new LocalClusteringCoefficientWriteResult(
             0,
             0,
             timings.preProcessingMillis,
             timings.computeMillis,
             timings.sideEffectMillis,
             0,
-            configurationMap
+            configurationMap,
+            0
         );
     }
-
-    public static class Builder extends AbstractResultBuilder<LocalClusteringCoefficientWriteResult> {
-        double averageClusteringCoefficient = 0;
-
-        public Builder withAverageClusteringCoefficient(double averageClusteringCoefficient) {
-            this.averageClusteringCoefficient = averageClusteringCoefficient;
-            return this;
-        }
-
-        @Override
-        public LocalClusteringCoefficientWriteResult build() {
-            return new LocalClusteringCoefficientWriteResult(
-                averageClusteringCoefficient,
-                nodeCount,
-                preProcessingMillis,
-                computeMillis,
-                writeMillis,
-                nodePropertiesWritten,
-                config.toMap()
-            );
-        }
-    }
 }

procedures/facade-api/community-facade-api/src/main/java/org/neo4j/gds/procedures/algorithms/community/LouvainStatsResult.java

@@ -20,6 +20,7 @@
 package org.neo4j.gds.procedures.algorithms.community;
 
 import org.neo4j.gds.applications.algorithms.machinery.AlgorithmProcessingTimings;
+import org.neo4j.gds.procedures.algorithms.results.StatsResult;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -28,16 +29,16 @@
 import java.util.stream.Collectors;
 
 public record LouvainStatsResult(
-        double modularity,
-        List<Double> modularities,
-        long ranLevels,
-        long communityCount,
-        Map<String, Object> communityDistribution,
-        long preProcessingMillis,
-        long computeMillis,
-        long postProcessingMillis,
-        Map<String, Object> configuration
-    ) {
+    double modularity,
+    List<Double> modularities,
+    long ranLevels,
+    long communityCount,
+    Map<String, Object> communityDistribution,
+    long preProcessingMillis,
+    long computeMillis,
+    long postProcessingMillis,
+    Map<String, Object> configuration
+) implements StatsResult {
 
     static LouvainStatsResult emptyFrom(AlgorithmProcessingTimings timings, Map<String, Object> configurationMap) {
         return new LouvainStatsResult(