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/09/08 05:26:09 UTC
[dolphinscheduler] 01/01: Merge pull request #6124 from
apache/json_split_two
This is an automated email from the ASF dual-hosted git repository.
lidongdai pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit 1f838e61026fab1db479754b64c9b15690b1a80b
Merge: 2ac6d2f c4478f8
Author: David <da...@gmail.com>
AuthorDate: Wed Sep 8 13:26:00 2021 +0800
Merge pull request #6124 from apache/json_split_two
[Feature][JsonSplit-api] api module controller design
.github/actions/translate-on-issue | 1 -
.gitignore | 1 +
.../dolphinscheduler/logback/logback-alert.xml | 7 +-
.../conf/dolphinscheduler/logback/logback-api.xml | 7 +-
.../dolphinscheduler/logback/logback-master.xml | 11 +-
.../dolphinscheduler/logback/logback-worker.xml | 11 +-
.../templates/deployment-dolphinscheduler-api.yaml | 2 +-
.../statefulset-dolphinscheduler-master.yaml | 2 +-
.../statefulset-dolphinscheduler-worker.yaml | 2 +-
docker/kubernetes/dolphinscheduler/values.yaml | 18 +-
.../src/main/resources/logback-alert.xml | 8 +-
.../api/controller/AccessTokenController.java | 48 +-
.../api/controller/AlertGroupController.java | 64 +-
.../controller/AlertPluginInstanceController.java | 51 +-
.../api/controller/BaseController.java | 5 +-
.../api/controller/DataAnalysisController.java | 65 +-
.../api/controller/DataSourceController.java | 73 +-
.../api/controller/ExecutorController.java | 37 +-
.../api/controller/LoggerController.java | 28 +-
.../api/controller/LoginController.java | 16 +-
.../api/controller/MonitorController.java | 8 +-
.../controller/ProcessDefinitionController.java | 491 +++---
.../api/controller/ProcessInstanceController.java | 269 ++--
.../api/controller/ProjectController.java | 132 +-
.../api/controller/QueueController.java | 46 +-
.../api/controller/ResourcesController.java | 245 ++-
.../api/controller/SchedulerController.java | 115 +-
.../api/controller/TaskDefinitionController.java | 313 ++++
.../api/controller/TaskInstanceController.java | 69 +-
.../api/controller/TenantController.java | 46 +-
.../api/controller/UiPluginController.java | 10 +-
.../api/controller/UsersController.java | 152 +-
.../api/controller/WorkFlowLineageController.java | 14 +-
.../api/controller/WorkerGroupController.java | 40 +-
.../dolphinscheduler/api/dto/DagDataSchedule.java | 43 +-
.../dolphinscheduler/api/dto/ProcessMeta.java | 231 ---
.../apache/dolphinscheduler/api/enums/Status.java | 25 +-
.../api/service/DataAnalysisService.java | 20 +-
.../api/service/ExecutorService.java | 16 +-
.../api/service/ProcessDefinitionService.java | 235 +--
.../api/service/ProcessInstanceService.java | 90 +-
.../api/service/ProjectService.java | 24 +-
.../api/service/SchedulerService.java | 39 +-
.../api/service/TaskDefinitionService.java | 105 +-
.../api/service/TaskInstanceService.java | 28 +-
.../api/service/WorkFlowLineageService.java | 4 +-
.../api/service/impl/DataAnalysisServiceImpl.java | 93 +-
.../api/service/impl/DataSourceServiceImpl.java | 3 +-
.../api/service/impl/ExecutorServiceImpl.java | 118 +-
.../service/impl/ProcessDefinitionServiceImpl.java | 1621 +++++++-------------
.../service/impl/ProcessInstanceServiceImpl.java | 295 ++--
.../impl/ProcessTaskRelationServiceImpl.java | 78 -
.../api/service/impl/ProjectServiceImpl.java | 80 +-
.../api/service/impl/ResourcesServiceImpl.java | 30 +-
.../api/service/impl/SchedulerServiceImpl.java | 87 +-
.../service/impl/TaskDefinitionServiceImpl.java | 340 ++--
.../api/service/impl/TaskInstanceServiceImpl.java | 47 +-
.../api/service/impl/TenantServiceImpl.java | 20 -
.../service/impl/WorkFlowLineageServiceImpl.java | 8 +-
.../dolphinscheduler/api/utils/CheckUtils.java | 19 +-
.../src/main/resources/logback-api.xml | 7 +-
.../api/controller/AbstractControllerTest.java | 20 +
.../api/controller/AccessTokenControllerTest.java | 12 +-
.../api/controller/AlertGroupControllerTest.java | 16 +-
.../api/controller/DataAnalysisControllerTest.java | 55 +-
.../api/controller/DataSourceControllerTest.java | 25 +-
.../api/controller/LoggerControllerTest.java | 5 +-
.../api/controller/LoginControllerTest.java | 5 +-
.../api/controller/MonitorControllerTest.java | 13 +-
.../ProcessDefinitionControllerTest.java | 242 ++-
.../controller/ProcessInstanceControllerTest.java | 146 +-
.../api/controller/ProjectControllerTest.java | 270 ++--
.../api/controller/QueueControllerTest.java | 25 +-
.../api/controller/ResourcesControllerTest.java | 38 +-
.../api/controller/SchedulerControllerTest.java | 78 +-
.../api/controller/TaskInstanceControllerTest.java | 10 +-
.../api/controller/TenantControllerTest.java | 30 +-
.../api/controller/UsersControllerTest.java | 33 +-
.../controller/WorkFlowLineageControllerTest.java | 45 +-
.../api/exceptions/ApiExceptionHandlerTest.java | 9 +-
.../api/service/DataAnalysisServiceTest.java | 205 ++-
.../api/service/DataSourceServiceTest.java | 26 +-
.../api/service/ExecutorService2Test.java | 308 ----
.../api/service/ExecutorServiceTest.java | 315 +++-
.../api/service/LoggerServiceTest.java | 6 +-
.../api/service/ProcessDefinitionServiceTest.java | 1162 ++++----------
.../api/service/ProcessInstanceServiceTest.java | 331 ++--
.../ProcessTaskRelationServiceImplTest.java | 107 --
.../api/service/ProjectServiceTest.java | 55 +-
.../api/service/QueueServiceTest.java | 10 +-
.../api/service/ResourcesServiceTest.java | 13 +-
.../api/service/SchedulerServiceTest.java | 43 +-
.../api/service/TaskDefinitionServiceImplTest.java | 263 ++--
.../api/service/TaskInstanceServiceTest.java | 82 +-
.../api/service/TenantServiceTest.java | 2 +-
.../api/service/WorkFlowLineageServiceTest.java | 8 +-
.../dolphinscheduler/api/utils/ResultTest.java | 6 +-
.../apache/dolphinscheduler/common/Constants.java | 8 +-
.../apache/dolphinscheduler/common/enums/Flag.java | 3 +-
.../dolphinscheduler/common/enums/Priority.java | 2 +-
.../common/enums/TaskStateType.java | 4 +-
.../common/enums/TaskTimeoutStrategy.java | 13 +-
.../dolphinscheduler/common/utils/JSONUtils.java | 1 -
.../common/task/SqlParametersTest.java | 3 -
.../dolphinscheduler/dao/entity/Command.java | 24 +-
.../dolphinscheduler/dao/entity/DagData.java | 74 +
.../dolphinscheduler/dao/entity/ErrorCommand.java | 43 +-
.../dao/entity/ProcessDefinition.java | 144 +-
.../dao/entity/ProcessDefinitionLog.java | 5 +-
.../dao/entity/ProcessInstance.java | 185 +--
.../dao/entity/ProcessTaskRelation.java | 58 +-
.../dao/entity/ProcessTaskRelationLog.java | 10 +
.../dolphinscheduler/dao/entity/Project.java | 10 +-
.../dolphinscheduler/dao/entity/Schedule.java | 15 +-
.../dao/entity/TaskDefinition.java | 100 +-
.../dao/entity/TaskDefinitionLog.java | 11 +
.../dao/mapper/ProcessDefinitionLogMapper.java | 29 +-
.../dao/mapper/ProcessDefinitionMapper.java | 43 +-
.../dao/mapper/ProcessTaskRelationLogMapper.java | 11 +-
.../dao/mapper/ProcessTaskRelationMapper.java | 19 +-
.../dolphinscheduler/dao/mapper/ProjectMapper.java | 5 +-
.../dao/mapper/ScheduleMapper.java | 32 +-
.../dao/mapper/TaskDefinitionLogMapper.java | 49 +-
.../dao/mapper/TaskDefinitionMapper.java | 56 +-
.../dolphinscheduler/dao/mapper/TenantMapper.java | 4 +-
.../dolphinscheduler/dao/mapper/CommandMapper.xml | 6 +-
.../dao/mapper/ErrorCommandMapper.xml | 4 +-
.../dao/mapper/ProcessDefinitionLogMapper.xml | 18 +-
.../dao/mapper/ProcessDefinitionMapper.xml | 31 +-
.../dao/mapper/ProcessTaskRelationLogMapper.xml | 24 +-
.../dao/mapper/ProcessTaskRelationMapper.xml | 12 +-
.../dolphinscheduler/dao/mapper/ProjectMapper.xml | 2 +-
.../dolphinscheduler/dao/mapper/ScheduleMapper.xml | 32 +-
.../dao/mapper/TaskDefinitionLogMapper.xml | 44 +-
.../dao/mapper/TaskDefinitionMapper.xml | 62 +-
.../dao/mapper/WorkFlowLineageMapper.xml | 4 +-
.../dao/mapper/CommandMapperTest.java | 73 +-
.../dao/mapper/ErrorCommandMapperTest.java | 11 +-
.../dao/mapper/ProcessDefinitionMapperTest.java | 13 +-
.../dao/mapper/ProcessInstanceMapperTest.java | 2 -
.../dao/mapper/ScheduleMapperTest.java | 46 +-
.../dao/mapper/TaskDefinitionLogMapperTest.java | 20 -
.../dao/mapper/TaskDefinitionMapperTest.java | 34 +-
.../dao/mapper/TaskInstanceMapperTest.java | 2 -
.../dao/mapper/TenantMapperTest.java | 4 +-
.../dao/mapper/WorkFlowLineageMapperTest.java | 7 +-
.../server}/log/SensitiveDataConverter.java | 14 +-
.../cache/impl/TaskInstanceCacheManagerImpl.java | 1 -
.../master/runner/WorkflowExecuteThread.java | 8 +-
.../server/utils/FlinkArgsUtils.java | 12 +-
.../src/main/resources/config/install_config.conf | 14 +-
.../src/main/resources/logback-master.xml | 11 +-
.../src/main/resources/logback-worker.xml | 11 +-
.../server/log/SensitiveDataConverterTest.java | 180 +++
.../server/master/MasterCommandTest.java | 22 +-
.../server/master/SwitchTaskTest.java | 3 -
.../server/master/WorkflowExecuteThreadTest.java | 4 +-
.../consumer/TaskPriorityQueueConsumerTest.java | 6 -
.../server/worker/task/sql/SqlTaskTest.java | 90 +-
.../service/process/ProcessService.java | 762 ++++-----
.../service/quartz/ProcessScheduleJob.java | 6 +-
.../src/main/resources/logback-zookeeper.xml | 0
.../service/log/SensitiveDataConverterTest.java | 137 --
.../service/process/ProcessServiceTest.java | 176 +--
.../spi/plugin/DolphinPluginDiscovery.java | 12 +-
.../spi/plugin/DolphinPluginManagerConfig.java | 2 +-
.../src/main/resources/registry.properties | 22 +
dolphinscheduler-ui/package.json | 2 +
.../conf/home/pages/dag/_source/canvas/canvas.scss | 48 +-
.../conf/home/pages/dag/_source/canvas/canvas.vue | 747 +++++++++
.../home/pages/dag/_source/canvas/contextMenu.scss | 34 +-
.../home/pages/dag/_source/canvas/contextMenu.vue | 155 ++
.../home/pages/dag/_source/canvas/draggableBox.vue | 48 +-
.../pages/dag/_source/canvas/edgeEditModel.vue | 114 ++
.../home/pages/dag/_source/canvas/menuItem.vue | 40 +-
.../home/pages/dag/_source/canvas/nodeStatus.js | 52 +
.../{plugIn/dragZoom.js => canvas/nodeStatus.scss} | 28 +-
.../home/pages/dag/_source/canvas/taskbar.scss | 167 ++
.../conf/home/pages/dag/_source/canvas/taskbar.vue | 64 +
.../home/pages/dag/_source/canvas/toolbar.scss | 113 ++
.../conf/home/pages/dag/_source/canvas/toolbar.vue | 218 +++
.../home/pages/dag/_source/canvas/x6-helper.js | 315 ++++
.../home/pages/dag/_source/canvas/x6-style.scss | 26 +-
.../src/js/conf/home/pages/dag/_source/dag.js | 195 ---
.../src/js/conf/home/pages/dag/_source/dag.scss | 563 +------
.../src/js/conf/home/pages/dag/_source/dag.vue | 1224 ++++++---------
.../home/pages/dag/_source/formModel/formModel.vue | 198 +--
.../conf/home/pages/dag/_source/formModel/log.vue | 13 +-
.../dag/_source/formModel/tasks/_source/commcon.js | 5 -
.../home/pages/dag/_source/formModel/tasks/sql.vue | 24 -
.../dag/_source/formModel/tasks/sub_process.vue | 32 +-
.../pages/dag/_source/images/full-screen-close.png | Bin 0 -> 463 bytes
.../dag/_source/images/full-screen-close_hover.png | Bin 0 -> 652 bytes
.../pages/dag/_source/images/full-screen-open.png | Bin 0 -> 575 bytes
.../dag/_source/images/full-screen-open_hover.png | Bin 0 -> 575 bytes
.../home/pages/dag/_source/images/graph-format.png | Bin 0 -> 458 bytes
.../dag/_source/images/graph-format_hover.png | Bin 0 -> 461 bytes
.../pages/dag/_source/images/startup-params.png | Bin 0 -> 903 bytes
.../dag/_source/images/startup-params_hover.png | Bin 0 -> 903 bytes
.../dag/_source/images/task-icos/conditions.png | Bin 0 -> 812 bytes
.../_source/images/task-icos/conditions_hover.png | Bin 0 -> 736 bytes
.../pages/dag/_source/images/task-icos/datax.png | Bin 0 -> 1122 bytes
.../dag/_source/images/task-icos/datax_hover.png | Bin 0 -> 1127 bytes
.../dag/_source/images/task-icos/dependent.png | Bin 0 -> 743 bytes
.../_source/images/task-icos/dependent_hover.png | Bin 0 -> 745 bytes
.../pages/dag/_source/images/task-icos/flink.png | Bin 0 -> 1443 bytes
.../dag/_source/images/task-icos/flink_hover.png | Bin 0 -> 1348 bytes
.../pages/dag/_source/images/task-icos/http.png | Bin 0 -> 707 bytes
.../dag/_source/images/task-icos/http_hover.png | Bin 0 -> 709 bytes
.../home/pages/dag/_source/images/task-icos/mr.png | Bin 0 -> 930 bytes
.../dag/_source/images/task-icos/mr_hover.png | Bin 0 -> 862 bytes
.../dag/_source/images/task-icos/procedure.png | Bin 0 -> 1555 bytes
.../_source/images/task-icos/procedure_hover.png | Bin 0 -> 1436 bytes
.../pages/dag/_source/images/task-icos/python.png | Bin 0 -> 1618 bytes
.../dag/_source/images/task-icos/python_hover.png | Bin 0 -> 1233 bytes
.../pages/dag/_source/images/task-icos/shell.png | Bin 0 -> 747 bytes
.../dag/_source/images/task-icos/shell_hover.png | Bin 0 -> 745 bytes
.../pages/dag/_source/images/task-icos/spark.png | Bin 0 -> 1067 bytes
.../dag/_source/images/task-icos/spark_hover.png | Bin 0 -> 1066 bytes
.../pages/dag/_source/images/task-icos/sql.png | Bin 0 -> 1317 bytes
.../dag/_source/images/task-icos/sql_hover.png | Bin 0 -> 1262 bytes
.../pages/dag/_source/images/task-icos/sqoop.png | Bin 0 -> 896 bytes
.../dag/_source/images/task-icos/sqoop_hover.png | Bin 0 -> 897 bytes
.../dag/_source/images/task-icos/sub_process.png | Bin 0 -> 692 bytes
.../_source/images/task-icos/sub_process_hover.png | Bin 0 -> 693 bytes
.../dag/_source/images/task-icos/waterdrop.png | Bin 0 -> 1086 bytes
.../_source/images/task-icos/waterdrop_hover.png | Bin 0 -> 1054 bytes
.../pages/dag/_source/images/view-variables.png | Bin 0 -> 858 bytes
.../dag/_source/images/view-variables_hover.png | Bin 0 -> 858 bytes
.../js/conf/home/pages/dag/_source/loading.scss | 24 +-
.../home/pages/dag/_source/plugIn/downChart.js | 122 --
.../home/pages/dag/_source/plugIn/jsPlumbHandle.js | 814 ----------
.../home/pages/dag/_source/plugIn/multiDrag.js | 67 -
.../js/conf/home/pages/dag/_source/plugIn/util.js | 171 ---
.../pages/dag/_source/udp/_source/selectTenant.vue | 7 +-
.../src/js/conf/home/pages/dag/_source/udp/udp.vue | 48 +-
.../js/conf/home/pages/dag/definitionDetails.vue | 13 +-
.../pages/definition/pages/list/_source/list.vue | 30 +-
.../pages/definition/pages/list/_source/start.vue | 4 +-
.../pages/definition/pages/list/_source/timing.vue | 2 +-
.../definition/pages/list/_source/versions.vue | 7 +-
.../pages/definition/timing/_source/list.vue | 2 +-
.../pages/index/_source/commandStateCount.vue | 94 --
.../pages/index/_source/defineUserCount.vue | 8 +-
.../pages/index/_source/processStateCount.vue | 6 +-
.../projects/pages/index/_source/queueCount.vue | 101 --
.../pages/index/_source/taskStatusCount.vue | 4 +-
.../conf/home/pages/projects/pages/index/index.vue | 12 +-
.../pages/instance/pages/list/_source/list.vue | 4 +-
.../pages/projects/pages/list/_source/list.vue | 6 +-
.../conf/home/pages/security/pages/users/index.vue | 6 +-
.../src/js/conf/home/router/index.js | 32 +-
.../src/js/conf/home/store/dag/actions.js | 263 ++--
.../src/js/conf/home/store/dag/mutations.js | 57 +-
.../src/js/conf/home/store/dag/state.js | 16 +-
.../src/js/conf/home/store/datasource/actions.js | 10 +-
.../src/js/conf/home/store/kinship/actions.js | 8 +-
.../src/js/conf/home/store/monitor/actions.js | 8 +-
.../src/js/conf/home/store/projects/actions.js | 10 +-
.../src/js/conf/home/store/resource/actions.js | 22 +-
.../src/js/conf/home/store/security/actions.js | 62 +-
.../src/js/conf/home/store/user/actions.js | 10 +-
.../components/secondaryMenu/secondaryMenu.vue | 7 +
.../src/js/module/i18n/locale/en_US.js | 3 -
.../src/js/module/i18n/locale/zh_CN.js | 3 -
pom.xml | 3 +-
sql/dolphinscheduler_h2.sql | 4 +-
sql/dolphinscheduler_mysql.sql | 13 +-
sql/dolphinscheduler_postgre.sql | 11 +-
.../1.4.0_schema/mysql/dolphinscheduler_ddl.sql | 296 ----
.../postgresql/dolphinscheduler_ddl.sql | 339 +---
271 files changed, 8923 insertions(+), 11268 deletions(-)