[iotdb] branch master updated: Fix the issue that query is not removed from QueryExecutionMap (#6278)

[qiaojialin]

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

qiaojialin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 47ad89c8da Fix the issue that query is not removed from 
QueryExecutionMap (#6278)
47ad89c8da is described below

commit 47ad89c8da4fc655fec87e0b3c26f6dd3ede44f6
Author: Zhang.Jinrui <xingtan...@gmail.com>
AuthorDate: Tue Jun 14 19:16:53 2022 +0800

    Fix the issue that query is not removed from QueryExecutionMap (#6278)
---
 server/src/main/java/org/apache/iotdb/db/mpp/plan/Coordinator.java    | 4 ++++
 .../org/apache/iotdb/db/mpp/plan/analyze/ClusterSchemaFetcher.java    | 1 +
 .../apache/iotdb/db/service/thrift/impl/DataNodeTSIServiceImpl.java   | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/Coordinator.java 
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/Coordinator.java
index 872d8c3cfa..b8ff45b639 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/Coordinator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/Coordinator.java
@@ -137,6 +137,10 @@ public class Coordinator {
     return queryExecutionMap.get(queryId);
   }
 
+  public void removeQueryExecution(Long queryId) {
+    queryExecutionMap.remove(queryId);
+  }
+
   // TODO: (xingtanzjr) need to redo once we have a concrete policy for the 
threadPool management
   private ExecutorService getQueryExecutor() {
     return IoTDBThreadPoolFactory.newFixedThreadPool(
diff --git 
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterSchemaFetcher.java
 
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterSchemaFetcher.java
index 3ed55d9995..d5e41a50b7 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterSchemaFetcher.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterSchemaFetcher.java
@@ -126,6 +126,7 @@ public class ClusterSchemaFetcher implements ISchemaFetcher 
{
           result.mergeSchemaTree(fetchedSchemaTree);
         }
       }
+      coordinator.removeQueryExecution(queryId);
       return result;
     }
   }
diff --git 
a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeTSIServiceImpl.java
 
b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeTSIServiceImpl.java
index 6e5ac4349e..2c2edcd03e 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeTSIServiceImpl.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeTSIServiceImpl.java
@@ -626,6 +626,7 @@ public class DataNodeTSIServiceImpl implements 
TSIEventHandler {
         resp.setIsAlign(true);
 
         QUERY_TIME_MANAGER.unRegisterQuery(req.queryId, false);
+        COORDINATOR.removeQueryExecution(req.queryId);
         return resp;
       }
     } catch (Exception e) {
@@ -1304,6 +1305,7 @@ public class DataNodeTSIServiceImpl implements 
TSIEventHandler {
       try (SetThreadName threadName = new 
SetThreadName(queryExecution.getQueryId())) {
         LOGGER.info("stop and clean up");
         queryExecution.stopAndCleanup();
+        COORDINATOR.removeQueryExecution(queryId);
       }
     }
   }