This is an automated email from the ASF dual-hosted git repository.
wenjun pushed a change to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
from 17cd644506 [Fix-#11669][Workflow Instance Page] Fix the duration in
Workflow Instance page. (#12264)
add db1d319159 Reorganize some classes in common module, remove duplicate
classes (#12321)
No new revisions were added by this update.
Summary of changes:
.../api/controller/AccessTokenController.java | 2 +-
.../api/controller/AlertGroupController.java | 2 +-
.../controller/AlertPluginInstanceController.java | 3 +-
.../api/controller/ClusterController.java | 2 +-
.../api/controller/DataQualityController.java | 2 +-
.../api/controller/DataSourceController.java | 4 +-
.../api/controller/EnvironmentController.java | 2 +-
.../api/controller/K8sNamespaceController.java | 2 +-
.../controller/ProcessDefinitionController.java | 2 +-
.../api/controller/ProcessInstanceController.java | 2 +-
.../api/controller/ProjectController.java | 2 +-
.../api/controller/ProjectV2Controller.java | 2 +-
.../api/controller/QueueController.java | 2 +-
.../api/controller/QueueV2Controller.java | 2 +-
.../api/controller/ResourcesController.java | 2 +-
.../api/controller/SchedulerController.java | 3 +-
.../api/controller/TaskDefinitionController.java | 2 +-
.../api/controller/TaskInstanceController.java | 2 +-
.../api/controller/TenantController.java | 2 +-
.../api/controller/UsersController.java | 2 +-
.../api/controller/WorkFlowLineageController.java | 2 +-
.../api/controller/WorkerGroupController.java | 2 +-
.../dolphinscheduler/api/k8s/K8sManager.java | 4 +-
.../api/service/impl/ClusterServiceImpl.java | 3 +-
.../service/impl/ProcessDefinitionServiceImpl.java | 4 +-
.../service/impl/ProcessInstanceServiceImpl.java | 4 +-
.../api/service/impl/ResourcesServiceImpl.java | 2 +-
.../api/service/impl/TenantServiceImpl.java | 4 +-
.../api/service/impl/UsersServiceImpl.java | 3 +-
.../api/service/impl/WorkerGroupServiceImpl.java | 2 +-
.../api}/utils/ClusterConfUtils.java | 3 +-
.../api/controller/WorkerGroupControllerTest.java | 2 +-
.../api/service/BaseServiceTest.java | 3 +-
.../api/service/ProcessInstanceServiceTest.java | 2 +-
.../api/service/ResourcesServiceTest.java | 2 +-
.../api/service/TenantServiceTest.java | 2 +-
.../api/service/UsersServiceTest.java | 2 +-
.../api/service/WorkerGroupServiceTest.java | 4 +-
dolphinscheduler-common/pom.xml | 211 +--------------------
.../apache/dolphinscheduler/common/Constants.java | 20 --
.../dolphinscheduler/common/utils/JSONUtils.java | 60 +++---
.../dolphinscheduler/common/utils/OSUtils.java | 7 +-
.../common/utils/PropertyUtils.java | 2 +-
.../common/utils/PropertyUtilsTest.java | 10 +-
.../placeholder/TimePlaceholderUtilsTest.java | 83 --------
dolphinscheduler-dao/pom.xml | 32 ++--
.../dolphinscheduler/dao/entity/ProcessData.java | 115 -----------
.../plugin/datasource/api/utils/CommonUtils.java | 2 +-
.../plugin/datasource/hive/utils/CommonUtil.java | 8 +-
.../master/processor/StateEventProcessor.java | 2 +-
.../master/processor/TaskEventProcessor.java | 2 +-
.../processor/TaskExecuteResponseProcessor.java | 3 +-
.../master/processor/TaskRecallProcessor.java | 3 +-
.../processor/queue/StateEventResponseService.java | 2 +-
.../processor/queue/TaskExecuteRunnable.java | 3 +-
.../server/master/runner/EventExecuteService.java | 3 +-
.../master/runner/MasterSchedulerBootstrap.java | 3 +-
.../master/runner/StateWheelExecuteThread.java | 2 +-
.../master/runner/StreamTaskExecuteRunnable.java | 2 +-
.../master/runner/StreamTaskExecuteThreadPool.java | 3 +-
.../server/master/runner/WorkflowEventLooper.java | 2 +-
.../master/runner/WorkflowExecuteRunnable.java | 9 +-
.../master/runner/WorkflowExecuteThreadPool.java | 2 +-
.../master/runner/task/BaseTaskProcessor.java | 4 +-
.../master/service/MasterFailoverService.java | 2 +-
.../master/service/WorkerFailoverService.java | 2 +-
.../server/master/BlockingTaskTest.java | 2 +-
.../server/master/ConditionsTaskTest.java | 2 +-
.../server/master/DependentTaskTest.java | 2 +-
.../dolphinscheduler/server/master/ParamsTest.java | 4 +-
.../server/master/SubProcessTaskTest.java | 2 +-
dolphinscheduler-remote/pom.xml | 32 ++--
.../apache/dolphinscheduler/remote/utils/Host.java | 7 +-
dolphinscheduler-service/pom.xml | 58 +++++-
.../service/expand/CuringGlobalParams.java | 33 ++--
.../dolphinscheduler/service/log/LogClient.java | 2 +-
.../service/log/LoggerRequestProcessor.java | 2 +-
.../dolphinscheduler/service}/model/TaskNode.java | 19 +-
.../service}/process/ProcessDag.java | 4 +-
.../service/process/ProcessService.java | 2 +-
.../service/process/ProcessServiceImpl.java | 14 +-
.../service}/storage/StorageOperate.java | 9 +-
.../service/storage}/StoreConfiguration.java | 9 +-
.../service/storage/impl}/HadoopUtils.java | 19 +-
.../service/storage/impl}/OssOperator.java | 5 +-
.../service/storage/impl}/S3Utils.java | 67 ++++---
.../service}/utils/CommonUtils.java | 42 ++--
.../dolphinscheduler/service/utils/Constants.java | 44 +++++
.../dolphinscheduler/service}/utils/DagHelper.java | 10 +-
.../service}/utils/LoggerUtils.java | 27 +--
.../service/utils/ProcessData.java | 31 +--
.../service/utils/ProcessUtils.java | 5 +-
.../service/log/LogClientTest.java | 2 +-
.../service/log/LoggerRequestProcessorTest.java | 2 +-
.../service/process/ProcessServiceTest.java | 8 +-
.../service/storage/impl}/HadoopUtilsTest.java | 3 +-
.../service/storage/impl}/OssOperatorTest.java | 3 +-
.../service}/utils/CommonUtilsTest.java | 5 +-
.../service}/utils/DagHelperTest.java | 7 +-
.../service/utils/ProcessUtilsTest.java | 2 +-
dolphinscheduler-spi/pom.xml | 32 ++--
.../dolphinscheduler/spi/enums/ResUploadType.java | 25 ---
.../dolphinscheduler/spi/utils/PropertyUtils.java | 184 ------------------
.../dolphinscheduler-task-api/pom.xml | 77 ++++----
.../plugin/task/api/AbstractCommandExecutor.java | 34 ++--
.../plugin/task/api/utils/OSUtils.java | 2 +-
.../plugin/task/api}/utils/ParameterUtils.java | 6 +-
.../plugin/task/api/model}/JSONUtilsTest.java | 43 ++---
.../plugin/task/api}/utils/ParameterUtilsTest.java | 19 +-
.../plugin/task/datasync/DatasyncHook.java | 48 +++--
.../dolphinscheduler/plugin/task/dms/DmsHook.java | 91 +++++----
.../plugin/task/emr/AbstractEmrTask.java | 23 +--
.../plugin/task/jupyter/JupyterTask.java | 2 +-
.../plugin/task/mlflow/MlflowTask.java | 35 ++--
.../plugin/task/mlflow/MlflowTaskTest.java | 2 +-
.../plugin/task/sagemaker/SagemakerTask.java | 2 +-
.../server/worker/WorkerServer.java | 2 +-
.../server/worker/message/MessageRetryRunner.java | 2 +-
.../worker/processor/TaskDispatchProcessor.java | 5 +-
.../processor/TaskExecuteResultAckProcessor.java | 2 +-
.../processor/TaskExecuteRunningAckProcessor.java | 3 +-
.../server/worker/processor/TaskKillProcessor.java | 2 +-
.../worker/processor/TaskRejectAckProcessor.java | 2 +-
.../worker/processor/TaskSavePointProcessor.java | 2 +-
.../DefaultWorkerDelayTaskExecuteRunnable.java | 2 +-
...faultWorkerDelayTaskExecuteRunnableFactory.java | 2 +-
.../runner/WorkerDelayTaskExecuteRunnable.java | 2 +-
.../WorkerDelayTaskExecuteRunnableFactory.java | 2 +-
.../worker/runner/WorkerTaskExecuteRunnable.java | 6 +-
.../WorkerTaskExecuteRunnableFactoryBuilder.java | 2 +-
.../worker/utils/TaskExecutionCheckerUtils.java | 7 +-
.../processor/TaskDispatchProcessorTest.java | 2 +-
.../DefaultWorkerDelayTaskExecuteRunnableTest.java | 4 +-
133 files changed, 695 insertions(+), 1157 deletions(-)
rename
{dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common =>
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api}/utils/ClusterConfUtils.java
(93%)
delete mode 100644
dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils/placeholder/TimePlaceholderUtilsTest.java
delete mode 100644
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessData.java
rename
{dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common =>
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service}/model/TaskNode.java
(97%)
rename
{dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common =>
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service}/process/ProcessDag.java
(94%)
rename
{dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common =>
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service}/storage/StorageOperate.java
(95%)
rename
{dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/config
=>
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/storage}/StoreConfiguration.java
(87%)
rename
{dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils
=>
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/storage/impl}/HadoopUtils.java
(98%)
rename
{dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils
=>
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/storage/impl}/OssOperator.java
(98%)
rename
{dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils
=>
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/storage/impl}/S3Utils.java
(85%)
rename
{dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common =>
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service}/utils/CommonUtils.java
(82%)
create mode 100644
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/utils/Constants.java
rename {dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao =>
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service}/utils/DagHelper.java
(99%)
rename
{dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common =>
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service}/utils/LoggerUtils.java
(88%)
copy
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/parameters/DependentParameters.java
=>
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/utils/ProcessData.java
(57%)
rename
{dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils
=>
dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/storage/impl}/HadoopUtilsTest.java
(95%)
rename
{dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils
=>
dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/storage/impl}/OssOperatorTest.java
(98%)
rename
{dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common =>
dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service}/utils/CommonUtilsTest.java
(93%)
rename {dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao =>
dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service}/utils/DagHelperTest.java
(98%)
delete mode 100644
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/enums/ResUploadType.java
delete mode 100644
dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/utils/PropertyUtils.java
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/ParameterUtils.java
(96%)
rename
{dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/utils
=>
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/test/java/org/apache/dolphinscheduler/plugin/task/api/model}/JSONUtilsTest.java
(87%)
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/ParameterUtilsTest.java
(80%)
