Merge 848f48f into 49d04de

apache · Mar 21, 2024 · dfaf872 · dfaf872
2 parents 49d04de + 848f48f
commit dfaf872
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 54 deletions.
diff --git a/...duler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java b/...duler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java
@@ -199,22 +199,6 @@ ProcessInstance queryLastSchedulerProcess(@Param("processDefinitionCode") Long d
                                               @Param("endTime") Date endTime,
                                               @Param("testFlag") int testFlag);
 
-    /**
-     * query last running process instance
-     *
-     * @param definitionCode definitionCode
-     * @param startTime      startTime
-     * @param endTime        endTime
-     * @param testFlag       testFlag
-     * @param stateArray     stateArray
-     * @return process instance
-     */
-    ProcessInstance queryLastRunningProcess(@Param("processDefinitionCode") Long definitionCode,
-                                            @Param("startTime") Date startTime,
-                                            @Param("endTime") Date endTime,
-                                            @Param("testFlag") int testFlag,
-                                            @Param("states") int[] stateArray);
-
     /**
      * query last manual process instance
      *

diff --git a/...r-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml b/...r-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
@@ -206,23 +206,6 @@
         </if>
         order by end_time desc limit 1
     </select>
-    <select id="queryLastRunningProcess" resultType="org.apache.dolphinscheduler.dao.entity.ProcessInstance">
-        select
-        <include refid="baseSql"/>
-        from t_ds_process_instance
-        where process_definition_code=#{processDefinitionCode} and test_flag=#{testFlag}
-        <if test="states !=null and states.length != 0">
-            and state in
-            <foreach collection="states" item="i" index="index" open="(" separator="," close=")">
-                #{i}
-            </foreach>
-        </if>
-        <if test="startTime!=null and endTime != null ">
-            and ((schedule_time <![CDATA[ >= ]]> #{startTime} and schedule_time <![CDATA[ <= ]]> #{endTime})
-            or (start_time <![CDATA[ >= ]]> #{startTime} and start_time <![CDATA[ <= ]]> #{endTime}))
-        </if>
-        order by start_time desc limit 1
-    </select>
     <select id="queryLastManualProcess" resultType="org.apache.dolphinscheduler.dao.entity.ProcessInstance">
         select t1.*
         from

diff --git a/...r-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java b/...r-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java
@@ -269,27 +269,6 @@ public void testQueryLastSchedulerProcess() {
         processInstanceMapper.deleteById(processInstance.getId());
     }
 
-    /**
-     * test query last running process instance
-     */
-    @Test
-    public void testQueryLastRunningProcess() {
-        ProcessInstance processInstance = insertOne();
-        processInstance.setState(WorkflowExecutionStatus.RUNNING_EXECUTION);
-        processInstanceMapper.updateById(processInstance);
-
-        int[] stateArray = new int[]{
-                WorkflowExecutionStatus.RUNNING_EXECUTION.ordinal(),
-                WorkflowExecutionStatus.SUBMITTED_SUCCESS.ordinal()};
-
-        ProcessInstance processInstance1 = processInstanceMapper
-                .queryLastRunningProcess(processInstance.getProcessDefinitionCode(), null, null,
-                        processInstance.getTestFlag(), stateArray);
-
-        Assertions.assertNotEquals(null, processInstance1);
-        processInstanceMapper.deleteById(processInstance.getId());
-    }
-
     /**
      * test query last manual process instance
      */