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 2021/02/23 11:06:25 UTC

[incubator-dolphinscheduler] branch dev updated (149b0da -> 5517599)

This is an automated email from the ASF dual-hosted git repository.

lidongdai pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.


    from 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

No new revisions were added by this update.

Summary of changes:
 .../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 +++-
 .../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            | 166 ++++++++++++++-------
 .../service/process/ProcessServiceTest.java        |  22 +++
 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 +
 30 files changed, 559 insertions(+), 136 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