You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by le...@apache.org on 2021/02/24 04:10:29 UTC
[incubator-dolphinscheduler] branch json_split updated (f1375b9 ->
2afc9f3)
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a change to branch json_split
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
from f1375b9 Merge remote-tracking branch 'upstream/dev' into spilit
add 668ef64 [Improvement][readme] fix readme.md broken link (#4825)
add 149b0da [Improvement][Docker] Sync docker conf templates to the latest conf properties (#4772)
add ca0cfb2 Merge remote-tracking branch 'upstream/dev' into params-trans
add 69c55f4 Merge remote-tracking branch 'upstream/dev' into params-trans
add df8a7d8 Merge remote-tracking branch 'upstream/dev' into params-trans
add f207ad3 Merge remote-tracking branch 'upstream/dev' into params-trans
add c984355 Merge remote-tracking branch 'upstream/dev' into params-trans
add 6d98a97 Merge remote-tracking branch 'upstream/dev' into params-trans
add 1509ee7 Merge remote-tracking branch 'upstream/dev' into params-trans
add 87ff13f [Feature-#3805][server-master] global params of master (#4678)
add 559efac [Feature-#3805][server-worker]global params of worker (#4679)
add 74cf370 [Feature-#3805][server-UI] global params of UI (#4680)
add d28c856 [Feature-#3805][server-UI] global params of UI (#4736)
add 3ee1ce0 Merge remote-tracking branch 'upstream/dev' into params-trans
add 0aa403f Merge remote-tracking branch 'upstream/dev' into params-trans
add a6fb333 Merge branch 'dev' into params-trans
add 7e9d582 Merge remote-tracking branch 'upstream/dev' into params-trans
add 90e197a add return result
add 59811d0 Merge remote-tracking branch 'upstream/dev' into params-trans
add 874ca07 [Feature-3805][mater-worker-ui]fix function of passing variables between tasks bug (#4811)
add 5517599 Merge pull request #4743 from apache/params-trans
new 2afc9f3 merge from dev
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 12 +-
README_zh_CN.md | 6 +-
docker/README.md | 1 +
docker/build/Dockerfile | 2 +-
.../conf/dolphinscheduler/alert.properties.tpl | 46 ++----
.../application-api.properties.tpl | 27 +++-
.../conf/dolphinscheduler/common.properties.tpl | 66 ++++----
.../dolphinscheduler/datasource.properties.tpl | 17 ++-
.../conf/dolphinscheduler/logback/logback-api.xml | 4 +-
.../dolphinscheduler/logback/logback-master.xml | 4 +-
.../dolphinscheduler/logback/logback-worker.xml | 9 +-
.../conf/dolphinscheduler/master.properties.tpl | 5 +-
.../conf/dolphinscheduler/quartz.properties.tpl | 2 +-
.../conf/dolphinscheduler/worker.properties.tpl | 14 +-
.../conf/dolphinscheduler/zookeeper.properties.tpl | 3 +-
docker/build/startup-init-conf.sh | 27 +---
docker/build/startup.sh | 38 ++++-
docker/docker-swarm/docker-compose.yml | 28 +---
docker/docker-swarm/docker-stack.yml | 28 +---
.../src/main/resources/alert.properties | 2 -
.../src/main/resources/application-api.properties | 10 +-
.../src/main/resources/logback-api.xml | 4 +-
.../src/main/resources/common.properties | 13 +-
.../dao/mapper/ProcessInstanceMapper.java | 3 +
.../src/main/resources/datasource.properties | 2 +-
.../dao/mapper/ProcessInstanceMapper.xml | 6 +-
.../remote/command/TaskExecuteResponseCommand.java | 12 ++
.../master/processor/TaskResponseProcessor.java | 4 +-
.../master/processor/queue/TaskResponseEvent.java | 16 +-
.../processor/queue/TaskResponseService.java | 3 +-
.../server/master/runner/MasterExecThread.java | 55 ++++++-
.../server/worker/runner/TaskExecuteThread.java | 1 +
.../worker/task/AbstractCommandExecutor.java | 20 +++
.../server/worker/task/AbstractTask.java | 13 ++
.../server/worker/task/ShellCommandExecutor.java | 3 +
.../server/worker/task/shell/ShellTask.java | 21 ++-
.../server/worker/task/sql/SqlTask.java | 32 +++-
.../src/main/resources/master.properties | 6 +-
.../src/main/resources/worker.properties | 2 +-
.../processor/queue/TaskResponseServiceTest.java | 3 +-
.../worker/processor/TaskCallbackServiceTest.java | 5 +
.../worker/task/AbstractCommandExecutorTest.java | 53 +++----
...ShellTaskTest.java => ShellTaskReturnTest.java} | 61 +++++---
.../server/worker/task/TaskManagerTest.java | 75 +++++++++
.../server/worker/task/shell/ShellTaskTest.java | 19 ++-
.../server/worker/task/sql/SqlTaskTest.java | 12 +-
.../service/process/ProcessService.java | 168 ++++++++++++++-------
.../src/main/resources/logback-zookeeper.xml | 2 +-
.../src/main/resources/quartz.properties | 2 +-
.../src/main/resources/zookeeper.properties | 2 +-
dolphinscheduler-ui.zip | Bin 0 -> 946313 bytes
.../src/js/conf/home/pages/dag/_source/dag.vue | 19 ++-
.../formModel/tasks/_source/localParams.vue | 4 +-
.../pages/dag/_source/formModel/tasks/shell.vue | 2 +-
.../src/js/conf/home/pages/dag/_source/udp/udp.vue | 50 +++++-
.../src/js/conf/home/store/dag/mutations.js | 11 ++
pom.xml | 2 +
57 files changed, 722 insertions(+), 335 deletions(-)
copy dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/threadutils/ThreadPoolExecutorsTest.java => dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/AbstractCommandExecutorTest.java (50%)
copy dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/{shell/ShellTaskTest.java => ShellTaskReturnTest.java} (58%)
create mode 100644 dolphinscheduler-ui.zip
[incubator-dolphinscheduler] 01/01: merge from dev
Posted by le...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch json_split
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit 2afc9f3bfce875f26e3410e481ce7ad15e5bd649
Merge: f1375b9 5517599
Author: lenboo <ba...@gmail.com>
AuthorDate: Wed Feb 24 12:10:07 2021 +0800
merge from dev
README.md | 12 +-
README_zh_CN.md | 6 +-
docker/README.md | 1 +
docker/build/Dockerfile | 2 +-
.../conf/dolphinscheduler/alert.properties.tpl | 46 ++----
.../application-api.properties.tpl | 27 +++-
.../conf/dolphinscheduler/common.properties.tpl | 66 ++++----
.../dolphinscheduler/datasource.properties.tpl | 17 ++-
.../conf/dolphinscheduler/logback/logback-api.xml | 4 +-
.../dolphinscheduler/logback/logback-master.xml | 4 +-
.../dolphinscheduler/logback/logback-worker.xml | 9 +-
.../conf/dolphinscheduler/master.properties.tpl | 5 +-
.../conf/dolphinscheduler/quartz.properties.tpl | 2 +-
.../conf/dolphinscheduler/worker.properties.tpl | 14 +-
.../conf/dolphinscheduler/zookeeper.properties.tpl | 3 +-
docker/build/startup-init-conf.sh | 27 +---
docker/build/startup.sh | 38 ++++-
docker/docker-swarm/docker-compose.yml | 28 +---
docker/docker-swarm/docker-stack.yml | 28 +---
.../src/main/resources/alert.properties | 2 -
.../src/main/resources/application-api.properties | 10 +-
.../src/main/resources/logback-api.xml | 4 +-
.../src/main/resources/common.properties | 13 +-
.../dao/mapper/ProcessInstanceMapper.java | 3 +
.../src/main/resources/datasource.properties | 2 +-
.../dao/mapper/ProcessInstanceMapper.xml | 6 +-
.../remote/command/TaskExecuteResponseCommand.java | 12 ++
.../master/processor/TaskResponseProcessor.java | 4 +-
.../master/processor/queue/TaskResponseEvent.java | 16 +-
.../processor/queue/TaskResponseService.java | 3 +-
.../server/master/runner/MasterExecThread.java | 55 ++++++-
.../server/worker/runner/TaskExecuteThread.java | 1 +
.../worker/task/AbstractCommandExecutor.java | 20 +++
.../server/worker/task/AbstractTask.java | 13 ++
.../server/worker/task/ShellCommandExecutor.java | 3 +
.../server/worker/task/shell/ShellTask.java | 21 ++-
.../server/worker/task/sql/SqlTask.java | 32 +++-
.../src/main/resources/master.properties | 6 +-
.../src/main/resources/worker.properties | 2 +-
.../processor/queue/TaskResponseServiceTest.java | 3 +-
.../worker/processor/TaskCallbackServiceTest.java | 5 +
.../worker/task/AbstractCommandExecutorTest.java | 53 +++++++
...ShellTaskTest.java => ShellTaskReturnTest.java} | 61 +++++---
.../server/worker/task/TaskManagerTest.java | 75 +++++++++
.../server/worker/task/shell/ShellTaskTest.java | 19 ++-
.../server/worker/task/sql/SqlTaskTest.java | 12 +-
.../service/process/ProcessService.java | 168 ++++++++++++++-------
.../src/main/resources/logback-zookeeper.xml | 2 +-
.../src/main/resources/quartz.properties | 2 +-
.../src/main/resources/zookeeper.properties | 2 +-
dolphinscheduler-ui.zip | Bin 0 -> 946313 bytes
.../src/js/conf/home/pages/dag/_source/dag.vue | 19 ++-
.../formModel/tasks/_source/localParams.vue | 4 +-
.../pages/dag/_source/formModel/tasks/shell.vue | 2 +-
.../src/js/conf/home/pages/dag/_source/udp/udp.vue | 50 +++++-
.../src/js/conf/home/store/dag/mutations.js | 11 ++
pom.xml | 2 +
57 files changed, 750 insertions(+), 307 deletions(-)
diff --cc dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
index cc82844,c5f5e3a..fd888e9
--- 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
@@@ -31,8 -32,8 +32,9 @@@ import static java.util.stream.Collecto
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.AuthorizationType;
import org.apache.dolphinscheduler.common.enums.CommandType;
+import org.apache.dolphinscheduler.common.enums.ConditionType;
import org.apache.dolphinscheduler.common.enums.CycleEnum;
+ import org.apache.dolphinscheduler.common.enums.Direct;
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
import org.apache.dolphinscheduler.common.enums.FailureStrategy;
import org.apache.dolphinscheduler.common.enums.Flag;
@@@ -494,10 -430,16 +499,10 @@@ public class ProcessService
* recursive query sub process definition id by parent id.
*
* @param parentId parentId
- * @param ids ids
+ * @param ids ids
*/
public void recurseFindSubProcessId(int parentId, List<Integer> ids) {
- ProcessDefinition processDefinition = processDefineMapper.selectById(parentId);
- String processDefinitionJson = processDefinition.getProcessDefinitionJson();
-
- ProcessData processData = JSONUtils.parseObject(processDefinitionJson, ProcessData.class);
-
- List<TaskNode> taskNodeList = processData.getTasks();
-
+ List<TaskNode> taskNodeList = this.getTaskNodeListByDefinitionId(parentId);
if (taskNodeList != null && !taskNodeList.isEmpty()) {
for (TaskNode taskNode : taskNodeList) {