Skip to content

Commit 763fcf2

Browse files
SbloodySSbloodyS
authored
Merge branch 'dev' into fix-18074-sql-parameter-type-passing
2 parents bb2b244 + daea87b commit 763fcf2

51 files changed

Lines changed: 677 additions & 484 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ProjectAuditOperatorImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import org.apache.dolphinscheduler.api.audit.operator.BaseAuditOperator;
2121
import org.apache.dolphinscheduler.dao.entity.Project;
22-
import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
22+
import org.apache.dolphinscheduler.dao.repository.ProjectDao;
2323

2424
import lombok.extern.slf4j.Slf4j;
2525

@@ -31,7 +31,7 @@
3131
public class ProjectAuditOperatorImpl extends BaseAuditOperator {
3232

3333
@Autowired
34-
private ProjectMapper projectMapper;
34+
private ProjectDao projectDao;
3535

3636
@Override
3737
protected String getObjectNameFromIdentity(Object identity) {
@@ -40,7 +40,7 @@ protected String getObjectNameFromIdentity(Object identity) {
4040
return "";
4141
}
4242

43-
Project obj = projectMapper.queryByCode(objId);
43+
Project obj = projectDao.queryByCode(objId);
4444
return obj == null ? "" : obj.getName();
4545
}
4646
}

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/ScheduleAuditOperatorImpl.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@
2525
import org.apache.dolphinscheduler.dao.entity.AuditLog;
2626
import org.apache.dolphinscheduler.dao.entity.Schedule;
2727
import org.apache.dolphinscheduler.dao.entity.WorkflowDefinition;
28-
import org.apache.dolphinscheduler.dao.mapper.ScheduleMapper;
29-
import org.apache.dolphinscheduler.dao.mapper.WorkflowDefinitionMapper;
28+
import org.apache.dolphinscheduler.dao.repository.ScheduleDao;
29+
import org.apache.dolphinscheduler.dao.repository.WorkflowDefinitionDao;
3030

3131
import java.util.List;
3232
import java.util.Map;
@@ -38,18 +38,18 @@
3838
public class ScheduleAuditOperatorImpl extends BaseAuditOperator {
3939

4040
@Autowired
41-
private ScheduleMapper scheduleMapper;
41+
private ScheduleDao scheduleDao;
4242

4343
@Autowired
44-
private WorkflowDefinitionMapper workflowDefinitionMapper;
44+
private WorkflowDefinitionDao workflowDefinitionDao;
4545

4646
@Override
4747
public void modifyRequestParams(String[] paramNameArr, Map<String, Object> paramsMap, List<AuditLog> auditLogList) {
4848
if (!paramNameArr[0].equals(AuditLogConstants.ID)) {
4949
return;
5050
}
5151
int id = (int) paramsMap.get(paramNameArr[0]);
52-
Schedule schedule = scheduleMapper.selectById(id);
52+
Schedule schedule = scheduleDao.queryById(id);
5353
if (schedule != null) {
5454
paramsMap.put(AuditLogConstants.CODE, schedule.getWorkflowDefinitionCode());
5555
paramNameArr[0] = AuditLogConstants.CODE;
@@ -78,7 +78,7 @@ protected String getObjectNameFromIdentity(Object identity) {
7878
return "";
7979
}
8080

81-
WorkflowDefinition obj = workflowDefinitionMapper.queryByCode(objId);
81+
WorkflowDefinition obj = workflowDefinitionDao.queryByCode(objId).orElse(null);
8282
return obj == null ? "" : obj.getName();
8383
}
8484
}

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/operator/impl/WorkflowAuditOperatorImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.apache.dolphinscheduler.common.enums.AuditOperationType;
2525
import org.apache.dolphinscheduler.dao.entity.AuditLog;
2626
import org.apache.dolphinscheduler.dao.entity.WorkflowDefinition;
27-
import org.apache.dolphinscheduler.dao.mapper.WorkflowDefinitionMapper;
27+
import org.apache.dolphinscheduler.dao.repository.WorkflowDefinitionDao;
2828

2929
import java.util.List;
3030
import java.util.Map;
@@ -36,7 +36,7 @@
3636
public class WorkflowAuditOperatorImpl extends BaseAuditOperator {
3737

3838
@Autowired
39-
private WorkflowDefinitionMapper workflowDefinitionMapper;
39+
private WorkflowDefinitionDao workflowDefinitionDao;
4040

4141
@Override
4242
public void modifyAuditOperationType(AuditType auditType, Map<String, Object> paramsMap,
@@ -71,7 +71,7 @@ protected String getObjectNameFromIdentity(Object identity) {
7171
return "";
7272
}
7373

74-
WorkflowDefinition obj = workflowDefinitionMapper.queryByCode(objId);
74+
WorkflowDefinition obj = workflowDefinitionDao.queryByCode(objId).orElse(null);
7575
return obj == null ? "" : obj.getName();
7676
}
7777
}

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,10 @@
3838
import org.apache.dolphinscheduler.dao.mapper.DataSourceMapper;
3939
import org.apache.dolphinscheduler.dao.mapper.EnvironmentMapper;
4040
import org.apache.dolphinscheduler.dao.mapper.K8sNamespaceMapper;
41-
import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
4241
import org.apache.dolphinscheduler.dao.mapper.QueueMapper;
4342
import org.apache.dolphinscheduler.dao.mapper.TaskGroupMapper;
4443
import org.apache.dolphinscheduler.dao.mapper.TenantMapper;
44+
import org.apache.dolphinscheduler.dao.repository.ProjectDao;
4545
import org.apache.dolphinscheduler.dao.repository.UserDao;
4646
import org.apache.dolphinscheduler.dao.repository.WorkerGroupDao;
4747

@@ -155,10 +155,10 @@ public Set<Integer> listAuthorizedResourceIds(int userId, Logger logger) {
155155
@Component
156156
public static class ProjectsResourcePermissionCheck implements ResourceAcquisitionAndPermissionCheck<Integer> {
157157

158-
private final ProjectMapper projectMapper;
158+
private final ProjectDao projectDao;
159159

160-
public ProjectsResourcePermissionCheck(ProjectMapper projectMapper) {
161-
this.projectMapper = projectMapper;
160+
public ProjectsResourcePermissionCheck(ProjectDao projectDao) {
161+
this.projectDao = projectDao;
162162
}
163163

164164
@Override
@@ -174,7 +174,7 @@ public boolean permissionCheck(int userId, String permissionKey, Logger logger)
174174

175175
@Override
176176
public Set<Integer> listAuthorizedResourceIds(int userId, Logger logger) {
177-
return projectMapper.listAuthorizedProjects(userId, null).stream().map(Project::getId).collect(toSet());
177+
return projectDao.listAuthorizedProjects(userId, null).stream().map(Project::getId).collect(toSet());
178178
}
179179
}
180180

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python/PythonGateway.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,11 @@
5151
import org.apache.dolphinscheduler.dao.entity.User;
5252
import org.apache.dolphinscheduler.dao.entity.WorkflowDefinition;
5353
import org.apache.dolphinscheduler.dao.mapper.DataSourceMapper;
54-
import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
5554
import org.apache.dolphinscheduler.dao.mapper.ProjectUserMapper;
56-
import org.apache.dolphinscheduler.dao.mapper.ScheduleMapper;
5755
import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper;
58-
import org.apache.dolphinscheduler.dao.mapper.WorkflowDefinitionMapper;
56+
import org.apache.dolphinscheduler.dao.repository.ProjectDao;
57+
import org.apache.dolphinscheduler.dao.repository.ScheduleDao;
58+
import org.apache.dolphinscheduler.dao.repository.WorkflowDefinitionDao;
5959
import org.apache.dolphinscheduler.plugin.storage.api.StorageEntity;
6060
import org.apache.dolphinscheduler.spi.enums.ResourceType;
6161

@@ -93,7 +93,7 @@ public class PythonGateway {
9393
private static final int ADMIN_USER_ID = 1;
9494

9595
@Autowired
96-
private WorkflowDefinitionMapper workflowDefinitionMapper;
96+
private WorkflowDefinitionDao workflowDefinitionDao;
9797

9898
@Autowired
9999
private ProjectService projectService;
@@ -120,7 +120,7 @@ public class PythonGateway {
120120
private ResourcesService resourceService;
121121

122122
@Autowired
123-
private ProjectMapper projectMapper;
123+
private ProjectDao projectDao;
124124

125125
@Autowired
126126
private TaskDefinitionMapper taskDefinitionMapper;
@@ -129,7 +129,7 @@ public class PythonGateway {
129129
private SchedulerService schedulerService;
130130

131131
@Autowired
132-
private ScheduleMapper scheduleMapper;
132+
private ScheduleDao scheduleDao;
133133

134134
@Autowired
135135
private DataSourceMapper dataSourceMapper;
@@ -172,7 +172,7 @@ public Map<String, Object> genTaskCodeList(Integer genNum) {
172172

173173
public Map<String, Long> getCodeAndVersion(String projectName, String workflowDefinitionName,
174174
String taskName) {
175-
Project project = projectMapper.queryByName(projectName);
175+
Project project = projectDao.queryByName(projectName);
176176
Map<String, Long> result = new HashMap<>();
177177
// project do not exists, mean task not exists too, so we should directly return init value
178178
if (project == null) {
@@ -182,7 +182,7 @@ public Map<String, Long> getCodeAndVersion(String projectName, String workflowDe
182182
}
183183

184184
WorkflowDefinition workflowDefinition =
185-
workflowDefinitionMapper.queryByDefineName(project.getCode(), workflowDefinitionName);
185+
workflowDefinitionDao.queryByDefineName(project.getCode(), workflowDefinitionName);
186186
// In the case project exists, but current workflow still not created, we should also return the init
187187
// version of it
188188
if (workflowDefinition == null) {
@@ -247,7 +247,7 @@ public Long createOrUpdateWorkflow(String userName,
247247
throw new RuntimeException("Can not create or update workflow for user who not related to any tenant.");
248248
}
249249

250-
Project project = projectMapper.queryByName(projectName);
250+
Project project = projectDao.queryByName(projectName);
251251
long projectCode = project.getCode();
252252

253253
WorkflowDefinition workflowDefinition = getWorkflow(user, projectCode, name);
@@ -298,7 +298,7 @@ private WorkflowDefinition getWorkflow(User user, long projectCode, String workf
298298
return null;
299299
} catch (ServiceException e) {
300300
if (e.getCode() == Status.WORKFLOW_DEFINITION_NAME_EXIST.getCode()) {
301-
return workflowDefinitionMapper.queryByDefineName(projectCode, workflowName);
301+
return workflowDefinitionDao.queryByDefineName(projectCode, workflowName);
302302
}
303303
throw e;
304304
}
@@ -326,7 +326,7 @@ private void createOrUpdateSchedule(User user,
326326
String workerGroup,
327327
String warningType,
328328
int warningGroupId) {
329-
Schedule scheduleObj = scheduleMapper.queryByWorkflowDefinitionCode(workflowCode);
329+
Schedule scheduleObj = scheduleDao.queryByWorkflowDefinitionCode(workflowCode);
330330
// create or update schedule
331331
int scheduleId;
332332
if (scheduleObj == null) {
@@ -357,9 +357,9 @@ public void execWorkflowInstance(String userName,
357357
String warningType,
358358
Integer warningGroupId) {
359359
User user = usersService.queryUser(userName);
360-
Project project = projectMapper.queryByName(projectName);
360+
Project project = projectDao.queryByName(projectName);
361361
WorkflowDefinition workflowDefinition =
362-
workflowDefinitionMapper.queryByDefineName(project.getCode(), workflowName);
362+
workflowDefinitionDao.queryByDefineName(project.getCode(), workflowName);
363363

364364
// make sure workflow online
365365
workflowDefinitionService.onlineWorkflowDefinition(user, project.getCode(), workflowDefinition.getCode());
@@ -402,7 +402,7 @@ public void createOrGrantProject(String userName, String name, String desc) {
402402
User user = usersService.queryUser(userName);
403403

404404
Project project;
405-
project = projectMapper.queryByName(name);
405+
project = projectDao.queryByName(name);
406406
if (project == null) {
407407
projectService.createProject(user, name, desc);
408408
} else if (project.getUserId() != user.getId()) {
@@ -552,7 +552,7 @@ public Map<String, Object> getWorkflowInfo(String userName, String projectName,
552552
public Map<String, Object> getDependentInfo(String projectName, String workflowName, String taskName) {
553553
Map<String, Object> result = new HashMap<>();
554554

555-
Project project = projectMapper.queryByName(projectName);
555+
Project project = projectDao.queryByName(projectName);
556556
if (project == null) {
557557
String msg = String.format("Can not find valid project by name %s", projectName);
558558
log.error(msg);
@@ -562,7 +562,7 @@ public Map<String, Object> getDependentInfo(String projectName, String workflowN
562562
result.put("projectCode", projectCode);
563563

564564
WorkflowDefinition workflowDefinition =
565-
workflowDefinitionMapper.queryByDefineName(projectCode, workflowName);
565+
workflowDefinitionDao.queryByDefineName(projectCode, workflowName);
566566
if (workflowDefinition == null) {
567567
String msg = String.format("Can not find valid workflow by name %s", workflowName);
568568
log.error(msg);

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataAnalysisServiceImpl.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
import org.apache.dolphinscheduler.dao.entity.User;
3737
import org.apache.dolphinscheduler.dao.mapper.CommandMapper;
3838
import org.apache.dolphinscheduler.dao.mapper.ErrorCommandMapper;
39-
import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
4039
import org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper;
41-
import org.apache.dolphinscheduler.dao.mapper.WorkflowDefinitionMapper;
4240
import org.apache.dolphinscheduler.dao.mapper.WorkflowInstanceMapper;
4341
import org.apache.dolphinscheduler.dao.model.TaskInstanceStatusCountDto;
4442
import org.apache.dolphinscheduler.dao.model.WorkflowDefinitionCountDto;
4543
import org.apache.dolphinscheduler.dao.model.WorkflowInstanceStatusCountDto;
44+
import org.apache.dolphinscheduler.dao.repository.ProjectDao;
45+
import org.apache.dolphinscheduler.dao.repository.WorkflowDefinitionDao;
4646

4747
import org.apache.commons.collections4.CollectionUtils;
4848

@@ -70,7 +70,7 @@
7070
public class DataAnalysisServiceImpl extends BaseServiceImpl implements DataAnalysisService {
7171

7272
@Autowired
73-
private ProjectMapper projectMapper;
73+
private ProjectDao projectDao;
7474

7575
@Autowired
7676
private ProjectService projectService;
@@ -79,7 +79,7 @@ public class DataAnalysisServiceImpl extends BaseServiceImpl implements DataAnal
7979
private WorkflowInstanceMapper workflowInstanceMapper;
8080

8181
@Autowired
82-
private WorkflowDefinitionMapper workflowDefinitionMapper;
82+
private WorkflowDefinitionDao workflowDefinitionDao;
8383

8484
@Autowired
8585
private CommandMapper commandMapper;
@@ -151,7 +151,7 @@ public WorkflowInstanceCountVO getAllWorkflowInstanceStateCount(User loginUser,
151151
public WorkflowDefinitionCountVO getWorkflowDefinitionCountByProject(User loginUser, Long projectCode) {
152152
projectService.checkProjectAndAuthThrowException(loginUser, projectCode, PROJECT_OVERVIEW);
153153
List<WorkflowDefinitionCountDto> workflowDefinitionCounts =
154-
workflowDefinitionMapper.countDefinitionByProjectCodes(Lists.newArrayList(projectCode));
154+
workflowDefinitionDao.countDefinitionByProjectCodes(Lists.newArrayList(projectCode));
155155
return WorkflowDefinitionCountVO.of(workflowDefinitionCounts);
156156
}
157157

@@ -161,7 +161,7 @@ public WorkflowDefinitionCountVO getAllWorkflowDefinitionCount(User loginUser) {
161161
if (CollectionUtils.isEmpty(projectCodes)) {
162162
return WorkflowDefinitionCountVO.empty();
163163
}
164-
return WorkflowDefinitionCountVO.of(workflowDefinitionMapper.countDefinitionByProjectCodes(projectCodes));
164+
return WorkflowDefinitionCountVO.of(workflowDefinitionDao.countDefinitionByProjectCodes(projectCodes));
165165
}
166166

167167
@Override
@@ -250,7 +250,7 @@ private List<Long> getAuthDefinitionCodes(User loginUser, Long projectCode) {
250250
if (CollectionUtils.isEmpty(projectIds)) {
251251
return Collections.emptyList();
252252
}
253-
List<Long> projectCodes = projectMapper.selectBatchIds(projectIds)
253+
List<Long> projectCodes = projectDao.queryByIds(projectIds)
254254
.stream()
255255
.map(Project::getCode)
256256
.collect(Collectors.toList());
@@ -263,7 +263,7 @@ private List<Long> getAuthDefinitionCodes(User loginUser, Long projectCode) {
263263
projectCodes = Collections.singletonList(projectCode);
264264
}
265265

266-
return workflowDefinitionMapper.queryDefinitionCodeListByProjectCodes(projectCodes);
266+
return workflowDefinitionDao.queryDefinitionCodeListByProjectCodes(projectCodes);
267267
}
268268

269269
}

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionLogMapper;
5454
import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper;
5555
import org.apache.dolphinscheduler.dao.mapper.TaskGroupQueueMapper;
56-
import org.apache.dolphinscheduler.dao.mapper.WorkflowDefinitionMapper;
5756
import org.apache.dolphinscheduler.dao.mapper.WorkflowTaskRelationMapper;
57+
import org.apache.dolphinscheduler.dao.repository.WorkflowDefinitionDao;
5858
import org.apache.dolphinscheduler.dao.repository.WorkflowInstanceDao;
5959
import org.apache.dolphinscheduler.plugin.task.api.utils.TaskTypeUtils;
6060
import org.apache.dolphinscheduler.service.command.CommandService;
@@ -83,7 +83,7 @@ public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorServ
8383
private ProjectService projectService;
8484

8585
@Autowired
86-
private WorkflowDefinitionMapper workflowDefinitionMapper;
86+
private WorkflowDefinitionDao workflowDefinitionDao;
8787

8888
@Lazy()
8989
@Autowired
@@ -217,7 +217,7 @@ public boolean checkSubWorkflowDefinitionValid(WorkflowDefinition workflowDefini
217217
}
218218

219219
// check sub releaseState
220-
List<WorkflowDefinition> workflowDefinitions = workflowDefinitionMapper.queryByCodes(workflowDefinitionCodeSet);
220+
List<WorkflowDefinition> workflowDefinitions = workflowDefinitionDao.queryByCodes(workflowDefinitionCodeSet);
221221
return workflowDefinitions.stream()
222222
.filter(definition -> definition.getReleaseState().equals(ReleaseState.OFFLINE))
223223
.collect(Collectors.toSet())

‎dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/LoggerServiceImpl.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
import org.apache.dolphinscheduler.dao.entity.TaskDefinition;
3333
import org.apache.dolphinscheduler.dao.entity.TaskInstance;
3434
import org.apache.dolphinscheduler.dao.entity.User;
35-
import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
3635
import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper;
36+
import org.apache.dolphinscheduler.dao.repository.ProjectDao;
3737
import org.apache.dolphinscheduler.dao.repository.TaskInstanceDao;
3838

3939
import org.apache.commons.lang3.StringUtils;
@@ -57,7 +57,7 @@ public class LoggerServiceImpl extends BaseServiceImpl implements LoggerService
5757
private TaskInstanceDao taskInstanceDao;
5858

5959
@Autowired
60-
private ProjectMapper projectMapper;
60+
private ProjectDao projectDao;
6161

6262
@Autowired
6363
private ProjectService projectService;
@@ -112,7 +112,7 @@ public byte[] getLogBytes(User loginUser, int taskInstId) {
112112
if (taskInstance == null || StringUtils.isBlank(taskInstance.getHost())) {
113113
throw new ServiceException("task instance is null or host is null");
114114
}
115-
Project project = projectMapper.queryProjectByTaskInstanceId(taskInstId);
115+
Project project = projectDao.queryProjectByTaskInstanceId(taskInstId);
116116
projectService.checkProjectAndAuthThrowException(loginUser, project, DOWNLOAD_LOG);
117117
return getLogBytes(taskInstance);
118118
}

0 commit comments

Comments
 (0)