This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 2792c35 [Bug] [API] queryProcessDefinitionByCode bug (#7221)
2792c35 is described below
commit 2792c35d68517ab293cc19416cfcf9218c02f984
Author: JinYong Li <[email protected]>
AuthorDate: Tue Dec 7 14:41:26 2021 +0800
[Bug] [API] queryProcessDefinitionByCode bug (#7221)
---
.../dolphinscheduler/api/controller/SchedulerController.java | 6 ++++--
.../api/service/impl/WorkFlowLineageServiceImpl.java | 3 +++
.../dolphinscheduler/service/process/ProcessService.java | 12 +++++++++---
3 files changed, 16 insertions(+), 5 deletions(-)
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java
index e1edfea..0e1ca4d 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java
@@ -148,6 +148,7 @@ public class SchedulerController extends BaseController {
@ApiImplicitParam(name = "environmentCode", value =
"ENVIRONMENT_CODE", dataType = "Long"),
})
@PutMapping("/{id}")
+ @ResponseStatus(HttpStatus.OK)
@ApiException(UPDATE_SCHEDULE_ERROR)
@AccessLogAnnotation(ignoreRequestArgs = "loginUser")
public Result updateSchedule(@ApiIgnore @RequestAttribute(value =
SESSION_USER) User loginUser,
@@ -330,11 +331,12 @@ public class SchedulerController extends BaseController {
@ApiImplicitParam(name = "warningType", value = "WARNING_TYPE", type =
"WarningType"),
@ApiImplicitParam(name = "warningGroupId", value = "WARNING_GROUP_ID",
dataType = "Int", example = "100"),
@ApiImplicitParam(name = "failureStrategy", value =
"FAILURE_STRATEGY", type = "FailureStrategy"),
- @ApiImplicitParam(name = "workerGroupId", value = "WORKER_GROUP_ID",
dataType = "Int", example = "100"),
+ @ApiImplicitParam(name = "workerGroup", value = "WORKER_GROUP",
dataType = "String", example = "default"),
@ApiImplicitParam(name = "processInstancePriority", value =
"PROCESS_INSTANCE_PRIORITY", type = "Priority"),
@ApiImplicitParam(name = "environmentCode", value =
"ENVIRONMENT_CODE", dataType = "Long"),
})
- @PutMapping("/{code}")
+ @PutMapping("/update/{code}")
+ @ResponseStatus(HttpStatus.OK)
@ApiException(UPDATE_SCHEDULE_ERROR)
@AccessLogAnnotation(ignoreRequestArgs = "loginUser")
public Result updateScheduleByProcessDefinitionCode(@ApiIgnore
@RequestAttribute(value = SESSION_USER) User loginUser,
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkFlowLineageServiceImpl.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkFlowLineageServiceImpl.java
index d665a1a..1367de7 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkFlowLineageServiceImpl.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkFlowLineageServiceImpl.java
@@ -177,6 +177,9 @@ public class WorkFlowLineageServiceImpl extends
BaseServiceImpl implements WorkF
private Set<Long> querySourceWorkFlowCodes(long projectCode, long
workFlowCode, List<TaskDefinition> taskDefinitionList) {
Set<Long> sourceWorkFlowCodes = new HashSet<>();
+ if (taskDefinitionList == null || taskDefinitionList.isEmpty()) {
+ return sourceWorkFlowCodes;
+ }
List<TaskDefinitionLog> taskDefinitionLogs =
taskDefinitionLogMapper.queryByTaskDefinitions(taskDefinitionList);
for (TaskDefinitionLog taskDefinitionLog : taskDefinitionLogs) {
if (taskDefinitionLog.getProjectCode() == projectCode) {
diff --git
a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
index 9992002..c3ee5c8 100644
---
a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
+++
b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
@@ -136,9 +136,9 @@ import
org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
-import com.facebook.presto.jdbc.internal.guava.collect.Lists;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.collect.Lists;
/**
* process relative dao that some mappers in this.
@@ -415,7 +415,7 @@ public class ProcessService {
ProcessDefinition processDefinition =
processDefineMapper.queryByCode(defineCode);
if (processDefinition == null) {
logger.error("process define not exists");
- return new ArrayList<>();
+ return Lists.newArrayList();
}
List<ProcessTaskRelationLog> processTaskRelations =
processTaskRelationLogMapper.queryByProcessCodeAndVersion(processDefinition.getCode(),
processDefinition.getVersion());
Set<TaskDefinition> taskDefinitionSet = new HashSet<>();
@@ -424,8 +424,11 @@ public class ProcessService {
taskDefinitionSet.add(new
TaskDefinition(processTaskRelation.getPostTaskCode(),
processTaskRelation.getPostTaskVersion()));
}
}
+ if (taskDefinitionSet.isEmpty()) {
+ return Lists.newArrayList();
+ }
List<TaskDefinitionLog> taskDefinitionLogs =
taskDefinitionLogMapper.queryByTaskDefinitions(taskDefinitionSet);
- return new ArrayList<>(taskDefinitionLogs);
+ return Lists.newArrayList(taskDefinitionLogs);
}
/**
@@ -2409,6 +2412,9 @@ public class ProcessService {
taskDefinitionSet.add(new
TaskDefinition(processTaskRelation.getPostTaskCode(),
processTaskRelation.getPostTaskVersion()));
}
}
+ if (taskDefinitionSet.isEmpty()) {
+ return Lists.newArrayList();
+ }
return
taskDefinitionLogMapper.queryByTaskDefinitions(taskDefinitionSet);
}
