Reorder tasks

Author: jjaderberg

algo/src/main/java/org/neo4j/gds/steiner/ShortestPathsSteinerAlgorithm.java

@@ -114,9 +114,7 @@ private BitSet createTerminals() {
     @Override
     public SteinerTreeResult compute() {
         progressTracker.beginSubTask("SteinerTree");
-        if (applyRerouting) {
-            progressTracker.beginSubTask("Traverse");
-        }
+        progressTracker.beginSubTask("Traverse");
         HugeLongArray parent = HugeLongArray.newArray(graph.nodeCount());
         HugeDoubleArray parentCost = HugeDoubleArray.newArray(graph.nodeCount());
         ParallelUtil.parallelForEachNode(graph.nodeCount(), concurrency, v -> {
@@ -136,11 +134,12 @@ public SteinerTreeResult compute() {
             processPath(path, parent, parentCost, totalCost, effectiveNodeCount);
             terminalsReached.increment();
         });
+        progressTracker.endSubTask("Traverse");
 
         if (applyRerouting) {
-            progressTracker.endSubTask("Traverse");
             reroute(parent, parentCost, totalCost, effectiveNodeCount);
         }
+
         progressTracker.endSubTask("SteinerTree");
         return SteinerTreeResult.of(
             parent,

algo/src/main/java/org/neo4j/gds/steiner/SteinerTreeAlgorithmFactory.java

@@ -26,6 +26,7 @@
 import org.neo4j.gds.core.utils.progress.tasks.Task;
 import org.neo4j.gds.core.utils.progress.tasks.Tasks;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -66,14 +67,12 @@ public String taskName() {
     @Override
     public Task progressTask(Graph graph, CONFIG config) {
         var targetNodesSize = config.targetNodes().size();
+        var subtasks = new ArrayList<Task>();
+        subtasks.add(Tasks.leaf("Traverse", targetNodesSize));
         if (config.applyRerouting()) {
             long nodeCount = graph.nodeCount();
-            return Tasks.task(taskName(), List.of(
-                Tasks.leaf("Traverse", targetNodesSize),
-                Tasks.leaf("Reroute", nodeCount)
-            ));
-        } else {
-            return Tasks.leaf(taskName(), targetNodesSize);
+            subtasks.add(Tasks.leaf("Reroute", nodeCount));
         }
+        return Tasks.task(taskName(), subtasks);
     }
 }

algo/src/test/java/org/neo4j/gds/steiner/ShortestPathsSteinerAlgorithmReroutingTest.java

@@ -215,8 +215,10 @@ void shouldLogProgress() {
             .extracting(replaceTimings())
             .containsExactly(
                 "SteinerTree :: Start",
-                "SteinerTree 50%",
-                "SteinerTree 100%",
+                "SteinerTree :: Traverse :: Start",
+                "SteinerTree :: Traverse 50%",
+                "SteinerTree :: Traverse 100%",
+                "SteinerTree :: Traverse :: Finished",
                 "SteinerTree :: Finished"
             );
     }
@@ -252,18 +254,18 @@ void shouldLogProgressWithRerouting() {
             .extracting(replaceTimings())
             .containsExactly(
                 "SteinerTree :: Start",
-                "SteinerTree :: Main :: Start",
-                "SteinerTree :: Main 50%",
-                "SteinerTree :: Main 100%",
-                "SteinerTree :: Main :: Finished",
-                "SteinerTree :: Rerouting :: Start",
-                "SteinerTree :: Rerouting 16%",
-                "SteinerTree :: Rerouting 33%",
-                "SteinerTree :: Rerouting 50%",
-                "SteinerTree :: Rerouting 66%",
-                "SteinerTree :: Rerouting 83%",
-                "SteinerTree :: Rerouting 100%",
-                "SteinerTree :: Rerouting :: Finished",
+                "SteinerTree :: Traverse :: Start",
+                "SteinerTree :: Traverse 50%",
+                "SteinerTree :: Traverse 100%",
+                "SteinerTree :: Traverse :: Finished",
+                "SteinerTree :: Reroute :: Start",
+                "SteinerTree :: Reroute 16%",
+                "SteinerTree :: Reroute 33%",
+                "SteinerTree :: Reroute 50%",
+                "SteinerTree :: Reroute 66%",
+                "SteinerTree :: Reroute 83%",
+                "SteinerTree :: Reroute 100%",
+                "SteinerTree :: Reroute :: Finished",
                 "SteinerTree :: Finished"
             );
     }