You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2022/07/06 05:30:52 UTC

[iotdb] branch rel/0.12 updated: Remove concurrent query thread limit (#6593)

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

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


The following commit(s) were added to refs/heads/rel/0.12 by this push:
     new ac7dcc7d09 Remove concurrent query thread limit (#6593)
ac7dcc7d09 is described below

commit ac7dcc7d0978c58287d872759cb4389364976304
Author: Jackie Tien <ja...@gmail.com>
AuthorDate: Wed Jul 6 13:30:47 2022 +0800

    Remove concurrent query thread limit (#6593)
---
 .../org/apache/iotdb/db/query/pool/QueryTaskManager.java     | 12 +++---------
 .../iotdb/db/query/pool/RawQueryReadTaskPoolManager.java     |  5 +----
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/query/pool/QueryTaskManager.java b/server/src/main/java/org/apache/iotdb/db/query/pool/QueryTaskManager.java
index c68f526d55..001b785856 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/pool/QueryTaskManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/pool/QueryTaskManager.java
@@ -38,10 +38,7 @@ public class QueryTaskManager extends AbstractPoolManager {
   private static final Logger LOGGER = LoggerFactory.getLogger(QueryTaskManager.class);
 
   private QueryTaskManager() {
-    int threadCnt =
-        Math.min(
-            Runtime.getRuntime().availableProcessors(),
-            IoTDBDescriptor.getInstance().getConfig().getConcurrentQueryThread());
+    int threadCnt = IoTDBDescriptor.getInstance().getConfig().getConcurrentQueryThread();
     pool = IoTDBThreadPoolFactory.newFixedThreadPool(threadCnt, ThreadName.QUERY_SERVICE.getName());
   }
 
@@ -62,10 +59,7 @@ public class QueryTaskManager extends AbstractPoolManager {
   @Override
   public void start() {
     if (pool == null) {
-      int threadCnt =
-          Math.min(
-              Runtime.getRuntime().availableProcessors(),
-              IoTDBDescriptor.getInstance().getConfig().getConcurrentQueryThread());
+      int threadCnt = IoTDBDescriptor.getInstance().getConfig().getConcurrentQueryThread();
       pool =
           IoTDBThreadPoolFactory.newFixedThreadPool(threadCnt, ThreadName.QUERY_SERVICE.getName());
     }
@@ -85,6 +79,6 @@ public class QueryTaskManager extends AbstractPoolManager {
       // allowed to do nothing
     }
 
-    private static QueryTaskManager instance = new QueryTaskManager();
+    private static final QueryTaskManager instance = new QueryTaskManager();
   }
 }
diff --git a/server/src/main/java/org/apache/iotdb/db/query/pool/RawQueryReadTaskPoolManager.java b/server/src/main/java/org/apache/iotdb/db/query/pool/RawQueryReadTaskPoolManager.java
index dc84652077..235667796f 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/pool/RawQueryReadTaskPoolManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/pool/RawQueryReadTaskPoolManager.java
@@ -37,10 +37,7 @@ public class RawQueryReadTaskPoolManager extends AbstractPoolManager {
   private static final Logger LOGGER = LoggerFactory.getLogger(RawQueryReadTaskPoolManager.class);
 
   private RawQueryReadTaskPoolManager() {
-    int threadCnt =
-        Math.min(
-            Runtime.getRuntime().availableProcessors(),
-            IoTDBDescriptor.getInstance().getConfig().getConcurrentSubRawQueryThread());
+    int threadCnt = IoTDBDescriptor.getInstance().getConfig().getConcurrentSubRawQueryThread();
     pool =
         IoTDBThreadPoolFactory.newFixedThreadPool(
             threadCnt, ThreadName.SUB_RAW_QUERY_SERVICE.getName());