This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new dfe4945 remove processDefinition resourceIds (#6813)
dfe4945 is described below
commit dfe4945b48b319fc923c2560c1abda44d9fbded4
Author: JinYong Li <[email protected]>
AuthorDate: Fri Nov 12 11:39:16 2021 +0800
remove processDefinition resourceIds (#6813)
---
.../api/service/impl/ProcessDefinitionServiceImpl.java | 14 --------------
.../api/service/impl/TaskDefinitionServiceImpl.java | 6 ------
.../api/service/ProcessDefinitionServiceTest.java | 2 --
.../dolphinscheduler/dao/entity/ProcessDefinition.java | 15 ---------------
.../dolphinscheduler/dao/entity/ProcessDefinitionLog.java | 1 -
.../dao/mapper/ProcessDefinitionMapperTest.java | 2 --
6 files changed, 40 deletions(-)
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
index 602387d..d61463b 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
@@ -724,20 +724,6 @@ public class ProcessDefinitionServiceImpl extends
BaseServiceImpl implements Pro
switch (releaseState) {
case ONLINE:
- // To check resources whether they are already cancel
authorized or deleted
- String resourceIds = processDefinition.getResourceIds();
- if
(org.apache.commons.lang.StringUtils.isNotBlank(resourceIds)) {
- Integer[] resourceIdArray =
Arrays.stream(resourceIds.split(Constants.COMMA)).map(Integer::parseInt).toArray(Integer[]::new);
- PermissionCheck<Integer> permissionCheck = new
PermissionCheck<>(AuthorizationType.RESOURCE_FILE_ID, processService,
resourceIdArray, loginUser.getId(), logger);
- try {
- permissionCheck.checkPermission();
- } catch (Exception e) {
- logger.error(e.getMessage(), e);
- putMsg(result,
Status.RESOURCE_NOT_EXIST_OR_NO_PERMISSION, RELEASESTATE);
- return result;
- }
- }
-
processDefinition.setReleaseState(releaseState);
processDefinitionMapper.updateById(processDefinition);
break;
diff --git
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java
index cc63bbc..deed94f 100644
---
a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java
+++
b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskDefinitionServiceImpl.java
@@ -119,12 +119,6 @@ public class TaskDefinitionServiceImpl extends
BaseServiceImpl implements TaskDe
putMsg(result, Status.PROCESS_NODE_S_PARAMETER_INVALID,
taskDefinitionLog.getName());
return result;
}
- TaskDefinition taskDefinition =
taskDefinitionMapper.queryByName(projectCode, taskDefinitionLog.getName());
- if (taskDefinition != null) {
- logger.error("task definition name {} already exists",
taskDefinitionLog.getName());
- putMsg(result, Status.TASK_DEFINITION_NAME_EXISTED,
taskDefinitionLog.getName());
- return result;
- }
}
int saveTaskResult = processService.saveTaskDefine(loginUser,
projectCode, taskDefinitionLogs);
if (saveTaskResult == Constants.DEFINITION_FAILURE) {
diff --git
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
index 3714de9..7fe02eb 100644
---
a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
+++
b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
@@ -436,8 +436,6 @@ public class ProcessDefinitionServiceTest {
Assert.assertEquals(Status.SUCCESS, onlineRes.get(Constants.STATUS));
// project check auth success, processs definition online
- ProcessDefinition processDefinition1 = getProcessDefinition();
- processDefinition1.setResourceIds("1,2");
Map<String, Object> onlineWithResourceRes =
processDefinitionService.releaseProcessDefinition(
loginUser, projectCode, 46, ReleaseState.ONLINE);
Assert.assertEquals(Status.SUCCESS,
onlineWithResourceRes.get(Constants.STATUS));
diff --git
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java
index 2fbcac1..59ff3f5 100644
---
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java
+++
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java
@@ -164,12 +164,6 @@ public class ProcessDefinition {
private String modifyBy;
/**
- * resource ids
- */
- @TableField(exist = false)
- private String resourceIds;
-
- /**
* warningGroupId
*/
@TableField(exist = false)
@@ -345,14 +339,6 @@ public class ProcessDefinition {
this.scheduleReleaseState = scheduleReleaseState;
}
- public String getResourceIds() {
- return resourceIds;
- }
-
- public void setResourceIds(String resourceIds) {
- this.resourceIds = resourceIds;
- }
-
public int getTimeout() {
return timeout;
}
@@ -472,7 +458,6 @@ public class ProcessDefinition {
+ ", tenantId=" + tenantId
+ ", tenantCode='" + tenantCode + '\''
+ ", modifyBy='" + modifyBy + '\''
- + ", resourceIds='" + resourceIds + '\''
+ ", warningGroupId=" + warningGroupId
+ '}';
}
diff --git
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinitionLog.java
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinitionLog.java
index ee11ba7..9a20af3 100644
---
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinitionLog.java
+++
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinitionLog.java
@@ -65,7 +65,6 @@ public class ProcessDefinitionLog extends ProcessDefinition {
this.setTimeout(processDefinition.getTimeout());
this.setTenantId(processDefinition.getTenantId());
this.setModifyBy(processDefinition.getModifyBy());
- this.setResourceIds(processDefinition.getResourceIds());
this.setWarningGroupId(processDefinition.getWarningGroupId());
this.setExecutionType(processDefinition.getExecutionType());
}
diff --git
a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapperTest.java
b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapperTest.java
index bfdf4e6..2eebc3b 100644
---
a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapperTest.java
+++
b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapperTest.java
@@ -329,7 +329,6 @@ public class ProcessDefinitionMapperTest extends
BaseDaoTest {
@Test
public void listResourcesTest() {
ProcessDefinition processDefinition = insertOne("def 1");
- processDefinition.setResourceIds("3,5");
processDefinition.setReleaseState(ReleaseState.ONLINE);
List<Map<String, Object>> maps =
processDefinitionMapper.listResources();
Assert.assertNotNull(maps);
@@ -338,7 +337,6 @@ public class ProcessDefinitionMapperTest extends
BaseDaoTest {
@Test
public void listResourcesByUserTest() {
ProcessDefinition processDefinition = insertOne("def 1");
- processDefinition.setResourceIds("3,5");
processDefinition.setReleaseState(ReleaseState.ONLINE);
List<Map<String, Object>> maps =
processDefinitionMapper.listResourcesByUser(processDefinition.getUserId());
Assert.assertNotNull(maps);
