[iotdb] branch gps51 created (now bf43857ab4)

[qi...@apache.org]

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

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


      at bf43857ab4 gps51_0.13

This branch includes the following new commits:

     new bf43857ab4 gps51_0.13

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[iotdb] 01/01: gps51_0.13

[qi...@apache.org]

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

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

commit bf43857ab4616d08bd54820a8cfe507a94af66d2
Author: qiaojialin <64...@qq.com>
AuthorDate: Sun Apr 16 22:33:56 2023 +0800

    gps51_0.13
---
 server/src/assembly/resources/conf/iotdb-engine.properties           | 2 +-
 server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java       | 2 +-
 .../main/java/org/apache/iotdb/db/query/pool/QueryTaskManager.java   | 5 +----
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties
index 849d195ba1..ed6a504db1 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties
@@ -273,7 +273,7 @@ timestamp_precision=ms
 
 # How many threads can concurrently execute query statement. When <= 0, use CPU core number.
 # Datatype: int
-# concurrent_query_thread=16
+# concurrent_query_thread=0
 
 # How many threads can concurrently run archiving tasks. When <= 0, use default number of 2.
 # Datatype: int
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index c629a1bda7..f97a1d2d22 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -277,7 +277,7 @@ public class IoTDBConfig {
   private int concurrentFlushThread = Runtime.getRuntime().availableProcessors();
 
   /** How many threads can concurrently execute query statement. When <= 0, use CPU core number. */
-  private int concurrentQueryThread = 16;
+  private int concurrentQueryThread = 0;
 
   /**
    * How many threads can concurrently read data for raw data query. When <= 0, use CPU core number.
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 f251e28fc9..44f8a7fa1c 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());
   }