Skip to content

Commit f53debf

Browse files
committed
migrate estimation cli wcc to application layer
but not the factory because that is widely used
1 parent 287d77d commit f53debf

File tree

10 files changed

+12
-297
lines changed

10 files changed

+12
-297
lines changed

algo/src/main/java/org/neo4j/gds/wcc/Wcc.java

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -59,27 +59,6 @@ public class Wcc extends Algorithm<DisjointSetStruct> {
5959

6060
private final Graph graph;
6161

62-
/**
63-
* @deprecated Stop using this, use the variant that does direct injection of termination flag instead
64-
*/
65-
@Deprecated
66-
public Wcc(
67-
Graph graph,
68-
ExecutorService executor,
69-
int minBatchSize,
70-
WccParameters parameters,
71-
ProgressTracker progressTracker
72-
) {
73-
this(
74-
graph,
75-
executor,
76-
minBatchSize,
77-
parameters,
78-
progressTracker,
79-
TerminationFlag.RUNNING_TRUE
80-
);
81-
}
82-
8362
public Wcc(
8463
Graph graph,
8564
ExecutorService executor,

algo/src/main/java/org/neo4j/gds/wcc/WccAlgorithmFactory.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
3030
import org.neo4j.gds.core.utils.progress.tasks.Task;
3131
import org.neo4j.gds.core.utils.progress.tasks.Tasks;
32+
import org.neo4j.gds.termination.TerminationFlag;
3233

3334
public final class WccAlgorithmFactory<CONFIG extends WccBaseConfig> extends GraphAlgorithmFactory<Wcc, CONFIG> {
3435

@@ -51,7 +52,8 @@ public Wcc build(
5152
DefaultPool.INSTANCE,
5253
ParallelUtil.DEFAULT_BATCH_SIZE,
5354
parameters,
54-
progressTracker
55+
progressTracker,
56+
TerminationFlag.RUNNING_TRUE
5557
);
5658
}
5759

algo/src/test/java/org/neo4j/gds/wcc/IncrementalWccTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.neo4j.gds.core.concurrency.DefaultPool;
2828
import org.neo4j.gds.core.utils.paged.dss.DisjointSetStruct;
2929
import org.neo4j.gds.core.utils.progress.tasks.ProgressTracker;
30+
import org.neo4j.gds.termination.TerminationFlag;
3031

3132
import java.util.Optional;
3233
import java.util.stream.Collectors;
@@ -123,7 +124,8 @@ private DisjointSetStruct run(Graph graph, WccParameters parameters) {
123124
DefaultPool.INSTANCE,
124125
COMMUNITY_SIZE / ConcurrencyConfig.DEFAULT_CONCURRENCY,
125126
parameters,
126-
ProgressTracker.NULL_TRACKER
127+
ProgressTracker.NULL_TRACKER,
128+
TerminationFlag.RUNNING_TRUE
127129
).compute();
128130
}
129131

algo/src/test/java/org/neo4j/gds/wcc/WccTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import org.neo4j.gds.extension.Inject;
4343
import org.neo4j.gds.extension.TestGraph;
4444
import org.neo4j.gds.logging.GdsTestLog;
45+
import org.neo4j.gds.termination.TerminationFlag;
4546

4647
import java.util.ArrayList;
4748
import java.util.Arrays;
@@ -218,7 +219,8 @@ DisjointSetStruct run(Graph graph, WccParameters parameters, int concurrency) {
218219
DefaultPool.INSTANCE,
219220
communitySize() / concurrency,
220221
parameters,
221-
ProgressTracker.NULL_TRACKER
222+
ProgressTracker.NULL_TRACKER,
223+
TerminationFlag.RUNNING_TRUE
222224
).compute();
223225
}
224226

algo/src/test/java/org/neo4j/gds/wcc/WccThresholdTest.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.neo4j.gds.extension.GdlGraph;
3232
import org.neo4j.gds.extension.Inject;
3333
import org.neo4j.gds.extension.TestGraph;
34+
import org.neo4j.gds.termination.TerminationFlag;
3435

3536
import java.util.stream.Stream;
3637

@@ -110,7 +111,8 @@ private void assertResults(double threshold, TestGraph graph, String[][] expecte
110111
DefaultPool.INSTANCE,
111112
DEFAULT_BATCH_SIZE,
112113
parameters,
113-
ProgressTracker.NULL_TRACKER
114+
ProgressTracker.NULL_TRACKER,
115+
TerminationFlag.RUNNING_TRUE
114116
).compute();
115117

116118
long[] communityData = new long[(int) graph.nodeCount()];

algorithm-specifications/src/main/java/org/neo4j/gds/wcc/Constants.java

Lines changed: 0 additions & 28 deletions
This file was deleted.

algorithm-specifications/src/main/java/org/neo4j/gds/wcc/WccMutateSpecification.java

Lines changed: 0 additions & 60 deletions
This file was deleted.

algorithm-specifications/src/main/java/org/neo4j/gds/wcc/WccStatsSpecification.java

Lines changed: 0 additions & 57 deletions
This file was deleted.

algorithm-specifications/src/main/java/org/neo4j/gds/wcc/WccStreamSpecification.java

Lines changed: 0 additions & 70 deletions
This file was deleted.

algorithm-specifications/src/main/java/org/neo4j/gds/wcc/WccWriteSpecification.java

Lines changed: 0 additions & 57 deletions
This file was deleted.

0 commit comments

Comments
 (0)