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 ad2d9f9 [Draft][Merge][133-dev]133 merge dev (#4031)
add 02dbd3e Revert "[Draft][Merge][133-dev]133 merge dev (#4031)" (#4057)
No new revisions were added by this update.
Summary of changes:
.gitignore | 128 +-----
.mvn/wrapper/maven-wrapper.jar | Bin 50710 -> 0 bytes
.../DOLPHIN/{1.3.3 => 1.2.1}/alerts.json | 6 +-
.../configuration/dolphin-alert.xml | 7 +
.../configuration/dolphin-application-api.xml | 16 -
.../1.2.1/configuration/dolphin-application.xml | 467 +++++++++++++++++++++
.../configuration/dolphin-common.xml | 0
.../{1.3.3 => 1.2.1}/configuration/dolphin-env.xml | 0
.../configuration/dolphin-quartz.xml | 23 +-
.../DOLPHIN/{1.3.3 => 1.2.1}/metainfo.xml | 6 +-
.../alerts/alert_dolphin_scheduler_status.py | 0
.../package/scripts/dolphin_alert_service.py | 3 +-
.../package/scripts/dolphin_api_service.py | 3 +-
.../package/scripts/dolphin_env.py | 46 +-
.../package/scripts/dolphin_logger_service.py | 4 +-
.../package/scripts/dolphin_master_service.py | 3 +-
.../package/scripts/dolphin_worker_service.py | 3 +-
.../{1.3.3 => 1.2.1}/package/scripts/params.py | 85 ++--
.../package/scripts/service_check.py | 0
.../package/scripts/status_params.py | 0
.../package/templates/alert.properties.j2 | 0
.../templates/application-api.properties.j2 | 0
.../package/templates/application.properties.j2} | 2 +-
.../package/templates/common.properties.j2 | 0
.../package/templates/dolphin-daemon.j2} | 13 +-
.../package/templates/quartz.properties.j2 | 0
.../{1.3.3 => 1.2.1}/quicklinks/quicklinks.json | 0
.../DOLPHIN/{1.3.3 => 1.2.1}/themes/theme.json | 84 +---
.../1.3.3/configuration/dolphin-datasource.xml | 206 ---------
.../DOLPHIN/1.3.3/configuration/dolphin-master.xml | 88 ----
.../DOLPHIN/1.3.3/configuration/dolphin-worker.xml | 67 ---
.../1.3.3/configuration/dolphin-zookeeper.xml | 76 ----
.../package/templates/datasource.properties.j2 | 20 -
.../1.3.3/package/templates/master.properties.j2 | 20 -
.../1.3.3/package/templates/worker.properties.j2 | 20 -
.../package/templates/zookeeper.properties.j2 | 20 -
.../kubernetes/dolphinscheduler/requirements.yaml | 25 --
dolphinscheduler-alert/pom.xml | 2 +-
.../alert/plugin/EmailAlertPluginTest.java | 4 +-
dolphinscheduler-api/pom.xml | 2 +-
.../api/controller/AccessTokenController.java | 6 +-
.../api/controller/ResourcesController.java | 47 +--
.../api/controller/UsersController.java | 2 +-
.../api/service/AccessTokenService.java | 7 +-
.../dolphinscheduler/api/service/BaseService.java | 19 -
.../api/service/ResourcesService.java | 181 ++------
.../api/service/UdfFuncService.java | 20 +-
.../dolphinscheduler/api/service/UsersService.java | 51 ++-
.../api/service/impl/AccessTokenServiceImpl.java | 24 +-
.../api/service/impl/LoggerServiceImpl.java | 1 +
.../service/impl/ProcessDefinitionServiceImpl.java | 117 ++----
.../api/service/impl/TenantServiceImpl.java | 20 -
.../src/main/resources/logback-api.xml | 1 +
.../api/service/AccessTokenServiceTest.java | 16 +-
.../api/service/ProcessDefinitionServiceTest.java | 10 +-
.../api/service/ResourcesServiceTest.java | 22 +-
.../api/service/UdfFuncServiceTest.java | 8 +-
.../api/service/UsersServiceTest.java | 10 +-
dolphinscheduler-common/pom.xml | 2 +-
.../dolphinscheduler/common/enums/Event.java | 23 -
.../common/process/ResourceInfo.java | 2 +
.../common/task/flink/FlinkParameters.java | 1 -
.../common/task/spark/SparkParameters.java | 2 +-
dolphinscheduler-dao/pom.xml | 5 +-
.../dolphinscheduler/dao/entity/Command.java | 2 -
.../dao/mapper/ProcessInstanceMapper.java | 14 -
.../dolphinscheduler/dao/mapper/UdfFuncMapper.java | 7 -
.../dao/upgrade/DolphinSchedulerManager.java | 2 -
.../dolphinscheduler/dao/upgrade/ResourceDao.java | 67 ---
.../dolphinscheduler/dao/upgrade/UpgradeDao.java | 194 +++------
.../dolphinscheduler/dao/utils/DagHelper.java | 177 +++-----
.../dolphinscheduler/dao/mapper/UdfFuncMapper.xml | 13 -
.../dao/mapper/UdfFuncMapperTest.java | 59 +--
.../dolphinscheduler/dao/utils/DagHelperTest.java | 254 +----------
dolphinscheduler-dist/pom.xml | 2 +-
dolphinscheduler-microbench/pom.xml | 2 +-
dolphinscheduler-plugin-api/pom.xml | 2 +-
dolphinscheduler-remote/pom.xml | 2 +-
.../remote/command/CommandType.java | 10 -
.../remote/command/DBTaskAckCommand.java | 73 ----
.../remote/command/DBTaskResponseCommand.java | 71 ----
dolphinscheduler-server/pom.xml | 2 +-
.../server/log/TaskLogAppender.java | 39 --
.../dispatch/executor/NettyExecutorManager.java | 79 ++--
.../server/master/processor/TaskAckProcessor.java | 28 +-
.../master/processor/TaskResponseProcessor.java | 30 +-
.../master/processor/queue/TaskResponseEvent.java | 36 +-
.../processor/queue/TaskResponseService.java | 58 +--
.../master/runner/ConditionsTaskExecThread.java | 3 +
.../master/runner/DependentTaskExecThread.java | 4 -
.../master/runner/MasterBaseTaskExecThread.java | 103 +----
.../server/master/runner/MasterExecThread.java | 191 ++++++---
.../server/master/runner/MasterTaskExecThread.java | 32 +-
.../master/runner/SubProcessTaskExecThread.java | 7 +-
.../server/utils/AlertManager.java | 4 -
.../server/utils/DependentExecute.java | 4 +-
.../dolphinscheduler/server/utils/UDFUtils.java | 6 +-
.../server/worker/WorkerServer.java | 11 -
.../server/worker/cache/ResponceCache.java | 94 -----
.../worker/processor/DBTaskAckProcessor.java | 56 ---
.../worker/processor/DBTaskResponseProcessor.java | 58 ---
.../worker/processor/NettyRemoteChannel.java | 6 -
.../worker/processor/TaskCallbackService.java | 36 +-
.../worker/processor/TaskExecuteProcessor.java | 40 +-
.../worker/runner/RetryReportTaskStatusThread.java | 94 -----
.../server/worker/runner/TaskExecuteThread.java | 14 +-
.../worker/task/AbstractCommandExecutor.java | 115 +++--
.../server/worker/task/AbstractTask.java | 22 +-
.../dolphinscheduler/server/zk/ZKMasterClient.java | 22 +-
.../src/main/resources/logback-master.xml | 1 +
.../src/main/resources/logback-worker.xml | 1 +
.../server/master/DependentTaskTest.java | 1 -
.../server/master/MasterCommandTest.java | 25 ++
.../host/assign/RoundRobinSelectorTest.java | 80 +---
.../master/processor/TaskAckProcessorTest.java | 24 +-
.../processor/queue/TaskResponseServiceTest.java | 4 +-
.../master/runner/MasterTaskExecThreadTest.java | 3 +-
.../worker/processor/TaskCallbackServiceTest.java | 12 +-
.../worker/runner/TaskExecuteThreadTest.java | 7 +-
dolphinscheduler-service/pom.xml | 2 +-
.../service/process/ProcessService.java | 70 ++-
.../service/zk/ZookeeperCachedOperator.java | 27 +-
.../service/zk/ZookeeperOperator.java | 93 +---
dolphinscheduler-ui/build/webpack.config.prod.js | 7 +-
dolphinscheduler-ui/pom.xml | 2 +-
.../src/js/conf/home/pages/dag/_source/dag.js | 8 +-
.../conf/home/pages/dag/_source/formModel/log.vue | 23 +-
.../pages/index/_source/processStateCount.vue | 21 +-
.../pages/index/_source/taskCtatusCount.vue | 19 +-
.../projects/pages/taskInstance/_source/list.vue | 1 -
.../resource/pages/file/pages/details/index.vue | 2 +-
.../pages/udf/pages/function/_source/list.vue | 10 +-
.../pages/tenement/_source/createTenement.vue | 3 +-
.../pages/user/pages/token/_source/createToken.vue | 2 +-
.../home/pages/user/pages/token/_source/list.vue | 2 +-
.../src/js/conf/home/store/projects/mutations.js | 6 -
.../src/js/conf/home/store/projects/state.js | 2 +-
.../components/fileUpdate/fileChildReUpdate.vue | 336 ---------------
.../module/components/fileUpdate/fileReUpload.vue | 335 ---------------
.../src/js/module/i18n/locale/en_US.js | 13 -
.../src/js/module/i18n/locale/zh_CN.js | 11 +-
.../data/project/CreateProjectData.java | 26 --
.../data/project/CreateWorkflowData.java | 77 ----
.../locator/project/CreateProjectLocator.java | 47 ---
.../locator/project/CreateWorkflowLocator.java | 183 --------
.../page/project/CreateProjectPage.java | 74 ----
.../page/project/CreateWorkflowPage.java | 201 ---------
.../page/security/TenantManagePage.java | 2 +-
.../testcase/deleteData/DeleteProjectTest.java | 39 --
.../testcase/deleteData/DeleteTenantTest.java | 38 --
.../testcase/deleteData/DeleteUserTest.java | 42 --
.../testcase/deleteData/DeleteWorkflowTest.java | 43 --
pom.xml | 2 +-
script/dolphinscheduler-daemon.sh | 20 +-
.../1.3.2_schema/mysql/dolphinscheduler_ddl.sql | 16 -
.../1.3.2_schema/mysql/dolphinscheduler_dml.sql | 19 -
.../postgresql/dolphinscheduler_ddl.sql | 16 -
.../postgresql/dolphinscheduler_dml.sql | 17 -
158 files changed, 1490 insertions(+), 4716 deletions(-)
delete mode 100644 .mvn/wrapper/maven-wrapper.jar
rename ambari_plugin/common-services/DOLPHIN/{1.3.3 => 1.2.1}/alerts.json (95%)
rename ambari_plugin/common-services/DOLPHIN/{1.3.3 =>
1.2.1}/configuration/dolphin-alert.xml (95%)
rename ambari_plugin/common-services/DOLPHIN/{1.3.3 =>
1.2.1}/configuration/dolphin-application-api.xml (82%)
create mode 100644
ambari_plugin/common-services/DOLPHIN/1.2.1/configuration/dolphin-application.xml
rename ambari_plugin/common-services/DOLPHIN/{1.3.3 =>
1.2.1}/configuration/dolphin-common.xml (100%)
rename ambari_plugin/common-services/DOLPHIN/{1.3.3 =>
1.2.1}/configuration/dolphin-env.xml (100%)
rename ambari_plugin/common-services/DOLPHIN/{1.3.3 =>
1.2.1}/configuration/dolphin-quartz.xml (91%)
rename ambari_plugin/common-services/DOLPHIN/{1.3.3 => 1.2.1}/metainfo.xml
(98%)
rename ambari_plugin/common-services/DOLPHIN/{1.3.3 =>
1.2.1}/package/alerts/alert_dolphin_scheduler_status.py (100%)
rename ambari_plugin/common-services/DOLPHIN/{1.3.3 =>
1.2.1}/package/scripts/dolphin_alert_service.py (92%)
rename ambari_plugin/common-services/DOLPHIN/{1.3.3 =>
1.2.1}/package/scripts/dolphin_api_service.py (93%)
rename ambari_plugin/common-services/DOLPHIN/{1.3.3 =>
1.2.1}/package/scripts/dolphin_env.py (78%)
rename ambari_plugin/common-services/DOLPHIN/{1.3.3 =>
1.2.1}/package/scripts/dolphin_logger_service.py (92%)
rename ambari_plugin/common-services/DOLPHIN/{1.3.3 =>
1.2.1}/package/scripts/dolphin_master_service.py (92%)
rename ambari_plugin/common-services/DOLPHIN/{1.3.3 =>
1.2.1}/package/scripts/dolphin_worker_service.py (92%)
rename ambari_plugin/common-services/DOLPHIN/{1.3.3 =>
1.2.1}/package/scripts/params.py (68%)
rename ambari_plugin/common-services/DOLPHIN/{1.3.3 =>
1.2.1}/package/scripts/service_check.py (100%)
rename ambari_plugin/common-services/DOLPHIN/{1.3.3 =>
1.2.1}/package/scripts/status_params.py (100%)
rename ambari_plugin/common-services/DOLPHIN/{1.3.3 =>
1.2.1}/package/templates/alert.properties.j2 (100%)
rename ambari_plugin/common-services/DOLPHIN/{1.3.3 =>
1.2.1}/package/templates/application-api.properties.j2 (100%)
copy
ambari_plugin/common-services/DOLPHIN/{1.3.0/package/templates/alert.properties.j2
=> 1.2.1/package/templates/application.properties.j2} (91%)
rename ambari_plugin/common-services/DOLPHIN/{1.3.3 =>
1.2.1}/package/templates/common.properties.j2 (100%)
rename
ambari_plugin/common-services/DOLPHIN/{1.3.3/package/templates/dolphin-daemon.sh.j2
=> 1.2.1/package/templates/dolphin-daemon.j2} (83%)
rename ambari_plugin/common-services/DOLPHIN/{1.3.3 =>
1.2.1}/package/templates/quartz.properties.j2 (100%)
rename ambari_plugin/common-services/DOLPHIN/{1.3.3 =>
1.2.1}/quicklinks/quicklinks.json (100%)
mode change 100644 => 100755
rename ambari_plugin/common-services/DOLPHIN/{1.3.3 =>
1.2.1}/themes/theme.json (86%)
delete mode 100644
ambari_plugin/common-services/DOLPHIN/1.3.3/configuration/dolphin-datasource.xml
delete mode 100644
ambari_plugin/common-services/DOLPHIN/1.3.3/configuration/dolphin-master.xml
delete mode 100644
ambari_plugin/common-services/DOLPHIN/1.3.3/configuration/dolphin-worker.xml
delete mode 100644
ambari_plugin/common-services/DOLPHIN/1.3.3/configuration/dolphin-zookeeper.xml
delete mode 100644
ambari_plugin/common-services/DOLPHIN/1.3.3/package/templates/datasource.properties.j2
delete mode 100644
ambari_plugin/common-services/DOLPHIN/1.3.3/package/templates/master.properties.j2
delete mode 100644
ambari_plugin/common-services/DOLPHIN/1.3.3/package/templates/worker.properties.j2
delete mode 100644
ambari_plugin/common-services/DOLPHIN/1.3.3/package/templates/zookeeper.properties.j2
delete mode 100644 docker/kubernetes/dolphinscheduler/requirements.yaml
delete mode 100644
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Event.java
delete mode 100644
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/upgrade/ResourceDao.java
delete mode 100644
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/DBTaskAckCommand.java
delete mode 100644
dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/DBTaskResponseCommand.java
delete mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/log/TaskLogAppender.java
delete mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/cache/ResponceCache.java
delete mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/DBTaskAckProcessor.java
delete mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/processor/DBTaskResponseProcessor.java
delete mode 100644
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/RetryReportTaskStatusThread.java
delete mode 100644
dolphinscheduler-ui/src/js/module/components/fileUpdate/fileChildReUpdate.vue
delete mode 100644
dolphinscheduler-ui/src/js/module/components/fileUpdate/fileReUpload.vue
delete mode 100644
e2e/src/test/java/org/apache/dolphinscheduler/data/project/CreateProjectData.java
delete mode 100644
e2e/src/test/java/org/apache/dolphinscheduler/data/project/CreateWorkflowData.java
delete mode 100644
e2e/src/test/java/org/apache/dolphinscheduler/locator/project/CreateProjectLocator.java
delete mode 100644
e2e/src/test/java/org/apache/dolphinscheduler/locator/project/CreateWorkflowLocator.java
delete mode 100644
e2e/src/test/java/org/apache/dolphinscheduler/page/project/CreateProjectPage.java
delete mode 100644
e2e/src/test/java/org/apache/dolphinscheduler/page/project/CreateWorkflowPage.java
delete mode 100644
e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteProjectTest.java
delete mode 100644
e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteTenantTest.java
delete mode 100644
e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteUserTest.java
delete mode 100644
e2e/src/test/java/org/apache/dolphinscheduler/testcase/deleteData/DeleteWorkflowTest.java
delete mode 100644 sql/upgrade/1.3.2_schema/mysql/dolphinscheduler_ddl.sql
delete mode 100644 sql/upgrade/1.3.2_schema/mysql/dolphinscheduler_dml.sql
delete mode 100644 sql/upgrade/1.3.2_schema/postgresql/dolphinscheduler_ddl.sql
delete mode 100644 sql/upgrade/1.3.2_schema/postgresql/dolphinscheduler_dml.sql
