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 cd19507 [feature][jsonsplit]fix copy/export/import processDefinition
bugs (#5146)
add f109a75 [Bug][PGSQL] Delete the stopped workflow without deleting the
correspon… (#5066)
add 0d065c0 [Feature-5062][*] Create/Edit/Delete Worker Group in Web UI
(#5113)
add 5d264c9 [Improvement][Api] Optimize query processInstanceList #5134
(#5135)
new f05ba84 Merge remote-tracking branch 'upstream/dev' into spilit
new 0914699 Merge branch 'json_split' of
https://github.com/apache/incubator-dolphinscheduler into spilit
The 2 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:
.../conf/dolphinscheduler/master.properties.tpl | 2 +-
.../conf/dolphinscheduler/worker.properties.tpl | 10 +-
docker/kubernetes/dolphinscheduler/README.md | 6 +-
.../api/controller/WorkerGroupController.java | 74 ++++++--
.../apache/dolphinscheduler/api/enums/Status.java | 4 +
.../dolphinscheduler/api/service/UsersService.java | 8 +
.../api/service/WorkerGroupService.java | 18 ++
.../api/service/impl/MonitorServiceImpl.java | 2 +-
.../service/impl/ProcessInstanceServiceImpl.java | 4 +-
.../api/service/impl/UsersServiceImpl.java | 8 +
.../api/service/impl/WorkerGroupServiceImpl.java | 199 ++++++++++++++++++---
.../api/utils/ZookeeperMonitor.java | 143 +++++++--------
.../api/service/UsersServiceTest.java | 13 ++
.../api/service/WorkerGroupServiceTest.java | 91 +++++++++-
.../apache/dolphinscheduler/common/Constants.java | 4 +-
.../dolphinscheduler/common/enums/ZKNodeType.java | 3 +-
.../common/utils/CollectionUtils.java | 34 ++++
.../common/utils/CollectionUtilsTest.java | 16 ++
.../dolphinscheduler/dao/entity/WorkerGroup.java | 69 +++++--
.../dao/mapper/ProcessInstanceMapper.java | 15 +-
.../dolphinscheduler/dao/mapper/UserMapper.java | 8 +
.../{AlertMapper.java => WorkerGroupMapper.java} | 26 ++-
.../dao/mapper/ProcessInstanceMapper.xml | 12 +-
.../dolphinscheduler/dao/mapper/UserMapper.xml | 8 +
.../{AlertMapper.xml => WorkerGroupMapper.xml} | 21 ++-
.../dao/mapper/TaskInstanceMapperTest.java | 26 ++-
.../dao/mapper/UserMapperTest.java | 11 ++
.../master/dispatch/host/CommonHostManager.java | 92 +++++++---
.../master/dispatch/host/HostManagerConfig.java | 2 +-
.../dispatch/host/LowerWeightHostManager.java | 64 +++++--
.../server/master/registry/MasterRegistry.java | 4 +-
.../server/registry/HeartBeatTask.java | 2 +-
.../server/registry/ZookeeperRegistryCenter.java | 6 +-
.../server/worker/config/WorkerConfig.java | 10 +-
.../server/worker/registry/WorkerRegistry.java | 4 +-
.../dolphinscheduler/server/zk/ZKMasterClient.java | 8 +-
.../src/main/resources/master.properties | 2 +-
.../src/main/resources/worker.properties | 10 +-
.../consumer/TaskPriorityQueueConsumerTest.java | 10 +-
.../service/zk/AbstractZKClient.java | 52 ++++--
.../service/zk/RegisterOperator.java | 8 +-
.../service/zk/RegisterOperatorTest.java | 8 +-
.../home/pages/dag/_source/formModel/tasks/sql.vue | 4 +-
.../conf/home/pages/security/pages/queue/index.vue | 2 -
.../home/pages/security/pages/tenement/index.vue | 2 -
.../pages/security/pages/users/_source/list.vue | 2 +-
.../conf/home/pages/security/pages/users/index.vue | 3 -
.../security/pages/warningGroups/_source/list.vue | 2 +-
.../pages/security/pages/warningGroups/index.vue | 3 -
.../pages/security/pages/warningInstance/index.vue | 3 -
.../pages/workerGroups/_source/createWorker.vue | 67 ++++---
.../security/pages/workerGroups/_source/list.vue | 23 ++-
.../pages/security/pages/workerGroups/index.vue | 31 +++-
.../src/js/conf/home/store/security/actions.js | 2 +-
.../src/js/module/i18n/locale/en_US.js | 16 +-
.../src/js/module/i18n/locale/zh_CN.js | 14 +-
sql/dolphinscheduler_mysql.sql | 16 ++
sql/dolphinscheduler_postgre.sql | 5 +-
.../mysql/dolphinscheduler_ddl.sql | 22 ++-
.../mysql}/dolphinscheduler_dml.sql | 0
.../postgresql/dolphinscheduler_ddl.sql | 22 ++-
.../postgresql/dolphinscheduler_dml.sql | 0
62 files changed, 981 insertions(+), 375 deletions(-)
copy
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/{AlertMapper.java
=> WorkerGroupMapper.java} (68%)
copy
dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/{AlertMapper.xml
=> WorkerGroupMapper.xml} (68%)
copy sql/upgrade/{1.3.3_schema => 1.3.6_schema}/mysql/dolphinscheduler_ddl.sql
(63%)
copy sql/upgrade/{1.4.0_schema/postgresql =>
1.3.6_schema/mysql}/dolphinscheduler_dml.sql (100%)
copy sql/upgrade/{1.3.3_schema =>
1.3.6_schema}/postgresql/dolphinscheduler_ddl.sql (54%)
copy sql/upgrade/{1.4.0_schema =>
1.3.6_schema}/postgresql/dolphinscheduler_dml.sql (100%)
