From c2da81493c6c035a02c2b325d261132ab45120ef Mon Sep 17 00:00:00 2001
From: fuwenkai <834260992@qq.com>
Date: Tue, 19 Mar 2024 18:05:21 +0800
Subject: [PATCH] [INLONG-9846][Manager] Optimize slow query SQL

---
 .../mappers/DataNodeEntityMapper.xml          | 20 +++++++++----------
 .../mappers/InlongGroupEntityMapper.xml       |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/DataNodeEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/DataNodeEntityMapper.xml
index f5cbe7aff3c..7e62cb562ab 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/DataNodeEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/DataNodeEntityMapper.xml
@@ -65,11 +65,11 @@
         <include refid="Base_Column_List"/>
         from data_node
         <where>
+            id = #{id, jdbcType=INTEGER}
             <if test="_isInlongService == false">
-                tenant = #{tenant,jdbcType=VARCHAR}
+                and tenant = #{tenant,jdbcType=VARCHAR}
             </if>
             and is_deleted = 0
-            and id = #{id, jdbcType=INTEGER}
         </where>
     </select>
     <select id="selectByUniqueKey" resultType="org.apache.inlong.manager.dao.entity.DataNodeEntity">
@@ -78,12 +78,12 @@
         <include refid="Base_Column_List"/>
         from data_node
         <where>
+            name = #{name, jdbcType=VARCHAR}
+            and type = #{type, jdbcType=VARCHAR}
+            and is_deleted = 0
             <if test="_isInlongService == false">
-                tenant = #{tenant,jdbcType=VARCHAR}
+                and tenant = #{tenant,jdbcType=VARCHAR}
             </if>
-            and is_deleted = 0
-            and name = #{name, jdbcType=VARCHAR}
-            and type = #{type, jdbcType=VARCHAR}
         </where>
     </select>
     <select id="selectByCondition"
@@ -94,10 +94,6 @@
         <include refid="Base_Column_List"/>
         from data_node
         <where>
-            <if test="_isInlongService == false">
-                tenant = #{tenant,jdbcType=VARCHAR}
-            </if>
-            and is_deleted = 0
             <if test="name != null and name != ''">
                 and name = #{name, jdbcType=VARCHAR}
             </if>
@@ -115,6 +111,10 @@
             <if test="status != null and status != ''">
                 and status = #{status, jdbcType=INTEGER}
             </if>
+            <if test="_isInlongService == false">
+                and tenant = #{tenant,jdbcType=VARCHAR}
+            </if>
+            and is_deleted = 0
         </where>
         order by modify_time desc
     </select>
diff --git a/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml b/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
index 4d373f00020..b97475c58fe 100644
--- a/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
+++ b/inlong-manager/manager-dao/src/main/resources/mappers/InlongGroupEntityMapper.xml
@@ -241,10 +241,10 @@
         from inlong_group
         <where>
             inlong_group_id = #{groupId, jdbcType=VARCHAR}
+            and is_deleted = 0
             <if test="_isInlongService == false">
                 and tenant = #{tenant,jdbcType=VARCHAR}
             </if>
-            and is_deleted = 0
         </where>
     </select>
     <select id="selectByGroupIdForUpdate" resultMap="BaseResultMap">
@@ -254,10 +254,10 @@
         from inlong_group
         <where>
             inlong_group_id = #{groupId, jdbcType=VARCHAR}
+            and is_deleted = 0
             <if test="_isInlongService == false">
                 and tenant = #{tenant,jdbcType=VARCHAR}
             </if>
-            and is_deleted = 0
         </where>
          for update
     </select>