gps51_0.13

diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties b/server/src/assembly/resources/conf/iotdb-engine.properties
index 849d195..ed6a504 100644
--- a/server/src/assembly/resources/conf/iotdb-engine.properties
+++ b/server/src/assembly/resources/conf/iotdb-engine.properties

@@ -273,7 +273,7 @@
 
 # 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 c629a1b..f97a1d2 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 @@
   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 f251e28..44f8a7f 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 @@
   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());
   }