Convert TriangleCount proc results to records

Author: vnickolov

procedures/facade-api/community-facade-api/src/main/java/org/neo4j/gds/procedures/algorithms/community/TriangleCountMutateResult.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.MutateNodePropertiesResult;
 
 import java.util.Map;
 
-public class TriangleCountMutateResult extends TriangleCountStatsResult {
-    public long mutateMillis;
-    public long nodePropertiesWritten;
+public record TriangleCountMutateResult(
+    long globalTriangleCount,
+    long nodeCount,
+    long preProcessingMillis,
+    long computeMillis,
+    long mutateMillis,
+    long nodePropertiesWritten,
+    Map<String, Object> configuration,
+    long postProcessingMillis
+) implements MutateNodePropertiesResult {
 
     public TriangleCountMutateResult(
         long globalTriangleCount,
@@ -37,15 +44,16 @@ public TriangleCountMutateResult(
         long nodePropertiesWritten,
         Map<String, Object> configuration
     ) {
-        super(
+        this(
             globalTriangleCount,
             nodeCount,
             preProcessingMillis,
             computeMillis,
-            configuration
+            mutateMillis,
+            nodePropertiesWritten,
+            configuration,
+            0
         );
-        this.mutateMillis = mutateMillis;
-        this.nodePropertiesWritten = nodePropertiesWritten;
     }
 
     public static TriangleCountMutateResult emptyFrom(
@@ -59,29 +67,8 @@ public static TriangleCountMutateResult emptyFrom(
             timings.computeMillis,
             timings.sideEffectMillis,
             0,
-            configurationMap
+            configurationMap,
+            0
         );
     }
-
-    public static class Builder extends AbstractResultBuilder<TriangleCountMutateResult> {
-        long globalTriangleCount = 0;
-
-        public Builder withGlobalTriangleCount(long globalTriangleCount) {
-            this.globalTriangleCount = globalTriangleCount;
-            return this;
-        }
-
-        @Override
-        public TriangleCountMutateResult build() {
-            return new TriangleCountMutateResult(
-                globalTriangleCount,
-                nodeCount,
-                preProcessingMillis,
-                computeMillis,
-                mutateMillis,
-                nodePropertiesWritten,
-                config.toMap()
-            );
-        }
-    }
 }

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

@@ -20,58 +20,46 @@
 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 TriangleCountStatsResult {
-    public final long globalTriangleCount;
-    public final long nodeCount;
-    public final long preProcessingMillis;
-    public final long computeMillis;
-    public final long postProcessingMillis;
-    public final Map<String, Object> configuration;
-
+public record TriangleCountStatsResult(
+    long globalTriangleCount,
+    long nodeCount,
+    long preProcessingMillis,
+    long computeMillis,
+    Map<String, Object> configuration,
+    long postProcessingMillis
+) implements StatsResult {
     public TriangleCountStatsResult(
         long globalTriangleCount,
         long nodeCount,
         long preProcessingMillis,
         long computeMillis,
         Map<String, Object> configuration
     ) {
-        // post-processing is instant for TC
-        this.postProcessingMillis = 0;
-        this.preProcessingMillis = preProcessingMillis;
-        this.configuration = configuration;
-        this.computeMillis = computeMillis;
-        this.globalTriangleCount = globalTriangleCount;
-        this.nodeCount = nodeCount;
+        this(
+            globalTriangleCount,
+            nodeCount,
+            preProcessingMillis,
+            computeMillis,
+            configuration,
+            0 // post-processing is instant for TC
+        );
     }
 
     static TriangleCountStatsResult emptyFrom(
         AlgorithmProcessingTimings timings,
         Map<String, Object> configurationMap
     ) {
-        return new TriangleCountStatsResult(0, 0, timings.preProcessingMillis, timings.computeMillis, configurationMap);
-    }
-
-    public static class Builder extends AbstractResultBuilder<TriangleCountStatsResult> {
-        long globalTriangleCount = 0;
-
-        public Builder withGlobalTriangleCount(long globalTriangleCount) {
-            this.globalTriangleCount = globalTriangleCount;
-            return this;
-        }
-
-        @Override
-        public TriangleCountStatsResult build() {
-            return new TriangleCountStatsResult(
-                globalTriangleCount,
-                nodeCount,
-                preProcessingMillis,
-                computeMillis,
-                config.toMap()
-            );
-        }
+        return new TriangleCountStatsResult(
+            0,
+            0,
+            timings.preProcessingMillis,
+            timings.computeMillis,
+            configurationMap,
+            0
+        );
     }
 }

procedures/facade-api/community-facade-api/src/main/java/org/neo4j/gds/procedures/algorithms/community/TriangleCountWriteResult.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 class TriangleCountWriteResult extends TriangleCountStatsResult {
-    public long writeMillis;
-    public long nodePropertiesWritten;
+public record TriangleCountWriteResult(
+    long globalTriangleCount,
+    long nodeCount,
+    long preProcessingMillis,
+    long computeMillis,
+    long writeMillis,
+    long nodePropertiesWritten,
+    Map<String, Object> configuration,
+    long postProcessingMillis
+) implements WriteNodePropertiesResult {
 
     public TriangleCountWriteResult(
         long globalTriangleCount,
@@ -37,15 +44,16 @@ public TriangleCountWriteResult(
         long nodePropertiesWritten,
         Map<String, Object> configuration
     ) {
-        super(
+        this(
             globalTriangleCount,
             nodeCount,
             preProcessingMillis,
             computeMillis,
-            configuration
+            writeMillis,
+            nodePropertiesWritten,
+            configuration,
+            0
         );
-        this.writeMillis = writeMillis;
-        this.nodePropertiesWritten = nodePropertiesWritten;
     }
 
     static TriangleCountWriteResult emptyFrom(
@@ -59,29 +67,8 @@ static TriangleCountWriteResult emptyFrom(
             timings.computeMillis,
             timings.sideEffectMillis,
             0,
-            configurationMap
+            configurationMap,
+            0
         );
     }
-
-    public static class Builder extends AbstractResultBuilder<TriangleCountWriteResult> {
-        long globalTriangleCount = 0;
-
-        public Builder withGlobalTriangleCount(long globalTriangleCount) {
-            this.globalTriangleCount = globalTriangleCount;
-            return this;
-        }
-
-        @Override
-        public TriangleCountWriteResult build() {
-            return new TriangleCountWriteResult(
-                globalTriangleCount,
-                nodeCount,
-                preProcessingMillis,
-                computeMillis,
-                writeMillis,
-                nodePropertiesWritten,
-                config.toMap()
-            );
-        }
-    }
 }