This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a change to branch json_split_two
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git.
from aa8301a [Feature][JsonSplit-api] modify API to Restful-04 (#6110)
add 33ea3ed [Feature][JsonSplit-api] merge code from dev to json2 (#6115)
No new revisions were added by this update.
Summary of changes:
...figmap-dolphinscheduler-alert.yaml => .asf.yaml | 39 +-
README.md | 2 +-
README_zh_CN.md | 2 +-
.../dolphinscheduler/supervisor/supervisor.ini | 15 +
docker/build/startup.sh | 17 +-
.../plugin/alert/email/MailSender.java | 2 +-
dolphinscheduler-alert/pom.xml | 7 +-
.../apache/dolphinscheduler/alert/AlertServer.java | 85 +-
.../alert/plugin/AlertPluginManager.java | 2 +-
.../alert/processor/AlertRequestProcessor.java | 7 +-
.../dolphinscheduler/alert/runner/AlertSender.java | 5 +-
.../dolphinscheduler/alert/utils/FuncUtils.java | 47 -
.../alert/utils/FuncUtilsTest.java | 60 -
.../api/controller/DataSourceController.java | 4 +-
.../apache/dolphinscheduler/api/enums/Status.java | 1 +
.../api/service/AlertGroupService.java | 8 +
.../api/service/impl/AlertGroupServiceImpl.java | 41 +-
.../dolphinscheduler/api/utils/CheckUtils.java | 45 +-
.../api/controller/QueueControllerTest.java | 12 +-
.../api/controller/SchedulerControllerTest.java | 17 +-
.../api/controller/TenantControllerTest.java | 15 +-
.../api/service/AlertGroupServiceTest.java | 28 +-
dolphinscheduler-common/pom.xml | 12 +
.../apache/dolphinscheduler/common/Constants.java | 5 +-
.../dolphinscheduler/common/enums/StateEvent.java | 111 ++
.../enums/{UserType.java => StateEventType.java} | 18 +-
.../dolphinscheduler/common/enums/TaskType.java | 4 +-
.../dolphinscheduler/common/model/TaskNode.java | 19 +-
.../common/task/AbstractParameters.java | 3 +-
.../common/task/sql/SqlParameters.java | 6 +-
.../SwitchParameters.java} | 66 +-
.../common/task/switchtask/SwitchResultVo.java | 42 +-
.../common/utils/TaskParametersUtils.java | 3 +
.../dolphinscheduler/dao/entity/TaskInstance.java | 25 +
.../dao/mapper/AlertGroupMapper.java | 10 +
.../dolphinscheduler/dao/mapper/CommandMapper.java | 8 +-
.../dolphinscheduler/dao/utils/DagHelper.java | 50 +-
.../dolphinscheduler/dao/vo/AlertGroupVo.java | 32 +-
.../dao/mapper/AlertGroupMapper.xml | 11 +-
.../dolphinscheduler/dao/mapper/CommandMapper.xml | 5 +
.../dao/mapper/PluginDefineMapper.xml | 2 +-
.../dolphinscheduler/dao/utils/DagHelperTest.java | 99 +-
.../src/main/assembly/dolphinscheduler-bin.xml | 9 -
.../registry/zookeeper/ZookeeperRegistry.java | 11 +-
dolphinscheduler-remote/pom.xml | 10 +
.../remote/command/CommandType.java | 27 +-
...lRequestCommand.java => HostUpdateCommand.java} | 23 +-
...Command.java => HostUpdateResponseCommand.java} | 50 +-
.../remote/command/StateEventChangeCommand.java | 131 +++
...Command.java => StateEventResponseCommand.java} | 27 +-
.../remote/command/TaskExecuteAckCommand.java | 20 +-
.../remote/command/TaskExecuteResponseCommand.java | 16 +-
.../remote}/processor/NettyRemoteChannel.java | 2 +-
.../processor/StateEventCallbackService.java | 125 +++
dolphinscheduler-server/pom.xml | 11 +-
.../server/entity/TaskExecutionContext.java | 14 +
.../server/master/MasterServer.java | 26 +-
.../server/master/config/MasterConfig.java | 11 +
.../dispatch/executor/NettyExecutorManager.java | 2 +-
.../server/master/future/TaskFuture.java | 175 ---
...essor.java => HostUpdateResponseProcessor.java} | 22 +-
.../master/processor/StateEventProcessor.java | 74 ++
.../server/master/processor/TaskAckProcessor.java | 15 +-
.../master/processor/TaskResponseProcessor.java | 18 +-
.../processor/queue/StateEventResponseService.java | 149 +++
.../master/processor/queue/TaskResponseEvent.java | 17 +-
.../processor/queue/TaskResponseService.java | 67 +-
.../master/registry/MasterRegistryClient.java | 88 +-
.../server/master/registry/ServerNodeManager.java | 66 +-
.../server/master/runner/EventExecuteService.java | 195 ++++
.../master/runner/MasterBaseTaskExecThread.java | 324 ------
.../master/runner/MasterSchedulerService.java | 134 ++-
.../server/master/runner/MasterTaskExecThread.java | 230 ----
.../master/runner/StateWheelExecuteThread.java | 154 +++
.../master/runner/SubProcessTaskExecThread.java | 181 ---
...rExecThread.java => WorkflowExecuteThread.java} | 720 ++++++------
.../master/runner/task/BaseTaskProcessor.java | 112 ++
.../runner/task/CommonTaskProcessFactory.java | 18 +-
.../master/runner/task/CommonTaskProcessor.java | 179 +++
.../runner/task/ConditionTaskProcessFactory.java | 19 +-
.../ConditionTaskProcessor.java} | 169 ++-
.../runner/task/DependentTaskProcessFactory.java | 18 +-
.../DependentTaskProcessor.java} | 204 ++--
.../task/ITaskProcessFactory.java} | 12 +-
.../server/master/runner/task/ITaskProcessor.java | 31 +-
.../master/runner/task/SubTaskProcessFactory.java | 19 +-
.../master/runner/task/SubTaskProcessor.java | 171 +++
.../runner/task/SwitchTaskProcessFactory.java | 18 +-
.../master/runner/task/SwitchTaskProcessor.java | 220 ++++
.../task/TaskAction.java} | 14 +-
.../master/runner/task/TaskProcessorFactory.java | 53 +
.../server/registry/HeartBeatTask.java | 57 +-
.../utils/{ArgsUtils.java => SwitchTaskUtils.java} | 20 +-
.../server/worker/WorkerServer.java | 3 +
.../worker/processor/DBTaskResponseProcessor.java | 1 -
...onseProcessor.java => HostUpdateProcessor.java} | 43 +-
.../worker/processor/TaskCallbackService.java | 81 +-
.../worker/processor/TaskExecuteProcessor.java | 3 +
.../server/worker/processor/TaskKillProcessor.java | 1 +
.../worker/runner/RetryReportTaskStatusThread.java | 2 +
.../server/worker/runner/TaskExecuteThread.java | 25 +-
.../server/worker/runner/WorkerManagerThread.java | 3 +-
.../server/worker/task/datax/DataxTask.java | 8 +
.../server/worker/task/flink/FlinkTask.java | 15 +-
.../server/worker/task/http/HttpTask.java | 8 +
.../server/worker/task/mr/MapReduceTask.java | 21 +-
.../server/worker/task/python/PythonTask.java | 15 +-
.../server/worker/task/shell/ShellTask.java | 27 +-
.../server/worker/task/spark/SparkTask.java | 15 +-
.../server/worker/task/sql/SqlTask.java | 8 +-
.../server/worker/task/sqoop/SqoopTask.java | 11 +-
...r.server.master.runner.task.ITaskProcessFactory | 8 +-
.../server/log/SensitiveDataConverterTest.java | 6 +-
.../server/master/ConditionsTaskTest.java | 14 +-
.../server/master/DependentTaskTest.java | 32 +-
.../server/master/SubProcessTaskTest.java | 13 +-
...SubProcessTaskTest.java => SwitchTaskTest.java} | 149 ++-
...eadTest.java => WorkflowExecuteThreadTest.java} | 68 +-
.../master/processor/TaskAckProcessorTest.java | 4 +-
.../processor/queue/TaskResponseServiceTest.java | 31 +-
.../master/runner/MasterTaskExecThreadTest.java | 10 +-
.../runner/task/TaskProcessorFactoryTest.java | 21 +-
.../worker/processor/TaskKillProcessorTest.java | 1 +
.../worker/runner/TaskExecuteThreadTest.java | 2 +-
.../worker/runner/WorkerManagerThreadTest.java | 4 +-
.../service/alert/ProcessAlertManager.java | 6 +
.../service/process/ProcessService.java | 63 +-
.../service/quartz/cron/CronUtils.java | 404 +++----
.../service/queue/MasterPriorityQueue.java | 109 ++
.../queue/PeerTaskInstancePriorityQueue.java | 13 +
.../service/process/ProcessServiceTest.java | 18 +-
dolphinscheduler-spi/pom.xml | 6 +
.../spi/DolphinSchedulerPlugin.java | 1 +
dolphinscheduler-standalone-server/pom.xml | 4 +
.../dolphinscheduler/server/StandaloneServer.java | 59 +-
.../conf/home/pages/dag/_source/canvas/canvas.scss | 6 +-
.../src/js/conf/home/pages/dag/_source/config.js | 4 +
.../pages/dag/_source/formModel/formLineModel.vue | 2 +-
.../pages/dag/_source/formModel/formModel.scss | 2 +
.../pages/dag/_source/formModel/tasks/switch.vue | 223 ++++
.../js/conf/home/pages/dag/img/toolbar_SWITCH.png | Bin 0 -> 2987 bytes
.../pages/list/_source/createDataSource.vue | 4 +-
.../pages/definition/pages/list/_source/start.vue | 2 +-
.../pages/definition/pages/list/_source/timing.vue | 2 +-
.../resource/pages/file/pages/create/index.vue | 2 +-
.../pages/file/pages/createFolder/index.vue | 2 +-
.../pages/file/pages/createUdfFolder/index.vue | 2 +-
.../pages/resource/pages/file/pages/edit/index.vue | 2 +-
.../resource/pages/file/pages/subFile/index.vue | 2 +-
.../pages/file/pages/subFileFolder/index.vue | 2 +-
.../pages/udf/pages/createUdfFolder/index.vue | 2 +-
.../pages/udf/pages/subUdfFolder/index.vue | 2 +-
.../pages/user/pages/password/_source/info.vue | 2 +-
dolphinscheduler-ui/src/js/conf/login/App.vue | 2 +-
.../js/module/components/fileUpdate/udfUpdate.vue | 2 +-
.../src/js/module/components/popup/popover.vue | 2 +-
.../src/js/module/components/popup/popup.vue | 2 +-
.../src/js/module/i18n/locale/en_US.js | 4 +-
.../src/js/module/i18n/locale/zh_CN.js | 4 +-
pom.xml | 1 +
sql/dolphinscheduler_h2.sql | 1149 ++++++++++----------
style/checkstyle.xml | 5 -
162 files changed, 5104 insertions(+), 3136 deletions(-)
copy
docker/kubernetes/dolphinscheduler/templates/configmap-dolphinscheduler-alert.yaml
=> .asf.yaml (50%)
delete mode 100644
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/FuncUtils.java
delete mode 100644
dolphinscheduler-alert/src/test/java/org/apache/dolphinscheduler/alert/utils/FuncUtilsTest.java
create mode 100644
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/StateEvent.java
copy
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/{UserType.java
=> StateEventType.java} (82%)
copy
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/{conditions/ConditionsParameters.java
=> switchtask/SwitchParameters.java} (58%)
copy
dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/utils/ResourceProcessDefinitionUtilsTest.java
=>
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/switchtask/SwitchResultVo.java
(54%)
copy
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/register/RegistryFactory.java
=>
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/vo/AlertGroupVo.java
(65%)
copy
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/{TaskKillRequestCommand.java
=> HostUpdateCommand.java} (76%)
copy
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/{DBTaskResponseCommand.java
=> HostUpdateResponseCommand.java} (69%)
create mode 100644
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/StateEventChangeCommand.java
copy
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/{DBTaskResponseCommand.java
=> StateEventResponseCommand.java} (74%)
rename
{dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker
=>
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote}/processor/NettyRemoteChannel.java
(97%)
create mode 100644
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/processor/StateEventCallbackService.java
delete mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/future/TaskFuture.java
copy
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/processor/{TaskKillResponseProcessor.java
=> HostUpdateResponseProcessor.java} (62%)
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/processor/StateEventProcessor.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/processor/queue/StateEventResponseService.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/EventExecuteService.java
delete mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java
delete mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterTaskExecThread.java
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/StateWheelExecuteThread.java
delete mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/SubProcessTaskExecThread.java
rename
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/{MasterExecThread.java
=> WorkflowExecuteThread.java} (66%)
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/BaseTaskProcessor.java
copy
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/PropertyUtilsTest.java
=>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/CommonTaskProcessFactory.java
(73%)
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/CommonTaskProcessor.java
copy
dolphinscheduler-microbench/src/main/java/org/apache/dolphinscheduler/microbench/common/UserService.java
=>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/ConditionTaskProcessFactory.java
(70%)
rename
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/{ConditionsTaskExecThread.java
=> task/ConditionTaskProcessor.java} (56%)
copy
dolphinscheduler-microbench/src/main/java/org/apache/dolphinscheduler/microbench/common/UserService.java
=>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/DependentTaskProcessFactory.java
(70%)
rename
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/{DependentTaskExecThread.java
=> task/DependentTaskProcessor.java} (55%)
copy
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/{dispatch/enums/ExecutorType.java
=> runner/task/ITaskProcessFactory.java} (84%)
copy
dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptType.java
=>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/ITaskProcessor.java
(58%)
copy
dolphinscheduler-microbench/src/main/java/org/apache/dolphinscheduler/microbench/common/UserService.java
=>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/SubTaskProcessFactory.java
(71%)
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/SubTaskProcessor.java
copy
dolphinscheduler-microbench/src/main/java/org/apache/dolphinscheduler/microbench/common/UserService.java
=>
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/SwitchTaskProcessFactory.java
(71%)
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/SwitchTaskProcessor.java
copy
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/{dispatch/enums/ExecutorType.java
=> runner/task/TaskAction.java} (85%)
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/TaskProcessorFactory.java
copy
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/{ArgsUtils.java
=> SwitchTaskUtils.java} (63%)
copy
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/{DBTaskResponseProcessor.java
=> HostUpdateProcessor.java} (54%)
copy
ambari_plugin/common-services/DOLPHIN/1.3.0/package/templates/alert.properties.j2
=>
dolphinscheduler-server/src/main/resources/META-INF/services/org.apache.dolphinscheduler.server.master.runner.task.ITaskProcessFactory
(66%)
copy
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/{SubProcessTaskTest.java
=> SwitchTaskTest.java} (53%)
rename
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/{MasterExecThreadTest.java
=> WorkflowExecuteThreadTest.java} (79%)
copy
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/SensitiveLogUtilsTest.java
=>
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/runner/task/TaskProcessorFactoryTest.java
(66%)
create mode 100644
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/queue/MasterPriorityQueue.java
create mode 100644
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/switch.vue
create mode 100644
dolphinscheduler-ui/src/js/conf/home/pages/dag/img/toolbar_SWITCH.png
mode change 100755 => 100644
dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
