[dolphinscheduler] branch dev updated: [Improvement][dao] Optimized countInstanceStateByProjectCodes (#13273)

[we...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

wenjun 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 5077fa6aae [Improvement][dao] Optimized countInstanceStateByProjectCodes (#13273)
5077fa6aae is described below

commit 5077fa6aaef436e24615ca2fef9819044df13398
Author: 陈家名 <13...@163.com>
AuthorDate: Wed Dec 28 14:31:21 2022 +0800

    [Improvement][dao] Optimized countInstanceStateByProjectCodes (#13273)
---
 .../apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.xml    | 6 ++----
 .../org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml   | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

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 ce4e35aac9..a9fb446307 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
@@ -178,14 +178,12 @@
         select t.state, count(0) as count
         from t_ds_process_instance t
         join t_ds_process_definition d on d.code=t.process_definition_code
-        join t_ds_project p on p.code=d.project_code
-        where 1 = 1
-        and t.is_sub_process = 0
+        where t.is_sub_process = 0
         <if test="startTime != null and endTime != null">
             and t.start_time <![CDATA[ >= ]]> #{startTime} and t.start_time <![CDATA[ <= ]]> #{endTime}
         </if>
         <if test="projectCodes != null and projectCodes.length != 0">
-            and p.code in
+            and d.project_code in
             <foreach collection="projectCodes" index="index" item="i" open="(" close=")" separator=",">
                 #{i}
             </foreach>
diff --git a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
index 306bb7f49a..9603070dc0 100644
--- a/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
+++ b/dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
@@ -123,7 +123,6 @@
         state, count(0) as count
         from t_ds_task_instance t
         left join t_ds_task_definition_log d on d.code=t.task_code and d.version=t.task_definition_version
-        left join t_ds_project p on p.code=d.project_code
         where 1=1
         <if test="states != null and states.size != 0">
             and t.state in