This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.3.1
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.3.1 by this push:
new eda6f9dc0 [NodeMetricManagerMapper]The sql annotation form is
optimized to XML (#3652)
eda6f9dc0 is described below
commit eda6f9dc0a144eafa2f802f4934fb181f497f4bc
Author: 成彬彬 <[email protected]>
AuthorDate: Tue Oct 18 09:56:32 2022 +0800
[NodeMetricManagerMapper]The sql annotation form is optimized to XML (#3652)
---
.../manager/dao/NodeMetricManagerMapper.java | 55 -------------
.../manager/dao/impl/NodeMetricManagerMapper.xml | 94 ++++++++++++----------
2 files changed, 50 insertions(+), 99 deletions(-)
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/NodeMetricManagerMapper.java
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/NodeMetricManagerMapper.java
index 843d0599e..8d9397ff9 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/NodeMetricManagerMapper.java
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/NodeMetricManagerMapper.java
@@ -26,76 +26,21 @@ import java.util.List;
public interface NodeMetricManagerMapper {
- @Insert(
- "insert into linkis_cg_manager_service_instance_metrics (instance,
instance_status, overload,
heartbeat_msg,healthy_status,update_time,create_time)"
- +
"values(#{nodeMetrics.instance},#{nodeMetrics.status},#{nodeMetrics.overLoad},#{nodeMetrics.heartBeatMsg},#{nodeMetrics.healthy},now(),now())")
void addNodeMetrics(@Param("nodeMetrics") PersistenceNodeMetrics
nodeMetrics);
- @Select(
- "select count(id) from linkis_cg_manager_service_instance_metrics met
inner join linkis_cg_manager_service_instance ins"
- + " on met.instance = #{instance} and ins.instance = #{instance} and
met.instance = ins.instance")
Integer checkInstanceExist(@Param("instance") String instance);
- @Select(
- "<script>"
- + "select * from linkis_cg_manager_service_instance_metrics where
instance in("
- + "<foreach collection='instances' separator=',' item='instance'>"
- + "#{instance}"
- + "</foreach>"
- + ")</script>")
- @Results({
- @Result(property = "updateTime", column = "update_time"),
- @Result(property = "createTime", column = "create_time"),
- @Result(property = "instance", column = "instance"),
- @Result(property = "heartBeatMsg", column = "heartbeat_msg"),
- @Result(property = "status", column = "instance_status"),
- @Result(property = "healthy", column = "healthy_status")
- })
List<PersistenceNodeMetrics> getNodeMetricsByInstances(
@Param("instances") List<String> instances);
- @Select("select * from linkis_cg_manager_service_instance_metrics where
instance = #{instance}")
- @Results({
- @Result(property = "updateTime", column = "update_time"),
- @Result(property = "createTime", column = "create_time"),
- @Result(property = "instance", column = "instance"),
- @Result(property = "heartBeatMsg", column = "heartbeat_msg"),
- @Result(property = "status", column = "instance_status"),
- @Result(property = "healthy", column = "healthy_status")
- })
PersistenceNodeMetrics getNodeMetricsByInstance(@Param("instance") String
instance);
- @Update({
- "<script> update linkis_cg_manager_service_instance_metrics"
- + "<trim prefix=\"set\" suffixOverrides=\",\">"
- + "<if test=\"nodeMetrics.status != null\">instance_status =
#{nodeMetrics.status},</if>"
- + "<if test=\"nodeMetrics.overLoad != null\"> overload =
#{nodeMetrics.overLoad},</if>"
- + "<if test=\"nodeMetrics.heartBeatMsg != null\"> heartbeat_msg =
#{nodeMetrics.heartBeatMsg},</if>"
- + "<if test=\"nodeMetrics.healthy != null\">
healthy_status=#{nodeMetrics.healthy}, </if>"
- + "<if test=\"nodeMetrics.updateTime != null\">
update_time=#{nodeMetrics.updateTime},</if>"
- + "</trim> where instance = #{instance}"
- + "</script>"
- })
void updateNodeMetrics(
@Param("nodeMetrics") PersistenceNodeMetrics nodeMetrics,
@Param("instance") String instance);
- @Delete(
- "delete from linkis_cg_manager_service_instance_metrics where instance
in (select instance from linkis_cg_manager_service_instance where
instance=#{instance})")
void deleteNodeMetrics(@Param("instance") String instance);
- @Delete("delete from linkis_cg_manager_service_instance_metrics where
instance = #{instance}")
void deleteNodeMetricsByInstance(@Param("instance") String instance);
- @Select(
- "select A.name,B.* from linkis_cg_manager_service_instance A join
linkis_cg_manager_service_instance_metrics B where A.instance = B.instance")
- @Results({
- @Result(property = "instance", column = "instance"),
- @Result(property = "heartBeatMsg", column = "heartbeat_msg"),
- @Result(property = "status", column = "instance_status"),
- @Result(property = "healthy", column = "healthy_status"),
- @Result(property = "updateTime", column = "update_time"),
- @Result(property = "createTime", column = "create_time")
- })
- @ResultType(PersistenceNodeMetricsEntity.class)
List<PersistenceNodeMetricsEntity> getAllNodeMetrics();
}
diff --git
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/NodeMetricManagerMapper.xml
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/NodeMetricManagerMapper.xml
index 0797735aa..569bb838a 100644
---
a/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/NodeMetricManagerMapper.xml
+++
b/linkis-computation-governance/linkis-manager/linkis-manager-persistence/src/main/java/org/apache/linkis/manager/dao/impl/NodeMetricManagerMapper.xml
@@ -20,57 +20,63 @@
<mapper namespace="org.apache.linkis.manager.dao.NodeMetricManagerMapper">
- <!-- 增 -->
-<!-- <sql id="addNodeMetrics">-->
-<!--
`service_instance_id`,`status`,`overload`,`heartbeat_msg`,`healthy`,`serviceInstance`,`update_time`,`create_time`-->
-<!-- </sql>-->
-<!-- <insert id="addNodeMetrics" useGeneratedKeys="true" keyProperty="id"-->
-<!--
parameterType="org.apache.linkis.manager.common.entity.persistence.PersistenceNodeMetrics">-->
-<!-- INSERT INTO linkis_cg_manager_service_instance_metrics(<include
refid="addNodeMetrics"/>)-->
-<!-- VALUES
(#{serviceInstanceId},#{status},#{overload},#{heartBeatMsg},#{healthy},#{serviceInstance},#{updateTime},#{createTime})-->
-<!-- </insert>-->
+ <!-- 获取 -->
+ <resultMap id="PersistenceNodeMetrics"
+
type="org.apache.linkis.manager.common.entity.persistence.PersistenceNodeMetrics">
+ <id column="instance" property="instance"/>
+ <id column="instance_status" property="status"/>
+ <id column="overload" property="overLoad"/>
+ <id column="heartbeat_msg" property="heartBeatMsg"/>
+ <id column="healthy_status" property="healthy"/>
+ <id column="update_time" property="updateTime"/>
+ <id column="create_time" property="createTime"/>
+ </resultMap>
- <!-- 删除 -->
-<!-- <delete id="deleteNodeMetrics">-->
-<!-- DELETE FROM linkis_cg_manager_service_instance_metrics where
service_instance_id = #{serviceInstanceId}-->
-<!-- </delete>-->
+ <insert id="addNodeMetrics" >
+ insert into linkis_cg_manager_service_instance_metrics (instance,
instance_status, overload, heartbeat_msg,healthy_status,update_time,create_time)
+
values(#{nodeMetrics.instance},#{nodeMetrics.status},#{nodeMetrics.overLoad},#{nodeMetrics.heartBeatMsg},#{nodeMetrics.healthy},now(),now())
+ </insert>
- <!-- 获取 -->
-<!-- <resultMap id="PersistenceNodeMetrics"-->
-<!--
type="org.apache.linkis.manager.common.entity.persistence.PersistenceNodeMetrics">-->
-<!-- <id column="service_instance_id" property="serviceInstanceId"/>-->
-<!-- <id column="status" property="status"/>-->
-<!-- <id column="overLoad" property="overLoad"/>-->
-<!-- <id column="heartbeat_msg" property="heartBeatMsg"/>-->
-<!-- <id column="healthy" property="healthy"/>-->
-<!-- <id column="serviceInstance" property="serviceInstance"/>-->
-<!-- <id column="update_time" property="updateTime"/>-->
-<!-- <id column="create_time" property="createTime"/>-->
+ <select id="checkInstanceExist" resultType="java.lang.Integer">
+ select count(id) from linkis_cg_manager_service_instance_metrics met
inner join linkis_cg_manager_service_instance ins
+ on met.instance = #{instance} and ins.instance = #{instance} and
met.instance = ins.instance
+ </select>
+
+ <select id="getNodeMetricsByInstances" resultMap="PersistenceNodeMetrics">
+ select * from linkis_cg_manager_service_instance_metrics where
instance in(
+ <foreach collection='instances' separator=',' item='instance'>
+ #{instance}
+ </foreach>
+ )
+ </select>
-<!-- </resultMap>-->
+ <select id="getNodeMetricsByInstance" resultMap="PersistenceNodeMetrics">
+ select * from linkis_cg_manager_service_instance_metrics where
instance = #{instance}
+ </select>
-<!-- <select id="getNodeMetrics" resultMap="PersistenceNodeMetrics">-->
-<!-- SELECT * FROM linkis_cg_manager_service_instance_metrics where
service_instance_id = #{serviceInstanceId}-->
-<!-- </select>-->
+ <update id="updateNodeMetrics">
+ update linkis_cg_manager_service_instance_metrics
+ <trim prefix='set' suffixOverrides=','>
+ <if test='nodeMetrics.status != null'>instance_status =
#{nodeMetrics.status},</if>
+ <if test='nodeMetrics.overLoad != null'> overload =
#{nodeMetrics.overLoad},</if>
+ <if test='nodeMetrics.heartBeatMsg != null'> heartbeat_msg =
#{nodeMetrics.heartBeatMsg},</if>
+ <if test='nodeMetrics.healthy != null'>
healthy_status=#{nodeMetrics.healthy}, </if>
+ <if test='nodeMetrics.updateTime != null'>
update_time=#{nodeMetrics.updateTime},</if>
+ </trim> where instance = #{instance}
+ </update>
+ <delete id="deleteNodeMetrics">
+ delete from linkis_cg_manager_service_instance_metrics where instance
in
+ (select instance from linkis_cg_manager_service_instance where
instance=#{instance})
+ </delete>
- <!-- 更新 -->
-<!-- <update id="updateNodeMetrics"-->
-<!--
parameterType="org.apache.linkis.manager.common.entity.persistence.PersistenceNodeMetrics">-->
-<!-- UPDATE linkis_cg_manager_service_instance_metrics-->
-<!-- <trim prefix="set" suffixOverrides=",">-->
-<!-- <if test="service_instance_id != null">`service_instance_id` =
#{serviceInstanceId},</if>-->
-<!-- <if test="status != null">`name` = #{status},</if>-->
-<!-- <if test="overload != null">`overload` = #{overLoad},</if>-->
-<!-- <if test="heartbeat_msg != null">`heartbeat_msg` =
#{heartBeatMsg},</if>-->
-<!-- <if test="healthy != null">`healthy` = #{healthy},</if>-->
-<!-- <if test="serviceInstance != null">`healthy` =
#{serviceInstance},</if>-->
-<!-- <if test="update_time != null">`update_time` =
#{updateTime},</if>-->
-<!-- <if test="create_time != null">`create_time` =
#{createTime},</if>-->
-<!-- </trim>-->
-<!-- WHERE service_instance_id = #{serviceInstanceId}-->
-<!-- </update>-->
+ <delete id="deleteNodeMetricsByInstance">
+ delete from linkis_cg_manager_service_instance_metrics where instance
= #{instance}
+ </delete>
+ <select id="getAllNodeMetrics" resultMap="PersistenceNodeMetrics">
+ select A.name,B.* from linkis_cg_manager_service_instance A join
linkis_cg_manager_service_instance_metrics B where A.instance = B.instance
+ </select>
</mapper>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
