[Feature][JsonSplit-api]remove unuse field (#5955)

* check has cycle of ProcessDefinition

* checkProcessNode of processDefinition

* TaskInstance api

* Replace projectName with projectCode in ProcessInstance api

* ProcessInstance api

* ProcessInstance api

* remove unuse field

Co-authored-by: JinyLeeChina <297062848@qq.com>

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java

@@ -307,7 +307,7 @@ public class ProcessDefinitionController extends BaseController {
     public Result switchProcessDefinitionVersion(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                                  @ApiParam(name = "projectCode", value = "PROJECT_CODE", required = true) @PathVariable long projectCode,
                                                  @RequestParam(value = "processDefinitionId") int processDefinitionId,
-                                                 @RequestParam(value = "version") long version) {
+                                                 @RequestParam(value = "version") int version) {
         Map<String, Object> result = processDefinitionService.switchProcessDefinitionVersion(loginUser, projectCode, processDefinitionId, version);
         return returnDataList(result);
     }
@@ -333,7 +333,7 @@ public class ProcessDefinitionController extends BaseController {
     public Result deleteProcessDefinitionVersion(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
                                                  @ApiParam(name = "projectCode", value = "PROJECT_CODE", required = true) @PathVariable long projectCode,
                                                  @RequestParam(value = "processDefinitionId") int processDefinitionId,
-                                                 @RequestParam(value = "version") long version) {
+                                                 @RequestParam(value = "version") int version) {
         Map<String, Object> result = processDefinitionService.deleteByProcessDefinitionIdAndVersion(loginUser, projectCode, processDefinitionId, version);
         return returnDataList(result);
     }

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java

@@ -291,7 +291,7 @@ public interface ProcessDefinitionService {
     Map<String, Object> switchProcessDefinitionVersion(User loginUser,
                                                        long projectCode,
                                                        int processDefinitionId,
-                                                       long version);
+                                                       int version);
 
     /**
      * query the pagination versions info by one certain process definition code
@@ -321,6 +321,6 @@ public interface ProcessDefinitionService {
     Map<String, Object> deleteByProcessDefinitionIdAndVersion(User loginUser,
                                                               long projectCode,
                                                               int processDefinitionId,
-                                                              long version);
+                                                              int version);
 }
 

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

@@ -324,15 +324,11 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
                 page, searchVal, userId, project.getCode(), isAdmin(loginUser));
 
         List<ProcessDefinition> records = processDefinitionIPage.getRecords();
-
         for (ProcessDefinition pd : records) {
-            ProcessDefinitionLog processDefinitionLog = processDefinitionLogMapper.queryMaxVersionDefinitionLog(pd.getCode());
-            int operator = processDefinitionLog.getOperator();
-            User user = userMapper.selectById(operator);
+            ProcessDefinitionLog processDefinitionLog = processDefinitionLogMapper.queryByDefinitionCodeAndVersion(pd.getCode(), pd.getVersion());
+            User user = userMapper.selectById(processDefinitionLog.getOperator());
             pd.setModifyBy(user.getUserName());
-            pd.setProjectId(project.getId());
         }
-
         processDefinitionIPage.setRecords(records);
 
         PageInfo<ProcessDefinition> pageInfo = new PageInfo<>(pageNo, pageSize);
@@ -1264,7 +1260,7 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
      * @return switch process definition version result code
      */
     @Override
-    public Map<String, Object> switchProcessDefinitionVersion(User loginUser, long projectCode, int processDefinitionId, long version) {
+    public Map<String, Object> switchProcessDefinitionVersion(User loginUser, long projectCode, int processDefinitionId, int version) {
         Project project = projectMapper.queryByCode(projectCode);
         //check user access for project
         Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, project.getName());
@@ -1375,7 +1371,7 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
      * @return delele result code
      */
     @Override
-    public Map<String, Object> deleteByProcessDefinitionIdAndVersion(User loginUser, long projectCode, int processDefinitionId, long version) {
+    public Map<String, Object> deleteByProcessDefinitionIdAndVersion(User loginUser, long projectCode, int processDefinitionId, int version) {
         Project project = projectMapper.queryByCode(projectCode);
         //check user access for project
         Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, project.getName());
@@ -1391,6 +1387,5 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
             putMsg(result, Status.SUCCESS);
         }
         return result;
-
     }
 }

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java

@@ -640,7 +640,6 @@ public class ProcessDefinitionServiceTest {
         processDefinition.setId(46);
         processDefinition.setProjectCode(1L);
         processDefinition.setName("test_pdf");
-        processDefinition.setProjectId(2);
         processDefinition.setTenantId(1);
         processDefinition.setDescription("");
         processDefinition.setCode(46L);

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java

@@ -570,7 +570,6 @@ public class ProcessInstanceServiceTest {
         processDefinition.setVersion(1);
         processDefinition.setId(46);
         processDefinition.setName("test_pdf");
-        processDefinition.setProjectId(2);
         processDefinition.setProjectCode(2L);
         processDefinition.setTenantId(1);
         processDefinition.setDescription("");

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProjectServiceTest.java

@@ -390,7 +390,7 @@ public class ProjectServiceTest {
     private List<ProcessDefinition> getProcessDefinitions() {
         List<ProcessDefinition> list = new ArrayList<>();
         ProcessDefinition processDefinition = new ProcessDefinition();
-        processDefinition.setProjectId(1);
+        processDefinition.setProjectCode(1L);
         list.add(processDefinition);
         return list;
     }

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessDefinition.java

@@ -35,7 +35,6 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.fasterxml.jackson.annotation.JsonFormat;
 
-
 /**
  * process definition
  */
@@ -68,13 +67,6 @@ public class ProcessDefinition {
      */
     private ReleaseState releaseState;
 
-    /**
-     * project id
-     * TODO: delete
-     */
-    @TableField(exist = false)
-    private int projectId;
-
     /**
      * project code
      */
@@ -251,14 +243,6 @@ public class ProcessDefinition {
         this.createTime = createTime;
     }
 
-    public int getProjectId() {
-        return projectId;
-    }
-
-    public void setProjectId(int projectId) {
-        this.projectId = projectId;
-    }
-
     public Date getUpdateTime() {
         return updateTime;
     }
@@ -422,7 +406,6 @@ public class ProcessDefinition {
             + ", code=" + code
             + ", version=" + version
             + ", releaseState=" + releaseState
-            + ", projectId=" + projectId
             + ", projectCode=" + projectCode
             + ", description='" + description + '\''
             + ", globalParams='" + globalParams + '\''

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionLogMapper.java

@@ -67,8 +67,8 @@ public interface ProcessDefinitionLogMapper extends BaseMapper<ProcessDefinition
      * @param version version number
      * @return the process definition version info
      */
-    ProcessDefinitionLog queryByDefinitionCodeAndVersion(@Param("processDefinitionCode") long processDefinitionCode,
-                                                         @Param("version") long version);
+    ProcessDefinitionLog queryByDefinitionCodeAndVersion(@Param("code") long processDefinitionCode,
+                                                         @Param("version") int version);
     
     /**
      * query the paging process definition version list by pagination info
@@ -87,5 +87,5 @@ public interface ProcessDefinitionLogMapper extends BaseMapper<ProcessDefinition
      * @param version version number
      * @return delete result
      */
-    int deleteByProcessDefinitionCodeAndVersion(@Param("processDefinitionCode") long processDefinitionCode, @Param("version") long version);
+    int deleteByProcessDefinitionCodeAndVersion(@Param("processDefinitionCode") long processDefinitionCode, @Param("version") int version);
 }

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.java

@@ -164,23 +164,4 @@ public interface ProcessDefinitionMapper extends BaseMapper<ProcessDefinition> {
      * @return project ids list
      */
     List<Integer> listProjectIds();
-
-    /**
-     * query the paging process definition version list by pagination info
-     *
-     * @param page pagination info
-     * @param processDefinitionCode process definition code
-     * @return the paging process definition version list
-     */
-    IPage<ProcessDefinitionLog> queryProcessDefinitionVersionsPaging(Page<ProcessDefinitionLog> page,
-                                                                     @Param("processDefinitionCode") long processDefinitionCode);
-
-    /**
-     * query has associated definition by id and version
-     *
-     * @param processDefinitionId process definition id
-     * @param version version
-     * @return definition id
-     */
-    Integer queryHasAssociatedDefinitionByIdAndVersion(@Param("processDefinitionId") int processDefinitionId, @Param("version") long version);
 }

dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessDefinitionMapper.xml

@@ -163,11 +163,4 @@
         SELECT DISTINCT(id) as project_id
         FROM t_ds_project
     </select>
-
-    <select id="queryHasAssociatedDefinitionByIdAndVersion" resultType="java.lang.Integer">
-        select id
-        from t_ds_process_definition
-        where id = #{processDefinitionId}
-        and version = #{version} limit 1
-    </select>
 </mapper>

dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java

@@ -173,7 +173,6 @@ public class ProcessInstanceMapperTest {
 
         ProcessDefinition processDefinition = new ProcessDefinition();
         processDefinition.setCode(1L);
-        processDefinition.setProjectId(1010);
         processDefinition.setProjectCode(1L);
         processDefinition.setReleaseState(ReleaseState.ONLINE);
         processDefinition.setUpdateTime(new Date());
@@ -267,7 +266,6 @@ public class ProcessInstanceMapperTest {
 
         ProcessDefinition processDefinition = new ProcessDefinition();
         processDefinition.setCode(1L);
-        processDefinition.setProjectId(1010);
         processDefinition.setProjectCode(1L);
         processDefinition.setReleaseState(ReleaseState.ONLINE);
         processDefinition.setUpdateTime(new Date());

dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ScheduleMapperTest.java

@@ -133,7 +133,6 @@ public class ScheduleMapperTest {
         ProcessDefinition processDefinition = new ProcessDefinition();
         processDefinition.setCode(1L);
         processDefinition.setProjectCode(project.getCode());
-        processDefinition.setProjectId(project.getId());
         processDefinition.setUserId(user.getId());
         processDefinition.setLocations("");
         processDefinition.setCreateTime(new Date());
@@ -172,7 +171,6 @@ public class ScheduleMapperTest {
         ProcessDefinition processDefinition = new ProcessDefinition();
         processDefinition.setCode(1L);
         processDefinition.setProjectCode(project.getCode());
-        processDefinition.setProjectId(project.getId());
         processDefinition.setUserId(user.getId());
         processDefinition.setLocations("");
         processDefinition.setCreateTime(new Date());

dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java

@@ -323,7 +323,6 @@ public class TaskInstanceMapperTest {
         TaskInstance task = insertTaskInstance(processInstance.getId());
         ProcessDefinition definition = new ProcessDefinition();
         definition.setCode(1111L);
-        definition.setProjectId(1111);
         definition.setProjectCode(1111L);
         definition.setCreateTime(new Date());
         definition.setUpdateTime(new Date());
@@ -348,7 +347,6 @@ public class TaskInstanceMapperTest {
     public void testQueryTaskInstanceListPaging() {
         ProcessDefinition definition = new ProcessDefinition();
         definition.setCode(1L);
-        definition.setProjectId(1111);
         definition.setProjectCode(1111L);
         definition.setCreateTime(new Date());
         definition.setUpdateTime(new Date());

dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/consumer/TaskPriorityQueueConsumerTest.java

@@ -106,7 +106,6 @@ public class TaskPriorityQueueConsumerTest {
 
         ProcessDefinition processDefinition = new ProcessDefinition();
         processDefinition.setUserId(2);
-        processDefinition.setProjectId(1);
         taskInstance.setProcessDefine(processDefinition);
 
         Mockito.doReturn(taskInstance).when(processService).getTaskInstanceDetailByTaskId(1);
@@ -136,7 +135,6 @@ public class TaskPriorityQueueConsumerTest {
 
         ProcessDefinition processDefinition = new ProcessDefinition();
         processDefinition.setUserId(2);
-        processDefinition.setProjectId(1);
         taskInstance.setProcessDefine(processDefinition);
         Mockito.doReturn(taskInstance).when(processService).getTaskInstanceDetailByTaskId(1);
         TaskPriority taskPriority = new TaskPriority(2, 1, 2, 1, "default");
@@ -179,7 +177,6 @@ public class TaskPriorityQueueConsumerTest {
 
         ProcessDefinition processDefinition = new ProcessDefinition();
         processDefinition.setUserId(2);
-        processDefinition.setProjectId(1);
         taskInstance.setProcessDefine(processDefinition);
         Mockito.doReturn(taskInstance).when(processService).getTaskInstanceDetailByTaskId(1);
         TaskPriority taskPriority = new TaskPriority(2, 1, 2, 1, "default");
@@ -220,7 +217,6 @@ public class TaskPriorityQueueConsumerTest {
 
         ProcessDefinition processDefinition = new ProcessDefinition();
         processDefinition.setUserId(2);
-        processDefinition.setProjectId(1);
         taskInstance.setProcessDefine(processDefinition);
         Mockito.doReturn(taskInstance).when(processService).getTaskInstanceDetailByTaskId(1);
         TaskPriority taskPriority = new TaskPriority(2, 1, 2, 1, "default");
@@ -280,7 +276,6 @@ public class TaskPriorityQueueConsumerTest {
 
         ProcessDefinition processDefinition = new ProcessDefinition();
         processDefinition.setUserId(2);
-        processDefinition.setProjectId(1);
         taskInstance.setProcessDefine(processDefinition);
 
         Mockito.doReturn(taskInstance).when(processService).getTaskInstanceDetailByTaskId(1);
@@ -459,7 +454,6 @@ public class TaskPriorityQueueConsumerTest {
 
         ProcessDefinition processDefinition = new ProcessDefinition();
         processDefinition.setUserId(2);
-        processDefinition.setProjectId(1);
         taskInstance.setProcessDefine(processDefinition);
 
         Mockito.doReturn(taskInstance).when(processService).getTaskInstanceDetailByTaskId(1);