Skip to content

Commit 72a4e0e

Browse files
committed
[service] use depList instead of preTasks in TaskNode
1 parent 43a27e1 commit 72a4e0e

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkflowDefinitionServiceImpl.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1989,19 +1989,16 @@ public Map<String, Object> viewTree(User loginUser, long projectCode, long code,
19891989
* @return if graph has cycle flag
19901990
*/
19911991
private boolean graphHasCycle(List<TaskNode> taskNodeResponseList) {
1992-
DAG<String, TaskNode, String> graph = new DAG<>();
1992+
DAG<Long, TaskNode, String> graph = new DAG<>();
19931993
// Fill the vertices
19941994
for (TaskNode taskNodeResponse : taskNodeResponseList) {
1995-
graph.addNode(Long.toString(taskNodeResponse.getCode()), taskNodeResponse);
1995+
graph.addNode(taskNodeResponse.getCode(), taskNodeResponse);
19961996
}
19971997
// Fill edge relations
19981998
for (TaskNode taskNodeResponse : taskNodeResponseList) {
1999-
List<String> preTasks = JSONUtils.toList(taskNodeResponse.getPreTasks(), String.class);
2000-
if (CollectionUtils.isNotEmpty(preTasks)) {
2001-
for (String preTask : preTasks) {
2002-
if (!graph.addEdge(preTask, Long.toString(taskNodeResponse.getCode()))) {
2003-
return true;
2004-
}
1999+
for (Long preTask : taskNodeResponse.getDepList()) {
2000+
if (!graph.addEdge(preTask, taskNodeResponse.getCode())) {
2001+
return true;
20052002
}
20062003
}
20072004
}

0 commit comments

Comments
 (0)