Merge pull request #8119 from Mats-SX/24-fix-pool

2.4 - Fixing the pool sizes
neo4j · Sep 11, 2023 · 2180877 · 2180877
2 parents 816b0d9 + 8c82ff9
commit 2180877
Show file tree

Hide file tree

Showing 177 changed files with 588 additions and 557 deletions.
diff --git a/algo-common/src/main/java/org/neo4j/gds/result/AbstractCentralityResultBuilder.java b/algo-common/src/main/java/org/neo4j/gds/result/AbstractCentralityResultBuilder.java
@@ -22,7 +22,7 @@
 import org.HdrHistogram.DoubleHistogram;
 import org.jetbrains.annotations.NotNull;
 import org.neo4j.gds.api.ProcedureReturnColumns;
-import org.neo4j.gds.core.concurrency.Pools;
+import org.neo4j.gds.core.concurrency.DefaultPool;
 import org.neo4j.gds.core.utils.ProgressTimer;
 import org.neo4j.gds.scaling.LogScaler;
 import org.neo4j.gds.scaling.ScalerFactory;
@@ -95,7 +95,7 @@ private Optional<DoubleHistogram> computeCentralityHistogram() {
                     return Optional.of(CentralityStatistics.histogram(
                         nodeCount,
                         centralityFunction,
-                        Pools.DEFAULT,
+                        DefaultPool.INSTANCE,
                         concurrency
                     ));
                 } catch (ArrayIndexOutOfBoundsException e) {

diff --git a/algo-common/src/main/java/org/neo4j/gds/result/AbstractCommunityResultBuilder.java b/algo-common/src/main/java/org/neo4j/gds/result/AbstractCommunityResultBuilder.java
@@ -22,7 +22,7 @@
 import org.HdrHistogram.Histogram;
 import org.jetbrains.annotations.Nullable;
 import org.neo4j.gds.api.ProcedureReturnColumns;
-import org.neo4j.gds.core.concurrency.Pools;
+import org.neo4j.gds.core.concurrency.DefaultPool;
 import org.neo4j.gds.core.utils.ProgressTimer;
 
 import java.util.Map;
@@ -54,7 +54,7 @@ protected AbstractCommunityResultBuilder(
         ProcedureReturnColumns returnColumns,
         int concurrency
     ) {
-        this(returnColumns, Pools.DEFAULT, concurrency);
+        this(returnColumns, DefaultPool.INSTANCE, concurrency);
     }
 
     protected AbstractCommunityResultBuilder(

diff --git a/algo-common/src/test/java/org/neo4j/gds/result/CommunityStatisticsTest.java b/algo-common/src/test/java/org/neo4j/gds/result/CommunityStatisticsTest.java
@@ -24,7 +24,7 @@
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.neo4j.gds.TestSupport;
-import org.neo4j.gds.core.concurrency.Pools;
+import org.neo4j.gds.core.concurrency.DefaultPool;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -49,7 +49,7 @@ void communitySizes(
         var communitySizes = CommunityStatistics.communitySizes(
             nodeCount,
             communityFunction,
-            Pools.DEFAULT,
+            DefaultPool.INSTANCE,
             concurrency
         );
         expectedCommunitySizes.forEach((communityId, expectedSize) -> {
@@ -72,7 +72,7 @@ void communityCount(
             CommunityStatistics.communityCount(
                 nodeCount,
                 communityFunction,
-                Pools.DEFAULT,
+                DefaultPool.INSTANCE,
                 concurrency
             )
         );
@@ -91,7 +91,7 @@ void communityCountAndHistogram(
         var communityCountAndHistogram = CommunityStatistics.communityCountAndHistogram(
             nodeCount,
             communityFunction,
-            Pools.DEFAULT,
+            DefaultPool.INSTANCE,
             concurrency
         );
 

diff --git a/algo-common/src/test/java/org/neo4j/gds/scaling/CenterTest.java b/algo-common/src/test/java/org/neo4j/gds/scaling/CenterTest.java
@@ -26,7 +26,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
 import org.neo4j.gds.core.CypherMapWrapper;
-import org.neo4j.gds.core.concurrency.Pools;
+import org.neo4j.gds.core.concurrency.DefaultPool;
 import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
 import org.neo4j.gds.nodeproperties.DoubleTestPropertyValues;
 
@@ -63,7 +63,7 @@ void normalizes(NodePropertyValues properties, double avg, double[] expected) {
             10,
             1,
             ProgressTracker.NULL_TRACKER,
-            Pools.DEFAULT
+            DefaultPool.INSTANCE
         );
 
         assertThat(scaler.avg).isEqualTo(avg);
@@ -81,7 +81,7 @@ void handlesMissingValue() {
             10,
             1,
             ProgressTracker.NULL_TRACKER,
-            Pools.DEFAULT
+            DefaultPool.INSTANCE
         );
 
         var avg = 4.444;

diff --git a/algo-common/src/test/java/org/neo4j/gds/scaling/L1NormTest.java b/algo-common/src/test/java/org/neo4j/gds/scaling/L1NormTest.java
@@ -26,7 +26,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
 import org.neo4j.gds.core.CypherMapWrapper;
-import org.neo4j.gds.core.concurrency.Pools;
+import org.neo4j.gds.core.concurrency.DefaultPool;
 import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
 import org.neo4j.gds.nodeproperties.DoubleTestPropertyValues;
 
@@ -62,7 +62,7 @@ void scale(int nodeCount, NodePropertyValues properties, double l1norm, double[]
             nodeCount,
             1,
             ProgressTracker.NULL_TRACKER,
-            Pools.DEFAULT
+            DefaultPool.INSTANCE
         );
 
         assertThat(scaler.l1Norm).isEqualTo(l1norm);
@@ -79,7 +79,7 @@ void avoidsDivByZero() {
             10,
             1,
             ProgressTracker.NULL_TRACKER,
-            Pools.DEFAULT
+            DefaultPool.INSTANCE
         );
 
         for (int i = 0; i < 10; i++) {
@@ -95,7 +95,7 @@ void handlesMissingValue() {
             10,
             1,
             ProgressTracker.NULL_TRACKER,
-            Pools.DEFAULT
+            DefaultPool.INSTANCE
         );
 
         var l1norm = 40D;

diff --git a/algo-common/src/test/java/org/neo4j/gds/scaling/L2NormTest.java b/algo-common/src/test/java/org/neo4j/gds/scaling/L2NormTest.java
@@ -26,7 +26,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
 import org.neo4j.gds.core.CypherMapWrapper;
-import org.neo4j.gds.core.concurrency.Pools;
+import org.neo4j.gds.core.concurrency.DefaultPool;
 import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
 import org.neo4j.gds.nodeproperties.DoubleTestPropertyValues;
 
@@ -53,7 +53,7 @@ void normalizes(NodePropertyValues properties, double euclideanLength, double[]
             10,
             1,
             ProgressTracker.NULL_TRACKER,
-            Pools.DEFAULT
+            DefaultPool.INSTANCE
         );
 
         assertThat(scaler.euclideanLength).isEqualTo(euclideanLength);
@@ -70,7 +70,7 @@ void avoidsDivByZero() {
             10,
             1,
             ProgressTracker.NULL_TRACKER,
-            Pools.DEFAULT
+            DefaultPool.INSTANCE
         );
 
         for (int i = 0; i < 10; i++) {
@@ -86,7 +86,7 @@ void handlesMissingValue() {
             10,
             1,
             ProgressTracker.NULL_TRACKER,
-            Pools.DEFAULT
+            DefaultPool.INSTANCE
         );
 
         var euclideanLength = 16.124;

diff --git a/algo-common/src/test/java/org/neo4j/gds/scaling/LogScalerTest.java b/algo-common/src/test/java/org/neo4j/gds/scaling/LogScalerTest.java
@@ -26,7 +26,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
 import org.neo4j.gds.core.CypherMapWrapper;
-import org.neo4j.gds.core.concurrency.Pools;
+import org.neo4j.gds.core.concurrency.DefaultPool;
 import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
 import org.neo4j.gds.nodeproperties.DoubleTestPropertyValues;
 import org.neo4j.gds.nodeproperties.LongTestPropertyValues;
@@ -72,7 +72,7 @@ void handlesMissingValue() {
             10,
             1,
             ProgressTracker.NULL_TRACKER,
-            Pools.DEFAULT
+            DefaultPool.INSTANCE
         );
 
         for (int i = 0; i < 5; i++) {

diff --git a/algo-common/src/test/java/org/neo4j/gds/scaling/MaxTest.java b/algo-common/src/test/java/org/neo4j/gds/scaling/MaxTest.java
@@ -26,7 +26,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
 import org.neo4j.gds.core.CypherMapWrapper;
-import org.neo4j.gds.core.concurrency.Pools;
+import org.neo4j.gds.core.concurrency.DefaultPool;
 import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
 import org.neo4j.gds.nodeproperties.DoubleTestPropertyValues;
 
@@ -70,7 +70,7 @@ void scale(int nodeCount, NodePropertyValues properties, double absMax, double[]
             nodeCount,
             1,
             ProgressTracker.NULL_TRACKER,
-            Pools.DEFAULT
+            DefaultPool.INSTANCE
         );
 
         assertThat(scaler.maxAbs).isEqualTo(absMax);
@@ -88,7 +88,7 @@ void avoidsDivByZero() {
             10,
             1,
             ProgressTracker.NULL_TRACKER,
-            Pools.DEFAULT
+            DefaultPool.INSTANCE
         );
 
         assertThat(scaler.statistics()).containsExactlyEntriesOf(Map.of("absMax", List.of(0D)));
@@ -106,7 +106,7 @@ void handlesMissingValue() {
             10,
             1,
             ProgressTracker.NULL_TRACKER,
-            Pools.DEFAULT
+            DefaultPool.INSTANCE
         );
 
 

diff --git a/algo-common/src/test/java/org/neo4j/gds/scaling/MeanTest.java b/algo-common/src/test/java/org/neo4j/gds/scaling/MeanTest.java
@@ -26,7 +26,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
 import org.neo4j.gds.core.CypherMapWrapper;
-import org.neo4j.gds.core.concurrency.Pools;
+import org.neo4j.gds.core.concurrency.DefaultPool;
 import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
 import org.neo4j.gds.nodeproperties.DoubleTestPropertyValues;
 
@@ -57,7 +57,7 @@ void normalizes(NodePropertyValues properties, double avg, double min, double ma
             10,
             1,
             ProgressTracker.NULL_TRACKER,
-            Pools.DEFAULT
+            DefaultPool.INSTANCE
         );
 
         assertThat(scaler.avg).isEqualTo(avg);
@@ -81,7 +81,7 @@ void avoidsDivByZero() {
             10,
             1,
             ProgressTracker.NULL_TRACKER,
-            Pools.DEFAULT
+            DefaultPool.INSTANCE
         );
 
         assertThat(scaler.statistics()).containsExactlyInAnyOrderEntriesOf(Map.of(
@@ -103,7 +103,7 @@ void handlesMissingValue() {
             10,
             1,
             ProgressTracker.NULL_TRACKER,
-            Pools.DEFAULT
+            DefaultPool.INSTANCE
         );
 
         var avg = 4.444;

diff --git a/algo-common/src/test/java/org/neo4j/gds/scaling/MinMaxTest.java b/algo-common/src/test/java/org/neo4j/gds/scaling/MinMaxTest.java
@@ -26,7 +26,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
 import org.neo4j.gds.core.CypherMapWrapper;
-import org.neo4j.gds.core.concurrency.Pools;
+import org.neo4j.gds.core.concurrency.DefaultPool;
 import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
 import org.neo4j.gds.nodeproperties.DoubleTestPropertyValues;
 
@@ -53,7 +53,7 @@ void normalizes(NodePropertyValues properties, double min, double max) {
             10,
             1,
             ProgressTracker.NULL_TRACKER,
-            Pools.DEFAULT
+            DefaultPool.INSTANCE
         );
 
         assertThat(scaler.min).isEqualTo(min);
@@ -77,7 +77,7 @@ void avoidsDivByZero() {
             10,
             1,
             ProgressTracker.NULL_TRACKER,
-            Pools.DEFAULT
+            DefaultPool.INSTANCE
         );
 
         assertThat(scaler.statistics()).containsExactlyEntriesOf(Map.of(
@@ -98,7 +98,7 @@ void handlesMissingValue() {
             10,
             1,
             ProgressTracker.NULL_TRACKER,
-            Pools.DEFAULT
+            DefaultPool.INSTANCE
         );
 
 

diff --git a/algo-common/src/test/java/org/neo4j/gds/scaling/ScalerTest.java b/algo-common/src/test/java/org/neo4j/gds/scaling/ScalerTest.java
@@ -21,7 +21,7 @@
 
 import org.junit.jupiter.api.Test;
 import org.neo4j.gds.core.CypherMapWrapper;
-import org.neo4j.gds.core.concurrency.Pools;
+import org.neo4j.gds.core.concurrency.DefaultPool;
 import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
 import org.neo4j.gds.nodeproperties.DoubleTestPropertyValues;
 
@@ -39,14 +39,14 @@ void shouldAccumulateStatsCorrectly() {
             10,
             1,
             ProgressTracker.NULL_TRACKER,
-            Pools.DEFAULT
+            DefaultPool.INSTANCE
         );
         var meanScaler2 = (Mean) Mean.buildFrom(CypherMapWrapper.empty()).create(
             new DoubleTestPropertyValues(nodeId -> 2 * nodeId),
             10,
             1,
             ProgressTracker.NULL_TRACKER,
-            Pools.DEFAULT
+            DefaultPool.INSTANCE
         );
 
         var meanScaler1Stats = meanScaler1.statistics();

diff --git a/algo-common/src/test/java/org/neo4j/gds/scaling/StdScoreTest.java b/algo-common/src/test/java/org/neo4j/gds/scaling/StdScoreTest.java
@@ -26,7 +26,7 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
 import org.neo4j.gds.core.CypherMapWrapper;
-import org.neo4j.gds.core.concurrency.Pools;
+import org.neo4j.gds.core.concurrency.DefaultPool;
 import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
 import org.neo4j.gds.nodeproperties.DoubleTestPropertyValues;
 
@@ -56,7 +56,7 @@ void normalizes(NodePropertyValues properties, double avg, double std, double[]
             10,
             1,
             ProgressTracker.NULL_TRACKER,
-            Pools.DEFAULT
+            DefaultPool.INSTANCE
         );
 
         assertThat(scaler.avg).isEqualTo(avg);
@@ -78,7 +78,7 @@ void handlesMissingValue() {
             10,
             1,
             ProgressTracker.NULL_TRACKER,
-            Pools.DEFAULT
+            DefaultPool.INSTANCE
         );
 
         var avg = 4.444;
@@ -100,7 +100,7 @@ void avoidsDivByZero() {
             10,
             1,
             ProgressTracker.NULL_TRACKER,
-            Pools.DEFAULT
+            DefaultPool.INSTANCE
         );
 
         for (int i = 0; i < 10; i++) {

diff --git a/algo/src/main/java/org/neo4j/gds/approxmaxkcut/ApproxMaxKCutFactory.java b/algo/src/main/java/org/neo4j/gds/approxmaxkcut/ApproxMaxKCutFactory.java
@@ -24,7 +24,7 @@
 import org.neo4j.gds.approxmaxkcut.config.ApproxMaxKCutConfig;
 import org.neo4j.gds.collections.haa.HugeAtomicByteArray;
 import org.neo4j.gds.collections.haa.HugeAtomicDoubleArray;
-import org.neo4j.gds.core.concurrency.Pools;
+import org.neo4j.gds.core.concurrency.DefaultPool;
 import org.neo4j.gds.core.utils.mem.MemoryEstimation;
 import org.neo4j.gds.core.utils.mem.MemoryEstimations;
 import org.neo4j.gds.core.utils.paged.HugeByteArray;
@@ -51,7 +51,7 @@ public ApproxMaxKCut build(
         CONFIG configuration,
         ProgressTracker progressTracker
     ) {
-        return new ApproxMaxKCut(graph, Pools.DEFAULT, configuration, progressTracker);
+        return new ApproxMaxKCut(graph, DefaultPool.INSTANCE, configuration, progressTracker);
     }
 
     @Override

diff --git a/algo/src/main/java/org/neo4j/gds/betweenness/BetweennessCentralityFactory.java b/algo/src/main/java/org/neo4j/gds/betweenness/BetweennessCentralityFactory.java
@@ -23,7 +23,7 @@
 import org.neo4j.gds.GraphAlgorithmFactory;
 import org.neo4j.gds.api.Graph;
 import org.neo4j.gds.collections.haa.HugeAtomicDoubleArray;
-import org.neo4j.gds.core.concurrency.Pools;
+import org.neo4j.gds.core.concurrency.DefaultPool;
 import org.neo4j.gds.core.utils.mem.MemoryEstimation;
 import org.neo4j.gds.core.utils.mem.MemoryEstimations;
 import org.neo4j.gds.core.utils.paged.HugeDoubleArray;
@@ -66,7 +66,7 @@ public BetweennessCentrality build(
             graph,
             strategy,
             traverserFactory,
-            Pools.DEFAULT,
+            DefaultPool.INSTANCE,
             configuration.concurrency(),
             progressTracker
         );