Skip to content

[Improvement-18056] Clean up unused methods and classes in the dolphinschudler-master module #18164

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
njnu-seafish wants to merge 6 commits into
base: dev
Choose a base branch
from
Open

[Improvement-18056] Clean up unused methods and classes in the dolphinschudler-master module #18164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
031f71b
Clean up unused methods and classes
Apr 11, 2026
25eec94
Merge remote-tracking branch 'origin/dev' into Improvement-18056-mast…
Apr 13, 2026
95cf842
Merge remote-tracking branch 'origin/dev' into Improvement-18056-mast…
Apr 15, 2026
d8ba590
resolve conflicts
Apr 15, 2026
7ad7730
Revert some changes
Apr 15, 2026
6f7c06e
Merge branch 'dev' into Improvement-18056-master-syc
SbloodyS Apr 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 0 additions & 32 deletions ...ler/server/master/engine/exceptions/WorkflowExecutionGraphInitializeFailureException.java
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions ...ava/org/apache/dolphinscheduler/server/master/engine/system/SystemEventBusFireWorker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.apache.dolphinscheduler.common.thread.ThreadUtils;
import org.apache.dolphinscheduler.server.master.engine.system.event.AbstractSystemEvent;
import org.apache.dolphinscheduler.server.master.engine.system.event.ISystemEventHandler;
import org.apache.dolphinscheduler.server.master.failover.FailoverCoordinator;

import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.time.StopWatch;
Expand All @@ -43,9 +42,6 @@ public class SystemEventBusFireWorker extends BaseDaemonThread implements AutoCl
@Autowired
private SystemEventBus systemEventBus;

@Autowired
private FailoverCoordinator failoverCoordinator;

@Autowired
private List<ISystemEventHandler> systemEventHandlers;

Expand Down
6 changes: 0 additions & 6 deletions ...che/dolphinscheduler/server/master/engine/task/execution/AbstractTaskInstanceFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,13 @@
import org.apache.dolphinscheduler.dao.entity.TaskDefinition;
import org.apache.dolphinscheduler.dao.entity.TaskInstance;
import org.apache.dolphinscheduler.dao.entity.WorkflowInstance;
import org.apache.dolphinscheduler.dao.mapper.EnvironmentMapper;
import org.apache.dolphinscheduler.dao.utils.EnvironmentUtils;
import org.apache.dolphinscheduler.dao.utils.WorkerGroupUtils;

import org.springframework.beans.factory.annotation.Autowired;

public abstract class AbstractTaskInstanceFactory<BUILDER extends ITaskInstanceFactory.ITaskInstanceBuilder>
implements
ITaskInstanceFactory<BUILDER> {

@Autowired
protected EnvironmentMapper environmentMapper;

protected TaskInstance cloneTaskInstance(TaskInstance originTaskInstance) {
final TaskInstance result = new TaskInstance();
result.setId(originTaskInstance.getId());
Expand Down
45 changes: 0 additions & 45 deletions .../dolphinscheduler/server/master/engine/task/listener/ITaskExecutionLifecycleListener.java
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions ...ache/dolphinscheduler/server/master/engine/task/statemachine/AbstractTaskStateAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import org.apache.dolphinscheduler.plugin.task.api.utils.VarPoolUtils;
import org.apache.dolphinscheduler.server.master.engine.AbstractLifecycleEvent;
import org.apache.dolphinscheduler.server.master.engine.ITaskGroupCoordinator;
import org.apache.dolphinscheduler.server.master.engine.IWorkflowRepository;
import org.apache.dolphinscheduler.server.master.engine.graph.IWorkflowExecutionGraph;
import org.apache.dolphinscheduler.server.master.engine.task.client.ITaskExecutorClient;
import org.apache.dolphinscheduler.server.master.engine.task.execution.ITaskExecution;
Expand Down Expand Up @@ -66,9 +65,6 @@ public abstract class AbstractTaskStateAction implements ITaskStateAction {
@Autowired
protected TaskInstanceDao taskInstanceDao;

@Autowired
protected IWorkflowRepository workflowRepository;

@Autowired
protected ITaskExecutorClient taskExecutorClient;

Expand Down
4 changes: 0 additions & 4 deletions ...he/dolphinscheduler/server/master/engine/workflow/execution/WorkflowExecutionFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import org.apache.dolphinscheduler.common.enums.CommandType;
import org.apache.dolphinscheduler.dao.entity.Command;
import org.apache.dolphinscheduler.dao.repository.CommandDao;
import org.apache.dolphinscheduler.dao.repository.WorkflowInstanceDao;
import org.apache.dolphinscheduler.server.master.engine.command.ICommandHandler;
import org.apache.dolphinscheduler.server.master.engine.exceptions.CommandDuplicateHandleException;

Expand All @@ -39,9 +38,6 @@ public class WorkflowExecutionFactory {
@Autowired
private List<ICommandHandler> commandHandlers;

@Autowired
private WorkflowInstanceDao workflowInstanceDao;

@Autowired
private CommandDao commandDao;

Expand Down
11 changes: 0 additions & 11 deletions ...erver/master/engine/workflow/lifecycle/handler/WorkflowFinalizeLifecycleEventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,13 @@
package org.apache.dolphinscheduler.server.master.engine.workflow.lifecycle.handler;

import org.apache.dolphinscheduler.server.master.engine.ILifecycleEventType;
import org.apache.dolphinscheduler.server.master.engine.IWorkflowRepository;
import org.apache.dolphinscheduler.server.master.engine.WorkflowEventBusCoordinator;
import org.apache.dolphinscheduler.server.master.engine.workflow.execution.IWorkflowExecution;
import org.apache.dolphinscheduler.server.master.engine.workflow.lifecycle.WorkflowLifecycleEventType;
import org.apache.dolphinscheduler.server.master.engine.workflow.lifecycle.event.WorkflowFinalizeLifecycleEvent;
import org.apache.dolphinscheduler.server.master.engine.workflow.statemachine.IWorkflowStateAction;

import lombok.extern.slf4j.Slf4j;

import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Component;

/**
Expand All @@ -40,13 +36,6 @@ public class WorkflowFinalizeLifecycleEventHandler
extends
AbstractWorkflowLifecycleEventHandler<WorkflowFinalizeLifecycleEvent> {

@Lazy
@Autowired
private WorkflowEventBusCoordinator workflowEventBusCoordinator;

@Autowired
private IWorkflowRepository workflowRepository;

@Override
public void handle(final IWorkflowStateAction workflowStateAction,
final IWorkflowExecution workflowExecution,
Expand Down
4 changes: 0 additions & 4 deletions ...hinscheduler/server/master/engine/workflow/listener/WorkflowSuccessLifecycleListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.apache.dolphinscheduler.common.utils.DateUtils;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
import org.apache.dolphinscheduler.dao.entity.WorkflowInstance;
import org.apache.dolphinscheduler.dao.repository.CommandDao;
import org.apache.dolphinscheduler.extract.master.command.BackfillWorkflowCommandParam;
import org.apache.dolphinscheduler.extract.master.command.ICommandParam;
import org.apache.dolphinscheduler.extract.master.transportor.workflow.WorkflowBackfillTriggerRequest;
Expand All @@ -48,9 +47,6 @@ public class WorkflowSuccessLifecycleListener implements IWorkflowLifecycleListe
@Autowired
private WorkflowBackfillTrigger workflowBackfillTrigger;

@Autowired
private CommandDao commandDao;

@Override
public void notifyWorkflowLifecycleEvent(final IWorkflowExecution workflowExecution,
final AbstractWorkflowLifecycleLifecycleEvent lifecycleEvent) {
Expand Down
1 change: 1 addition & 0 deletions .../java/org/apache/dolphinscheduler/server/master/exception/MasterTaskExecuteException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ public MasterTaskExecuteException(String message) {
public MasterTaskExecuteException(String message, Throwable cause) {
super(message, cause);
}

}
30 changes: 0 additions & 30 deletions ...g/apache/dolphinscheduler/server/master/exception/TaskExecuteRunnableCreateException.java
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions ...ain/java/org/apache/dolphinscheduler/server/master/exception/WorkflowCreateException.java
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions ...rc/main/java/org/apache/dolphinscheduler/server/master/rpc/WorkflowMetricServiceImpl.java
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions ...-master/src/main/java/org/apache/dolphinscheduler/server/master/utils/ExceptionUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@
package org.apache.dolphinscheduler.server.master.utils;

import org.apache.dolphinscheduler.server.master.exception.TaskExecutionContextCreateException;
import org.apache.dolphinscheduler.server.master.exception.dispatch.NoAvailableWorkerException;
import org.apache.dolphinscheduler.server.master.exception.dispatch.WorkerGroupNotFoundException;

import org.springframework.dao.DataAccessResourceFailureException;

Expand All @@ -33,11 +31,4 @@ public static boolean isTaskExecutionContextCreateException(Throwable e) {
return e instanceof TaskExecutionContextCreateException;
}

public static boolean isWorkerGroupNotFoundException(Throwable e) {
return e instanceof WorkerGroupNotFoundException;
}

public static boolean isNoAvailableWorkerException(Throwable e) {
return e instanceof NoAvailableWorkerException;
}
}
2 changes: 0 additions & 2 deletions .../src/main/java/org/apache/dolphinscheduler/server/master/utils/WorkflowInstanceUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import org.apache.dolphinscheduler.dao.entity.WorkflowInstance;
import org.apache.dolphinscheduler.server.master.engine.WorkflowEventBus;
import org.apache.dolphinscheduler.server.master.engine.graph.IWorkflowExecutionGraph;
import org.apache.dolphinscheduler.server.master.engine.graph.IWorkflowGraph;
import org.apache.dolphinscheduler.server.master.engine.task.execution.ITaskExecution;
import org.apache.dolphinscheduler.server.master.engine.workflow.execution.IWorkflowExecution;
import org.apache.dolphinscheduler.server.master.runner.IWorkflowExecuteContext;
Expand All @@ -39,7 +38,6 @@ public class WorkflowInstanceUtils {
public static String logWorkflowInstanceInDetails(IWorkflowExecution workflowExecution) {
final IWorkflowExecuteContext workflowExecuteContext = workflowExecution.getWorkflowExecuteContext();
final IWorkflowExecutionGraph workflowExecutionGraph = workflowExecuteContext.getWorkflowExecutionGraph();
final IWorkflowGraph workflowGraph = workflowExecuteContext.getWorkflowGraph();
final WorkflowInstance workflowInstance = workflowExecuteContext.getWorkflowInstance();
final WorkflowEventBus workflowEventBus = workflowExecuteContext.getWorkflowEventBus();

Expand Down
Loading