(incubator-streampark) branch dev-2.1.6 updated: [BUG] issues-4134 bug fixed

[benjobs]

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

benjobs pushed a commit to branch dev-2.1.6
in repository https://gitbox.apache.org/repos/asf/incubator-streampark.git


The following commit(s) were added to refs/heads/dev-2.1.6 by this push:
     new 8dab676fe [BUG] issues-4134 bug fixed
8dab676fe is described below

commit 8dab676feaec9db27c6abd3b7e4ae63cd7a217b4
Author: benjobs <benj...@apache.org>
AuthorDate: Sat Nov 30 20:03:54 2024 +0800

    [BUG] issues-4134 bug fixed
---
 .../console/core/mapper/SavepointMapper.java       |  8 +-------
 .../core/service/impl/SavepointServiceImpl.java    | 22 +++++++++++++---------
 .../main/resources/mapper/core/SavepointMapper.xml | 12 ------------
 3 files changed, 14 insertions(+), 28 deletions(-)

diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/SavepointMapper.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/SavepointMapper.java
index 690463c43..8332b0ae7 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/SavepointMapper.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/mapper/SavepointMapper.java
@@ -19,12 +19,6 @@ package org.apache.streampark.console.core.mapper;
 
 import org.apache.streampark.console.core.entity.Savepoint;
 
-import org.apache.ibatis.annotations.Param;
-
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
-public interface SavepointMapper extends BaseMapper<Savepoint> {
-  Savepoint findLatestByTime(@Param("appId") Long appId);
-
-  void cleanLatest(@Param("appId") Long appId);
-}
+public interface SavepointMapper extends BaseMapper<Savepoint> {}
diff --git 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavepointServiceImpl.java
 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavepointServiceImpl.java
index cfc112842..9dae7dc84 100644
--- 
a/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavepointServiceImpl.java
+++ 
b/streampark-console/streampark-console-service/src/main/java/org/apache/streampark/console/core/service/impl/SavepointServiceImpl.java
@@ -117,10 +117,10 @@ public class SavepointServiceImpl extends 
ServiceImpl<SavepointMapper, Savepoint
 
   @Override
   public void expire(Long appId) {
-    savepointMapper.cleanLatest(appId);
+    this.cleanLatest(appId);
   }
 
-  private void expire(Savepoint entity) {
+  private void clearExpire(Savepoint entity) {
     FlinkEnv flinkEnv = flinkEnvService.getByAppId(entity.getAppId());
     Application application = applicationService.getById(entity.getAppId());
     Utils.notNull(flinkEnv);
@@ -222,16 +222,20 @@ public class SavepointServiceImpl extends 
ServiceImpl<SavepointMapper, Savepoint
 
   @Override
   public Savepoint getLatest(Long id) {
-    LambdaQueryWrapper<Savepoint> queryWrapper =
-        new LambdaQueryWrapper<Savepoint>()
+    List<Savepoint> savepointList =
+        this.lambdaQuery()
             .eq(Savepoint::getAppId, id)
             .eq(Savepoint::getLatest, true)
-            .orderByDesc(Savepoint::getCreateTime);
-    List<Savepoint> savepointList = this.baseMapper.selectList(queryWrapper);
+            .orderByDesc(Savepoint::getCreateTime)
+            .list();
+
     if (!savepointList.isEmpty()) {
       return savepointList.get(0);
     }
-    return this.baseMapper.findLatestByTime(id);
+    return this.lambdaQuery()
+        .eq(Savepoint::getAppId, id)
+        .orderByDesc(Savepoint::getTriggerTime)
+        .one();
   }
 
   @Override
@@ -314,13 +318,13 @@ public class SavepointServiceImpl extends 
ServiceImpl<SavepointMapper, Savepoint
 
   @Override
   public void saveSavePoint(Savepoint savepoint) {
-    this.expire(savepoint);
+    this.clearExpire(savepoint);
     this.cleanLatest(savepoint.getAppId());
     super.save(savepoint);
   }
 
   private void cleanLatest(Long appId) {
-    savepointMapper.cleanLatest(appId);
+    this.lambdaUpdate().eq(Savepoint::getAppId, 
appId).set(Savepoint::getLatest, false).update();
   }
 
   @Override
diff --git 
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/SavepointMapper.xml
 
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/SavepointMapper.xml
index c4d8c0a07..d3588761a 100644
--- 
a/streampark-console/streampark-console-service/src/main/resources/mapper/core/SavepointMapper.xml
+++ 
b/streampark-console/streampark-console-service/src/main/resources/mapper/core/SavepointMapper.xml
@@ -17,17 +17,5 @@
   -->
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
"http://mybatis.org/dtd/mybatis-3-mapper.dtd";>
 <mapper namespace="org.apache.streampark.console.core.mapper.SavepointMapper">
-    <select id="findLatestByTime" 
resultType="org.apache.streampark.console.core.entity.Savepoint">
-        select * from t_flink_savepoint
-        where app_id = #{appId}
-        order by trigger_time desc
-        limit 1;
-    </select>
-
-    <update id="cleanLatest">
-        update t_flink_savepoint
-        set latest = 0
-        where app_id = #{appId}
-    </update>
 
 </mapper>