Remove unnecessary RelationshipIntersectConfig

jjaderberg · jjaderberg · commit fc6ec8d3fde7 · 2025-06-11T17:12:05.000+02:00
diff --git a/algo/src/main/java/org/neo4j/gds/triangle/IntersectingTriangleCount.java b/algo/src/main/java/org/neo4j/gds/triangle/IntersectingTriangleCount.java
@@ -29,8 +29,6 @@
 import org.neo4j.gds.core.utils.paged.ParalleLongPageCreator;
 import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
 import org.neo4j.gds.termination.TerminationFlag;
-import org.neo4j.gds.triangle.intersect.ImmutableRelationshipIntersectConfig;
-import org.neo4j.gds.triangle.intersect.RelationshipIntersectConfig;
 import org.neo4j.gds.triangle.intersect.RelationshipIntersectFactory;
 import org.neo4j.gds.triangle.intersect.RelationshipIntersectFactoryLocator;
 
@@ -58,7 +56,6 @@ public final class IntersectingTriangleCount extends Algorithm<TriangleCountResu
 
     private final Graph graph;
     private final RelationshipIntersectFactory intersectFactory;
-    private final RelationshipIntersectConfig intersectConfig;
     private final ExecutorService executorService;
     private final AtomicLong queue;
 
@@ -100,7 +97,6 @@ private IntersectingTriangleCount(
         this.intersectFactory = intersectFactory;
         this.concurrency = concurrency;
         this.maxDegree = maxDegree;
-        this.intersectConfig = ImmutableRelationshipIntersectConfig.of(maxDegree);
         this.triangleCounts = HugeAtomicLongArray.of(graph.nodeCount(), ParalleLongPageCreator.passThrough(concurrency));
         this.executorService = executorService;
         this.globalTriangleCounter = new LongAdder();
@@ -117,7 +113,7 @@ public TriangleCountResult compute() {
         // create tasks
         final Collection<? extends Runnable> tasks = ParallelUtil.tasks(
             concurrency,
-            () -> new IntersectTask(intersectFactory.load(graph, intersectConfig))
+            () -> new IntersectTask(intersectFactory.load(graph, maxDegree))
         );
         // run
         ParallelUtil.run(tasks, executorService);
diff --git a/algo/src/main/java/org/neo4j/gds/triangle/TriangleStream.java b/algo/src/main/java/org/neo4j/gds/triangle/TriangleStream.java
@@ -26,10 +26,8 @@
 import org.neo4j.gds.api.RelationshipIntersect;
 import org.neo4j.gds.core.concurrency.Concurrency;
 import org.neo4j.gds.core.concurrency.ParallelUtil;
-import org.neo4j.gds.termination.TerminationFlag;
 import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
-import org.neo4j.gds.triangle.intersect.ImmutableRelationshipIntersectConfig;
-import org.neo4j.gds.triangle.intersect.RelationshipIntersectConfig;
+import org.neo4j.gds.termination.TerminationFlag;
 import org.neo4j.gds.triangle.intersect.RelationshipIntersectFactory;
 import org.neo4j.gds.triangle.intersect.RelationshipIntersectFactoryLocator;
 
@@ -54,7 +52,6 @@ public final class TriangleStream extends Algorithm<Stream<TriangleResult>> {
 
     private final Graph graph;
     private final RelationshipIntersectFactory intersectFactory;
-    private final RelationshipIntersectConfig intersectConfig;
     private final ExecutorService executorService;
     private final AtomicInteger queue;
     private final Concurrency concurrency;
@@ -86,7 +83,6 @@ private TriangleStream(
         super(ProgressTracker.NULL_TRACKER);
         this.graph = graph;
         this.intersectFactory = intersectFactory;
-        this.intersectConfig = ImmutableRelationshipIntersectConfig.builder().build();
         this.executorService = executorService;
         this.concurrency = concurrency;
         this.nodeCount = Math.toIntExact(graph.nodeCount());
@@ -124,7 +120,7 @@ private void submitTasks() {
         queue.set(0);
         runningThreads.set(0);
         final Collection<Runnable> tasks;
-        tasks = ParallelUtil.tasks(concurrency, () -> new IntersectTask(intersectFactory.load(graph, intersectConfig)));
+        tasks = ParallelUtil.tasks(concurrency, () -> new IntersectTask(intersectFactory.load(graph, Long.MAX_VALUE)));
         ParallelUtil.run(tasks, false, executorService, null);
     }
 
diff --git a/algo/src/main/java/org/neo4j/gds/triangle/intersect/HugeGraphIntersect.java b/algo/src/main/java/org/neo4j/gds/triangle/intersect/HugeGraphIntersect.java
@@ -55,11 +55,11 @@ public boolean canLoad(Graph graph) {
         }
 
         @Override
-        public RelationshipIntersect load(Graph graph, RelationshipIntersectConfig config) {
+        public RelationshipIntersect load(Graph graph, long maxDegree) {
             assert graph instanceof HugeGraph;
             var hugeGraph = (HugeGraph) graph;
             var topology = hugeGraph.relationshipTopology().adjacencyList();
-            return new HugeGraphIntersect(topology, config.maxDegree());
+            return new HugeGraphIntersect(topology, maxDegree);
         }
     }
 }
diff --git a/algo/src/main/java/org/neo4j/gds/triangle/intersect/NodeFilteredGraphIntersect.java b/algo/src/main/java/org/neo4j/gds/triangle/intersect/NodeFilteredGraphIntersect.java
@@ -63,15 +63,15 @@ public boolean canLoad(Graph graph) {
         }
 
         @Override
-        public RelationshipIntersect load(Graph graph, RelationshipIntersectConfig config) {
+        public RelationshipIntersect load(Graph graph, long maxDegree) {
             assert graph instanceof NodeFilteredGraph;
             var nodeFilteredGraph = (NodeFilteredGraph) graph;
             var innerGraph = nodeFilteredGraph.graph();
 
             var relationshipIntersect = RelationshipIntersectFactoryLocator
                 .lookup(innerGraph)
                 .orElseThrow(() -> new IllegalArgumentException("No intersect factory found for graph type " + innerGraph.getClass()))
-                .load(innerGraph, config);
+                .load(innerGraph, maxDegree);
 
             return new NodeFilteredGraphIntersect(nodeFilteredGraph, relationshipIntersect);
         }
diff --git a/algo/src/main/java/org/neo4j/gds/triangle/intersect/RelationshipIntersectConfig.java b/algo/src/main/java/org/neo4j/gds/triangle/intersect/RelationshipIntersectConfig.java
diff --git a/algo/src/main/java/org/neo4j/gds/triangle/intersect/RelationshipIntersectFactory.java b/algo/src/main/java/org/neo4j/gds/triangle/intersect/RelationshipIntersectFactory.java
@@ -28,5 +28,5 @@ public interface RelationshipIntersectFactory {
 
     boolean canLoad(Graph graph);
 
-    RelationshipIntersect load(Graph graph, RelationshipIntersectConfig config);
+    RelationshipIntersect load(Graph graph, long maxDegree);
 }
diff --git a/algo/src/main/java/org/neo4j/gds/triangle/intersect/UnionGraphIntersect.java b/algo/src/main/java/org/neo4j/gds/triangle/intersect/UnionGraphIntersect.java
@@ -69,14 +69,14 @@ public boolean canLoad(Graph graph) {
         }
 
         @Override
-        public UnionGraphIntersect load(Graph graph, RelationshipIntersectConfig config) {
+        public UnionGraphIntersect load(Graph graph, long maxDegree) {
             assert graph instanceof UnionGraph;
             var topology = ((UnionGraph) graph).relationshipTopology();
             return new UnionGraphIntersect(
                 graph::degree,
                 i -> i,
                 topology,
-                config.maxDegree()
+                maxDegree
             );
         }
     }
@@ -93,14 +93,14 @@ public boolean canLoad(Graph graph) {
         }
 
         @Override
-        public UnionGraphIntersect load(Graph graph, RelationshipIntersectConfig config) {
+        public UnionGraphIntersect load(Graph graph, long maxDegree) {
             assert graph instanceof UnionGraph;
             var topology = ((UnionGraph) graph).relationshipTopology();
             return new UnionGraphIntersect(
                 graph::degree,
                 graph::toRootNodeId,
                 topology,
-                config.maxDegree()
+                maxDegree
             );
         }
     }
diff --git a/algo/src/test/java/org/neo4j/gds/triangle/IntersectingTriangleCountMemoryEstimateDefinitionTest.java b/algo/src/test/java/org/neo4j/gds/triangle/IntersectingTriangleCountMemoryEstimateDefinitionTest.java
@@ -39,7 +39,7 @@ void memoryEstimation(long nodeCount) {
         GraphDimensions graphDimensions = ImmutableGraphDimensions.builder().nodeCount(nodeCount).build();
 
         long hugeAtomicLongArray = 24 + nodeCount * 8 + 16;
-        long expected = 72 + hugeAtomicLongArray;
+        long expected = 64 + hugeAtomicLongArray;
 
         MemoryEstimationAssert.assertThat(memoryEstimation)
             .memoryRange(graphDimensions, new Concurrency(1))
@@ -55,7 +55,7 @@ void memoryEstimationLargePages(long nodeCount, long sizeOfHugeArray) {
         GraphDimensions graphDimensions = ImmutableGraphDimensions.builder().nodeCount(nodeCount).build();
 
         long hugeAtomicLongArray = 32 + sizeOfHugeArray;
-        long expected = 72 + hugeAtomicLongArray;
+        long expected = 64 + hugeAtomicLongArray;
 
         MemoryEstimationAssert.assertThat(memoryEstimation)
             .memoryRange(graphDimensions, new Concurrency(1))
diff --git a/algo/src/test/java/org/neo4j/gds/triangle/LocalClusteringCoefficientMemoryEstimateDefinitionTest.java b/algo/src/test/java/org/neo4j/gds/triangle/LocalClusteringCoefficientMemoryEstimateDefinitionTest.java
@@ -36,7 +36,7 @@ void memoryEstimation(long nodeCount) {
         var memoryEstimation = new LocalClusteringCoefficientMemoryEstimateDefinition(null)
             .memoryEstimation();
 
-        long triangleCountEstimate = 56 + 24 + nodeCount * 8 + 16;
+        long triangleCountEstimate = 48 + 24 + nodeCount * 8 + 16;
         long hugeDoubleArray = 16 + nodeCount * 8 + 16;
         long expected = 80 + hugeDoubleArray + triangleCountEstimate;
 
@@ -68,7 +68,7 @@ void memoryEstimationLargePages(long nodeCount, long sizeOfHugeArray) {
         var memoryEstimation = new LocalClusteringCoefficientMemoryEstimateDefinition(null)
             .memoryEstimation();
 
-        long triangleCountEstimate = 56 + 32 + sizeOfHugeArray;
+        long triangleCountEstimate = 48 + 32 + sizeOfHugeArray;
         long hugeDoubleArray = 24 + sizeOfHugeArray;
         long expected = 80 + hugeDoubleArray + triangleCountEstimate;
 
diff --git a/algo/src/test/java/org/neo4j/gds/triangle/intersect/CompositeIntersectionTest.java b/algo/src/test/java/org/neo4j/gds/triangle/intersect/CompositeIntersectionTest.java
@@ -52,7 +52,7 @@ void intersectWithTargets() {
 
         var intersect = new UnionGraphIntersect.UnionGraphIntersectFactory().load(
             graph,
-            ImmutableRelationshipIntersectConfig.builder().build()
+            Long.MAX_VALUE
         );
 
         intersect.intersectAll(start2, (a, b, c) -> {
@@ -76,10 +76,7 @@ void intersectWithTargetsWithMaxDegree() {
 
         var start2 = Math.max(graph.toMappedNodeId(DEGREE + 1), graph.toMappedNodeId(DEGREE));
 
-        var intersect = new UnionGraphIntersect.UnionGraphIntersectFactory().load(
-            graph,
-            ImmutableRelationshipIntersectConfig.builder().maxDegree(0).build()
-        );
+        var intersect = new UnionGraphIntersect.UnionGraphIntersectFactory().load(graph, 0);
         assertThatNoException().isThrownBy(
             () ->
                 intersect.intersectAll(start2, (a, b, c) ->
diff --git a/algo/src/test/java/org/neo4j/gds/triangle/intersect/HugeIntersectionTest.java b/algo/src/test/java/org/neo4j/gds/triangle/intersect/HugeIntersectionTest.java
@@ -46,7 +46,7 @@ void intersectWithTargets() {
 
         var intersect = RelationshipIntersectFactoryLocator.lookup(graph)
             .orElseThrow(IllegalArgumentException::new)
-            .load(graph, ImmutableRelationshipIntersectConfig.builder().build());
+            .load(graph, Long.MAX_VALUE);
 
         var start1 = Math.min(graph.toMappedNodeId(DEGREE + 1), graph.toMappedNodeId(DEGREE));
         var start2 = Math.max(graph.toMappedNodeId(DEGREE + 1), graph.toMappedNodeId(DEGREE));
diff --git a/algo/src/test/java/org/neo4j/gds/triangle/intersect/NodeFilteredGraphIntersectTest.java b/algo/src/test/java/org/neo4j/gds/triangle/intersect/NodeFilteredGraphIntersectTest.java
@@ -52,13 +52,13 @@ class NodeFilteredGraphIntersectTest {
     @Test
     void testFilter() {
         var graph = graphStore.getGraph("B", RelationshipType.ALL_RELATIONSHIPS.name(), Optional.empty());
-        var config = ImmutableRelationshipIntersectConfig.builder().build();
+        var maxDegree = Long.MAX_VALUE;
         var nodeCount = graph.nodeCount();
 
         assertThat(nodeCount).isEqualTo(3);
         assertThat(graph.relationshipCount()).isEqualTo(6);
 
-        var intersect = new NodeFilteredGraphIntersect.NodeFilteredGraphIntersectFactory().load(graph, config);
+        var intersect = new NodeFilteredGraphIntersect.NodeFilteredGraphIntersectFactory().load(graph, maxDegree);
 
         var triangleCount = new MutableInt(0);
         intersect.intersectAll(                 //triangles are found in reverse, so must change from 'a' to 'c'
diff --git a/doc/modules/ROOT/pages/algorithms/local-clustering-coefficient.adoc b/doc/modules/ROOT/pages/algorithms/local-clustering-coefficient.adoc
@@ -281,7 +281,7 @@ YIELD nodeCount, relationshipCount, bytesMin, bytesMax, requiredMemory
 [opts="header"]
 |===
 | nodeCount | relationshipCount | bytesMin | bytesMax | requiredMemory
-| 6         | 16                | 304      | 304      | "304 Bytes"
+| 6         | 16                | 296      | 296      | "296 Bytes"
 |===
 --
 
diff --git a/doc/modules/ROOT/pages/algorithms/triangle-count.adoc b/doc/modules/ROOT/pages/algorithms/triangle-count.adoc
@@ -313,7 +313,7 @@ YIELD nodeCount, relationshipCount, bytesMin, bytesMax, requiredMemory
 [opts="header"]
 |===
 | nodeCount | relationshipCount | bytesMin | bytesMax | requiredMemory
-| 6         | 16                | 160      | 160      | "160 Bytes"
+| 6         | 16                | 152      | 152      | "152 Bytes"
 |===
 --
 

Original file line number	Diff line number	Diff line change
`@@ -55,11 +55,11 @@ public boolean canLoad(Graph graph) {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`@Override`
`58`		`- public RelationshipIntersect load(Graph graph, RelationshipIntersectConfig config) {`
	`58`	`+ public RelationshipIntersect load(Graph graph, long maxDegree) {`
`59`	`59`	`assert graph instanceof HugeGraph;`
`60`	`60`	`var hugeGraph = (HugeGraph) graph;`
`61`	`61`	`var topology = hugeGraph.relationshipTopology().adjacencyList();`
`62`		`- return new HugeGraphIntersect(topology, config.maxDegree());`
	`62`	`+ return new HugeGraphIntersect(topology, maxDegree);`
`63`	`63`	`}`
`64`	`64`	`}`
`65`	`65`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,5 +28,5 @@ public interface RelationshipIntersectFactory {`
`28`	`28`
`29`	`29`	`boolean canLoad(Graph graph);`
`30`	`30`
`31`		`- RelationshipIntersect load(Graph graph, RelationshipIntersectConfig config);`
	`31`	`+ RelationshipIntersect load(Graph graph, long maxDegree);`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,14 +69,14 @@ public boolean canLoad(Graph graph) {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`@Override`
`72`		`- public UnionGraphIntersect load(Graph graph, RelationshipIntersectConfig config) {`
	`72`	`+ public UnionGraphIntersect load(Graph graph, long maxDegree) {`
`73`	`73`	`assert graph instanceof UnionGraph;`
`74`	`74`	`var topology = ((UnionGraph) graph).relationshipTopology();`
`75`	`75`	`return new UnionGraphIntersect(`
`76`	`76`	`graph::degree,`
`77`	`77`	`i -> i,`
`78`	`78`	`topology,`
`79`		`- config.maxDegree()`
	`79`	`+ maxDegree`
`80`	`80`	`);`
`81`	`81`	`}`
`82`	`82`	`}`
`@@ -93,14 +93,14 @@ public boolean canLoad(Graph graph) {`
`93`	`93`	`}`
`94`	`94`
`95`	`95`	`@Override`
`96`		`- public UnionGraphIntersect load(Graph graph, RelationshipIntersectConfig config) {`
	`96`	`+ public UnionGraphIntersect load(Graph graph, long maxDegree) {`
`97`	`97`	`assert graph instanceof UnionGraph;`
`98`	`98`	`var topology = ((UnionGraph) graph).relationshipTopology();`
`99`	`99`	`return new UnionGraphIntersect(`
`100`	`100`	`graph::degree,`
`101`	`101`	`graph::toRootNodeId,`
`102`	`102`	`topology,`
`103`		`- config.maxDegree()`
	`103`	`+ maxDegree`
`104`	`104`	`);`
`105`	`105`	`}`
`106`	`106`	`}`