You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ki...@apache.org on 2021/05/12 10:44:42 UTC
[dolphinscheduler] branch dev updated (5556e47 -> a3e5dfc)
This is an automated email from the ASF dual-hosted git repository.
kirs pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git.
from 5556e47 [Feature][Plugin-Email] Numeric data type support in email attachment #5424 (#5426)
add d67b335 Merge remote-tracking branch 'upstream/dev' into json-split
add d1a0d58 Merge remote-tracking branch 'upstream/dev' into json-split
add 74712a4 [Feature][JsonSplit] snowFlakeUtils (#4432)
add 4cdf970 [Feature][JsonSplit] Table Structure Design (#4431)
add 95bbdfe Merge branch 'json_split' of https://github.com/apache/incubator-dolphinscheduler into json-split
add a7d396f Merge remote-tracking branch 'upstream/dev' into json-split
add c3d1812 Merge remote-tracking branch 'upstream/dev' into json-split
add 26c457a Merge remote-tracking branch 'upstream/dev' into json-split
add c7038a0 [Feature][JsonSplit] task and relation entity (#4475)
add c4b84e2 Merge remote-tracking branch 'upstream/dev' into json-split
add db5c3bb Merge remote-tracking branch 'upstream/dev' into json-split
add 56b6097 [Feature][JsonSplit] ProcessDefinition Entity (#4477)
add c184b89 [Feature][JsonSplit] task mapper and postgre (#4498)
add 9b9952a Merge remote-tracking branch 'upstream/dev' into spilit
add 4a9099c Merge remote-tracking branch 'upstream/dev' into spilit
add 49204a6 merge from dev
add 0055ef4 [Feature][JsonSplit] Add Project code (#4509)
add 59a542d Merge branch 'json_split' of https://github.com/apache/incubator-dolphinscheduler into json-split
add 648bc41 [Feature][JsonSplit] add task and relation save code (#4546)
add 1d72a43 Merge remote-tracking branch 'upstream/dev' into spilit
add a9748bf [ui] add code in task model (#4583)
add e1e48d7 [Feature][JsonSplit] modify processdefinition create/delete method (#4579)
add f19b472 Merge remote-tracking branch 'upstream/dev' into spilit
add 33447c7 Merge remote-tracking branch 'upstream/dev' into spilit
add 47e620f [Feature][JsonSplit] add task query (#4619)
add fc6461c [Feature][JsonSplit]modify mysql.sql. remove dumplicate locations (#4582)
add c8d5454 merge form dev
add 988649a Merge remote-tracking branch 'upstream/dev' into spilit
add 6844f67 Merge remote-tracking branch 'upstream/dev' into spilit
add 852710a [Feature][JsonSplit] add task delete/update/switch method (#4654)
add c511658 [Feature][JsonSplit] modify updateProcessDefinition/switchProcessDefinitionVersion (#4666)
add 591f4f2 Merge remote-tracking branch 'upstream/dev' into spilit
add 6e01d65 Merge remote-tracking branch 'upstream/dev' into spilit
add 5073510 Merge remote-tracking branch 'upstream/dev' into spilit
add 9141840 merge from dev
add f31eee4 [Feature][JsonSplit] refactor process definition update (#4708)
add 52beecb Merge remote-tracking branch 'upstream/dev' into spilit
add 763a50d [Feature][JsonSplit] add relation method and refactor task method (#4737)
add 9fb7c9a Merge remote-tracking branch 'upstream/dev' into spilit
add 0081ce0 Merge remote-tracking branch 'upstream/dev' into spilit
add 061af08 [Feature][JsonSplit] Modify Project and ProjectUser Mapper (#4753)
add 069e9f9 [Feature][JsonSplit] modify ProcessService createTaskAndRelation (#4770)
add 9d81c5d Merge branch 'json_split' of https://github.com/apache/incubator-dolphinscheduler into spilit
add 9f809de merge from dev
add d5b6f44 Merge remote-tracking branch 'upstream/dev' into spilit
add 3571de9 Merge remote-tracking branch 'upstream/dev' into spilit
add f7ca571 Merge remote-tracking branch 'upstream/dev' into spilit
add 1b9ab88 Merge remote-tracking branch 'upstream/dev' into spilit
add 67eae43 [Feature-4417][JsonSplit] refactor process dag generate (#4790)
add 453ba09 Merge branch 'json_split' of https://github.com/apache/incubator-dolphinscheduler into spilit
add abf6723 [Feature][JsonSplit] modify saveProcessDefine remove the duplicate code (#4810)
add 4c9c419 Merge remote-tracking branch 'upstream/dev' into spilit
add 2d1d91d Merge remote-tracking branch 'upstream/dev' into spilit
add 62e961e [Feature][JsonSplit]refactor remove the json in process instance and definition (#4828)
add 674af05 Merge remote-tracking branch 'upstream/dev' into spilit
add f1375b9 Merge remote-tracking branch 'upstream/dev' into spilit
add 2afc9f3 merge from dev
add a32b40e [Feature][JsonSplit] add gen taskNodeList method (#4861)
add 2272966 Merge remote-tracking branch 'upstream/dev' into spilit
add ccc5aa9 merge from dev
add 2fdeba0 [Feature][JsonSplit]modify import/export processdefinition, add genProcessData (#4864)
add fd7aa53 [Feature-4417][JsonSplit] definition log extends definition (#4870)
add 0571681 Merge remote-tracking branch 'upstream/json_split' into spilit
add 8720c26 Merge remote-tracking branch 'upstream/dev' into spilit
add 929655f refactor task node
add 6d087cc [Feature][JsonSplit] fix processDefinitionService ut and bug (#4894)
add df0e3e9 Merge branch 'json_split' of https://github.com/apache/incubator-dolphinscheduler into spilit
add 2603d52 Merge remote-tracking branch 'upstream/dev' into spilit
add c342980 [Feature][jsonsplit] repalce project_id with code (#4904)
add 0c2b065 [Feature][jsonsplit]modify listResources mothod and remove getResourceIds mothod (#4928)
add dcf9792 merge from dev 2021-03-03
add 779596c [Feature][JsonSplit] modify checkDAGRing and ProcessService method (#4931)
add 8b35e21 [Feature][jsonsplit] replace processDefinitionVersion with processDefinitionLog (#4942)
add 5bda7c3 Merge remote-tracking branch 'upstream/dev' into spilit
add bd4b2f8 [Feature][jsonsplit]add ProcessTaskRelationServiceImplTest/TaskDefinitionServiceImplTest (#4949)
add f24ecff [Feature][jsonsplit]add mapper module ut and some bugfix (#4957)
add ce6338b Merge remote-tracking branch 'upstream/dev' into spilit
add bb7106d Merge remote-tracking branch 'upstream/dev' into spilit
add 39a9c0c [Feature][jsonspilt]modify process instance for project home page (#4991)
add 5e2b97b [feature-4417][JsonSplit]refactor json in process instance and process definition (#4993)
add 6111f05 [Feature][jsonspilt]fix ProcessInstanceMapperTest (#4989)
add eeaa495 Merge branch 'json_split' of https://github.com/apache/incubator-dolphinscheduler into spilit
add ab18ca0 [Feature][jsonsplit]fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest (#5000)
add 7f0678d [Feature][JsonSplit] Fix save process bug (#5001)
add c010ac1 [Feature][JsonSplit] Fix logical bug in saving process definition (#5009)
add 40bcb2e [Feature][jsonsplit]fix TaskInstanceMapperTest (#5010)
add 81dcd68 Merge remote-tracking branch 'upstream/dev' into spilit
add c4d9cef [Feature][jsonsplit]add TaskDefinitionLogMapperTest/TaskDefinitionMapperTest and bugfix (#5012)
add 461e633 Merge remote-tracking branch 'upstream/dev' into spilit
add 6ef54eb Merge remote-tracking branch 'upstream/dev' into spilit
add a574d2e Merge remote-tracking branch 'upstream/dev' into spilit
add 22ec6c0 [Feature][jsonsplit]Refactor process lineage (#5034)
add c33cc87 Merge remote-tracking branch 'upstream/dev' into spilit
add 6ab3892 Merge remote-tracking branch 'upstream/dev' into spilit
add d98c2c5 [Feature][JsonSplit] Fix bug in interface of queryProcessDefinitionList (#5043)
add 00dcc3f [Feature][jsonsplit]add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest (#5047)
add cf63fc1 Merge remote-tracking branch 'upstream/dev' into spilit
add 010b49c merge from dev
add f05ba84 Merge remote-tracking branch 'upstream/dev' into spilit
add d99934d [Feature][JsonSplit] Fix api bug (#5102)
add 1eaf1f6 [Feature][JsonSplit] fix taskId in processDefinitionJson (#5136)
add 21b7b77 [Feature][JsonSplit]fix modifyBy field (#5112)
add e53367b [Feature][JsonSplit] task page, rename field "description" to "desc" (#5137)
add 3c9b214 [Feature][jsonsplit]add ProcessServiceTest (#5097)
add cd19507 [feature][jsonsplit]fix copy/export/import processDefinition bugs (#5146)
add 0914699 Merge branch 'json_split' of https://github.com/apache/incubator-dolphinscheduler into spilit
add a467fff [Feature][JsonSplit] fix taskId in json (#5165)
add 0edd783 [FIxBug][JsonSplit] When create process, the version button is set to unavailable #5137 (#5168)
add f960eac [FixBug][Jsonsplit] sql condition bug #4417 (#5171)
add 689106d transform taskCode from long to string (#5174)
add c8ac6f9 Merge remote-tracking branch 'upstream/dev' into spilit
add 15b2b1c [FixBug][Jsonsplit] When to save process definition, upload task code field #4417 (#5178)
add dd36da8 [Feature][JsonSplit] fix process bug (#5193)
add 86ce8f1 [JsonSplit-4417][master/worker/api]json split- remove json in task instance. (#5160)
add a8f2894 [Feature][JsonSplit] Fix master/processInstance bug (#5206)
add 027781c Merge remote-tracking branch 'upstream/json_split' into spilit
add 4e97a0c fix: When process definition state is release, process version to set enable (#5216)
add 305288c fix: When modify the node name, circular dependence bug (#5220)
add 8d6c2e3 fix copy locations name error (#5228)
add cc82a98 [FixBug][JsonSplit] dag show bugs (#5226)
add 8c88bfa Fix dependency failure (#5239)
add 556c371 [Feature][JsonSplit] When create the process instance, save the field "locations" and "connects" (#5248)
add 31188ff [Feature][JsonSplit] Fix taskInstance (#5246)
add 73f5a8e [Feature][JsonSplit] Fix master/worker server (#5253)
add 645847c Fix quoted bug about processDefineId of processInstance (#5263)
add 0166aeb Merge remote-tracking branch 'upstream/dev' into json_split
add 784b355 fix: The instance page DAG does not display bug (#5298)
add f7a06a0 [Feature][JsonSplit] Fix master/worker about shellTask (#5300)
add 2a81b29 fix: process instance version page bug (#5319)
add 49b2346 update SnowFlake (#5321)
add d60f31b [Feature][JsonSplit] update processDefinite from processInstance (#5325)
add 37b149d fix circular dependence bug (#5330)
add feffd97 [Feature][JsonSplit] Fix task logger path (#5331)
add 862565a [Feature][JsonSplit] Fix dependTask bug (#5360)
add db96bf2 [Feature][JsonSplit] Fix batchMove of processDefinition bug (#5371)
add fd54dc0 [FixBug][JsonSplit] depend task, the field "process definition id" modify to "process definition code" (#5377)
add 7b2f334 fix: process definition version delete bug (#5380)
add c355896 update taskParams/add task delayTime/fix conditionType bug (#5385)
add 746d9ec Merge remote-tracking branch 'upstream/dev' into json_split
add 2a44cb9 [Feature][JsonSplit] update codeStyle for merge to dev (#5392)
add 86dcddb [Feature-4417]fix code style (#5395)
add 1646188 fix code style
add b594afc Merge remote-tracking branch 'upstream/dev' into json_split
add c850b85 Merge remote-tracking branch 'upstream/dev' into json_split
add 363426d [Feature][JsonSplit] fix process lineage bug (#5418)
add f7b71fb [Feature][JsonSplit] Fix codeStyle for json_split (#5432)
add 847865f [Feature][JsonSplit] Fix dao ut (#5433)
add 515fa49 [Feature][JsonSplit] Fix ProcessService ut (#5435)
add 156dada Merge remote-tracking branch 'upstream/dev' into json_split
add 2dd0d93 Merge remote-tracking branch 'upstream/dev' into json_split
add 7aa8b51 Merge remote-tracking branch 'upstream/dev' into json_split
add 5079600 fix: field length (#5446)
add 1c72a4b Merge remote-tracking branch 'upstream/dev' into json_split
add dd80f98 update sleep exception
new a3e5dfc Merge pull request #5390 from apache/json_split
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:
.../alert/plugin/AlertPluginManagerTest.java | 4 +-
dolphinscheduler-api/pom.xml | 5 +
.../controller/ProcessDefinitionController.java | 273 ++++----
.../apache/dolphinscheduler/api/enums/Status.java | 8 +-
.../api/service/ExecutorService.java | 4 +-
.../api/service/ProcessDefinitionService.java | 32 +-
.../service/ProcessDefinitionVersionService.java | 73 --
.../api/service/ProcessInstanceService.java | 18 +-
...ervice.java => ProcessTaskRelationService.java} | 32 +-
.../api/service/TaskDefinitionService.java | 88 +++
.../api/service/impl/DataAnalysisServiceImpl.java | 50 +-
.../api/service/impl/ExecutorServiceImpl.java | 13 +-
.../service/impl/ProcessDefinitionServiceImpl.java | 736 ++++++++++-----------
.../impl/ProcessDefinitionVersionServiceImpl.java | 189 ------
.../service/impl/ProcessInstanceServiceImpl.java | 270 ++++----
.../impl/ProcessTaskRelationServiceImpl.java | 78 +++
.../api/service/impl/ProjectServiceImpl.java | 10 +-
.../api/service/impl/ResourcesServiceImpl.java | 2 +-
.../service/impl/TaskDefinitionServiceImpl.java | 281 ++++++++
.../api/service/impl/TaskInstanceServiceImpl.java | 2 +-
.../api/service/impl/UsersServiceImpl.java | 6 +-
.../service/impl/WorkFlowLineageServiceImpl.java | 95 +--
.../dolphinscheduler/api/utils/CheckUtils.java | 254 +++----
.../api/utils/exportprocess/DataSourceParam.java | 4 +-
.../api/utils/exportprocess/DependentParam.java | 4 +-
.../ProcessDefinitionControllerTest.java | 63 +-
.../controller/ProcessInstanceControllerTest.java | 1 -
.../controller/WorkFlowLineageControllerTest.java | 99 ++-
.../api/service/DataAnalysisServiceTest.java | 39 +-
.../api/service/ExecutorService2Test.java | 24 +-
.../api/service/ProcessDefinitionServiceTest.java | 284 +++-----
.../ProcessDefinitionVersionServiceTest.java | 269 --------
.../api/service/ProcessInstanceServiceTest.java | 88 ++-
.../ProcessTaskRelationServiceImplTest.java | 107 +++
.../api/service/ProjectServiceTest.java | 5 +-
.../api/service/TaskDefinitionServiceImplTest.java | 298 +++++++++
.../api/service/TaskInstanceServiceTest.java | 11 +-
.../api/service/UsersServiceTest.java | 1 -
.../api/service/WorkFlowLineageServiceTest.java | 85 ++-
.../dolphinscheduler/api/utils/CheckUtilsTest.java | 137 ++--
.../apache/dolphinscheduler/common/Constants.java | 17 +
.../enums/{PluginType.java => ConditionType.java} | 39 +-
.../common/enums/TaskTimeoutStrategy.java | 1 +
.../dolphinscheduler/common/enums/TaskType.java | 43 +-
.../enums/{ResourceType.java => TimeoutFlag.java} | 23 +-
.../common/model/DependentItem.java | 12 +-
.../common/model/PreviousTaskNode.java | 65 +-
.../dolphinscheduler/common/model/TaskNode.java | 695 ++++++++++---------
.../dolphinscheduler/common/utils/FileUtils.java | 11 +-
.../dolphinscheduler/common/utils/JSONUtils.java | 2 +-
.../dolphinscheduler/common/utils/LoggerUtils.java | 11 +-
.../common/utils/SnowFlakeUtils.java | 91 +++
.../dolphinscheduler/common/utils/StringUtils.java | 43 +-
.../common/utils/TaskParametersUtils.java | 39 +-
.../common/utils/VarPoolUtils.java | 3 +-
.../plugin/DolphinSchedulerPluginLoaderTest.java | 2 +-
.../common/utils/FileUtilsTest.java | 4 +-
.../common/utils/LoggerUtilsTest.java | 4 +-
...ptionUtilsTest.java => SnowFlakeUtilsTest.java} | 20 +-
.../common/utils/TaskParametersUtilsTest.java | 24 +-
.../common/utils/VarPoolUtilsTest.java | 51 +-
.../dao/entity/ProcessDefinition.java | 44 +-
.../dao/entity/ProcessDefinitionLog.java | 89 +++
.../dao/entity/ProcessDefinitionVersion.java | 311 ---------
.../dao/entity/ProcessInstance.java | 48 +-
.../dao/entity/ProcessLineage.java | 120 ++++
.../dao/entity/ProcessTaskRelation.java | 254 +++++++
.../dao/entity/ProcessTaskRelationLog.java | 83 +++
.../dolphinscheduler/dao/entity/Project.java | 42 +-
.../dolphinscheduler/dao/entity/ProjectUser.java | 21 +-
.../dao/entity/TaskDefinition.java | 428 ++++++++++++
.../dao/entity/TaskDefinitionLog.java | 95 +++
.../dolphinscheduler/dao/entity/TaskInstance.java | 106 +--
.../dao/entity/WorkFlowRelation.java | 22 +
.../dolphinscheduler/dao/mapper/CommandMapper.java | 4 +-
.../dao/mapper/ErrorCommandMapper.java | 4 +-
.../dao/mapper/ProcessDefinitionLogMapper.java | 91 +++
.../dao/mapper/ProcessDefinitionMapper.java | 57 +-
.../dao/mapper/ProcessDefinitionVersionMapper.java | 69 --
.../dao/mapper/ProcessInstanceMapper.java | 78 ++-
...pper.java => ProcessTaskRelationLogMapper.java} | 49 +-
.../dao/mapper/ProcessTaskRelationMapper.java | 68 ++
.../dolphinscheduler/dao/mapper/ProjectMapper.java | 21 +
.../dao/mapper/ProjectUserMapper.java | 6 +-
.../dao/mapper/TaskDefinitionLogMapper.java | 70 ++
.../dao/mapper/TaskDefinitionMapper.java | 109 +++
.../dao/mapper/TaskInstanceMapper.java | 10 +-
.../dao/mapper/WorkFlowLineageMapper.java | 44 +-
.../dao/upgrade/ProcessDefinitionDao.java | 33 +-
.../dolphinscheduler/dao/utils/DagHelper.java | 133 ++--
.../dao/utils/ResourceProcessDefinitionUtils.java | 59 +-
.../dolphinscheduler/dao/mapper/CommandMapper.xml | 6 +-
.../dao/mapper/ErrorCommandMapper.xml | 8 +-
.../dao/mapper/ProcessDefinitionLogMapper.xml | 82 +++
.../dao/mapper/ProcessDefinitionMapper.xml | 98 ++-
.../dao/mapper/ProcessInstanceMapper.xml | 45 +-
...Mapper.xml => ProcessTaskRelationLogMapper.xml} | 43 +-
.../dao/mapper/ProcessTaskRelationMapper.xml | 62 ++
.../dolphinscheduler/dao/mapper/ProjectMapper.xml | 58 +-
.../dolphinscheduler/dao/mapper/ScheduleMapper.xml | 4 +-
.../dao/mapper/TaskDefinitionLogMapper.xml | 62 ++
.../dao/mapper/TaskDefinitionMapper.xml | 94 +++
.../dao/mapper/TaskInstanceMapper.xml | 33 +-
.../dao/mapper/WorkFlowLineageMapper.xml | 106 ++-
.../dao/entity/TaskInstanceTest.java | 59 +-
.../dao/mapper/CommandMapperTest.java | 9 +-
.../dao/mapper/ErrorCommandMapperTest.java | 13 +-
.../dao/mapper/ProcessDefinitionLogMapperTest.java | 183 +++++
.../dao/mapper/ProcessDefinitionMapperTest.java | 40 +-
.../mapper/ProcessDefinitionVersionMapperTest.java | 168 -----
.../dao/mapper/ProcessInstanceMapperTest.java | 80 ++-
....java => ProcessTaskRelationLogMapperTest.java} | 55 +-
.../dao/mapper/ProcessTaskRelationMapperTest.java | 94 +++
.../dao/mapper/ProjectMapperTest.java | 32 +-
.../dao/mapper/ResourceMapperTest.java | 7 +-
.../dao/mapper/ScheduleMapperTest.java | 14 +
.../dao/mapper/TaskDefinitionLogMapperTest.java | 135 ++++
.../dao/mapper/TaskDefinitionMapperTest.java | 176 +++++
.../dao/mapper/TaskInstanceMapperTest.java | 153 +++--
.../dao/mapper/UdfFuncMapperTest.java | 12 -
.../dao/mapper/WorkFlowLineageMapperTest.java | 125 +++-
.../dao/upgrade/ProcessDefinitionDaoTest.java | 38 +-
.../dao/upgrade/UpgradeDaoTest.java | 9 +-
...rGrouopDaoTest.java => WorkerGroupDaoTest.java} | 25 +-
.../dolphinscheduler/dao/utils/DagHelperTest.java | 19 +-
.../utils/ResourceProcessDefinitionUtilsTest.java | 2 +-
.../ui-licenses/LICENSE-@form-create-element-ui | 2 +-
.../builder/TaskExecutionContextBuilder.java | 23 +-
.../server/entity/TaskExecutionContext.java | 96 +--
.../cache/impl/TaskInstanceCacheManagerImpl.java | 10 +-
.../master/consumer/TaskPriorityQueueConsumer.java | 102 ++-
.../master/runner/ConditionsTaskExecThread.java | 53 +-
.../master/runner/DependentTaskExecThread.java | 72 +-
.../master/runner/MasterBaseTaskExecThread.java | 15 +-
.../server/master/runner/MasterExecThread.java | 105 ++-
.../server/master/zk/ZKMasterClient.java | 3 +-
.../server/utils/DependentExecute.java | 46 +-
.../dolphinscheduler/server/utils/LogUtils.java | 18 +-
.../worker/processor/TaskExecuteProcessor.java | 14 +-
.../server/worker/runner/TaskExecuteThread.java | 59 +-
.../worker/task/AbstractCommandExecutor.java | 8 +-
.../server/worker/task/AbstractTask.java | 6 +-
.../server/worker/task/TaskManager.java | 38 +-
.../worker/task/procedure/ProcedureTask.java | 82 ++-
.../server/worker/task/sql/SqlTask.java | 4 +-
.../server/master/ConditionsTaskTest.java | 39 +-
.../server/master/DependentTaskTest.java | 104 +--
.../server/master/MasterExecThreadTest.java | 3 +-
.../server/master/SubProcessTaskTest.java | 40 +-
.../consumer/TaskPriorityQueueConsumerTest.java | 252 ++-----
.../master/runner/MasterTaskExecThreadTest.java | 41 +-
.../server/utils/LogUtilsTest.java | 15 +-
.../worker/processor/TaskExecuteProcessorTest.java | 14 +-
.../worker/runner/TaskExecuteThreadTest.java | 13 +-
.../worker/runner/WorkerManagerThreadTest.java | 9 +-
.../worker/shell/ShellCommandExecutorTest.java | 1 -
.../server/worker/sql/SqlExecutorTest.java | 31 +-
.../server/worker/task/ShellTaskReturnTest.java | 5 +-
.../server/worker/task/TaskManagerTest.java | 57 +-
.../server/worker/task/shell/ShellTaskTest.java | 6 +-
.../service/process/ProcessService.java | 734 +++++++++++++++-----
.../service/process/ProcessServiceTest.java | 364 +++++-----
.../src/js/conf/home/pages/dag/_source/dag.vue | 18 +-
.../home/pages/dag/_source/formModel/formModel.vue | 18 +-
.../formModel/tasks/_source/dependItemList.vue | 50 +-
.../_source/formModel/tasks/_source/nodeStatus.vue | 14 +-
.../home/pages/dag/_source/plugIn/jsPlumbHandle.js | 3 +-
.../pages/definition/pages/list/_source/list.vue | 12 +-
.../definition/pages/list/_source/versions.vue | 12 +-
.../src/js/conf/home/store/dag/actions.js | 10 +-
.../src/js/conf/home/store/dag/state.js | 4 +
.../src/js/module/i18n/locale/zh_CN.js | 2 +-
pom.xml | 4 +-
sql/dolphinscheduler_mysql.sql | 177 +++--
sql/dolphinscheduler_postgre.sql | 175 ++++-
175 files changed, 8095 insertions(+), 4847 deletions(-)
delete mode 100644 dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionVersionService.java
copy dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/{LoggerService.java => ProcessTaskRelationService.java} (62%)
create mode 100644 dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskDefinitionService.java
delete mode 100644 dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionVersionServiceImpl.java
create mode 100644 dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessTaskRelationServiceImpl.java
create mode 100644 dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java
delete mode 100644 dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionVersionServiceTest.java
create mode 100644 dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessTaskRelationServiceImplTest.java
create mode 100644 dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TaskDefinitionServiceImplTest.java
copy dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/{PluginType.java => ConditionType.java} (63%)
copy dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/{ResourceType.java => TimeoutFlag.java} (80%)
copy dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/treeview/TreeViewDto.java => dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/PreviousTaskNode.java (56%)
create mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/SnowFlakeUtils.java
copy dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/{EncryptionUtilsTest.java => SnowFlakeUtilsTest.java} (75%)
create mode 100644 dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinitionLog.java
delete mode 100644 dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinitionVersion.java
create mode 100644 dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessLineage.java
create mode 100644 dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessTaskRelation.java
create mode 100644 dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessTaskRelationLog.java
create mode 100644 dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
create mode 100644 dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinitionLog.java
create mode 100644 dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionLogMapper.java
delete mode 100644 dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionVersionMapper.java
copy dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/{TenantMapper.java => ProcessTaskRelationLogMapper.java} (50%)
create mode 100644 dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessTaskRelationMapper.java
create mode 100644 dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TaskDefinitionLogMapper.java
create mode 100644 dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TaskDefinitionMapper.java
create mode 100644 dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionLogMapper.xml
rename dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/{ProcessDefinitionVersionMapper.xml => ProcessTaskRelationLogMapper.xml} (51%)
create mode 100644 dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessTaskRelationMapper.xml
create mode 100644 dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskDefinitionLogMapper.xml
create mode 100644 dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskDefinitionMapper.xml
create mode 100644 dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionLogMapperTest.java
delete mode 100644 dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionVersionMapperTest.java
copy dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/{WorkFlowLineageMapperTest.java => ProcessTaskRelationLogMapperTest.java} (51%)
create mode 100644 dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessTaskRelationMapperTest.java
create mode 100644 dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskDefinitionLogMapperTest.java
create mode 100644 dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskDefinitionMapperTest.java
rename dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/upgrade/{WokrerGrouopDaoTest.java => WorkerGroupDaoTest.java} (84%)
[dolphinscheduler] 01/01: Merge pull request #5390 from
apache/json_split
Posted by ki...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
commit a3e5dfc146e2ca72e75ee5b270241cea5bd7a478
Merge: 5556e47 dd80f98
Author: Kirs <ac...@163.com>
AuthorDate: Wed May 12 18:44:30 2021 +0800
Merge pull request #5390 from apache/json_split
[Feature-4417] Process definition json split
.../alert/plugin/AlertPluginManagerTest.java | 4 +-
dolphinscheduler-api/pom.xml | 5 +
.../controller/ProcessDefinitionController.java | 273 ++++----
.../apache/dolphinscheduler/api/enums/Status.java | 8 +-
.../api/service/ExecutorService.java | 4 +-
.../api/service/ProcessDefinitionService.java | 32 +-
.../service/ProcessDefinitionVersionService.java | 73 --
.../api/service/ProcessInstanceService.java | 18 +-
.../api/service/ProcessTaskRelationService.java | 32 +-
.../api/service/TaskDefinitionService.java | 88 +++
.../api/service/impl/DataAnalysisServiceImpl.java | 50 +-
.../api/service/impl/ExecutorServiceImpl.java | 13 +-
.../service/impl/ProcessDefinitionServiceImpl.java | 736 ++++++++++-----------
.../impl/ProcessDefinitionVersionServiceImpl.java | 189 ------
.../service/impl/ProcessInstanceServiceImpl.java | 270 ++++----
.../impl/ProcessTaskRelationServiceImpl.java | 78 +++
.../api/service/impl/ProjectServiceImpl.java | 10 +-
.../api/service/impl/ResourcesServiceImpl.java | 2 +-
.../service/impl/TaskDefinitionServiceImpl.java | 281 ++++++++
.../api/service/impl/TaskInstanceServiceImpl.java | 2 +-
.../api/service/impl/UsersServiceImpl.java | 6 +-
.../service/impl/WorkFlowLineageServiceImpl.java | 95 +--
.../dolphinscheduler/api/utils/CheckUtils.java | 254 +++----
.../api/utils/exportprocess/DataSourceParam.java | 4 +-
.../api/utils/exportprocess/DependentParam.java | 4 +-
.../ProcessDefinitionControllerTest.java | 63 +-
.../controller/ProcessInstanceControllerTest.java | 1 -
.../controller/WorkFlowLineageControllerTest.java | 99 ++-
.../api/service/DataAnalysisServiceTest.java | 39 +-
.../api/service/ExecutorService2Test.java | 24 +-
.../api/service/ProcessDefinitionServiceTest.java | 284 +++-----
.../ProcessDefinitionVersionServiceTest.java | 269 --------
.../api/service/ProcessInstanceServiceTest.java | 88 ++-
.../ProcessTaskRelationServiceImplTest.java | 107 +++
.../api/service/ProjectServiceTest.java | 5 +-
.../api/service/TaskDefinitionServiceImplTest.java | 298 +++++++++
.../api/service/TaskInstanceServiceTest.java | 11 +-
.../api/service/UsersServiceTest.java | 1 -
.../api/service/WorkFlowLineageServiceTest.java | 85 ++-
.../dolphinscheduler/api/utils/CheckUtilsTest.java | 137 ++--
.../apache/dolphinscheduler/common/Constants.java | 17 +
...TaskTimeoutStrategy.java => ConditionType.java} | 49 +-
.../common/enums/TaskTimeoutStrategy.java | 1 +
.../dolphinscheduler/common/enums/TaskType.java | 43 +-
.../{TaskTimeoutStrategy.java => TimeoutFlag.java} | 35 +-
.../common/model/DependentItem.java | 12 +-
.../PreviousTaskNode.java} | 66 +-
.../dolphinscheduler/common/model/TaskNode.java | 695 ++++++++++---------
.../dolphinscheduler/common/utils/FileUtils.java | 11 +-
.../dolphinscheduler/common/utils/JSONUtils.java | 2 +-
.../dolphinscheduler/common/utils/LoggerUtils.java | 11 +-
.../common/utils/SnowFlakeUtils.java | 91 +++
.../dolphinscheduler/common/utils/StringUtils.java | 43 +-
.../common/utils/TaskParametersUtils.java | 39 +-
.../common/utils/VarPoolUtils.java | 3 +-
.../plugin/DolphinSchedulerPluginLoaderTest.java | 2 +-
.../common/utils/FileUtilsTest.java | 4 +-
.../common/utils/LoggerUtilsTest.java | 4 +-
.../common/utils/SnowFlakeUtilsTest.java | 25 +-
.../common/utils/TaskParametersUtilsTest.java | 24 +-
.../common/utils/VarPoolUtilsTest.java | 51 +-
.../dao/entity/ProcessDefinition.java | 44 +-
.../dao/entity/ProcessDefinitionLog.java | 89 +++
.../dao/entity/ProcessDefinitionVersion.java | 311 ---------
.../dao/entity/ProcessInstance.java | 48 +-
.../dao/entity/ProcessLineage.java | 120 ++++
.../dao/entity/ProcessTaskRelation.java | 254 +++++++
.../dao/entity/ProcessTaskRelationLog.java | 83 +++
.../dolphinscheduler/dao/entity/Project.java | 42 +-
.../dolphinscheduler/dao/entity/ProjectUser.java | 21 +-
.../dao/entity/TaskDefinition.java | 428 ++++++++++++
.../dao/entity/TaskDefinitionLog.java | 95 +++
.../dolphinscheduler/dao/entity/TaskInstance.java | 106 +--
.../dao/entity/WorkFlowRelation.java | 22 +
.../dolphinscheduler/dao/mapper/CommandMapper.java | 4 +-
.../dao/mapper/ErrorCommandMapper.java | 4 +-
.../dao/mapper/ProcessDefinitionLogMapper.java | 91 +++
.../dao/mapper/ProcessDefinitionMapper.java | 57 +-
.../dao/mapper/ProcessDefinitionVersionMapper.java | 69 --
.../dao/mapper/ProcessInstanceMapper.java | 78 ++-
...pper.java => ProcessTaskRelationLogMapper.java} | 44 +-
.../dao/mapper/ProcessTaskRelationMapper.java | 68 ++
.../dolphinscheduler/dao/mapper/ProjectMapper.java | 21 +
.../dao/mapper/ProjectUserMapper.java | 6 +-
.../dao/mapper/TaskDefinitionLogMapper.java | 70 ++
.../dao/mapper/TaskDefinitionMapper.java | 109 +++
.../dao/mapper/TaskInstanceMapper.java | 10 +-
.../dao/mapper/WorkFlowLineageMapper.java | 44 +-
.../dao/upgrade/ProcessDefinitionDao.java | 33 +-
.../dolphinscheduler/dao/utils/DagHelper.java | 133 ++--
.../dao/utils/ResourceProcessDefinitionUtils.java | 59 +-
.../dolphinscheduler/dao/mapper/CommandMapper.xml | 6 +-
.../dao/mapper/ErrorCommandMapper.xml | 8 +-
.../dao/mapper/ProcessDefinitionLogMapper.xml | 82 +++
.../dao/mapper/ProcessDefinitionMapper.xml | 98 ++-
.../dao/mapper/ProcessInstanceMapper.xml | 45 +-
...Mapper.xml => ProcessTaskRelationLogMapper.xml} | 43 +-
.../dao/mapper/ProcessTaskRelationMapper.xml | 62 ++
.../dolphinscheduler/dao/mapper/ProjectMapper.xml | 58 +-
.../dolphinscheduler/dao/mapper/ScheduleMapper.xml | 4 +-
.../dao/mapper/TaskDefinitionLogMapper.xml | 62 ++
.../dao/mapper/TaskDefinitionMapper.xml | 94 +++
.../dao/mapper/TaskInstanceMapper.xml | 33 +-
.../dao/mapper/WorkFlowLineageMapper.xml | 106 ++-
.../dao/entity/TaskInstanceTest.java | 59 +-
.../dao/mapper/CommandMapperTest.java | 9 +-
.../dao/mapper/ErrorCommandMapperTest.java | 13 +-
.../dao/mapper/ProcessDefinitionLogMapperTest.java | 183 +++++
.../dao/mapper/ProcessDefinitionMapperTest.java | 40 +-
.../mapper/ProcessDefinitionVersionMapperTest.java | 168 -----
.../dao/mapper/ProcessInstanceMapperTest.java | 80 ++-
....java => ProcessTaskRelationLogMapperTest.java} | 55 +-
.../dao/mapper/ProcessTaskRelationMapperTest.java | 94 +++
.../dao/mapper/ProjectMapperTest.java | 32 +-
.../dao/mapper/ResourceMapperTest.java | 7 +-
.../dao/mapper/ScheduleMapperTest.java | 14 +
.../dao/mapper/TaskDefinitionLogMapperTest.java | 135 ++++
.../dao/mapper/TaskDefinitionMapperTest.java | 176 +++++
.../dao/mapper/TaskInstanceMapperTest.java | 153 +++--
.../dao/mapper/UdfFuncMapperTest.java | 12 -
.../dao/mapper/WorkFlowLineageMapperTest.java | 125 +++-
.../dao/upgrade/ProcessDefinitionDaoTest.java | 38 +-
.../dao/upgrade/UpgradeDaoTest.java | 9 +-
...rGrouopDaoTest.java => WorkerGroupDaoTest.java} | 25 +-
.../dolphinscheduler/dao/utils/DagHelperTest.java | 19 +-
.../utils/ResourceProcessDefinitionUtilsTest.java | 2 +-
.../ui-licenses/LICENSE-@form-create-element-ui | 2 +-
.../builder/TaskExecutionContextBuilder.java | 23 +-
.../server/entity/TaskExecutionContext.java | 96 +--
.../cache/impl/TaskInstanceCacheManagerImpl.java | 10 +-
.../master/consumer/TaskPriorityQueueConsumer.java | 102 ++-
.../master/runner/ConditionsTaskExecThread.java | 53 +-
.../master/runner/DependentTaskExecThread.java | 72 +-
.../master/runner/MasterBaseTaskExecThread.java | 15 +-
.../server/master/runner/MasterExecThread.java | 105 ++-
.../server/master/zk/ZKMasterClient.java | 3 +-
.../server/utils/DependentExecute.java | 46 +-
.../dolphinscheduler/server/utils/LogUtils.java | 18 +-
.../worker/processor/TaskExecuteProcessor.java | 14 +-
.../server/worker/runner/TaskExecuteThread.java | 59 +-
.../worker/task/AbstractCommandExecutor.java | 8 +-
.../server/worker/task/AbstractTask.java | 6 +-
.../server/worker/task/TaskManager.java | 38 +-
.../worker/task/procedure/ProcedureTask.java | 82 ++-
.../server/worker/task/sql/SqlTask.java | 4 +-
.../server/master/ConditionsTaskTest.java | 39 +-
.../server/master/DependentTaskTest.java | 104 +--
.../server/master/MasterExecThreadTest.java | 3 +-
.../server/master/SubProcessTaskTest.java | 40 +-
.../consumer/TaskPriorityQueueConsumerTest.java | 252 ++-----
.../master/runner/MasterTaskExecThreadTest.java | 41 +-
.../server/utils/LogUtilsTest.java | 15 +-
.../worker/processor/TaskExecuteProcessorTest.java | 14 +-
.../worker/runner/TaskExecuteThreadTest.java | 13 +-
.../worker/runner/WorkerManagerThreadTest.java | 9 +-
.../worker/shell/ShellCommandExecutorTest.java | 1 -
.../server/worker/sql/SqlExecutorTest.java | 31 +-
.../server/worker/task/ShellTaskReturnTest.java | 5 +-
.../server/worker/task/TaskManagerTest.java | 57 +-
.../server/worker/task/shell/ShellTaskTest.java | 6 +-
.../service/process/ProcessService.java | 734 +++++++++++++++-----
.../service/process/ProcessServiceTest.java | 364 +++++-----
.../src/js/conf/home/pages/dag/_source/dag.vue | 18 +-
.../home/pages/dag/_source/formModel/formModel.vue | 18 +-
.../formModel/tasks/_source/dependItemList.vue | 50 +-
.../_source/formModel/tasks/_source/nodeStatus.vue | 14 +-
.../home/pages/dag/_source/plugIn/jsPlumbHandle.js | 3 +-
.../pages/definition/pages/list/_source/list.vue | 12 +-
.../definition/pages/list/_source/versions.vue | 12 +-
.../src/js/conf/home/store/dag/actions.js | 10 +-
.../src/js/conf/home/store/dag/state.js | 4 +
.../src/js/module/i18n/locale/zh_CN.js | 2 +-
pom.xml | 4 +-
sql/dolphinscheduler_mysql.sql | 177 +++--
sql/dolphinscheduler_postgre.sql | 175 ++++-
175 files changed, 8123 insertions(+), 4842 deletions(-)