You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by li...@apache.org on 2020/04/07 14:27:37 UTC
[incubator-dolphinscheduler] branch dev updated: [optimization]:remove duplicate code (#2377)
This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 2b0b93b [optimization]:remove duplicate code (#2377)
2b0b93b is described below
commit 2b0b93b9123a5853b15f578a72b7f0d6e5fbbd42
Author: songgg <11...@qq.com>
AuthorDate: Tue Apr 7 22:27:28 2020 +0800
[optimization]:remove duplicate code (#2377)
* sqlTask failed to run
* remove duplicate code
* remove duplicate code
* remove duplicate code
* remove duplicate code
* remove duplicate code
Co-authored-by: songqh <so...@foxmail.com>
---
.../org/apache/dolphinscheduler/api/service/ExecutorService.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
index fe43f10..dda960d 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
@@ -453,7 +453,7 @@ public class ExecutorService extends BaseService{
TaskDependType nodeDep, FailureStrategy failureStrategy,
String startNodeList, String schedule, WarningType warningType,
int excutorId, int warningGroupId,
- RunMode runMode,Priority processInstancePriority, int workerGroupId) throws ParseException {
+ RunMode runMode,Priority processInstancePriority, int workerGroupId){
/**
* instantiate command schedule instance
@@ -496,6 +496,7 @@ public class ExecutorService extends BaseService{
}
}
+ // determine whether to complement
if(commandType == CommandType.COMPLEMENT_DATA){
runMode = (runMode == null) ? RunMode.RUN_MODE_SERIAL : runMode;
if(null != start && null != end && start.before(end)){
@@ -540,7 +541,7 @@ public class ExecutorService extends BaseService{
processDefineId, schedule);
}
}else{
- command.setCommandParam(JSONUtils.toJson(cmdParam));
+
return processService.createCommand(command);
}