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 cf63fc1 Merge remote-tracking branch 'upstream/dev' into spilit
add 0ba120e Fix shell task ${setValue(key,value)} is not working (#5067)
add 1cd62b4 [Improvement][Datax] Re-assign DATAX_HOME to /opt/soft/datax
instead of /opt/soft/datax/bin/datax.py (#5019)
add 6216817 [Improvement-4971][alert|dao|service]Remove redundant
PropertyUtils.class (#5020)
add 705715c [Improvement-5059][API] Verify that the new workflow
definition version is the current version before removing it #5059 (#5060)
add 5856a12 [Improvement-4984][Worker] Refactor and Improve worker load
balance (#4996)
add 29d42fd [Feature-#3805][server-master] Task parameter transfer (#5077)
add f94cfc6 [Feature][Worker] Add a configuration item to set whether the
tenant is automatically created on Worker (#5007)
add 086e716 [Improvement][Dao] SQL optimization - check exist #5069
(#5070)
add 9008fa4 [Fix-5089][UI] Fix code mirror cannot be displayed normally
in sqoop task (#5090)
add 91c29e6 [Improvement-5094][UI] Improve to add a main switch for
refresh_in_switched_tab (#5095)
add 4a6e8b7 [Fix-#5103] fix resource rename cause can not update (#5107)
add 8ac72e8 [Feature-5087][SqlTask] Add a switch to send mail and print
head logs in SqlTask (#5088)
add ba039dc [Improvement][dao] Resource features SQL slow query
optimization. (#4947)
new 010b49c 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:
.../DOLPHIN/1.3.0/configuration/dolphin-env.xml | 3 +-
.../DOLPHIN/1.3.3/configuration/dolphin-env.xml | 3 +-
docker/build/README.md | 2 +-
docker/build/README_zh_CN.md | 2 +-
.../env/dolphinscheduler_env.sh.tpl | 2 +-
.../conf/dolphinscheduler/worker.properties.tpl | 3 +
docker/build/startup-init-conf.sh | 2 +-
docker/docker-swarm/docker-compose.yml | 2 +-
docker/docker-swarm/docker-stack.yml | 2 +-
docker/kubernetes/dolphinscheduler/values.yaml | 4 +-
.../apache/dolphinscheduler/alert/AlertServer.java | 8 +-
.../alert/utils/PropertyUtils.java | 262 ---------------------
.../alert/plugin/AlertPluginManagerTest.java | 4 +-
.../alert/plugin/EmailAlertPluginTest.java | 2 +-
.../alert/utils/PropertyUtilsTest.java | 9 +-
.../apache/dolphinscheduler/api/enums/Status.java | 4 +-
.../api/service/ProcessDefinitionService.java | 8 +
.../api/service/impl/AlertGroupServiceImpl.java | 5 +-
.../impl/AlertPluginInstanceServiceImpl.java | 5 +-
.../service/impl/ProcessDefinitionServiceImpl.java | 12 +
.../api/service/impl/QueueServiceImpl.java | 8 +-
.../api/service/impl/ResourcesServiceImpl.java | 72 ++++--
.../api/service/impl/TenantServiceImpl.java | 7 +-
.../api/service/impl/UsersServiceImpl.java | 3 +-
.../service/impl/WorkFlowLineageServiceImpl.java | 3 +-
.../api/service/impl/WorkerGroupServiceImpl.java | 13 +-
.../api/service/AlertGroupServiceTest.java | 2 +-
.../service/AlertPluginInstanceServiceTest.java | 2 +-
.../api/service/QueueServiceTest.java | 31 +--
.../api/service/ResourcesServiceTest.java | 17 +-
.../api/service/TenantServiceTest.java | 6 +-
.../api/service/UsersServiceTest.java | 1 -
.../api/service/WorkerGroupServiceTest.java | 10 +-
.../apache/dolphinscheduler/common/Constants.java | 13 +-
.../common/task/sql/SqlParameters.java | 28 +++
.../common/utils/BooleanUtils.java} | 22 +-
.../dolphinscheduler/common/utils/OSUtils.java | 34 ++-
.../common/utils/PropertyUtils.java | 16 +-
.../dolphinscheduler/common/utils/ResInfo.java | 58 +++--
.../common/task/DataxParametersTest.java | 4 +-
.../common/task/SqlParametersTest.java | 68 ++++++
.../dolphinscheduler/common/utils/OSUtilsTest.java | 16 +-
.../org/apache/dolphinscheduler/dao/PluginDao.java | 3 +-
.../apache/dolphinscheduler/dao/TaskRecordDao.java | 39 +--
.../dao/datasource/SpringConnectionFactory.java | 77 +++---
.../dao/mapper/AlertGroupMapper.java | 7 +
.../dao/mapper/AlertPluginInstanceMapper.java | 7 +
.../dao/mapper/ProcessDefinitionMapper.java | 7 +
.../dolphinscheduler/dao/mapper/QueueMapper.java | 7 +
.../dao/mapper/ResourceMapper.java | 54 +++--
.../dao/mapper/ResourceUserMapper.java | 16 +-
.../dolphinscheduler/dao/mapper/TenantMapper.java | 7 +
.../dolphinscheduler/dao/mapper/UserMapper.java | 9 +-
.../dolphinscheduler/dao/utils/PropertyUtils.java | 162 -------------
.../dao/mapper/AlertGroupMapper.xml | 7 +
.../dao/mapper/AlertPluginInstanceMapper.xml | 6 +
.../dao/mapper/ProcessDefinitionMapper.xml | 7 +
.../dolphinscheduler/dao/mapper/QueueMapper.xml | 12 +-
.../dolphinscheduler/dao/mapper/ResourceMapper.xml | 131 ++++++-----
.../dao/mapper/ResourceUserMapper.xml | 14 ++
.../dolphinscheduler/dao/mapper/TenantMapper.xml | 5 +
.../dolphinscheduler/dao/mapper/UserMapper.xml | 7 +-
.../dao/mapper/AlertGroupMapperTest.java | 9 +
.../dao/mapper/AlertPluginInstanceMapperTest.java | 8 +
.../dao/mapper/QueueMapperTest.java | 25 +-
.../dao/mapper/ResourceMapperTest.java | 70 ++++--
.../dao/mapper/TenantMapperTest.java | 12 +-
.../dao/mapper/UserMapperTest.java | 10 +
.../apache/dolphinscheduler/remote/utils/Host.java | 143 ++---------
.../remote/NettyRemotingClientTest.java | 13 +-
.../{ => command/future}/ResponseFutureTest.java | 12 +-
.../log}/RemoveTaskLogRequestCommandTest.java | 10 +-
.../log}/RemoveTaskLogResponseCommandTest.java | 9 +-
.../dolphinscheduler/remote/utils/HostTest.java | 16 +-
.../remote/{ => utils}/NettyUtilTest.java | 5 +-
.../master/dispatch/host/CommonHostManager.java | 48 ++--
.../dispatch/host/LowerWeightHostManager.java | 60 +++--
.../master/dispatch/host/RandomHostManager.java | 11 +-
.../dispatch/host/RoundRobinHostManager.java | 7 +-
.../dispatch/host/assign/AbstractSelector.java | 4 +-
.../master/dispatch/host/assign/HostSelector.java | 6 +-
.../master/dispatch/host/assign/HostWeight.java | 44 ++--
.../master/dispatch/host/assign/HostWorker.java | 77 ++++++
.../dispatch/host/assign/RandomSelector.java | 14 +-
.../dispatch/host/assign/RoundRobinSelector.java | 27 +--
.../server/master/registry/MasterRegistry.java | 4 +-
.../server/master/runner/MasterExecThread.java | 13 +-
.../server/registry/HeartBeatTask.java | 30 ++-
.../server/worker/config/WorkerConfig.java | 18 +-
.../worker/processor/TaskExecuteProcessor.java | 4 +
.../server/worker/registry/WorkerRegistry.java | 24 +-
.../server/worker/task/datax/DataxTask.java | 10 +-
.../server/worker/task/shell/ShellTask.java | 1 +
.../server/worker/task/sql/SqlTask.java | 28 ++-
.../dolphinscheduler/server/zk/ZKMasterClient.java | 2 -
.../src/main/resources/worker.properties | 3 +
.../dispatch/host/assign/HostWorkerTest.java | 39 ++-
.../host/assign/LowerWeightRoundRobinTest.java | 22 +-
.../dispatch/host/assign/RandomSelectorTest.java | 10 +-
.../host/assign/RoundRobinSelectorTest.java | 36 ++-
.../server/master/registry/MasterRegistryTest.java | 3 +-
.../server/registry/DependencyConfig.java | 6 +
.../dolphinscheduler/server/utils/HostTest.java | 52 ----
.../processor/TaskCallbackServiceTestConfig.java | 6 +
.../service/process/ProcessService.java | 87 ++++++-
.../service/quartz/QuartzExecutors.java | 5 +-
.../service/zk/RegisterOperator.java | 4 +-
dolphinscheduler-ui/src/js/conf/home/App.vue | 2 +-
.../src/js/conf/home/pages/dag/_source/dag.scss | 2 +-
.../_source/formModel/tasks/_source/jsonBox.vue | 4 +-
.../_source/formModel/tasks/_source/scriptBox.vue | 4 +-
.../pages/dag/_source/formModel/tasks/datax.vue | 4 +-
.../pages/dag/_source/formModel/tasks/python.vue | 2 +-
.../pages/dag/_source/formModel/tasks/shell.vue | 2 +-
.../home/pages/dag/_source/formModel/tasks/sql.vue | 36 ++-
.../pages/dag/_source/formModel/tasks/sqoop.vue | 28 ++-
.../definition/pages/list/_source/versions.vue | 4 +-
.../src/js/conf/home/router/index.js | 83 +++----
.../js/module/components/conditions/conditions.vue | 2 +-
.../src/js/module/i18n/locale/en_US.js | 3 +
.../src/js/module/i18n/locale/zh_CN.js | 3 +
dolphinscheduler-ui/src/lib/external/config.js | 4 +-
dolphinscheduler-ui/src/sass/common/index.scss | 2 +-
pom.xml | 17 +-
script/env/dolphinscheduler_env.sh | 4 +-
125 files changed, 1340 insertions(+), 1275 deletions(-)
delete mode 100644
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/PropertyUtils.java
copy
dolphinscheduler-common/src/{test/java/org/apache/dolphinscheduler/common/utils/EncryptionUtilsTest.java
=> main/java/org/apache/dolphinscheduler/common/utils/BooleanUtils.java} (76%)
create mode 100644
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/task/SqlParametersTest.java
delete mode 100644
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/utils/PropertyUtils.java
rename
dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/{ =>
command/future}/ResponseFutureTest.java (93%)
rename
dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/{ =>
command/log}/RemoveTaskLogRequestCommandTest.java (83%)
rename
dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/{ =>
command/log}/RemoveTaskLogResponseCommandTest.java (88%)
copy
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/EncryptionUtilsTest.java
=>
dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/utils/HostTest.java
(70%)
rename
dolphinscheduler-remote/src/test/java/org/apache/dolphinscheduler/remote/{ =>
utils}/NettyUtilTest.java (92%)
create mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/HostWorker.java
copy
dolphinscheduler-alert-plugin/dolphinscheduler-alert-http/src/test/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannelFactoryTest.java
=>
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/HostWorkerTest.java
(51%)
delete mode 100644
dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/utils/HostTest.java
