This is an automated email from the ASF dual-hosted git repository.
chufenggao 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 023c22c340 remove unused method (#15743)
023c22c340 is described below
commit 023c22c3407871092ebe1f2f9db6f3072233a136
Author: Eric Gao <[email protected]>
AuthorDate: Thu Mar 21 11:54:26 2024 +0800
remove unused method (#15743)
Co-authored-by: xiangzihao <[email protected]>
---
.../dao/mapper/ProcessInstanceMapper.java | 16 ----------------
.../dao/mapper/ProcessInstanceMapper.xml | 17 -----------------
.../dao/mapper/ProcessInstanceMapperTest.java | 21 ---------------------
3 files changed, 54 deletions(-)
diff --git
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java
index 509bf7ca4d..a0a81374f5 100644
---
a/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java
+++
b/dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java
@@ -199,22 +199,6 @@ public interface ProcessInstanceMapper extends
BaseMapper<ProcessInstance> {
@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/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
index 80c008d0fd..baeb5f90a7 100644
---
a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml
+++
b/dolphinscheduler-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/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java
b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java
index 1a6049aeb1..39b8d04e4d 100644
---
a/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java
+++
b/dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapperTest.java
@@ -269,27 +269,6 @@ public class ProcessInstanceMapperTest extends BaseDaoTest
{
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
*/
