Tasks are ordered using TaskModel.getSeq()

Netflix · Mar 9, 2022 · 02a3b4b · 02a3b4b
1 parent a4d3cd4
commit 02a3b4b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 10 deletions.
diff --git a/mysql-persistence/src/main/java/com/netflix/conductor/mysql/dao/MySQLExecutionDAO.java b/mysql-persistence/src/main/java/com/netflix/conductor/mysql/dao/MySQLExecutionDAO.java
@@ -333,9 +333,7 @@ public WorkflowModel getWorkflow(String workflowId, boolean includeTasks) {
         if (workflow != null) {
             if (includeTasks) {
                 List<TaskModel> tasks = getTasksForWorkflow(workflowId);
-                tasks.sort(
-                        Comparator.comparingLong(TaskModel::getScheduledTime)
-                                .thenComparingInt(TaskModel::getSeq));
+                tasks.sort(Comparator.comparingInt(TaskModel::getSeq));
                 workflow.setTasks(tasks);
             }
         }

diff --git a/...es-persistence/src/main/java/com/netflix/conductor/postgres/dao/PostgresExecutionDAO.java b/...es-persistence/src/main/java/com/netflix/conductor/postgres/dao/PostgresExecutionDAO.java
@@ -335,9 +335,7 @@ public WorkflowModel getWorkflow(String workflowId, boolean includeTasks) {
         if (workflow != null) {
             if (includeTasks) {
                 List<TaskModel> tasks = getTasksForWorkflow(workflowId);
-                tasks.sort(
-                        Comparator.comparingLong(TaskModel::getScheduledTime)
-                                .thenComparingInt(TaskModel::getSeq));
+                tasks.sort(Comparator.comparingInt(TaskModel::getSeq));
                 workflow.setTasks(tasks);
             }
         }

diff --git a/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/RedisExecutionDAO.java b/redis-persistence/src/main/java/com/netflix/conductor/redis/dao/RedisExecutionDAO.java
@@ -499,9 +499,7 @@ public WorkflowModel getWorkflow(String workflowId, boolean includeTasks) {
                     "getWorkflow", json.length(), "n/a", workflow.getWorkflowName());
             if (includeTasks) {
                 List<TaskModel> tasks = getTasksForWorkflow(workflowId);
-                tasks.sort(
-                        Comparator.comparingLong(TaskModel::getScheduledTime)
-                                .thenComparingInt(TaskModel::getSeq));
+                tasks.sort(Comparator.comparingInt(TaskModel::getSeq));
                 workflow.setTasks(tasks);
             }
         }

diff --git a/...est/groovy/com/netflix/conductor/test/integration/WorkflowAndTaskConfigurationSpec.groovy b/...est/groovy/com/netflix/conductor/test/integration/WorkflowAndTaskConfigurationSpec.groovy
@@ -714,7 +714,7 @@ class WorkflowAndTaskConfigurationSpec extends AbstractSpecification {
     }
 
     def "Test wait time out task based simple workflow"() {
-        when: "Start a workflow based on a task that has a registered wiat time out"
+        when: "Start a workflow based on a task that has a registered wait time out"
         def workflowInstanceId = workflowExecutor.startWorkflow(WAIT_TIME_OUT_WORKFLOW, 1,
                 '', [:], null, null, null)