Skip to content

Commit 2180877

Browse files
Mats-SXMats-SX
authored
Merge pull request #8119 from Mats-SX/24-fix-pool
2.4 - Fixing the pool sizes
2 parents 816b0d9 + 8c82ff9 commit 2180877

File tree

177 files changed

+588
-557
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

177 files changed

+588
-557
lines changed

‎algo-common/src/main/java/org/neo4j/gds/result/AbstractCentralityResultBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.HdrHistogram.DoubleHistogram;
2323
import org.jetbrains.annotations.NotNull;
2424
import org.neo4j.gds.api.ProcedureReturnColumns;
25-
import org.neo4j.gds.core.concurrency.Pools;
25+
import org.neo4j.gds.core.concurrency.DefaultPool;
2626
import org.neo4j.gds.core.utils.ProgressTimer;
2727
import org.neo4j.gds.scaling.LogScaler;
2828
import org.neo4j.gds.scaling.ScalerFactory;
@@ -95,7 +95,7 @@ private Optional<DoubleHistogram> computeCentralityHistogram() {
9595
return Optional.of(CentralityStatistics.histogram(
9696
nodeCount,
9797
centralityFunction,
98-
Pools.DEFAULT,
98+
DefaultPool.INSTANCE,
9999
concurrency
100100
));
101101
} catch (ArrayIndexOutOfBoundsException e) {

‎algo-common/src/main/java/org/neo4j/gds/result/AbstractCommunityResultBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import org.HdrHistogram.Histogram;
2323
import org.jetbrains.annotations.Nullable;
2424
import org.neo4j.gds.api.ProcedureReturnColumns;
25-
import org.neo4j.gds.core.concurrency.Pools;
25+
import org.neo4j.gds.core.concurrency.DefaultPool;
2626
import org.neo4j.gds.core.utils.ProgressTimer;
2727

2828
import java.util.Map;
@@ -54,7 +54,7 @@ protected AbstractCommunityResultBuilder(
5454
ProcedureReturnColumns returnColumns,
5555
int concurrency
5656
) {
57-
this(returnColumns, Pools.DEFAULT, concurrency);
57+
this(returnColumns, DefaultPool.INSTANCE, concurrency);
5858
}
5959

6060
protected AbstractCommunityResultBuilder(

‎algo-common/src/test/java/org/neo4j/gds/result/CommunityStatisticsTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.junit.jupiter.params.provider.Arguments;
2525
import org.junit.jupiter.params.provider.MethodSource;
2626
import org.neo4j.gds.TestSupport;
27-
import org.neo4j.gds.core.concurrency.Pools;
27+
import org.neo4j.gds.core.concurrency.DefaultPool;
2828

2929
import java.util.HashMap;
3030
import java.util.Map;
@@ -49,7 +49,7 @@ void communitySizes(
4949
var communitySizes = CommunityStatistics.communitySizes(
5050
nodeCount,
5151
communityFunction,
52-
Pools.DEFAULT,
52+
DefaultPool.INSTANCE,
5353
concurrency
5454
);
5555
expectedCommunitySizes.forEach((communityId, expectedSize) -> {
@@ -72,7 +72,7 @@ void communityCount(
7272
CommunityStatistics.communityCount(
7373
nodeCount,
7474
communityFunction,
75-
Pools.DEFAULT,
75+
DefaultPool.INSTANCE,
7676
concurrency
7777
)
7878
);
@@ -91,7 +91,7 @@ void communityCountAndHistogram(
9191
var communityCountAndHistogram = CommunityStatistics.communityCountAndHistogram(
9292
nodeCount,
9393
communityFunction,
94-
Pools.DEFAULT,
94+
DefaultPool.INSTANCE,
9595
concurrency
9696
);
9797

‎algo-common/src/test/java/org/neo4j/gds/scaling/CenterTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.junit.jupiter.params.provider.MethodSource;
2727
import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
2828
import org.neo4j.gds.core.CypherMapWrapper;
29-
import org.neo4j.gds.core.concurrency.Pools;
29+
import org.neo4j.gds.core.concurrency.DefaultPool;
3030
import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
3131
import org.neo4j.gds.nodeproperties.DoubleTestPropertyValues;
3232

@@ -63,7 +63,7 @@ void normalizes(NodePropertyValues properties, double avg, double[] expected) {
6363
10,
6464
1,
6565
ProgressTracker.NULL_TRACKER,
66-
Pools.DEFAULT
66+
DefaultPool.INSTANCE
6767
);
6868

6969
assertThat(scaler.avg).isEqualTo(avg);
@@ -81,7 +81,7 @@ void handlesMissingValue() {
8181
10,
8282
1,
8383
ProgressTracker.NULL_TRACKER,
84-
Pools.DEFAULT
84+
DefaultPool.INSTANCE
8585
);
8686

8787
var avg = 4.444;

‎algo-common/src/test/java/org/neo4j/gds/scaling/L1NormTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.junit.jupiter.params.provider.MethodSource;
2727
import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
2828
import org.neo4j.gds.core.CypherMapWrapper;
29-
import org.neo4j.gds.core.concurrency.Pools;
29+
import org.neo4j.gds.core.concurrency.DefaultPool;
3030
import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
3131
import org.neo4j.gds.nodeproperties.DoubleTestPropertyValues;
3232

@@ -62,7 +62,7 @@ void scale(int nodeCount, NodePropertyValues properties, double l1norm, double[]
6262
nodeCount,
6363
1,
6464
ProgressTracker.NULL_TRACKER,
65-
Pools.DEFAULT
65+
DefaultPool.INSTANCE
6666
);
6767

6868
assertThat(scaler.l1Norm).isEqualTo(l1norm);
@@ -79,7 +79,7 @@ void avoidsDivByZero() {
7979
10,
8080
1,
8181
ProgressTracker.NULL_TRACKER,
82-
Pools.DEFAULT
82+
DefaultPool.INSTANCE
8383
);
8484

8585
for (int i = 0; i < 10; i++) {
@@ -95,7 +95,7 @@ void handlesMissingValue() {
9595
10,
9696
1,
9797
ProgressTracker.NULL_TRACKER,
98-
Pools.DEFAULT
98+
DefaultPool.INSTANCE
9999
);
100100

101101
var l1norm = 40D;

‎algo-common/src/test/java/org/neo4j/gds/scaling/L2NormTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.junit.jupiter.params.provider.MethodSource;
2727
import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
2828
import org.neo4j.gds.core.CypherMapWrapper;
29-
import org.neo4j.gds.core.concurrency.Pools;
29+
import org.neo4j.gds.core.concurrency.DefaultPool;
3030
import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
3131
import org.neo4j.gds.nodeproperties.DoubleTestPropertyValues;
3232

@@ -53,7 +53,7 @@ void normalizes(NodePropertyValues properties, double euclideanLength, double[]
5353
10,
5454
1,
5555
ProgressTracker.NULL_TRACKER,
56-
Pools.DEFAULT
56+
DefaultPool.INSTANCE
5757
);
5858

5959
assertThat(scaler.euclideanLength).isEqualTo(euclideanLength);
@@ -70,7 +70,7 @@ void avoidsDivByZero() {
7070
10,
7171
1,
7272
ProgressTracker.NULL_TRACKER,
73-
Pools.DEFAULT
73+
DefaultPool.INSTANCE
7474
);
7575

7676
for (int i = 0; i < 10; i++) {
@@ -86,7 +86,7 @@ void handlesMissingValue() {
8686
10,
8787
1,
8888
ProgressTracker.NULL_TRACKER,
89-
Pools.DEFAULT
89+
DefaultPool.INSTANCE
9090
);
9191

9292
var euclideanLength = 16.124;

‎algo-common/src/test/java/org/neo4j/gds/scaling/LogScalerTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.junit.jupiter.params.provider.MethodSource;
2727
import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
2828
import org.neo4j.gds.core.CypherMapWrapper;
29-
import org.neo4j.gds.core.concurrency.Pools;
29+
import org.neo4j.gds.core.concurrency.DefaultPool;
3030
import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
3131
import org.neo4j.gds.nodeproperties.DoubleTestPropertyValues;
3232
import org.neo4j.gds.nodeproperties.LongTestPropertyValues;
@@ -72,7 +72,7 @@ void handlesMissingValue() {
7272
10,
7373
1,
7474
ProgressTracker.NULL_TRACKER,
75-
Pools.DEFAULT
75+
DefaultPool.INSTANCE
7676
);
7777

7878
for (int i = 0; i < 5; i++) {

‎algo-common/src/test/java/org/neo4j/gds/scaling/MaxTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.junit.jupiter.params.provider.MethodSource;
2727
import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
2828
import org.neo4j.gds.core.CypherMapWrapper;
29-
import org.neo4j.gds.core.concurrency.Pools;
29+
import org.neo4j.gds.core.concurrency.DefaultPool;
3030
import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
3131
import org.neo4j.gds.nodeproperties.DoubleTestPropertyValues;
3232

@@ -70,7 +70,7 @@ void scale(int nodeCount, NodePropertyValues properties, double absMax, double[]
7070
nodeCount,
7171
1,
7272
ProgressTracker.NULL_TRACKER,
73-
Pools.DEFAULT
73+
DefaultPool.INSTANCE
7474
);
7575

7676
assertThat(scaler.maxAbs).isEqualTo(absMax);
@@ -88,7 +88,7 @@ void avoidsDivByZero() {
8888
10,
8989
1,
9090
ProgressTracker.NULL_TRACKER,
91-
Pools.DEFAULT
91+
DefaultPool.INSTANCE
9292
);
9393

9494
assertThat(scaler.statistics()).containsExactlyEntriesOf(Map.of("absMax", List.of(0D)));
@@ -106,7 +106,7 @@ void handlesMissingValue() {
106106
10,
107107
1,
108108
ProgressTracker.NULL_TRACKER,
109-
Pools.DEFAULT
109+
DefaultPool.INSTANCE
110110
);
111111

112112

‎algo-common/src/test/java/org/neo4j/gds/scaling/MeanTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.junit.jupiter.params.provider.MethodSource;
2727
import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
2828
import org.neo4j.gds.core.CypherMapWrapper;
29-
import org.neo4j.gds.core.concurrency.Pools;
29+
import org.neo4j.gds.core.concurrency.DefaultPool;
3030
import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
3131
import org.neo4j.gds.nodeproperties.DoubleTestPropertyValues;
3232

@@ -57,7 +57,7 @@ void normalizes(NodePropertyValues properties, double avg, double min, double ma
5757
10,
5858
1,
5959
ProgressTracker.NULL_TRACKER,
60-
Pools.DEFAULT
60+
DefaultPool.INSTANCE
6161
);
6262

6363
assertThat(scaler.avg).isEqualTo(avg);
@@ -81,7 +81,7 @@ void avoidsDivByZero() {
8181
10,
8282
1,
8383
ProgressTracker.NULL_TRACKER,
84-
Pools.DEFAULT
84+
DefaultPool.INSTANCE
8585
);
8686

8787
assertThat(scaler.statistics()).containsExactlyInAnyOrderEntriesOf(Map.of(
@@ -103,7 +103,7 @@ void handlesMissingValue() {
103103
10,
104104
1,
105105
ProgressTracker.NULL_TRACKER,
106-
Pools.DEFAULT
106+
DefaultPool.INSTANCE
107107
);
108108

109109
var avg = 4.444;

‎algo-common/src/test/java/org/neo4j/gds/scaling/MinMaxTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.junit.jupiter.params.provider.MethodSource;
2727
import org.neo4j.gds.api.properties.nodes.NodePropertyValues;
2828
import org.neo4j.gds.core.CypherMapWrapper;
29-
import org.neo4j.gds.core.concurrency.Pools;
29+
import org.neo4j.gds.core.concurrency.DefaultPool;
3030
import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
3131
import org.neo4j.gds.nodeproperties.DoubleTestPropertyValues;
3232

@@ -53,7 +53,7 @@ void normalizes(NodePropertyValues properties, double min, double max) {
5353
10,
5454
1,
5555
ProgressTracker.NULL_TRACKER,
56-
Pools.DEFAULT
56+
DefaultPool.INSTANCE
5757
);
5858

5959
assertThat(scaler.min).isEqualTo(min);
@@ -77,7 +77,7 @@ void avoidsDivByZero() {
7777
10,
7878
1,
7979
ProgressTracker.NULL_TRACKER,
80-
Pools.DEFAULT
80+
DefaultPool.INSTANCE
8181
);
8282

8383
assertThat(scaler.statistics()).containsExactlyEntriesOf(Map.of(
@@ -98,7 +98,7 @@ void handlesMissingValue() {
9898
10,
9999
1,
100100
ProgressTracker.NULL_TRACKER,
101-
Pools.DEFAULT
101+
DefaultPool.INSTANCE
102102
);
103103

104104

0 commit comments

Comments
 (0)