This is an automated email from the ASF dual-hosted git repository.
sadadw1 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozhera.git
The following commit(s) were added to refs/heads/master by this push:
new 4c0bdb9e fix: upgrade ozhera-app to 2.2.7-incubating and optimize
queryAppInfo SQL (#674)
4c0bdb9e is described below
commit 4c0bdb9e55af572335d542ef700f3c8f34756018
Author: lhhhhf <[email protected]>
AuthorDate: Tue Aug 18 19:08:22 2026 +0800
fix: upgrade ozhera-app to 2.2.7-incubating and optimize queryAppInfo SQL
(#674)
Remove unnecessary LEFT JOIN in queryAppInfo and queryLatestAppInfo queries.
Co-authored-by: liuhaifeng7 <[email protected]>
---
ozhera-app/app-api/pom.xml | 2 +-
ozhera-app/app-common/pom.xml | 4 +-
ozhera-app/app-server/pom.xml | 4 +-
ozhera-app/app-service/pom.xml | 4 +-
.../resources/mapper/HeraAppBaseInfoMapper.xml | 50 ++++++++++------------
ozhera-app/pom.xml | 2 +-
6 files changed, 30 insertions(+), 36 deletions(-)
diff --git a/ozhera-app/app-api/pom.xml b/ozhera-app/app-api/pom.xml
index dcdc72c1..36dc5084 100644
--- a/ozhera-app/app-api/pom.xml
+++ b/ozhera-app/app-api/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-app</artifactId>
- <version>2.2.6-incubating</version>
+ <version>2.2.7-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/ozhera-app/app-common/pom.xml b/ozhera-app/app-common/pom.xml
index fc4a56a8..a050263b 100644
--- a/ozhera-app/app-common/pom.xml
+++ b/ozhera-app/app-common/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-app</artifactId>
- <version>2.2.6-incubating</version>
+ <version>2.2.7-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>app-common</artifactId>
- <version>2.2.6-incubating</version>
+ <version>2.2.7-incubating</version>
<dependencies>
<dependency>
diff --git a/ozhera-app/app-server/pom.xml b/ozhera-app/app-server/pom.xml
index 0266f2b3..6ac58a7c 100644
--- a/ozhera-app/app-server/pom.xml
+++ b/ozhera-app/app-server/pom.xml
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-app</artifactId>
- <version>2.2.6-incubating</version>
+ <version>2.2.7-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>app-server</artifactId>
- <version>2.2.6-incubating</version>
+ <version>2.2.7-incubating</version>
<properties>
<maven.compiler.source>21</maven.compiler.source>
diff --git a/ozhera-app/app-service/pom.xml b/ozhera-app/app-service/pom.xml
index 62f2a513..28b2bc2c 100644
--- a/ozhera-app/app-service/pom.xml
+++ b/ozhera-app/app-service/pom.xml
@@ -23,12 +23,12 @@
<parent>
<groupId>org.apache.ozhera</groupId>
<artifactId>ozhera-app</artifactId>
- <version>2.2.6-incubating</version>
+ <version>2.2.7-incubating</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>app-service</artifactId>
- <version>2.2.6-incubating</version>
+ <version>2.2.7-incubating</version>
<properties>
<maven.compiler.source>21</maven.compiler.source>
diff --git
a/ozhera-app/app-service/src/main/resources/mapper/HeraAppBaseInfoMapper.xml
b/ozhera-app/app-service/src/main/resources/mapper/HeraAppBaseInfoMapper.xml
index 821fb605..0d349473 100644
--- a/ozhera-app/app-service/src/main/resources/mapper/HeraAppBaseInfoMapper.xml
+++ b/ozhera-app/app-service/src/main/resources/mapper/HeraAppBaseInfoMapper.xml
@@ -633,53 +633,47 @@
</resultMap>
<select id="queryAppInfo" resultMap="queryAppResultMap">
SELECT
- hb.id AS id,
- hb.bind_id AS bindId,
- hb.app_name AS appName,
- hb.app_cname AS appCname,
- hb.app_type AS appType,
- hb.platform_type AS platformType,
- he.tree_ids AS treeIds,
- he.node_ips AS nodeIPs
+ id,
+ bind_id AS bindId,
+ app_name AS appName,
+ app_cname AS appCname,
+ app_type AS appType,
+ platform_type AS platformType
FROM
- hera_app_base_info hb
- LEFT JOIN hera_app_excess_info he ON hb.id = he.app_base_id
+ hera_app_base_info
<where>
- `status` = 0
+ status = 0
<if test="appName != null and appName != ''">
- AND hb.app_name LIKE concat('%',#{appName},'%')
+ AND app_name LIKE concat('%',#{appName},'%')
</if>
<if test="platformType != null">
- AND hb.platform_type = #{platformType}
+ AND platform_type = #{platformType}
</if>
<if test="type != null">
- AND hb.app_type = #{type}
+ AND app_type = #{type}
</if>
</where>
</select>
<select id="queryLatestAppInfo" resultMap="queryAppResultMap">
- SELECT hb.id AS id,
- hb.bind_id AS bindId,
- hb.app_name AS appName,
- hb.app_cname AS appCname,
- hb.app_type AS appType,
- hb.platform_type AS platformType,
- he.tree_ids AS treeIds,
- he.node_ips AS nodeIPs
- FROM hera_app_base_info hb
- LEFT JOIN hera_app_excess_info he ON hb.id = he.app_base_id
+ SELECT id,
+ bind_id AS bindId,
+ app_name AS appName,
+ app_cname AS appCname,
+ app_type AS appType,
+ platform_type AS platformType
+ FROM hera_app_base_info
<where>
- `status` = 0
+ status = 0
<if test="platformType != null">
- AND hb.platform_type = #{platformType}
+ AND platform_type = #{platformType}
</if>
<if test="type != null">
- AND hb.app_type = #{type}
+ AND app_type = #{type}
</if>
</where>
ORDER BY
- hb.update_time DESC
+ update_time DESC
LIMIT #{limit}
</select>
diff --git a/ozhera-app/pom.xml b/ozhera-app/pom.xml
index 02eaf324..798b91c8 100644
--- a/ozhera-app/pom.xml
+++ b/ozhera-app/pom.xml
@@ -29,7 +29,7 @@
</parent>
<artifactId>ozhera-app</artifactId>
- <version>2.2.6-incubating</version>
+ <version>2.2.7-incubating</version>
<packaging>pom</packaging>
<modules>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]