This is an automated email from the ASF dual-hosted git repository.
morningman pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/doris.git
from 6b8ec22436d exclude regression test workload_manager_p1 (#26736)
add 13bc6b702b1 [refactor](Job)Refactor JOB (#26845)
No new revisions were added by this update.
Summary of changes:
.../main/java/org/apache/doris/common/Config.java | 32 +-
fe/fe-core/src/main/cup/sql_parser.cup | 10 +-
.../org/apache/doris/analysis/CreateJobStmt.java | 154 +++---
.../org/apache/doris/analysis/ShowJobStmt.java | 15 +-
.../org/apache/doris/analysis/ShowJobTaskStmt.java | 13 -
.../main/java/org/apache/doris/catalog/Env.java | 49 +-
.../org/apache/doris/job/base/AbstractJob.java | 205 ++++++++
.../main/java/org/apache/doris/job/base/Job.java | 120 +++++
.../JobType.java => job/base/JobExecuteType.java} | 11 +-
.../doris/job/base/JobExecutionConfiguration.java | 211 ++++++++
.../org/apache/doris/job/base/TimerDefinition.java | 61 +++
.../{scheduler => job}/common/IntervalUnit.java | 6 +-
.../constants => job/common}/JobStatus.java | 3 +-
.../common/JobType.java} | 20 +-
.../common/TaskStatus.java} | 25 +-
.../common/TaskType.java} | 19 +-
.../disruptor/ExecuteTaskEvent.java} | 20 +-
.../apache/doris/job/disruptor/TaskDisruptor.java | 82 +++
.../disruptor/TimerJobEvent.java} | 18 +-
.../exception/JobException.java} | 38 +-
.../job/executor/DefaultTaskExecutorHandler.java | 69 +++
.../doris/job/executor/DispatchTaskHandler.java | 68 +++
.../doris/job/executor/TimerJobSchedulerTask.java | 48 ++
.../extensions/insert/InsertIntoState.java} | 16 +-
.../doris/job/extensions/insert/InsertJob.java | 125 +++++
.../doris/job/extensions/insert/InsertTask.java | 77 +++
.../org/apache/doris/job/manager/JobManager.java | 216 ++++++++
.../job/manager/TaskDisruptorGroupManager.java | 113 ++++
.../apache/doris/job/manager/TaskTokenManager.java | 56 ++
.../apache/doris/job/scheduler/JobScheduler.java | 175 +++++++
.../org/apache/doris/job/task/AbstractTask.java | 116 +++++
.../main/java/org/apache/doris/job/task/Task.java | 66 +++
.../org/apache/doris/journal/JournalEntity.java | 9 +-
.../org/apache/doris/mtmv/MTMVRefreshSchedule.java | 2 +-
.../doris/nereids/parser/LogicalPlanBuilder.java | 2 +-
.../java/org/apache/doris/persist/EditLog.java | 33 +-
.../org/apache/doris/persist/gson/GsonUtils.java | 10 +-
.../doris/persist/meta/MetaPersistMethod.java | 4 -
.../doris/persist/meta/PersistMetaModules.java | 2 +-
.../main/java/org/apache/doris/qe/DdlExecutor.java | 10 +-
.../java/org/apache/doris/qe/ShowExecutor.java | 32 +-
.../doris/scheduler/constants/JobCategory.java | 58 ---
.../doris/scheduler/disruptor/TaskDisruptor.java | 8 +-
.../doris/scheduler/disruptor/TaskHandler.java | 105 +---
.../scheduler/executor/AbstractJobExecutor.java | 54 --
.../doris/scheduler/executor/JobExecutor.java | 46 --
.../doris/scheduler/executor/SqlJobExecutor.java | 79 ---
.../java/org/apache/doris/scheduler/job/Job.java | 292 -----------
.../org/apache/doris/scheduler/job/JobTask.java | 136 -----
.../apache/doris/scheduler/job/TimerJobTask.java | 57 --
.../doris/scheduler/manager/JobTaskManager.java | 152 ------
.../doris/scheduler/manager/TimerJobManager.java | 573 ---------------------
.../scheduler/manager/TransientTaskManager.java | 2 +
.../scheduler/registry/PersistentJobRegister.java | 136 -----
.../doris/scheduler/registry/TimerJobRegister.java | 115 -----
.../apache/doris/analysis/CreateJobStmtTest.java | 12 +-
.../job/base/JobExecutionConfigurationTest.java | 70 +++
.../apache/doris/scheduler/disruptor/JobTest.java | 77 ---
.../scheduler/disruptor/TaskDisruptorTest.java | 95 ----
.../scheduler/disruptor/TimerJobManagerTest.java | 182 -------
60 files changed, 2102 insertions(+), 2508 deletions(-)
create mode 100644
fe/fe-core/src/main/java/org/apache/doris/job/base/AbstractJob.java
create mode 100644 fe/fe-core/src/main/java/org/apache/doris/job/base/Job.java
rename
fe/fe-core/src/main/java/org/apache/doris/{scheduler/constants/JobType.java =>
job/base/JobExecuteType.java} (88%)
create mode 100644
fe/fe-core/src/main/java/org/apache/doris/job/base/JobExecutionConfiguration.java
create mode 100644
fe/fe-core/src/main/java/org/apache/doris/job/base/TimerDefinition.java
rename fe/fe-core/src/main/java/org/apache/doris/{scheduler =>
job}/common/IntervalUnit.java (92%)
rename fe/fe-core/src/main/java/org/apache/doris/{scheduler/constants =>
job/common}/JobStatus.java (96%)
copy
fe/fe-core/src/main/java/org/apache/doris/{scheduler/job/ExecutorResult.java =>
job/common/JobType.java} (74%)
copy
fe/fe-core/src/main/java/org/apache/doris/{scheduler/job/ExecutorResult.java =>
job/common/TaskStatus.java} (74%)
copy
fe/fe-core/src/main/java/org/apache/doris/{scheduler/job/ExecutorResult.java =>
job/common/TaskType.java} (74%)
copy
fe/fe-core/src/main/java/org/apache/doris/{scheduler/job/ExecutorResult.java =>
job/disruptor/ExecuteTaskEvent.java} (65%)
create mode 100644
fe/fe-core/src/main/java/org/apache/doris/job/disruptor/TaskDisruptor.java
copy
fe/fe-core/src/main/java/org/apache/doris/{scheduler/job/ExecutorResult.java =>
job/disruptor/TimerJobEvent.java} (71%)
copy
fe/fe-core/src/main/java/org/apache/doris/{scheduler/job/ExecutorResult.java =>
job/exception/JobException.java} (60%)
create mode 100644
fe/fe-core/src/main/java/org/apache/doris/job/executor/DefaultTaskExecutorHandler.java
create mode 100644
fe/fe-core/src/main/java/org/apache/doris/job/executor/DispatchTaskHandler.java
create mode 100644
fe/fe-core/src/main/java/org/apache/doris/job/executor/TimerJobSchedulerTask.java
rename
fe/fe-core/src/main/java/org/apache/doris/{scheduler/job/ExecutorResult.java =>
job/extensions/insert/InsertIntoState.java} (77%)
create mode 100644
fe/fe-core/src/main/java/org/apache/doris/job/extensions/insert/InsertJob.java
create mode 100644
fe/fe-core/src/main/java/org/apache/doris/job/extensions/insert/InsertTask.java
create mode 100644
fe/fe-core/src/main/java/org/apache/doris/job/manager/JobManager.java
create mode 100644
fe/fe-core/src/main/java/org/apache/doris/job/manager/TaskDisruptorGroupManager.java
create mode 100644
fe/fe-core/src/main/java/org/apache/doris/job/manager/TaskTokenManager.java
create mode 100644
fe/fe-core/src/main/java/org/apache/doris/job/scheduler/JobScheduler.java
create mode 100644
fe/fe-core/src/main/java/org/apache/doris/job/task/AbstractTask.java
create mode 100644 fe/fe-core/src/main/java/org/apache/doris/job/task/Task.java
delete mode 100644
fe/fe-core/src/main/java/org/apache/doris/scheduler/constants/JobCategory.java
delete mode 100644
fe/fe-core/src/main/java/org/apache/doris/scheduler/executor/AbstractJobExecutor.java
delete mode 100644
fe/fe-core/src/main/java/org/apache/doris/scheduler/executor/JobExecutor.java
delete mode 100644
fe/fe-core/src/main/java/org/apache/doris/scheduler/executor/SqlJobExecutor.java
delete mode 100644
fe/fe-core/src/main/java/org/apache/doris/scheduler/job/Job.java
delete mode 100644
fe/fe-core/src/main/java/org/apache/doris/scheduler/job/JobTask.java
delete mode 100644
fe/fe-core/src/main/java/org/apache/doris/scheduler/job/TimerJobTask.java
delete mode 100644
fe/fe-core/src/main/java/org/apache/doris/scheduler/manager/JobTaskManager.java
delete mode 100644
fe/fe-core/src/main/java/org/apache/doris/scheduler/manager/TimerJobManager.java
delete mode 100644
fe/fe-core/src/main/java/org/apache/doris/scheduler/registry/PersistentJobRegister.java
delete mode 100644
fe/fe-core/src/main/java/org/apache/doris/scheduler/registry/TimerJobRegister.java
create mode 100644
fe/fe-core/src/test/java/org/apache/doris/job/base/JobExecutionConfigurationTest.java
delete mode 100644
fe/fe-core/src/test/java/org/apache/doris/scheduler/disruptor/JobTest.java
delete mode 100644
fe/fe-core/src/test/java/org/apache/doris/scheduler/disruptor/TaskDisruptorTest.java
delete mode 100644
fe/fe-core/src/test/java/org/apache/doris/scheduler/disruptor/TimerJobManagerTest.java
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]