You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by le...@apache.org on 2021/12/03 06:02:39 UTC

[dolphinscheduler] branch dev updated (f480b8a -> 2b519f3)

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

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


    from f480b8a  [Feature-6930] [Python]Add workflow as code task type sub_process (#7022)
     add 2b519f3  [Feature-#6422] task group queue (#6722)

No new revisions were added by this update.

Summary of changes:
 .../api/controller/TaskGroupController.java        | 296 ++++++++++++++++++++
 .../apache/dolphinscheduler/api/enums/Status.java  |  22 +-
 ...roupService.java => TaskGroupQueueService.java} |  58 ++--
 .../api/service/TaskGroupService.java              | 140 ++++++++++
 .../api/service/impl/ExecutorServiceImpl.java      |  27 +-
 .../service/impl/TaskGroupQueueServiceImpl.java    | 130 +++++++++
 .../api/service/impl/TaskGroupServiceImpl.java     | 298 +++++++++++++++++++++
 ...ollerTest.java => TaskGroupControllerTest.java} | 182 ++++++-------
 ...Test.java => TaskGroupQueueControllerTest.java} |  39 +--
 .../api/service/TaskGroupQueueServiceTest.java     | 105 ++++++++
 .../api/service/TaskGroupServiceTest.java          | 178 ++++++++++++
 .../common/enums/StateEventType.java               |   4 +-
 ...eoutStrategy.java => TaskGroupQueueStatus.java} |  50 ++--
 .../dao/entity/TaskDefinition.java                 |  95 ++++---
 .../entity/{Environment.java => TaskGroup.java}    | 134 +++++----
 .../dao/entity/TaskGroupQueue.java                 | 200 ++++++++++++++
 .../dolphinscheduler/dao/entity/TaskInstance.java  |  25 +-
 .../dao/mapper/TaskGroupMapper.java                |  78 ++++++
 .../dao/mapper/TaskGroupQueueMapper.java           |  89 ++++++
 .../dao/mapper/TaskInstanceMapper.java             |   2 +
 .../dao/mapper/TaskDefinitionLogMapper.xml         |  10 +-
 .../dao/mapper/TaskDefinitionMapper.xml            |  10 +-
 .../dao/mapper/TaskGroupMapper.xml                 |  95 +++++++
 .../dao/mapper/TaskGroupQueueMapper.xml            | 120 +++++++++
 .../dao/mapper/TaskInstanceMapper.xml              |  18 +-
 .../src/main/resources/sql/dolphinscheduler_h2.sql |  35 +++
 .../main/resources/sql/dolphinscheduler_mysql.sql  |  40 +++
 .../resources/sql/dolphinscheduler_postgre.sql     |  34 +++
 .../dao/mapper/TaskGroupMapperTest.java            |  95 +++++++
 .../dao/mapper/TaskGroupQueueMapperTest.java       | 102 +++++++
 .../remote/command/CommandType.java                |  11 +-
 ...nseCommand.java => TaskEventChangeCommand.java} |  63 +++--
 .../server/master/MasterServer.java                |   3 +
 ...EventProcessor.java => TaskEventProcessor.java} |  32 +--
 .../processor/queue/StateEventResponseService.java |   4 +
 .../master/runner/WorkflowExecuteThread.java       |  57 +++-
 .../master/runner/task/BaseTaskProcessor.java      |   5 +
 .../master/runner/task/CommonTaskProcessor.java    |  20 +-
 .../server/master/runner/task/ITaskProcessor.java  |   2 +
 .../server/master/WorkflowExecuteThreadTest.java   |   2 -
 .../service/process/ProcessService.java            | 186 +++++++++++++
 .../service/process/ProcessServiceTest.java        |  45 ++++
 42 files changed, 2804 insertions(+), 337 deletions(-)
 create mode 100644 dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskGroupController.java
 copy dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/{WorkerGroupService.java => TaskGroupQueueService.java} (50%)
 create mode 100644 dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupService.java
 create mode 100644 dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupQueueServiceImpl.java
 create mode 100644 dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupServiceImpl.java
 copy dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/{EnvironmentControllerTest.java => TaskGroupControllerTest.java} (50%)
 copy dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/{LoginControllerTest.java => TaskGroupQueueControllerTest.java} (59%)
 create mode 100644 dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TaskGroupQueueServiceTest.java
 create mode 100644 dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TaskGroupServiceTest.java
 copy dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/{TaskTimeoutStrategy.java => TaskGroupQueueStatus.java} (64%)
 copy dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/{Environment.java => TaskGroup.java} (55%)
 create mode 100644 dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskGroupQueue.java
 create mode 100644 dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TaskGroupMapper.java
 create mode 100644 dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TaskGroupQueueMapper.java
 create mode 100644 dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskGroupMapper.xml
 create mode 100644 dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskGroupQueueMapper.xml
 create mode 100644 dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskGroupMapperTest.java
 create mode 100644 dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskGroupQueueMapperTest.java
 copy dolphinscheduler-remote/src/main/java/org/apache/dolphinscheduler/remote/command/{DBTaskResponseCommand.java => TaskEventChangeCommand.java} (61%)
 copy dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/processor/{StateEventProcessor.java => TaskEventProcessor.java} (58%)