Remove result statistics for triangle count

The computation has been added by accident and its
results have not been exposed via procedure results.
However, in combination with the maxDegree filter,
computing the statistics lead to an array index oo ex,
as filtered nodes returns a triangle count of -1.

Co-authored-by: Jacob Sznajdman <[email protected]>

Author: s1ck

proc/community/src/main/java/org/neo4j/graphalgo/triangle/TriangleCountCompanion.java

@@ -23,16 +23,11 @@
 import org.neo4j.graphalgo.core.utils.paged.AllocationTracker;
 import org.neo4j.graphalgo.core.utils.paged.HugeAtomicLongArray;
 import org.neo4j.graphalgo.core.write.PropertyTranslator;
-import org.neo4j.graphalgo.result.AbstractCommunityResultBuilder;
 import org.neo4j.graphalgo.result.AbstractResultBuilder;
 import org.neo4j.graphalgo.triangle.IntersectingTriangleCount.TriangleCountResult;
-import org.neo4j.internal.kernel.api.procs.ProcedureCallContext;
 
 import java.util.Optional;
 
-import static org.neo4j.graphalgo.ElementProjection.PROJECT_ALL;
-import static org.neo4j.graphalgo.utils.StringFormatting.formatWithLocale;
-
 final class TriangleCountCompanion {
 
     static final String DESCRIPTION =
@@ -48,38 +43,19 @@ static <PROC_RESULT, CONFIG extends TriangleCountBaseConfig> AbstractResultBuild
         TriangleCountResultBuilder<PROC_RESULT> procResultBuilder,
         AlgoBaseProc.ComputationResult<IntersectingTriangleCount, IntersectingTriangleCount.TriangleCountResult, CONFIG> computeResult
     ) {
-        var result = Optional.ofNullable(computeResult.result())
-            .orElse(EmptyResult.EMPTY_RESULT);
-
-        return procResultBuilder
-            .withTriangleCount(result.globalTriangles())
-            .buildHistogram()
-            .withCommunityFunction(result.localTriangles()::get);
+        var result = Optional.ofNullable(computeResult.result()).orElse(EmptyResult.EMPTY_RESULT);
+        return procResultBuilder.withTriangleCount(result.globalTriangles());
     }
 
-    abstract static class TriangleCountResultBuilder<PROC_RESULT> extends AbstractCommunityResultBuilder<PROC_RESULT> {
+    abstract static class TriangleCountResultBuilder<PROC_RESULT> extends AbstractResultBuilder<PROC_RESULT> {
 
         long triangleCount = 0;
 
-        TriangleCountResultBuilder(ProcedureCallContext callContext, AllocationTracker tracker) {
-            super(callContext, tracker);
-        }
-
         TriangleCountResultBuilder<PROC_RESULT> withTriangleCount(long triangleCount) {
             this.triangleCount = triangleCount;
             return this;
         }
 
-        TriangleCountResultBuilder<PROC_RESULT> buildCommunityCount() {
-            this.buildCommunityCount = true;
-            return this;
-        }
-
-        TriangleCountResultBuilder<PROC_RESULT> buildHistogram() {
-            this.buildHistogram = true;
-            return this;
-        }
-
     }
 
     private TriangleCountCompanion() {}

proc/community/src/main/java/org/neo4j/graphalgo/triangle/TriangleCountMutateProc.java

@@ -23,11 +23,9 @@
 import org.neo4j.graphalgo.MutateProc;
 import org.neo4j.graphalgo.config.GraphCreateConfig;
 import org.neo4j.graphalgo.core.CypherMapWrapper;
-import org.neo4j.graphalgo.core.utils.paged.AllocationTracker;
 import org.neo4j.graphalgo.core.write.PropertyTranslator;
 import org.neo4j.graphalgo.result.AbstractResultBuilder;
 import org.neo4j.graphalgo.results.MemoryEstimateResult;
-import org.neo4j.internal.kernel.api.procs.ProcedureCallContext;
 import org.neo4j.procedure.Description;
 import org.neo4j.procedure.Name;
 import org.neo4j.procedure.Procedure;
@@ -97,10 +95,7 @@ protected PropertyTranslator<IntersectingTriangleCount.TriangleCountResult> node
 
     @Override
     protected AbstractResultBuilder<MutateResult> resultBuilder(ComputationResult<IntersectingTriangleCount, IntersectingTriangleCount.TriangleCountResult, TriangleCountMutateConfig> computeResult) {
-        return TriangleCountCompanion.resultBuilder(
-            new TriangleCountMutateBuilder(callContext, computeResult.tracker()),
-            computeResult
-        );
+        return TriangleCountCompanion.resultBuilder(new TriangleCountMutateBuilder(), computeResult);
     }
 
     public static class MutateResult extends TriangleCountStatsProc.StatsResult {
@@ -131,15 +126,8 @@ public MutateResult(
 
     static class TriangleCountMutateBuilder extends TriangleCountCompanion.TriangleCountResultBuilder<MutateResult> {
 
-        TriangleCountMutateBuilder(
-            ProcedureCallContext callContext,
-            AllocationTracker tracker
-        ) {
-            super(callContext, tracker);
-        }
-
         @Override
-        protected MutateResult buildResult() {
+        public MutateResult build() {
             return new MutateResult(
                 triangleCount,
                 nodeCount,

proc/community/src/main/java/org/neo4j/graphalgo/triangle/TriangleCountStatsProc.java

@@ -23,10 +23,8 @@
 import org.neo4j.graphalgo.StatsProc;
 import org.neo4j.graphalgo.config.GraphCreateConfig;
 import org.neo4j.graphalgo.core.CypherMapWrapper;
-import org.neo4j.graphalgo.core.utils.paged.AllocationTracker;
 import org.neo4j.graphalgo.result.AbstractResultBuilder;
 import org.neo4j.graphalgo.results.MemoryEstimateResult;
-import org.neo4j.internal.kernel.api.procs.ProcedureCallContext;
 import org.neo4j.procedure.Description;
 import org.neo4j.procedure.Name;
 import org.neo4j.procedure.Procedure;
@@ -67,10 +65,7 @@ protected void validateConfigs(
 
     @Override
     protected AbstractResultBuilder<StatsResult> resultBuilder(ComputationResult<IntersectingTriangleCount, IntersectingTriangleCount.TriangleCountResult, TriangleCountStatsConfig> computeResult) {
-        return TriangleCountCompanion.resultBuilder(
-            new TriangleCountStatsBuilder(callContext, computeResult.tracker()),
-            computeResult
-        );
+        return TriangleCountCompanion.resultBuilder(new TriangleCountStatsBuilder(), computeResult);
     }
 
     @Override
@@ -119,15 +114,8 @@ public StatsResult(
 
     static class TriangleCountStatsBuilder extends TriangleCountCompanion.TriangleCountResultBuilder<StatsResult> {
 
-        TriangleCountStatsBuilder(
-            ProcedureCallContext callContext,
-            AllocationTracker tracker
-        ) {
-            super(callContext, tracker);
-        }
-
         @Override
-        protected StatsResult buildResult() {
+        public StatsResult build() {
             return new StatsResult(
                 triangleCount,
                 nodeCount,

proc/community/src/main/java/org/neo4j/graphalgo/triangle/TriangleCountWriteProc.java

@@ -23,11 +23,9 @@
 import org.neo4j.graphalgo.WriteProc;
 import org.neo4j.graphalgo.config.GraphCreateConfig;
 import org.neo4j.graphalgo.core.CypherMapWrapper;
-import org.neo4j.graphalgo.core.utils.paged.AllocationTracker;
 import org.neo4j.graphalgo.core.write.PropertyTranslator;
 import org.neo4j.graphalgo.result.AbstractResultBuilder;
 import org.neo4j.graphalgo.results.MemoryEstimateResult;
-import org.neo4j.internal.kernel.api.procs.ProcedureCallContext;
 import org.neo4j.procedure.Description;
 import org.neo4j.procedure.Name;
 import org.neo4j.procedure.Procedure;
@@ -96,10 +94,7 @@ protected PropertyTranslator<IntersectingTriangleCount.TriangleCountResult> node
 
     @Override
     protected AbstractResultBuilder<WriteResult> resultBuilder(ComputationResult<IntersectingTriangleCount, IntersectingTriangleCount.TriangleCountResult, TriangleCountWriteConfig> computeResult) {
-        return TriangleCountCompanion.resultBuilder(
-            new TriangleCountWriteBuilder(callContext, computeResult.tracker()),
-            computeResult
-        );
+        return TriangleCountCompanion.resultBuilder(new TriangleCountWriteBuilder(), computeResult);
     }
 
     public static class WriteResult extends TriangleCountStatsProc.StatsResult {
@@ -131,15 +126,8 @@ public WriteResult(
 
     static class TriangleCountWriteBuilder extends TriangleCountCompanion.TriangleCountResultBuilder<WriteResult> {
 
-        TriangleCountWriteBuilder(
-            ProcedureCallContext callContext,
-            AllocationTracker tracker
-        ) {
-            super(callContext, tracker);
-        }
-
         @Override
-        protected WriteResult buildResult() {
+        public WriteResult build() {
             return new WriteResult(
                 triangleCount,
                 nodeCount,

proc/community/src/test/java/org/neo4j/graphalgo/triangle/TriangleCountMutateProcTest.java

@@ -25,7 +25,10 @@
 import org.neo4j.graphalgo.GraphMutationTest;
 import org.neo4j.graphalgo.Orientation;
 import org.neo4j.graphalgo.RelationshipProjection;
+import org.neo4j.graphalgo.TestGraph;
+import org.neo4j.graphalgo.api.Graph;
 import org.neo4j.graphalgo.core.CypherMapWrapper;
+import org.neo4j.graphalgo.core.loading.GraphStoreCatalog;
 import org.neo4j.values.storable.NumberType;
 
 import java.util.List;
@@ -36,6 +39,8 @@
 import static org.hamcrest.Matchers.isA;
 import static org.neo4j.graphalgo.ElementProjection.PROJECT_ALL;
 import static org.neo4j.graphalgo.RelationshipType.ALL_RELATIONSHIPS;
+import static org.neo4j.graphalgo.TestGraph.Builder.fromGdl;
+import static org.neo4j.graphalgo.TestSupport.assertGraphEquals;
 
 class TriangleCountMutateProcTest
     extends TriangleCountBaseProcTest<TriangleCountMutateConfig>
@@ -91,6 +96,59 @@ void testMutateYields() {
         )));
     }
 
+    @Test
+    void testMutateWithMaxDegree() {
+        // Add a single node and connect it to the triangle
+        // to be able to apply the maxDegree filter.
+        runQuery("MATCH (n) " +
+                 "WITH n LIMIT 1 " +
+                 "CREATE (d)-[:REL]->(n)");
+
+        var createQuery = GdsCypher.call()
+            .loadEverything(Orientation.UNDIRECTED)
+            .graphCreate("testGraph")
+            .yields();
+
+        runQuery(createQuery);
+
+        var query = GdsCypher.call()
+            .explicitCreation("testGraph")
+            .algo("triangleCount")
+            .mutateMode()
+            .addParameter("mutateProperty", mutateProperty())
+            .addParameter("maxDegree", 2)
+            .yields();
+
+        assertCypherResult(query, List.of(Map.of(
+            "globalTriangleCount", 0L,
+            "nodeCount", 4L,
+            "createMillis", greaterThan(-1L),
+            "computeMillis", greaterThan(-1L),
+            "configuration", isA(Map.class),
+            "nodePropertiesWritten", 4L,
+            "mutateMillis", greaterThan(-1L)
+        )));
+
+        Graph actualGraph = GraphStoreCatalog.get(getUsername(), "testGraph").graphStore().getUnion();
+
+        assertGraphEquals(
+            fromGdl(
+                "  (a { mutatedTriangleCount: -1 })" +
+                ", (b { mutatedTriangleCount: 0 })" +
+                ", (c { mutatedTriangleCount: 0 })" +
+                ", (d { mutatedTriangleCount: 0 })" +
+                // Graph is UNDIRECTED, e.g. each rel twice
+                ", (a)-->(b)" +
+                ", (b)-->(a)" +
+                ", (b)-->(c)" +
+                ", (c)-->(b)" +
+                ", (a)-->(c)" +
+                ", (c)-->(a)" +
+                ", (d)-->(a)" +
+                ", (a)-->(d)"
+            ), actualGraph);
+    }
+
     @Override
     public Class<? extends AlgoBaseProc<IntersectingTriangleCount, IntersectingTriangleCount.TriangleCountResult, TriangleCountMutateConfig>> getProcedureClazz() {
         return TriangleCountMutateProc.class;

proc/community/src/test/java/org/neo4j/graphalgo/triangle/TriangleCountStatsProcTest.java

@@ -51,6 +51,29 @@ void testStats() {
         )));
     }
 
+    @Test
+    void testStatsWithMaxDegree() {
+        // Add a single node and connect it to the triangle
+        // to be able to apply the maxDegree filter.
+        runQuery("MATCH (n) " +
+                 "WITH n LIMIT 1 " +
+                 "CREATE (d)-[:REL]->(n)");
+
+        var query = GdsCypher.call()
+            .loadEverything(Orientation.UNDIRECTED)
+            .algo("triangleCount")
+            .statsMode()
+            .addParameter("maxDegree", 2)
+            .yields();
+
+        assertCypherResult(query, List.of(Map.of(
+            "globalTriangleCount", 0L,
+            "nodeCount", 4L,
+            "createMillis", greaterThan(-1L),
+            "computeMillis", greaterThan(-1L),
+            "configuration", isA(Map.class)
+        )));
+    }
 
     @Override
     public Class<? extends AlgoBaseProc<IntersectingTriangleCount, IntersectingTriangleCount.TriangleCountResult, TriangleCountStatsConfig>> getProcedureClazz() {

proc/community/src/test/java/org/neo4j/graphalgo/triangle/TriangleCountWriteProcTest.java

@@ -81,6 +81,37 @@ void testWrite() {
         assertWriteResult(expectedResult, "triangles");
     }
 
+    @Test
+    void testWriteWithMaxDegree() {
+        var query = GdsCypher.call()
+            .loadEverything(Orientation.UNDIRECTED)
+            .algo("triangleCount")
+            .writeMode()
+            .addParameter("writeProperty", "triangles")
+            .addParameter("maxDegree", 2)
+            .yields();
+
+        assertCypherResult(query, List.of(Map.of(
+            "globalTriangleCount", 0L,
+            "nodeCount", 5L,
+            "createMillis", greaterThan(-1L),
+            "computeMillis", greaterThan(-1L),
+            "configuration", isA(Map.class),
+            "nodePropertiesWritten", 5L,
+            "writeMillis", greaterThan(-1L)
+        )));
+
+        Map<String, Long> expectedResult = Map.of(
+            "a", -1L,
+            "b", -1L,
+            "c", -1L,
+            "d", -1L,
+            "e", 0L
+        );
+
+        assertWriteResult(expectedResult, "triangles");
+    }
+
     @Override
     public Class<? extends AlgoBaseProc<IntersectingTriangleCount, IntersectingTriangleCount.TriangleCountResult, TriangleCountWriteConfig>> getProcedureClazz() {
         return TriangleCountWriteProc.class;