Merge pull request #11730 from lassewesth/dieprogresstracker13

lassewesth · web-flow · commit aa69057ba5f0 · 2026-03-06T15:03:51.000+01:00
move settings into facade
diff --git a/algo/src/main/java/org/neo4j/gds/betweenness/BetweennessCentrality.java b/algo/src/main/java/org/neo4j/gds/betweenness/BetweennessCentrality.java
@@ -140,7 +140,7 @@ public void run() {
                 }
 
                 // reset
-                getProgressTracker().logProgress();
+                progressTracker.logProgress();
 
                 clear();
                 forwardTraversor.clear();
diff --git a/algo/src/main/java/org/neo4j/gds/k1coloring/K1Coloring.java b/algo/src/main/java/org/neo4j/gds/k1coloring/K1Coloring.java
@@ -197,7 +197,7 @@ private void runColoring(long volume) {
                 graph.concurrentCopy(),
                 colors,
                 partition,
-                getProgressTracker()
+                progressTracker
             )
         );
 
diff --git a/progress-tracking/src/main/java/org/neo4j/gds/core/utils/progress/ProgressLogger.java b/progress-tracking/src/main/java/org/neo4j/gds/core/utils/progress/ProgressLogger.java
@@ -73,46 +73,41 @@ default void logFinish() {
         logFinish("");
     }
 
-    default ProgressLogger logFinish(String message) {
+    default void logFinish(String message) {
         logMessage((message + TASK_SEPARATOR + "Finished").trim());
-        return this;
     }
 
-    default ProgressLogger logFinishWithFailure() {
-        return logFinishWithFailure("");
+    default void logFinishWithFailure() {
+        logFinishWithFailure("");
     }
 
-    default ProgressLogger logFinishWithFailure(String message) {
+    default void logFinishWithFailure(String message) {
         logMessage((message + TASK_SEPARATOR + "Failed").trim());
-        return this;
     }
 
-    default ProgressLogger logFinishSubtaskWithFailure(String subTaskName) {
+    default void logFinishSubtaskWithFailure(String subTaskName) {
         logFinishWithFailure();
         var endIndex = getTask().indexOf(TASK_SEPARATOR + subTaskName);
         if (endIndex == -1) {
             throw new IllegalArgumentException("Unknown subtask: " + subTaskName);
         }
         var task = getTask().substring(0, endIndex);
         setTask(task);
-        return this;
     }
 
-    default ProgressLogger startSubTask(String subTaskName) {
+    default void startSubTask(String subTaskName) {
         setTask(getTask() + TASK_SEPARATOR + subTaskName);
         logStart();
-        return this;
     }
 
-    default ProgressLogger finishSubTask(String subTaskName) {
+    default void finishSubTask(String subTaskName) {
         logFinish();
         var endIndex = getTask().lastIndexOf(TASK_SEPARATOR + subTaskName);
         if (endIndex == -1) {
             throw new IllegalArgumentException("Unknown subtask: " + subTaskName);
         }
         var task = getTask().substring(0, endIndex);
         setTask(task);
-        return this;
     }
 
     long reset(long newTaskVolume);
diff --git a/progress-tracking/src/main/java/org/neo4j/gds/core/utils/progress/tasks/IterativeTask.java b/progress-tracking/src/main/java/org/neo4j/gds/core/utils/progress/tasks/IterativeTask.java
@@ -82,7 +82,7 @@ protected Task nextSubTaskAfterValidation() {
         } else if (mode == Mode.OPEN) {
             var newIterationTasks = subTasksSupplier.get();
             subTasks().addAll(newIterationTasks);
-            return newIterationTasks.get(0);
+            return newIterationTasks.getFirst();
         } else {
             throw new IllegalStateException("No more pending subtasks");
         }
diff --git a/progress-tracking/src/main/java/org/neo4j/gds/core/utils/progress/tasks/LoggingLeafTaskVisitor.java b/progress-tracking/src/main/java/org/neo4j/gds/core/utils/progress/tasks/LoggingLeafTaskVisitor.java
@@ -21,7 +21,6 @@
 
 import org.neo4j.gds.core.utils.progress.ProgressLogger;
 
-@SuppressWarnings("ClassCanBeRecord")
 final class LoggingLeafTaskVisitor implements TaskVisitor {
     private final ProgressLogger progressLogger;
 
diff --git a/progress-tracking/src/main/java/org/neo4j/gds/core/utils/progress/tasks/TaskProgressLogger.java b/progress-tracking/src/main/java/org/neo4j/gds/core/utils/progress/tasks/TaskProgressLogger.java
@@ -28,7 +28,6 @@
 
 import static org.neo4j.gds.utils.StringFormatting.formatWithLocale;
 
-@SuppressWarnings("ClassCanBeRecord")
 public final class TaskProgressLogger implements ProgressLogger {
     private final BatchingProgressLogger batchingProgressLogger;
     private final Task baseTask;
diff --git a/progress-tracking/src/main/java/org/neo4j/gds/core/utils/progress/tasks/TaskTreeProgressTracker.java b/progress-tracking/src/main/java/org/neo4j/gds/core/utils/progress/tasks/TaskTreeProgressTracker.java
@@ -28,7 +28,6 @@
 
 import java.util.function.Supplier;
 
-@SuppressWarnings("ClassCanBeRecord")
 public final class TaskTreeProgressTracker implements ProgressTracker {
     private final TaskProgressTracker delegate;
 
diff --git a/progress-tracking/src/main/java/org/neo4j/gds/mem/GraphStoreMemoryContainer.java b/progress-tracking/src/main/java/org/neo4j/gds/mem/GraphStoreMemoryContainer.java
@@ -22,8 +22,6 @@
 import org.neo4j.gds.api.graph.store.catalog.GraphStoreAddedEvent;
 import org.neo4j.gds.api.graph.store.catalog.GraphStoreRemovedEvent;
 
-import java.util.HashSet;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
@@ -77,10 +75,7 @@ long memoryOfGraphs(String user){
             .reduce(0L, Long::sum);
     }
 
-    Set<String> graphUsers(Optional<Set<String>> inputUsers){
-            Set<String> users = inputUsers.orElseGet(HashSet::new);
-            users.addAll(graphStoresMemory.keySet());
-            return  users;
+    Set<String> graphUsers(){
+        return graphStoresMemory.keySet();
     }
-
 }
diff --git a/progress-tracking/src/main/java/org/neo4j/gds/mem/MemoryTracker.java b/progress-tracking/src/main/java/org/neo4j/gds/mem/MemoryTracker.java
@@ -28,7 +28,6 @@
 import org.neo4j.gds.core.utils.progress.UserTask;
 import org.neo4j.gds.logging.Log;
 
-import java.util.Optional;
 import java.util.stream.Stream;
 
 import static org.neo4j.gds.utils.StringFormatting.formatWithLocale;
@@ -83,9 +82,8 @@ public UserMemorySummary memorySummary(String user){
     }
 
     public Stream<UserMemorySummary> memorySummary(){
-
-        var  users = graphStoreMemoryContainer.graphUsers(Optional.empty());
-        users = taskMemoryContainer.taskUsers(Optional.of(users));
+        var  users = graphStoreMemoryContainer.graphUsers();
+        users = taskMemoryContainer.taskUsers(users);
 
         return  users.stream()
             .map(user -> new UserMemorySummary(
diff --git a/progress-tracking/src/main/java/org/neo4j/gds/mem/TaskMemoryContainer.java b/progress-tracking/src/main/java/org/neo4j/gds/mem/TaskMemoryContainer.java
@@ -24,7 +24,6 @@
 import org.neo4j.gds.core.utils.progress.UserTask;
 
 import java.util.HashSet;
-import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicLong;
@@ -81,10 +80,9 @@ long memoryOfTasks(String user){
 
     }
 
-    Set<String> taskUsers(Optional<Set<String>> inputUsers){
-        Set<String> users = inputUsers.orElseGet(HashSet::new);
+    Set<String> taskUsers(Set<String> inputUsers) {
+        var users = new HashSet<>(inputUsers);
         users.addAll(memoryInUse.keySet());
-        return  users;
+        return users;
     }
-
 }
diff --git a/progress-tracking/src/test/java/org/neo4j/gds/core/RequestCorrelationIdForTesting.java b/progress-tracking/src/test/java/org/neo4j/gds/core/RequestCorrelationIdForTesting.java
@@ -19,7 +19,6 @@
  */
 package org.neo4j.gds.core;
 
-@SuppressWarnings("ClassCanBeRecord")
 public class RequestCorrelationIdForTesting implements RequestCorrelationId {
     private final String value;
 
diff --git a/progress-tracking/src/test/java/org/neo4j/gds/core/utils/progress/tasks/TaskTraversalTest.java b/progress-tracking/src/test/java/org/neo4j/gds/core/utils/progress/tasks/TaskTraversalTest.java
@@ -40,8 +40,7 @@ void shouldTraverseWithDepthInformation() {
     }
 
     static class DepthCollectingVisitorVisitor extends DepthAwareTaskVisitor {
-
-        List<Integer> depthInformation = new ArrayList<>();
+        final List<Integer> depthInformation = new ArrayList<>();
 
         @Override
         public void visit(Task task) {

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ public void run() {`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`// reset`
`143`		`- getProgressTracker().logProgress();`
	`143`	`+ progressTracker.logProgress();`
`144`	`144`
`145`	`145`	`clear();`
`146`	`146`	`forwardTraversor.clear();`
Original file line number	Diff line number	Diff line change
`@@ -197,7 +197,7 @@ private void runColoring(long volume) {`
`197`	`197`	`graph.concurrentCopy(),`
`198`	`198`	`colors,`
`199`	`199`	`partition,`
`200`		`- getProgressTracker()`
	`200`	`+ progressTracker`
`201`	`201`	`)`
`202`	`202`	`);`
`203`	`203`
Original file line number	Diff line number	Diff line change
`@@ -73,46 +73,41 @@ default void logFinish() {`
`73`	`73`	`logFinish("");`
`74`	`74`	`}`
`75`	`75`
`76`		`- default ProgressLogger logFinish(String message) {`
	`76`	`+ default void logFinish(String message) {`
`77`	`77`	`logMessage((message + TASK_SEPARATOR + "Finished").trim());`
`78`		`- return this;`
`79`	`78`	`}`
`80`	`79`
`81`		`- default ProgressLogger logFinishWithFailure() {`
`82`		`- return logFinishWithFailure("");`
	`80`	`+ default void logFinishWithFailure() {`
	`81`	`+ logFinishWithFailure("");`
`83`	`82`	`}`
`84`	`83`
`85`		`- default ProgressLogger logFinishWithFailure(String message) {`
	`84`	`+ default void logFinishWithFailure(String message) {`
`86`	`85`	`logMessage((message + TASK_SEPARATOR + "Failed").trim());`
`87`		`- return this;`
`88`	`86`	`}`
`89`	`87`
`90`		`- default ProgressLogger logFinishSubtaskWithFailure(String subTaskName) {`
	`88`	`+ default void logFinishSubtaskWithFailure(String subTaskName) {`
`91`	`89`	`logFinishWithFailure();`
`92`	`90`	`var endIndex = getTask().indexOf(TASK_SEPARATOR + subTaskName);`
`93`	`91`	`if (endIndex == -1) {`
`94`	`92`	`throw new IllegalArgumentException("Unknown subtask: " + subTaskName);`
`95`	`93`	`}`
`96`	`94`	`var task = getTask().substring(0, endIndex);`
`97`	`95`	`setTask(task);`
`98`		`- return this;`
`99`	`96`	`}`
`100`	`97`
`101`		`- default ProgressLogger startSubTask(String subTaskName) {`
	`98`	`+ default void startSubTask(String subTaskName) {`
`102`	`99`	`setTask(getTask() + TASK_SEPARATOR + subTaskName);`
`103`	`100`	`logStart();`
`104`		`- return this;`
`105`	`101`	`}`
`106`	`102`
`107`		`- default ProgressLogger finishSubTask(String subTaskName) {`
	`103`	`+ default void finishSubTask(String subTaskName) {`
`108`	`104`	`logFinish();`
`109`	`105`	`var endIndex = getTask().lastIndexOf(TASK_SEPARATOR + subTaskName);`
`110`	`106`	`if (endIndex == -1) {`
`111`	`107`	`throw new IllegalArgumentException("Unknown subtask: " + subTaskName);`
`112`	`108`	`}`
`113`	`109`	`var task = getTask().substring(0, endIndex);`
`114`	`110`	`setTask(task);`
`115`		`- return this;`
`116`	`111`	`}`
`117`	`112`
`118`	`113`	`long reset(long newTaskVolume);`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ protected Task nextSubTaskAfterValidation() {`
`82`	`82`	`} else if (mode == Mode.OPEN) {`
`83`	`83`	`var newIterationTasks = subTasksSupplier.get();`
`84`	`84`	`subTasks().addAll(newIterationTasks);`
`85`		`- return newIterationTasks.get(0);`
	`85`	`+ return newIterationTasks.getFirst();`
`86`	`86`	`} else {`
`87`	`87`	`throw new IllegalStateException("No more pending subtasks");`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,6 @@`
`22`	`22`	`import org.neo4j.gds.api.graph.store.catalog.GraphStoreAddedEvent;`
`23`	`23`	`import org.neo4j.gds.api.graph.store.catalog.GraphStoreRemovedEvent;`
`24`	`24`
`25`		`-import java.util.HashSet;`
`26`		`-import java.util.Optional;`
`27`	`25`	`import java.util.Set;`
`28`	`26`	`import java.util.concurrent.ConcurrentHashMap;`
`29`	`27`	`import java.util.concurrent.atomic.AtomicLong;`
`@@ -77,10 +75,7 @@ long memoryOfGraphs(String user){`
`77`	`75`	`.reduce(0L, Long::sum);`
`78`	`76`	`}`
`79`	`77`
`80`		`- Set<String> graphUsers(Optional<Set<String>> inputUsers){`
`81`		`- Set<String> users = inputUsers.orElseGet(HashSet::new);`
`82`		`- users.addAll(graphStoresMemory.keySet());`
`83`		`- return users;`
	`78`	`+ Set<String> graphUsers(){`
	`79`	`+ return graphStoresMemory.keySet();`
`84`	`80`	`}`
`85`		`-`
`86`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,6 @@`
`24`	`24`	`import org.neo4j.gds.core.utils.progress.UserTask;`
`25`	`25`
`26`	`26`	`import java.util.HashSet;`
`27`		`-import java.util.Optional;`
`28`	`27`	`import java.util.Set;`
`29`	`28`	`import java.util.concurrent.ConcurrentHashMap;`
`30`	`29`	`import java.util.concurrent.atomic.AtomicLong;`
`@@ -81,10 +80,9 @@ long memoryOfTasks(String user){`
`81`	`80`
`82`	`81`	`}`
`83`	`82`
`84`		`- Set<String> taskUsers(Optional<Set<String>> inputUsers){`
`85`		`- Set<String> users = inputUsers.orElseGet(HashSet::new);`
	`83`	`+ Set<String> taskUsers(Set<String> inputUsers) {`
	`84`	`+ var users = new HashSet<>(inputUsers);`
`86`	`85`	`users.addAll(memoryInUse.keySet());`
`87`		`- return users;`
	`86`	`+ return users;`
`88`	`87`	`}`
`89`		`-`
`90`	`88`	`}`