Optimize clear cache operation

apache · Dec 16, 2022 · e5f80d2 · e5f80d2
1 parent 1269505
commit e5f80d2
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 18 deletions.
diff --git a/...ava/org/apache/dolphinscheduler/api/dto/taskInstance/TaskInstanceRemoveCacheResponse.java b/...ava/org/apache/dolphinscheduler/api/dto/taskInstance/TaskInstanceRemoveCacheResponse.java
@@ -19,8 +19,6 @@
 
 import org.apache.dolphinscheduler.api.utils.Result;
 
-import java.util.List;
-
 import lombok.Data;
 
 /**
@@ -29,7 +27,6 @@
 @Data
 public class TaskInstanceRemoveCacheResponse extends Result {
 
-    private List<Integer> deleteTaskInstanceCacheIds;
     private String cacheKey;
 
     public TaskInstanceRemoveCacheResponse(Result result) {
@@ -38,11 +35,10 @@ public TaskInstanceRemoveCacheResponse(Result result) {
         this.setMsg(result.getMsg());
     }
 
-    public TaskInstanceRemoveCacheResponse(Result result, List<Integer> deleteTaskInstanceCacheIds, String cacheKey) {
+    public TaskInstanceRemoveCacheResponse(Result result, String cacheKey) {
         super();
         this.setCode(result.getCode());
         this.setMsg(result.getMsg());
-        this.deleteTaskInstanceCacheIds = deleteTaskInstanceCacheIds;
         this.cacheKey = cacheKey;
     }
 }
diff --git a/...i/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskInstanceServiceImpl.java b/...i/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskInstanceServiceImpl.java
@@ -49,9 +49,9 @@
 import org.apache.dolphinscheduler.remote.utils.Host;
 import org.apache.dolphinscheduler.service.process.ProcessService;
 
+import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
 
-import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
@@ -348,20 +348,11 @@ public TaskInstanceRemoveCacheResponse removeTaskInstanceCache(User loginUser, l
         String tagCacheKey = taskInstance.getCacheKey();
         Pair<Integer, String> taskIdAndCacheKey = TaskCacheUtils.revertCacheKey(tagCacheKey);
         String cacheKey = taskIdAndCacheKey.getRight();
-        List<Integer> cacheTaskInstanceIds = new ArrayList<>();
-        while (true) {
-            TaskInstance cacheTaskInstance = taskInstanceDao.findTaskInstanceByCacheKey(cacheKey);
-            if (cacheTaskInstance == null) {
-                break;
-            }
-            cacheTaskInstance.setCacheKey(null);
-            boolean updateResult = taskInstanceDao.updateTaskInstance(cacheTaskInstance);
-            logger.info("remove task instance cache, taskInstanceId:{}, cacheKey:{}, result:{}",
-                    cacheTaskInstance.getId(), cacheKey, updateResult);
-            cacheTaskInstanceIds.add(cacheTaskInstance.getId());
+        if (StringUtils.isNotEmpty(cacheKey)) {
+            taskInstanceDao.clearCacheByCacheKey(cacheKey);
         }
         putMsg(result, Status.SUCCESS);
-        return new TaskInstanceRemoveCacheResponse(result, cacheTaskInstanceIds, cacheKey);
+        return new TaskInstanceRemoveCacheResponse(result, cacheKey);
     }
 
 }
diff --git a/...cheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.java b/...cheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.java
@@ -59,6 +59,8 @@ TaskInstance queryByInstanceIdAndCode(@Param("processInstanceId") int processIns
 
     TaskInstance queryByCacheKey(@Param("cacheKey") String cacheKey);
 
+    Boolean clearCacheByCacheKey(@Param("cacheKey") String cacheKey);
+
     List<TaskInstance> queryByProcessInstanceIdsAndTaskCodes(@Param("processInstanceIds") List<Integer> processInstanceIds,
                                                              @Param("taskCodes") List<Long> taskCodes);
 

diff --git a/...heduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/TaskInstanceDao.java b/...heduler-dao/src/main/java/org/apache/dolphinscheduler/dao/repository/TaskInstanceDao.java
@@ -95,6 +95,13 @@ public interface TaskInstanceDao {
      */
     TaskInstance findTaskInstanceByCacheKey(String cacheKey);
 
+    /**
+     * clear task instance cache by cache_key
+     * @param cacheKey cache key
+     * @return task instance
+     */
+    Boolean clearCacheByCacheKey(String cacheKey);
+
     /**
      * find task instance list by id list
      * @param idList task id list

diff --git a/...ao/src/main/java/org/apache/dolphinscheduler/dao/repository/impl/TaskInstanceDaoImpl.java b/...ao/src/main/java/org/apache/dolphinscheduler/dao/repository/impl/TaskInstanceDaoImpl.java
@@ -173,6 +173,17 @@ public TaskInstance findTaskInstanceByCacheKey(String cacheKey) {
         return taskInstanceMapper.queryByCacheKey(cacheKey);
     }
 
+    @Override
+    public Boolean clearCacheByCacheKey(String cacheKey) {
+        try {
+            taskInstanceMapper.clearCacheByCacheKey(cacheKey);
+            return true;
+        } catch (Exception e) {
+            logger.error("clear cache by cacheKey failed", e);
+            return false;
+        }
+    }
+
     @Override
     public List<TaskInstance> findTaskInstanceByIdList(List<Integer> idList) {
         if (CollectionUtils.isEmpty(idList)) {

diff --git a/...uler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml b/...uler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml
@@ -207,6 +207,11 @@
         where cache_key = #{cacheKey}
         limit 1
     </select>
+    <update id="clearCacheByCacheKey">
+        update t_ds_task_instance
+        set cache_key = null
+        where cache_key = #{cacheKey}
+    </update>
     <select id="queryByProcessInstanceIdsAndTaskCodes" resultType="org.apache.dolphinscheduler.dao.entity.TaskInstance">
         select
         <include refid="baseSql"/>