Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,5 @@ private AuditLogConstants() {
public static final String ALIAS = "alias";
public static final String FILE_NAME = "fileName";
public static final String FULL_NAME = "fullName";
public static final String FUNC_NAME = "funcName";

}
Original file line number Diff line number Diff line change
Expand Up @@ -24,44 +24,27 @@

public class ApiFuncIdentificationConstant {

public static final String ACCESS_TOKEN_MANAGE = "security:token:view";
public static final String ACCESS_TOKEN_VIEW = "security:token:view";
public static final String ACCESS_TOKEN_CREATE = "security:token:create";
public static final String ACCESS_TOKEN_UPDATE = "security:token:update";
public static final String ACCESS_TOKEN_DELETE = "security:token:delete";
public static final String ALERT_GROUP_VIEW = "security:alert-group:view";
public static final String ALERT_GROUP_CREATE = "security:alert-group:create";
public static final String ALERT_GROUP_UPDATE = "security:alert-group:update";
public static final String ALERT_GROUP_DELETE = "security:alert-group:delete";
public static final String TENANT_MANAGER = "security:tenant:view";
public static final String TENANT_CREATE = "security:tenant:create";
public static final String TENANT_UPDATE = "security:tenant:update";
public static final String TENANT_DELETE = "security:tenant:delete";
public static final String ALERT_INSTANCE_CREATE = "security:alert-plugin:create";
public static final String ALERT_PLUGIN_UPDATE = "security:alert-plugin:update";
public static final String ALERT_PLUGIN_DELETE = "security:alert-plugin:delete";
public static final String WORKER_GROUP_CREATE = "security:worker-group:create";
public static final String WORKER_GROUP_EDIT = "security:worker-group:update";
public static final String WORKER_GROUP_DELETE = "security:worker-group:delete";
public static final String YARN_QUEUE_MANAGE = "security:queue:view";
public static final String YARN_QUEUE_CREATE = "security:queue:create";
public static final String YARN_QUEUE_UPDATE = "security:queue:update";
public static final String ENVIRONMENT_CREATE = "security:environment:create";
public static final String ENVIRONMENT_UPDATE = "security:environment:update";
public static final String ENVIRONMENT_DELETE = "security:environment:delete";
public static final String ENVIRONMENT_MANAGER = "security:environment:view";
public static final String CALENDAR_CREATE = "security:calendar:create";
public static final String CALENDAR_EDIT = "security:calendar:update";
public static final String CALENDAR_DELETE = "security:calendar:delete";
public static final String CARDS_CREATE = "security:cards:create";
public static final String CARDS_EDIT = "security:cards:update";
public static final String CARDS_EDIT_VALUE = "security:cards:value";
public static final String CARDS_CARDS_DELETE = "security:cards:delete";
public static final String ALARM_GROUP_MANAGE = "security:alert-group:view";
public static final String ALARM_INSTANCE_MANAGE = "security:alert-plugin:view";
public static final String WORKER_GROUP_MANAGE = "security:worker-group:view";
public static final String CALENDAR_MANAGE = "security:calendar:view";
public static final String CARDS_MANAGER = "security:cards:view";
public static final String USER_MANAGER = "security:user:view";

public static final String PROJECT = "project:view";
Expand All @@ -70,80 +53,47 @@ public class ApiFuncIdentificationConstant {
public static final String PROJECT_DELETE = "project:delete";
public static final String WORKFLOW_DEFINITION = "project:definition:list";
public static final String WORKFLOW_CREATE = "project:definition:create";
public static final String WORKFLOW_IMPORT = "project:definition:import";
public static final String WORKFLOW_UPDATE = "project:definition:update";
public static final String WORKFLOW_START = "project:executors:start";
public static final String TIMING = "project:schedules:timing";
public static final String WORKFLOW_ONLINE_OFFLINE = "project:definition:release";
public static final String WORKFLOW_COPY = "project:definition:copy";
public static final String CRON_MANAGE = "project:schedules:corn";
public static final String WORKFLOW_DELETE = "project:definition:delete";
public static final String WORKFLOW_TREE_VIEW = "project:definition:view-tree";
public static final String WORKFLOW_EXPORT = "project:definition:export";
public static final String WORKFLOW_BATCH_COPY = "project:definition:batch-copy";
public static final String WORKFLOW_DEFINITION_EXPORT = "project:definition:batch-export";
public static final String WORKFLOW_DEFINITION_BATCH_DELETE = "project:definition:batch-delete";
public static final String WORKFLOW_SWITCH_TO_THIS_VERSION = "project:definition:version:switch";
public static final String WORKFLOW_DEFINITION_DELETE = "project:definition:version:delete";
public static final String WORKFLOW_SAVE = "project:definition:verify-name";
public static final String WORKFLOW_INSTANCE = "project:process-instance:list";
public static final String RERUN = "project:executors:execute";
public static final String FAILED_TO_RETRY = "project:executors:retry";
public static final String STOP = "project:executors:stop";
public static final String RECOVERY_SUSPEND = "project:executors:recover";
public static final String PAUSE = "project:executors:pause";
public static final String INSTANCE_DELETE = "project:process-instance:delete";
public static final String INSTANCE_BATCH_DELETE = "project:process-instance:batch-delete";
public static final String FORCED_SUCCESS = "project:task-instance:force-success";
public static final String VIEW_LOG = "project:log:detail";
public static final String DOWNLOAD_LOG = "project:log:download-log";
public static final String PROJECT_OVERVIEW = "project:overview:view";
public static final String WORKFLOW_RELATION = "project:lineages:view";
public static final String WORKFLOW_DEFINITION_VIEW = "project:definition:view";
public static final String WORKFLOW_INSTANCE_VIEW = "project:process-instance:view";
public static final String TASK_INSTANCE = "project:task-instance:view";
public static final String INSTANCE_UPDATE = "project:process-instance:update";
public static final String VERSION_LIST = "project:version:list";
public static final String TASK_DEFINITION = "project:task-definition:view";
public static final String TASK_DEFINITION_CREATE = "project:task-definition:create";
public static final String TASK_DEFINITION_UPDATE = "project:task-definition:edit";
public static final String TASK_DEFINITION_MOVE = "project:task-definition:move";
public static final String TASK_VERSION_VIEW = "project:task-definition:version";
public static final String TASK_DEFINITION_DELETE = "project:task-definition:delete";
public static final String VERSION_DELETE = "project:version:delete";

public static final String DATASOURCE = "datasource:view";
public static final String DATASOURCE_CREATE_DATASOURCE = "datasource:create";
public static final String DATASOURCE_UPDATE = "datasource:update";
public static final String DATASOURCE_DELETE = "datasource:delete";
public static final String DATASOURCE_LIST = "datasource:list";
public static final String DATASOURCE_PARAM_VIEW = "datasource:param-view";

public static final String FILE_VIEW = "resources:file:view";
public static final String FOLDER_ONLINE_CREATE = "resources:file:create";
public static final String FILE_ONLINE_CREATE = "resources:file:online-create";
public static final String FILE_UPLOAD = "resources:file:upload";
public static final String FILE_UPDATE = "resources:file:update-content";
public static final String FILE_RENAME = "resources:file:rename";
public static final String FILE_DOWNLOAD = "resources:file:download";
public static final String FILE_DELETE = "resources:file:delete";

public static final String TASK_GROUP_VIEW = "resources:task-group:view";
public static final String TASK_GROUP_CREATE = "resources:task-group:create";
public static final String TASK_GROUP_CLOSE = "resources:task-group:close";
public static final String TASK_GROUP_EDIT = "resources:task-group:update";
public static final String TASK_GROUP_VIEW_QUEUE = "resources:task-group:queue-view";

public static final String TASK_GROUP_QUEUE = "resources:task-group-queue:view";
public static final String TASK_GROUP_QUEUE_PRIORITY = "resources:task-group-queue:priority";
public static final String TASK_GROUP_QUEUE_START = "resources:task-group-queue:start";

public static final String MONITOR_MASTER_VIEW = "monitor:masters:view";
public static final String MONITOR_WORKER_VIEW = "monitor:workers:view";
public static final String MONITOR_DATABASES_VIEW = "monitor:databases:view";

public static final String MONITOR_STATISTICS_VIEW = "monitor:statistics:view";

public final static Map<ExecuteType, String> map = new HashMap<ExecuteType, String>();

static {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,6 @@
@Data
public class GanttDto {

/**
* height
*/
private int height;

/**
* tasks list
*/
Expand All @@ -52,18 +47,4 @@ public GanttDto() {
taskStatus.put("success", "success");
}

public GanttDto(int height, List<Task> tasks, List<Long> taskNames) {
this();
this.height = height;
this.tasks = tasks;
this.taskNames = taskNames;
}

public GanttDto(int height, List<Task> tasks, List<Long> taskNames, Map<String, String> taskStatus) {
this.height = height;
this.tasks = tasks;
this.taskNames = taskNames;
this.taskStatus = taskStatus;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,6 @@ public class TaskRelationFilterRequest extends PageQueryDto {
@Schema(example = "1234567890123")
private long postTaskCode;

public TaskRelationFilterRequest(long workflowCode, long preTaskCode, long postTaskCode) {
this.workflowCode = workflowCode;
this.preTaskCode = preTaskCode;
this.postTaskCode = postTaskCode;
}

public TaskRelationFilterRequest(long preTaskCode, long postTaskCode) {
this.preTaskCode = preTaskCode;
this.postTaskCode = postTaskCode;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,6 @@ public class Instance {

private long subflowCode;

public Instance() {
}

public Instance(int id, String name, long code, String type) {
this.id = id;
this.name = name;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,13 @@ public enum ExecuteType {

/**
* operation type
* 0 none
* 1 repeat running
* 2 resume pause
* 3 resume failure
* 4 stop
* 5 pause
* 6 execute task
*/
NONE(0, "NONE"),

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,12 @@
import org.apache.dolphinscheduler.common.model.Server;
import org.apache.dolphinscheduler.common.utils.DateUtils;
import org.apache.dolphinscheduler.dao.entity.WorkflowDefinition;
import org.apache.dolphinscheduler.dao.repository.CommandDao;
import org.apache.dolphinscheduler.extract.base.client.Clients;
import org.apache.dolphinscheduler.extract.master.IWorkflowControlClient;
import org.apache.dolphinscheduler.extract.master.transportor.workflow.WorkflowBackfillTriggerRequest;
import org.apache.dolphinscheduler.extract.master.transportor.workflow.WorkflowBackfillTriggerResponse;
import org.apache.dolphinscheduler.registry.api.RegistryClient;
import org.apache.dolphinscheduler.registry.api.enums.RegistryNodeType;
import org.apache.dolphinscheduler.service.process.ProcessService;

import java.time.ZonedDateTime;
import java.util.ArrayList;
Expand All @@ -51,12 +49,6 @@
@Component
public class BackfillWorkflowExecutorDelegate implements IExecutorDelegate<BackfillWorkflowDTO, List<Integer>> {

@Autowired
private CommandDao commandDao;

@Autowired
private ProcessService processService;

@Autowired
private RegistryClient registryClient;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import org.apache.dolphinscheduler.common.enums.AuthorizationType;
import org.apache.dolphinscheduler.common.enums.UserType;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.plugin.task.api.model.ResourceInfo;
import org.apache.dolphinscheduler.service.exceptions.ServiceException;
import org.apache.dolphinscheduler.service.process.ProcessService;

Expand All @@ -36,6 +35,7 @@ public class PermissionCheck<T> {
* logger
*/
private Logger logger;

/**
* Authorization Type
*/
Expand All @@ -51,11 +51,6 @@ public class PermissionCheck<T> {
*/
private T[] needChecks;

/**
* resoruce info
*/
private List<ResourceInfo> resourceList;

/**
* user id
*/
Expand Down Expand Up @@ -86,14 +81,6 @@ public void setUserId(int userId) {
this.userId = userId;
}

public List<ResourceInfo> getResourceList() {
return resourceList;
}

public void setResourceList(List<ResourceInfo> resourceList) {
this.resourceList = resourceList;
}

/**
* check permission
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,10 @@
import org.apache.dolphinscheduler.api.service.WorkflowDefinitionService;
import org.apache.dolphinscheduler.common.constants.Constants;
import org.apache.dolphinscheduler.common.enums.CommandType;
import org.apache.dolphinscheduler.common.enums.ComplementDependentMode;
import org.apache.dolphinscheduler.common.enums.ExecutionOrder;
import org.apache.dolphinscheduler.common.enums.FailureStrategy;
import org.apache.dolphinscheduler.common.enums.Flag;
import org.apache.dolphinscheduler.common.enums.Priority;
import org.apache.dolphinscheduler.common.enums.ReleaseState;
import org.apache.dolphinscheduler.common.enums.RunMode;
import org.apache.dolphinscheduler.common.enums.TaskDependType;
import org.apache.dolphinscheduler.common.enums.UserType;
import org.apache.dolphinscheduler.common.enums.WarningType;
Expand All @@ -49,7 +46,6 @@
import org.apache.dolphinscheduler.dao.entity.DataSource;
import org.apache.dolphinscheduler.dao.entity.Project;
import org.apache.dolphinscheduler.dao.entity.ProjectUser;
import org.apache.dolphinscheduler.dao.entity.Queue;
import org.apache.dolphinscheduler.dao.entity.Schedule;
import org.apache.dolphinscheduler.dao.entity.TaskDefinition;
import org.apache.dolphinscheduler.dao.entity.Tenant;
Expand Down Expand Up @@ -94,11 +90,6 @@ public class PythonGateway {
private static final Priority DEFAULT_PRIORITY = Priority.MEDIUM;
private static final Long DEFAULT_ENVIRONMENT_CODE = -1L;

private static final TaskDependType DEFAULT_TASK_DEPEND_TYPE = TaskDependType.TASK_POST;
private static final RunMode DEFAULT_RUN_MODE = RunMode.RUN_MODE_SERIAL;
private static final ExecutionOrder DEFAULT_EXECUTION_ORDER = ExecutionOrder.DESC_ORDER;
private static final int DEFAULT_DRY_RUN = 0;
private static final ComplementDependentMode COMPLEMENT_DEPENDENT_MODE = ComplementDependentMode.OFF_MODE;
// We use admin user's user_id to skip some permission issue from python gateway service
private static final int ADMIN_USER_ID = 1;

Expand Down Expand Up @@ -160,14 +151,6 @@ public class PythonGateway {
}
};

private final Queue queuePythonGateway = new Queue() {

{
setId(Integer.MAX_VALUE);
setQueueName("queuePythonGateway");
}
};

public String ping() {
return "PONG";
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@

package org.apache.dolphinscheduler.api.service;

import org.apache.dolphinscheduler.api.dto.task.TaskFilterRequest;
import org.apache.dolphinscheduler.api.utils.PageInfo;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.enums.ReleaseState;
import org.apache.dolphinscheduler.dao.entity.TaskDefinition;
Expand Down Expand Up @@ -54,16 +52,6 @@ Map<String, Object> queryTaskDefinitionByName(User loginUser,
TaskDefinition getTaskDefinition(User loginUser,
long taskCode);

/**
* Get resource task definition according to query parameter
*
* @param loginUser login user
* @param taskFilterRequest taskFilterRequest
* @return PageResourceResponse from condition
*/
PageInfo<TaskDefinition> filterTaskDefinition(User loginUser,
TaskFilterRequest taskFilterRequest);

/**
* update task definition and upstream
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.enums.TaskExecuteType;
import org.apache.dolphinscheduler.dao.entity.TaskInstance;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus;

Expand Down Expand Up @@ -90,15 +89,5 @@ void forceTaskSuccess(User loginUser,
*/
Result stopTask(User loginUser, long projectCode, Integer taskInstanceId);

/**
* query taskInstance by taskInstanceCode
*
* @param loginUser login user
* @param projectCode project code
* @param taskInstanceId taskInstance id
* @return the result code and msg
*/
TaskInstance queryTaskInstanceById(User loginUser, long projectCode, Long taskInstanceId);

void deleteByWorkflowInstanceId(Integer workflowInstanceId);
}
Original file line number Diff line number Diff line change
Expand Up @@ -51,18 +51,6 @@ Map<String, Object> queryWorkflowInstanceById(User loginUser,
long projectCode,
Integer workflowInstanceId);

WorkflowInstance queryByWorkflowInstanceIdThrowExceptionIfNotFound(Integer workflowInstanceId);

/**
* query workflow instance by id
*
* @param loginUser login user
* @param workflowInstanceId workflow instance id
* @return workflow instance detail
*/
Map<String, Object> queryWorkflowInstanceById(User loginUser,
Integer workflowInstanceId);

/**
* paging query workflow instance list, filtering according to project, workflow definition, time range, keyword, workflow status
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,6 @@ public interface WorkflowLineageService {
List<DependentLineageTask> queryDependentWorkflowDefinitions(long projectCode, long workflowDefinitionCode,
Long taskCode);

int createWorkflowLineage(List<WorkflowTaskLineage> workflowTaskLineages);

/**
* Replace the lineage of given workflow definition by new lineage list.
* When the list is empty, existing lineage data will be deleted.
Expand Down
Loading
Loading