You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ca...@apache.org on 2022/03/15 07:17:29 UTC

[dolphinscheduler] branch dev updated (8bcbe2a -> a1bef43)

This is an automated email from the ASF dual-hosted git repository.

caishunfeng pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git.


    from 8bcbe2a  [Fix] [UI Next][V1.0.0-Alpha]: Fix the dag map display uncorrect after changing the pre tasks. (#8895)
     add a1bef43  [Feature-8579][Task] Task back-end plugin optimization, new plugins only need to modify the plugin's own module (#8584)

No new revisions were added by this update.

Summary of changes:
 dolphinscheduler-api/pom.xml                       |   5 +
 .../api/controller/AccessTokenController.java      |   2 +-
 .../api/controller/ProcessInstanceController.java  |   3 +-
 .../controller/ProcessTaskRelationController.java  |   1 -
 .../api/controller/ProjectController.java          |   2 +-
 .../api/controller/TaskDefinitionController.java   |   7 +-
 .../api/controller/TaskGroupController.java        |  26 +-
 .../api/controller/TaskInstanceController.java     |   2 +-
 .../api/controller/UiPluginController.java         |   1 -
 .../api/controller/UsersController.java            |   2 +-
 .../api/dto/CommandStateCount.java                 |   2 +
 .../dolphinscheduler/api/dto/DefineUserDto.java    |   3 +-
 .../dolphinscheduler/api/dto/ScheduleParam.java    |   1 -
 .../dolphinscheduler/api/dto/TaskCountDto.java     |   4 +-
 .../dolphinscheduler/api/dto/TaskStateCount.java   |   4 +-
 .../dolphinscheduler/api/dto/gantt/Task.java       |   2 +-
 .../api/dto/resources/Directory.java               |   3 +-
 .../api/dto/resources/visitor/Visitor.java         |   1 +
 .../api/dto/treeview/Instance.java                 |   2 -
 .../dolphinscheduler/api/enums/ExecuteType.java    |   7 +-
 .../api/exceptions/ApiException.java               |   7 +-
 .../api/exceptions/ApiExceptionHandler.java        |   1 +
 .../api/service/AlertGroupService.java             |   1 +
 .../api/service/ProcessInstanceService.java        |   4 +-
 .../api/service/TaskDefinitionService.java         |   3 +-
 .../api/service/TaskInstanceService.java           |   2 +-
 .../api/service/WorkFlowLineageService.java        |   1 -
 .../api/service/impl/AccessTokenServiceImpl.java   |   3 +-
 .../api/service/impl/DataAnalysisServiceImpl.java  |   2 +-
 .../api/service/impl/DqRuleServiceImpl.java        |   2 +-
 .../api/service/impl/ExecutorServiceImpl.java      |   4 +-
 .../service/impl/ProcessDefinitionServiceImpl.java |  36 +-
 .../service/impl/ProcessInstanceServiceImpl.java   |  22 +-
 .../impl/ProcessTaskRelationServiceImpl.java       |  11 +-
 .../service/impl/TaskDefinitionServiceImpl.java    |  29 +-
 .../service/impl/TaskGroupQueueServiceImpl.java    |  12 +-
 .../api/service/impl/TaskInstanceServiceImpl.java  |   2 +-
 .../service/impl/WorkFlowLineageServiceImpl.java   |  11 +-
 .../api/service/impl/WorkerGroupServiceImpl.java   |   1 -
 .../dolphinscheduler/api/utils/CheckUtils.java     |  51 +-
 .../api/controller/AbstractControllerTest.java     |   3 -
 .../api/controller/AlertGroupControllerTest.java   |   1 -
 .../AlertPluginInstanceControllerTest.java         |  21 +-
 .../api/controller/DataQualityControllerTest.java  |   2 +-
 .../controller/ProcessInstanceControllerTest.java  |   2 +-
 .../api/controller/TaskInstanceControllerTest.java |   2 +-
 .../api/enums/ExecuteTypeTest.java                 |   4 +-
 .../api/service/DataAnalysisServiceTest.java       |   2 +-
 .../api/service/DataSourceServiceTest.java         |   8 +-
 .../api/service/DqExecuteResultServiceTest.java    |   2 +-
 .../api/service/DqRuleServiceTest.java             |  10 +-
 .../api/service/ExecutorServiceTest.java           |   6 +-
 .../api/service/LoggerServiceTest.java             |   1 -
 .../api/service/ProcessInstanceServiceTest.java    |  34 +-
 .../service/ProcessTaskRelationServiceTest.java    |   5 +-
 .../api/service/TaskDefinitionServiceImplTest.java |  13 +-
 .../api/service/TaskInstanceServiceTest.java       |   2 +-
 .../dolphinscheduler/api/utils/CheckUtilsTest.java | 154 -----
 dolphinscheduler-common/pom.xml                    |   5 +
 .../apache/dolphinscheduler/common/Constants.java  |   2 +-
 .../dolphinscheduler/common/enums/Direct.java      |  28 -
 .../dolphinscheduler/common/enums/StateEvent.java  |   2 +
 .../common/enums/TaskStateType.java                |   2 +
 .../dolphinscheduler/common/enums/TaskType.java    |  84 ---
 .../dolphinscheduler/common/model/Server.java      |   1 -
 .../dolphinscheduler/common/model/TaskNode.java    |  15 +-
 .../common/model/WorkerServerModel.java            |   1 -
 .../dolphinscheduler/common/process/Property.java  | 140 -----
 .../common/process/ResourceInfo.java               |  63 ---
 .../common/shell/AbstractShell.java                |   6 +-
 .../common/task/AbstractParameters.java            | 181 ------
 .../common/task/datax/DataxParameters.java         | 252 ---------
 .../common/task/dq/DataQualityParameters.java      | 103 ----
 .../common/task/emr/EmrParameters.java             |  59 --
 .../common/task/flink/FlinkParameters.java         | 241 --------
 .../common/task/http/HttpParameters.java           | 138 -----
 .../common/task/mr/MapReduceParameters.java        | 160 ------
 .../common/task/procedure/ProcedureParameters.java |  90 ---
 .../common/task/python/PythonParameters.java       |  61 --
 .../common/task/shell/ShellParameters.java         |  65 ---
 .../common/task/spark/SparkParameters.java         | 242 --------
 .../dolphinscheduler/common/task/sql/SqlBinds.java |  43 --
 .../common/task/sql/SqlParameters.java             | 295 ----------
 .../dolphinscheduler/common/task/sql/SqlType.java  |  27 -
 .../common/task/sqoop/SqoopParameters.java         | 205 -------
 .../task/sqoop/sources/SourceHdfsParameter.java    |  37 --
 .../task/sqoop/sources/SourceHiveParameter.java    |  73 ---
 .../task/sqoop/sources/SourceMysqlParameter.java   | 137 -----
 .../task/sqoop/targets/TargetHdfsParameter.java    |  98 ----
 .../task/sqoop/targets/TargetHiveParameter.java    | 121 ----
 .../task/sqoop/targets/TargetMysqlParameter.java   | 133 -----
 .../common/task/tis/PigeonCommonParameters.java    |  58 --
 .../common/utils/CollectionUtils.java              |   1 -
 .../dolphinscheduler/common/utils/HadoopUtils.java |   2 +-
 .../dolphinscheduler/common/utils/JSONUtils.java   |   1 -
 .../dolphinscheduler/common/utils/LoggerUtils.java |   2 +-
 .../common/utils/ParameterUtils.java               |   5 +-
 .../common/utils/TaskParametersUtils.java          | 106 ----
 .../utils/placeholder/BusinessTimeUtils.java       |  12 +-
 .../common/utils/placeholder/PlaceholderUtils.java |   9 +-
 .../dolphinscheduler/common/ConstantsTest.java     |   1 +
 .../common/task/DataQualityParameterTest.java      | 132 -----
 .../common/utils/JSONUtilsTest.java                |   6 +-
 .../common/utils/KerberosHttpClientTest.java       |   2 +
 .../common/utils/NetUtilsTest.java                 |   1 +
 .../common/utils/ParameterUtilsTest.java           |   6 +-
 .../common/utils/TaskParametersUtilsTest.java      |  40 --
 .../apache/dolphinscheduler/dao/MonitorDBDao.java  |   1 +
 .../dao/datasource/SpringConnectionFactory.java    |   2 +-
 .../dolphinscheduler/dao/entity/AccessToken.java   |  23 +-
 .../dolphinscheduler/dao/entity/CommandCount.java  |  12 +-
 .../dao/entity/CycleDependency.java                |  14 +-
 .../dolphinscheduler/dao/entity/DataSource.java    | 309 +++++-----
 .../dao/entity/DatasourceUser.java                 | 184 +++---
 .../dao/entity/DefinitionGroupByUser.java          |   1 +
 .../dao/entity/DependentProcessDefinition.java     |   6 +-
 .../dao/entity/DqRuleExecuteSql.java               |   2 +-
 .../dao/entity/DqRuleInputEntry.java               |   6 +-
 .../dao/entity/EnvironmentWorkerGroupRelation.java |   4 +-
 .../dao/entity/ExecuteStatusCount.java             |  12 +-
 .../apache/dolphinscheduler/dao/entity/K8s.java    |   1 -
 .../dolphinscheduler/dao/entity/MonitorRecord.java |  20 +-
 .../dao/entity/ProcessAlertContent.java            |   4 +-
 .../dolphinscheduler/dao/entity/ProcessData.java   |   2 +-
 .../dao/entity/ProcessDefinition.java              |   2 +-
 .../dao/entity/ProcessInstance.java                |   2 +-
 .../dao/entity/ProcessInstanceMap.java             |  15 +-
 .../dolphinscheduler/dao/entity/Project.java       |   1 +
 .../dolphinscheduler/dao/entity/ProjectUser.java   |   7 +-
 .../dao/entity/TaskAlertContent.java               |   2 +-
 .../dao/entity/TaskDefinition.java                 |   5 +-
 .../dao/entity/TaskGroupQueue.java                 |   9 +-
 .../dolphinscheduler/dao/entity/TaskInstance.java  |  22 +-
 .../dolphinscheduler/dao/entity/TaskMainInfo.java  |   1 -
 .../dolphinscheduler/dao/entity/TaskRecord.java    |   6 +-
 .../apache/dolphinscheduler/dao/entity/User.java   |   2 +-
 .../dao/entity/WorkFlowLineage.java                |   1 +
 .../dolphinscheduler/dao/entity/WorkerServer.java  |   2 +-
 .../dao/mapper/AccessTokenMapper.java              |   4 +-
 .../dolphinscheduler/dao/mapper/CommandMapper.java |   7 +-
 .../dao/mapper/DataSourceMapper.java               |   7 +-
 .../dao/mapper/DataSourceUserMapper.java           |   6 +-
 .../dao/mapper/ErrorCommandMapper.java             |   5 +-
 .../dao/mapper/ProcessInstanceMapMapper.java       |   6 +-
 .../dao/mapper/ProcessInstanceMapper.java          |   2 +-
 .../dao/mapper/ProjectUserMapper.java              |   1 +
 .../dao/mapper/TaskGroupMapper.java                |   2 +-
 .../dao/mapper/TaskGroupQueueMapper.java           |   2 +-
 .../dao/mapper/TaskInstanceMapper.java             |   2 +-
 .../dolphinscheduler/dao/mapper/UdfFuncMapper.java |   2 +-
 .../dao/utils/BaseDBPerformance.java               |   2 +-
 .../dolphinscheduler/dao/utils/BeanContext.java    |   6 +-
 .../dolphinscheduler/dao/utils/DagHelper.java      |   6 +-
 .../dao/entity/ProcessDefinitionTest.java          |   3 +-
 .../dao/entity/TaskInstanceTest.java               |  23 +-
 .../dao/mapper/AccessTokenMapperTest.java          |   2 +-
 .../dao/mapper/DataSourceMapperTest.java           |   1 +
 .../dao/mapper/DataSourceUserMapperTest.java       |   5 +-
 .../dao/mapper/ErrorCommandMapperTest.java         |   5 +-
 .../dao/mapper/ProcessInstanceMapMapperTest.java   |   8 +-
 .../dao/mapper/ProcessInstanceMapperTest.java      |   9 +-
 .../dao/mapper/ProjectMapperTest.java              |   1 +
 .../dao/mapper/ProjectUserMapperTest.java          |   5 +-
 .../dao/mapper/TaskDefinitionLogMapperTest.java    |   5 +-
 .../dao/mapper/TaskDefinitionMapperTest.java       |   3 +-
 .../dao/mapper/TaskGroupMapperTest.java            |   1 -
 .../dao/mapper/TaskGroupQueueMapperTest.java       |   1 -
 .../dao/mapper/TaskInstanceMapperTest.java         |   7 +-
 .../dao/mapper/UdfFuncMapperTest.java              |   2 +-
 .../dao/mapper/WorkFlowLineageMapperTest.java      |   1 +
 .../dolphinscheduler/dao/utils/DagHelperTest.java  |  27 +-
 .../dolphinscheduler-datasource-api/pom.xml        |   6 +
 .../plugin/datasource/api/utils/CommonUtils.java   |  22 +-
 .../plugin/datasource/api/utils/PasswordUtils.java |   6 +-
 .../AbstractDataSourceProcessorTest.java           |   6 +-
 .../datasource/api/utils/CommonUtilsTest.java      |   4 +-
 .../dolphinscheduler-datasource-hive/pom.xml       |   5 +
 .../datasource/hive/HiveDataSourceClient.java      |   6 +-
 .../pages/project/workflow/TaskInstanceTab.java    |   1 +
 .../server/log/TaskLogFilterTest.java              |   4 +-
 dolphinscheduler-master/pom.xml                    |   6 +
 .../builder/TaskExecutionContextBuilder.java       |  64 +--
 .../master/consumer/TaskPriorityQueueConsumer.java |  13 +-
 .../server/master/dispatch/ExecutorDispatcher.java |   7 +-
 .../master/dispatch/context/ExecutionContext.java  |   8 +-
 .../server/master/dispatch/enums/ExecutorType.java |   1 +
 .../dispatch/exceptions/ExecuteException.java      |   5 +-
 .../dispatch/executor/AbstractExecutorManager.java |   2 +-
 .../dispatch/executor/NettyExecutorManager.java    |  10 +-
 .../master/dispatch/host/HostManagerConfig.java    |   1 +
 .../dispatch/host/assign/AbstractSelector.java     |   1 +
 .../dispatch/host/assign/RoundRobinSelector.java   |   1 +
 .../master/dispatch/host/assign/Selector.java      |   1 -
 .../server/master/processor/CacheProcessor.java    |   1 -
 .../master/processor/StateEventProcessor.java      |   3 +-
 .../server/master/processor/TaskAckProcessor.java  |   9 +-
 .../master/processor/TaskEventProcessor.java       |   1 -
 .../master/processor/TaskResponseProcessor.java    |   7 +-
 .../processor/queue/StateEventResponseService.java |   2 +-
 .../master/processor/queue/TaskResponseEvent.java  |   3 +-
 .../processor/queue/TaskResponseService.java       |   4 +-
 .../master/registry/MasterRegistryClient.java      |   4 +-
 .../master/runner/MasterSchedulerService.java      |   4 +
 .../master/runner/StateWheelExecuteThread.java     |   4 +-
 .../master/runner/WorkflowExecuteThread.java       |  21 +-
 .../master/runner/WorkflowExecuteThreadPool.java   |   2 +-
 .../master/runner/task/BaseTaskProcessor.java      | 242 +++-----
 .../master/runner/task/BlockingTaskProcessor.java  |  24 +-
 .../master/runner/task/CommonTaskProcessor.java    |   4 +-
 .../master/runner/task/ConditionTaskProcessor.java |  19 +-
 .../master/runner/task/DependentTaskProcessor.java |  16 +-
 .../master/runner/task/SubTaskProcessor.java       |   9 +-
 .../master/runner/task/SwitchTaskProcessor.java    |  15 +-
 .../server/master/runner/task/TaskInstanceKey.java |  10 +-
 .../server/utils/DataQualityResultOperator.java    |  16 +-
 .../server/utils/DependentExecute.java             |  12 +-
 .../server/master/BlockingTaskTest.java            |  21 +-
 .../server/master/ConditionsTaskTest.java          |  18 +-
 .../server/master/DependentTaskTest.java           |  17 +-
 .../server/master/MasterCommandTest.java           |  16 +-
 .../server/master/SubProcessTaskTest.java          |   9 +-
 .../server/master/SwitchTaskTest.java              |   8 +-
 .../server/master/WorkflowExecuteThreadTest.java   |   2 +-
 .../consumer/TaskPriorityQueueConsumerTest.java    |  19 +-
 .../master/dispatch/ExecutionContextTestUtils.java |  14 +-
 .../executor/NettyExecutorManagerTest.java         |  15 +-
 .../master/processor/TaskAckProcessorTest.java     |  91 ---
 .../processor/TaskResponseProcessorTestConfig.java |   1 +
 .../processor/queue/TaskResponseServiceTest.java   |   2 +-
 .../master/runner/MasterTaskExecThreadTest.java    |   8 +-
 .../runner/task/CommonTaskProcessorTest.java       |  33 +-
 .../microbench/base/AbstractBaseBenchmark.java     |  16 +-
 .../remote/command/StateEventChangeCommand.java    |   2 +-
 dolphinscheduler-server/pom.xml                    |   4 -
 .../server/log/TaskLogDiscriminator.java           |   2 +-
 .../dolphinscheduler/server/log/TaskLogFilter.java |   2 +-
 .../dolphinscheduler/server/utils/LogUtils.java    |   2 +-
 .../server/utils/ProcessUtils.java                 |   4 +-
 .../server/log/TaskLogDiscriminatorTest.java       |   2 +-
 .../server/utils/LogUtilsTest.java                 |   2 +-
 .../server/utils/ProcessUtilsTest.java             |   2 +-
 dolphinscheduler-service/pom.xml                   |   5 +
 .../service/alert/ProcessAlertManager.java         |   2 +-
 .../service/k8s/K8sClientService.java              |   1 -
 .../dolphinscheduler/service/k8s/K8sManager.java   |   1 -
 .../dolphinscheduler/service/log/LogPromise.java   |  14 +-
 .../service/permission/PermissionCheck.java        |   2 +-
 .../service/process/ProcessService.java            |  37 +-
 .../service/queue/TaskPriority.java                |   2 +-
 .../service/queue/entity/TaskExecutionContext.java | 630 ---------------------
 .../service/task}/TaskPluginManager.java           |  32 +-
 .../service/alert/ProcessAlertManagerTest.java     |   2 +-
 .../service/process/ProcessServiceTest.java        | 108 +---
 .../dolphinscheduler/spi/enums/DataType.java       |  37 --
 .../spi/enums/TaskTimeoutStrategy.java             |  58 --
 .../dolphinscheduler/spi/task/ExecutionStatus.java | 162 ------
 .../dolphinscheduler/spi/task/IParameters.java     |  37 --
 .../dolphinscheduler/spi/task/UdfFuncBean.java     | 188 ------
 .../dolphinscheduler/spi/utils/DateUtils.java      | 117 ++++
 .../dolphinscheduler/spi/utils/StringUtils.java    |   6 -
 .../spi/utils/StringUtilsTest.java                 |   5 -
 .../dolphinscheduler-task-all/pom.xml              | 146 +++++
 .../dolphinscheduler-task-api/pom.xml              |   5 +
 .../plugin/task/api/AbstractCommandExecutor.java   |  18 +-
 .../plugin/task/api}/AbstractTask.java             |  10 +-
 .../plugin/task/api/AbstractTaskExecutor.java      |   7 +-
 .../plugin/task/api/AbstractYarnTask.java          |   6 +-
 .../task/api}/DataQualityTaskExecutionContext.java |   2 +-
 .../plugin/task/api/ProcessUtils.java              |   6 +-
 .../plugin/task/api}/SQLTaskExecutionContext.java  |  25 +-
 .../plugin/task/api/ShellCommandExecutor.java      |   5 +-
 .../plugin/task/api}/TaskChannel.java              |  12 +-
 .../plugin/task/api}/TaskChannelFactory.java       |   2 +-
 .../plugin/task/api}/TaskConstants.java            |  21 +-
 .../plugin/task/api/TaskExecutionContext.java      | 125 ++--
 .../api}/TaskExecutionContextCacheManager.java     |  14 +-
 .../plugin/task/api}/enums/DataType.java           |   2 +-
 .../plugin/task/api}/enums/DependResult.java       |   2 +-
 .../plugin/task/api}/enums/DependentRelation.java  |   2 +-
 .../plugin/task/api/enums}/Direct.java             |   2 +-
 .../plugin/task/api}/enums/ExecutionStatus.java    |   2 +-
 .../plugin/task/api/enums/ResourceType.java}       |   8 +-
 .../plugin/task/api/enums}/SqlType.java            |   2 +-
 .../plugin/task/api/{ => enums}/TaskRunStatus.java |   2 +-
 .../task/api}/enums/TaskTimeoutStrategy.java       |   2 +-
 .../plugin/task/api/enums}/UdfType.java            |   2 +-
 .../plugin/task/api/enums/dp}/CheckType.java       |   2 +-
 .../plugin/task/api/enums/dp}/ConnectorType.java   |   2 +-
 .../task/api/enums/dp}/DqFailureStrategy.java      |   2 +-
 .../plugin/task/api/enums/dp}/DqTaskState.java     |   2 +-
 .../plugin/task/api/enums/dp}/ExecuteSqlType.java  |   2 +-
 .../plugin/task/api/enums/dp}/InputType.java       |   2 +-
 .../plugin/task/api/enums/dp}/OperatorType.java    |   2 +-
 .../task/api/enums/dp}/OptionSourceType.java       |   2 +-
 .../plugin/task/api/enums/dp}/RuleType.java        |   2 +-
 .../plugin/task/api/enums/dp}/ValueType.java       |   2 +-
 .../plugin/task/api}/model/DateInterval.java       |   3 +-
 .../plugin/task/api}/model/DependentItem.java      |   6 +-
 .../plugin/task/api}/model/DependentTaskModel.java |   4 +-
 .../plugin/task/api}/model/JdbcInfo.java           |   2 +-
 .../plugin/task/api/model}/Property.java           |   5 +-
 .../plugin/task/api/model}/ResourceInfo.java       |   6 +-
 .../plugin/task/api/model}/SwitchResultVo.java     |   2 +-
 .../plugin/task/api/model}/TaskAlertInfo.java      |   2 +-
 .../plugin/task/api/{ => model}/TaskResponse.java  |   4 +-
 .../task/api/parameters}/AbstractParameters.java   |  29 +-
 .../task/api/parameters}/BlockingParameters.java   |  14 +-
 .../task/api/parameters}/ConditionsParameters.java |   9 +-
 .../task/api/parameters}/DependentParameters.java  |  14 +-
 .../plugin/task/api/parameters}/IParameters.java   |   6 +-
 .../plugin/task/api/parameters/ParametersNode.java | 115 ++++
 .../plugin/task/api/parameters}/SqlParameters.java |  62 +-
 .../task/api/parameters}/SubProcessParameters.java |  12 +-
 .../task/api/parameters}/SwitchParameters.java     |  12 +-
 .../task/api/parameters}/TaskTimeoutParameter.java |   4 +-
 .../resource/AbstractResourceParameters.java}      |   6 +-
 .../parameters/resource/DataSourceParameters.java  |  32 +-
 .../resource/ResourceParametersHelper.java         |  54 ++
 .../api/parameters/resource/UdfFuncParameters.java |  42 +-
 .../plugin/task/api/parser}/BusinessTimeUtils.java |  12 +-
 .../plugin/task/api/parser}/ParamUtils.java        |  18 +-
 .../plugin/task/api/parser}/ParameterUtils.java    |  12 +-
 .../plugin/task/api/parser}/PlaceholderUtils.java  |   2 +-
 .../api/parser}/PropertyPlaceholderHelper.java     |   2 +-
 .../task/api/parser}/TimePlaceholderUtils.java     |  46 +-
 .../plugin/task/{util => api/utils}/ArgsUtils.java |   8 +-
 .../task/api}/utils/DataQualityConstants.java      |   2 +-
 .../plugin/task/api/utils}/DependentDateUtils.java |  34 +-
 .../plugin/task/api}/utils/DependentUtils.java     |   9 +-
 .../plugin/task/api}/utils/JdbcUrlParser.java      |  18 +-
 .../plugin/task/{util => api/utils}/MapUtils.java  |   2 +-
 .../plugin/task/{util => api/utils}/OSUtils.java   |   2 +-
 .../{task/plugin => plugin/task}/api/TaskTest.java |   2 +-
 .../task/api}/enums/ExecutionStatusTest.java       |   2 +-
 .../plugin/task/api/enums/dp}/CheckTypeTest.java   |   2 +-
 .../task/api/enums/dp}/ConnectorTypeTest.java      |   2 +-
 .../task/api/enums/dp}/DqFailureStrategyTest.java  |   2 +-
 .../plugin/task/api/enums/dp}/DqTaskStateTest.java |   2 +-
 .../task/api/enums/dp}/ExecuteSqlTypeTest.java     |   2 +-
 .../plugin/task/api/enums/dp}/InputTypeTest.java   |   2 +-
 .../task/api/enums/dp}/OperatorTypeTest.java       |   2 +-
 .../task/api/enums/dp}/OptionSourceTypeTest.java   |   2 +-
 .../plugin/task/api/enums/dp}/RuleTypeTest.java    |   2 +-
 .../plugin/task/api/enums/dp}/ValueTypeTest.java   |   2 +-
 .../task/api/parameters}/SqlParametersTest.java    |   9 +-
 .../plugin/task/api}/utils/DependentUtilsTest.java |  36 +-
 .../plugin/task/api}/utils/JdbcUrlParserTest.java  |   4 +-
 .../{ => dolphinscheduler-task-blocking}/pom.xml   |  36 +-
 .../plugin/task/blocking/BlockingTaskChannel.java  |  50 ++
 .../task/blocking/BlockingTaskChannelFactory.java} |  21 +-
 .../{ => dolphinscheduler-task-conditions}/pom.xml |  38 +-
 .../task/conditions/ConditionsTaskChannel.java     |  50 ++
 .../conditions/ConditionsTaskChannelFactory.java}  |  14 +-
 .../plugin/task/dq/DataQualityParameters.java      |   6 +-
 .../plugin/task/dq/DataQualityTask.java            |  53 +-
 .../plugin/task/dq/DataQualityTaskChannel.java     |  22 +-
 .../task/dq/DataQualityTaskChannelFactory.java     |   4 +-
 .../plugin/task/dq/rule/RuleManager.java           |  14 +-
 .../task/dq/rule/entity/DqRuleExecuteSql.java      |   3 +-
 .../task/dq/rule/entity/DqRuleInputEntry.java      |   6 +-
 .../plugin/task/dq/rule/parser/IRuleParser.java    |   2 +-
 .../rule/parser/MultiTableAccuracyRuleParser.java  |  12 +-
 .../parser/MultiTableComparisonRuleParser.java     |   4 +-
 .../parser/SingleTableCustomSqlRuleParser.java     |   2 +-
 .../task/dq/rule/parser/SingleTableRuleParser.java |   6 +-
 .../plugin}/task/dq/utils/Md5Utils.java            |   2 +-
 .../plugin/task/dq/utils/RuleParserUtils.java      |  91 ++-
 .../plugin/task/dq/utils/spark/SparkArgsUtils.java |   4 +-
 .../task/dq/utils/spark/SparkParameters.java       |   4 +-
 .../plugin/task/dq/DataQualityTaskTest.java        |  18 +-
 .../plugin}/task/dq/utils/Md5UtilsTest.java        |   2 +-
 .../plugin/task/datax/DataxParameters.java         |  36 +-
 .../plugin/task/datax/DataxTask.java               |  43 +-
 .../plugin/task/datax/DataxTaskChannel.java        |  22 +-
 .../plugin/task/datax/DataxTaskChannelFactory.java |   4 +-
 .../task/datax}/DataxTaskExecutionContext.java     |  34 +-
 .../plugin/task/datax}/DataxParametersTest.java    |   4 +-
 .../{ => dolphinscheduler-task-dependent}/pom.xml  |  38 +-
 .../task/dependent/DependentTaskChannel.java       |  52 ++
 .../dependent/DependentTaskChannelFactory.java}    |  21 +-
 .../plugin/task/emr/EmrParameters.java             |  11 +-
 .../dolphinscheduler/plugin/task/emr/EmrTask.java  |  12 +-
 .../plugin/task/emr/EmrTaskChannel.java            |  22 +-
 .../plugin/task/emr/EmrTaskChannelFactory.java     |   4 +-
 .../plugin/task/emr/EmrTaskTest.java               |  11 +-
 .../plugin/task/flink/FlinkArgsUtils.java          |   4 +-
 .../plugin/task/flink/FlinkParameters.java         |   4 +-
 .../plugin/task/flink/FlinkTask.java               |  18 +-
 .../plugin/task/flink/FlinkTaskChannel.java        |  20 +-
 .../plugin/task/flink/FlinkTaskChannelFactory.java |   4 +-
 .../plugin/task/flink}/FlinkParametersTest.java    |  12 +-
 .../plugin/task/http/HttpParameters.java           |   4 +-
 .../plugin/task/http/HttpTask.java                 |  16 +-
 .../plugin/task/http/HttpTaskChannel.java          |  22 +-
 .../plugin/task/http/HttpTaskChannelFactory.java   |   4 +-
 .../plugin/task/http}/HttpParametersTest.java      |  50 +-
 .../plugin/task/mr/MapReduceArgsUtils.java         |   8 +-
 .../plugin/task/mr/MapReduceParameters.java        |   4 +-
 .../plugin/task/mr/MapReduceTask.java              |  20 +-
 .../plugin/task/mr/MapReduceTaskChannel.java       |  22 +-
 .../task/mr/MapReduceTaskChannelFactory.java       |   4 +-
 .../plugin/task/pigeon/PigeonParameters.java       |   4 +-
 .../plugin/task/pigeon/PigeonTask.java             |  10 +-
 .../plugin/task/pigeon/PigeonTaskChannel.java      |  22 +-
 .../task/pigeon/PigeonTaskChannelFactory.java      |   4 +-
 .../plugin/task/pigeon/PigeonTaskTest.java         |   8 +-
 .../plugin/task/procedure/ProcedureParameters.java |  27 +-
 .../plugin/task/procedure/ProcedureTask.java       |  32 +-
 .../task/procedure/ProcedureTaskChannel.java       |  22 +-
 .../procedure/ProcedureTaskChannelFactory.java     |   4 +-
 .../procedure}/ProcedureTaskExecutionContext.java  |  10 +-
 .../plugin/task/python/PythonParameters.java       |   4 +-
 .../plugin/task/python/PythonTask.java             |  24 +-
 .../plugin/task/python/PythonTaskChannel.java      |  20 +-
 .../task/python/PythonTaskChannelFactory.java      |   4 +-
 .../plugin/task/seatunnel/SeatunnelParameters.java |   4 +-
 .../plugin/task/seatunnel/SeatunnelTask.java       |  22 +-
 .../task/seatunnel/SeatunnelTaskChannel.java       |  20 +-
 .../seatunnel/SeatunnelTaskChannelFactory.java     |   4 +-
 .../plugin/task/shell/ShellParameters.java         |   4 +-
 .../plugin/task/shell/ShellTask.java               |  24 +-
 .../plugin/task/shell/ShellTaskChannel.java        |  20 +-
 .../plugin/task/shell/ShellTaskChannelFactory.java |   4 +-
 .../plugin/task/spark/SparkArgsUtils.java          |   4 +-
 .../plugin/task/spark/SparkParameters.java         |   4 +-
 .../plugin/task/spark/SparkTask.java               |  18 +-
 .../plugin/task/spark/SparkTaskChannel.java        |  22 +-
 .../plugin/task/spark/SparkTaskChannelFactory.java |   4 +-
 .../plugin/task/spark}/SparkParametersTest.java    |   5 +-
 .../dolphinscheduler/plugin/task/sql/SqlBinds.java |   2 +-
 .../dolphinscheduler/plugin/task/sql/SqlTask.java  |  89 ++-
 .../plugin/task/sql/SqlTaskChannel.java            |  23 +-
 .../plugin/task/sql/SqlTaskChannelFactory.java     |   4 +-
 .../plugin/task/sqoop/SqoopTask.java               |  22 +-
 .../plugin/task/sqoop/SqoopTaskChannel.java        |  23 +-
 .../plugin/task/sqoop/SqoopTaskChannelFactory.java |   4 +-
 .../task/sqoop}/SqoopTaskExecutionContext.java     |  34 +-
 .../task/sqoop/generator/CommonGenerator.java      |   8 +-
 .../task/sqoop/generator/ISourceGenerator.java     |   6 +-
 .../task/sqoop/generator/ITargetGenerator.java     |   6 +-
 .../task/sqoop/generator/SqoopJobGenerator.java    |   9 +-
 .../generator/sources/HdfsSourceGenerator.java     |   6 +-
 .../generator/sources/HiveSourceGenerator.java     |   6 +-
 .../generator/sources/MySQLSourceGenerator.java    |  18 +-
 .../generator/targets/HdfsTargetGenerator.java     |   8 +-
 .../generator/targets/HiveTargetGenerator.java     |   6 +-
 .../generator/targets/MySQLTargetGenerator.java    |  14 +-
 .../task/sqoop/parameter/SqoopParameters.java      |  52 +-
 .../parameter/sources/SourceMysqlParameter.java    |   2 +-
 .../plugin/task/sqoop}/EntityTestUtils.java        |   8 +-
 .../task/sqoop}/SqoopParameterEntityTest.java      |  25 +-
 .../{ => dolphinscheduler-task-subprocess}/pom.xml |  38 +-
 .../task/subprocess/SubProcessTaskChannel.java     |  50 ++
 .../subprocess/SubProcessTaskChannelFactory.java}  |  21 +-
 .../{ => dolphinscheduler-task-switch}/pom.xml     |  38 +-
 .../task/switchtask/SubProcessTaskChannel.java     |  52 ++
 .../switchtask/SubProcessTaskChannelFactory.java}  |  21 +-
 dolphinscheduler-task-plugin/pom.xml               |   6 +
 .../tools/datasource/dao/UpgradeDao.java           |  22 +-
 dolphinscheduler-worker/pom.xml                    |  56 +-
 .../server/worker/WorkerServer.java                |  10 +-
 .../server/worker/cache/ResponseCache.java         |  16 +-
 .../worker/processor/DBTaskAckProcessor.java       |  15 +-
 .../worker/processor/DBTaskResponseProcessor.java  |   4 +-
 .../worker/processor/HostUpdateProcessor.java      |   9 +-
 .../worker/processor/TaskExecuteProcessor.java     |  23 +-
 .../server/worker/processor/TaskKillProcessor.java |  17 +-
 .../worker/runner/RetryReportTaskStatusThread.java |  20 +-
 .../server/worker/runner/TaskExecuteThread.java    |  31 +-
 .../server/worker/runner/WorkerManagerThread.java  |  13 +-
 .../worker/processor/TaskExecuteProcessorTest.java |   8 +-
 pom.xml                                            |  68 +--
 tools/dependencies/known-dependencies.txt          |   4 +-
 473 files changed, 3342 insertions(+), 7328 deletions(-)
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Direct.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskType.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/Property.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/process/ResourceInfo.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/AbstractParameters.java
 delete mode 100755 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/datax/DataxParameters.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/dq/DataQualityParameters.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/emr/EmrParameters.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/flink/FlinkParameters.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/http/HttpParameters.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/mr/MapReduceParameters.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/procedure/ProcedureParameters.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/python/PythonParameters.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/shell/ShellParameters.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/spark/SparkParameters.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlBinds.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlParameters.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sql/SqlType.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/SqoopParameters.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/sources/SourceHdfsParameter.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/sources/SourceHiveParameter.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/sources/SourceMysqlParameter.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/targets/TargetHdfsParameter.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/targets/TargetHiveParameter.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/sqoop/targets/TargetMysqlParameter.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/tis/PigeonCommonParameters.java
 delete mode 100644 dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/TaskParametersUtils.java
 delete mode 100644 dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/task/DataQualityParameterTest.java
 delete mode 100644 dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/TaskParametersUtilsTest.java
 delete mode 100644 dolphinscheduler-master/src/test/java/org/apache/dolphinscheduler/server/master/processor/TaskAckProcessorTest.java
 delete mode 100644 dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/queue/entity/TaskExecutionContext.java
 rename {dolphinscheduler-worker/src/main/java/org/apache/dolphinscheduler/server/worker/plugin => dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/task}/TaskPluginManager.java (74%)
 delete mode 100644 dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/enums/DataType.java
 delete mode 100644 dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/enums/TaskTimeoutStrategy.java
 delete mode 100644 dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/ExecutionStatus.java
 delete mode 100644 dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/IParameters.java
 delete mode 100644 dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/UdfFuncBean.java
 create mode 100644 dolphinscheduler-task-plugin/dolphinscheduler-task-all/pom.xml
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api}/AbstractTask.java (91%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/request => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api}/DataQualityTaskExecutionContext.java (99%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/request => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api}/SQLTaskExecutionContext.java (73%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api}/TaskChannel.java (63%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api}/TaskChannelFactory.java (94%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api}/TaskConstants.java (93%)
 rename dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/request/TaskRequest.java => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskExecutionContext.java (80%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api}/TaskExecutionContextCacheManager.java (79%)
 rename {dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api}/enums/DataType.java (95%)
 rename {dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api}/enums/DependResult.java (94%)
 rename {dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api}/enums/DependentRelation.java (93%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums}/Direct.java (93%)
 rename {dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api}/enums/ExecutionStatus.java (98%)
 copy dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/{test/java/org/apache/dolphinscheduler/task/plugin/api/TaskTest.java => main/java/org/apache/dolphinscheduler/plugin/task/api/enums/ResourceType.java} (87%)
 rename dolphinscheduler-task-plugin/{dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql => dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums}/SqlType.java (93%)
 rename dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/{ => enums}/TaskRunStatus.java (93%)
 rename {dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api}/enums/TaskTimeoutStrategy.java (96%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/request => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums}/UdfType.java (96%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/dq/enums => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/dp}/CheckType.java (97%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/dq/enums => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/dp}/ConnectorType.java (96%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/dq/enums => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/dp}/DqFailureStrategy.java (96%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/dq/enums => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/dp}/DqTaskState.java (96%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/dq/enums => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/dp}/ExecuteSqlType.java (96%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/dq/enums => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/dp}/InputType.java (96%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/dq/enums => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/dp}/OperatorType.java (96%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/dq/enums => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/dp}/OptionSourceType.java (96%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/dq/enums => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/dp}/RuleType.java (97%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/dq/enums => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/enums/dp}/ValueType.java (96%)
 rename {dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api}/model/DateInterval.java (96%)
 rename {dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api}/model/DependentItem.java (92%)
 rename {dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api}/model/DependentTaskModel.java (90%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/dq => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api}/model/JdbcInfo.java (97%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/model}/Property.java (94%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/model}/ResourceInfo.java (91%)
 rename {dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/switchtask => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/model}/SwitchResultVo.java (96%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/model}/TaskAlertInfo.java (95%)
 rename dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/{ => model}/TaskResponse.java (95%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters}/AbstractParameters.java (81%)
 rename {dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/blocking => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters}/BlockingParameters.java (82%)
 rename {dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/conditions => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters}/ConditionsParameters.java (88%)
 rename {dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/dependent => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters}/DependentParameters.java (76%)
 rename {dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters}/IParameters.java (89%)
 create mode 100644 dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/ParametersNode.java
 rename dolphinscheduler-task-plugin/{dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql => dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters}/SqlParameters.java (72%)
 rename {dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/subprocess => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters}/SubProcessParameters.java (78%)
 rename {dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task/switchtask => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters}/SwitchParameters.java (87%)
 rename {dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/task => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters}/TaskTimeoutParameter.java (93%)
 copy dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/{test/java/org/apache/dolphinscheduler/task/plugin/api/TaskTest.java => main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/resource/AbstractResourceParameters.java} (86%)
 rename dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/queue/entity/DependenceTaskExecutionContext.java => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/resource/DataSourceParameters.java (59%)
 create mode 100644 dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/resource/ResourceParametersHelper.java
 rename dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/request/UdfFuncRequest.java => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/resource/UdfFuncParameters.java (85%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/paramparser => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parser}/BusinessTimeUtils.java (83%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/paramparser => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parser}/ParamUtils.java (88%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/paramparser => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parser}/ParameterUtils.java (95%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/paramparser => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parser}/PlaceholderUtils.java (98%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/paramparser => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parser}/PropertyPlaceholderHelper.java (99%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/paramparser => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parser}/TimePlaceholderUtils.java (91%)
 rename dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/{util => api/utils}/ArgsUtils.java (80%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/dq => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api}/utils/DataQualityConstants.java (98%)
 rename {dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/dependent => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/utils}/DependentDateUtils.java (90%)
 rename {dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api}/utils/DependentUtils.java (94%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/dq => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api}/utils/JdbcUrlParser.java (81%)
 rename dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/{util => api/utils}/MapUtils.java (94%)
 rename dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/{util => api/utils}/OSUtils.java (98%)
 rename dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/{task/plugin => plugin/task}/api/TaskTest.java (93%)
 rename {dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api}/enums/ExecutionStatusTest.java (95%)
 rename {dolphinscheduler-spi/src/test/java/org/apache/dolphinscheduler/spi/task/dq/enums => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/enums/dp}/CheckTypeTest.java (96%)
 rename {dolphinscheduler-spi/src/test/java/org/apache/dolphinscheduler/spi/task/dq/enums => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/enums/dp}/ConnectorTypeTest.java (95%)
 rename {dolphinscheduler-spi/src/test/java/org/apache/dolphinscheduler/spi/task/dq/enums => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/enums/dp}/DqFailureStrategyTest.java (95%)
 rename {dolphinscheduler-spi/src/test/java/org/apache/dolphinscheduler/spi/task/dq/enums => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/enums/dp}/DqTaskStateTest.java (96%)
 rename {dolphinscheduler-spi/src/test/java/org/apache/dolphinscheduler/spi/task/dq/enums => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/enums/dp}/ExecuteSqlTypeTest.java (96%)
 rename {dolphinscheduler-spi/src/test/java/org/apache/dolphinscheduler/spi/task/dq/enums => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/enums/dp}/InputTypeTest.java (96%)
 rename {dolphinscheduler-spi/src/test/java/org/apache/dolphinscheduler/spi/task/dq/enums => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/enums/dp}/OperatorTypeTest.java (97%)
 rename {dolphinscheduler-spi/src/test/java/org/apache/dolphinscheduler/spi/task/dq/enums => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/enums/dp}/OptionSourceTypeTest.java (96%)
 rename {dolphinscheduler-spi/src/test/java/org/apache/dolphinscheduler/spi/task/dq/enums => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/enums/dp}/RuleTypeTest.java (96%)
 rename {dolphinscheduler-spi/src/test/java/org/apache/dolphinscheduler/spi/task/dq/enums => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/enums/dp}/ValueTypeTest.java (96%)
 rename {dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/task => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/parameters}/SqlParametersTest.java (92%)
 rename {dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api}/utils/DependentUtilsTest.java (96%)
 rename {dolphinscheduler-spi/src/test/java/org/apache/dolphinscheduler/spi/task/dq => dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api}/utils/JdbcUrlParserTest.java (92%)
 copy dolphinscheduler-task-plugin/{ => dolphinscheduler-task-blocking}/pom.xml (56%)
 create mode 100644 dolphinscheduler-task-plugin/dolphinscheduler-task-blocking/src/main/java/org/apache/dolphinscheduler/plugin/task/blocking/BlockingTaskChannel.java
 copy dolphinscheduler-task-plugin/{dolphinscheduler-task-datax/src/main/java/org/apache/dolphinscheduler/plugin/task/datax/DataxTaskChannelFactory.java => dolphinscheduler-task-blocking/src/main/java/org/apache/dolphinscheduler/plugin/task/blocking/BlockingTaskChannelFactory.java} (72%)
 copy dolphinscheduler-task-plugin/{ => dolphinscheduler-task-conditions}/pom.xml (55%)
 create mode 100644 dolphinscheduler-task-plugin/dolphinscheduler-task-conditions/src/main/java/org/apache/dolphinscheduler/plugin/task/conditions/ConditionsTaskChannel.java
 copy dolphinscheduler-task-plugin/{dolphinscheduler-task-shell/src/main/java/org/apache/dolphinscheduler/plugin/task/shell/ShellTaskChannelFactory.java => dolphinscheduler-task-conditions/src/main/java/org/apache/dolphinscheduler/plugin/task/conditions/ConditionsTaskChannelFactory.java} (82%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi => dolphinscheduler-task-plugin/dolphinscheduler-task-dataquality/src/main/java/org/apache/dolphinscheduler/plugin}/task/dq/utils/Md5Utils.java (96%)
 rename {dolphinscheduler-spi/src/test/java/org/apache/dolphinscheduler/spi => dolphinscheduler-task-plugin/dolphinscheduler-task-dataquality/src/test/java/org/apache/dolphinscheduler/plugin}/task/dq/utils/Md5UtilsTest.java (94%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/request => dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src/main/java/org/apache/dolphinscheduler/plugin/task/datax}/DataxTaskExecutionContext.java (73%)
 rename {dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/task => dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src/test/java/org/apache/dolphinscheduler/plugin/task/datax}/DataxParametersTest.java (96%)
 copy dolphinscheduler-task-plugin/{ => dolphinscheduler-task-dependent}/pom.xml (55%)
 create mode 100644 dolphinscheduler-task-plugin/dolphinscheduler-task-dependent/src/main/java/org/apache/dolphinscheduler/plugin/task/dependent/DependentTaskChannel.java
 copy dolphinscheduler-task-plugin/{dolphinscheduler-task-mr/src/main/java/org/apache/dolphinscheduler/plugin/task/mr/MapReduceTaskChannelFactory.java => dolphinscheduler-task-dependent/src/main/java/org/apache/dolphinscheduler/plugin/task/dependent/DependentTaskChannelFactory.java} (73%)
 rename {dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/task => dolphinscheduler-task-plugin/dolphinscheduler-task-flink/src/test/java/org/apache/dolphinscheduler/plugin/task/flink}/FlinkParametersTest.java (90%)
 rename {dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/task => dolphinscheduler-task-plugin/dolphinscheduler-task-http/src/test/java/org/apache/dolphinscheduler/plugin/task/http}/HttpParametersTest.java (62%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/request => dolphinscheduler-task-plugin/dolphinscheduler-task-procedure/src/main/java/org/apache/dolphinscheduler/plugin/task/procedure}/ProcedureTaskExecutionContext.java (86%)
 rename {dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/task => dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/test/java/org/apache/dolphinscheduler/plugin/task/spark}/SparkParametersTest.java (92%)
 rename {dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/task/request => dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/main/java/org/apache/dolphinscheduler/plugin/task/sqoop}/SqoopTaskExecutionContext.java (73%)
 rename {dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/task => dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/test/java/org/apache/dolphinscheduler/plugin/task/sqoop}/EntityTestUtils.java (95%)
 rename {dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/task => dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/test/java/org/apache/dolphinscheduler/plugin/task/sqoop}/SqoopParameterEntityTest.java (68%)
 copy dolphinscheduler-task-plugin/{ => dolphinscheduler-task-subprocess}/pom.xml (55%)
 create mode 100644 dolphinscheduler-task-plugin/dolphinscheduler-task-subprocess/src/main/java/org/apache/dolphinscheduler/plugin/task/subprocess/SubProcessTaskChannel.java
 copy dolphinscheduler-task-plugin/{dolphinscheduler-task-mr/src/main/java/org/apache/dolphinscheduler/plugin/task/mr/MapReduceTaskChannelFactory.java => dolphinscheduler-task-subprocess/src/main/java/org/apache/dolphinscheduler/plugin/task/subprocess/SubProcessTaskChannelFactory.java} (72%)
 copy dolphinscheduler-task-plugin/{ => dolphinscheduler-task-switch}/pom.xml (55%)
 create mode 100644 dolphinscheduler-task-plugin/dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SubProcessTaskChannel.java
 copy dolphinscheduler-task-plugin/{dolphinscheduler-task-mr/src/main/java/org/apache/dolphinscheduler/plugin/task/mr/MapReduceTaskChannelFactory.java => dolphinscheduler-task-switch/src/main/java/org/apache/dolphinscheduler/plugin/task/switchtask/SubProcessTaskChannelFactory.java} (72%)