This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch rel/0.13
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/rel/0.13 by this push:
new 743bfeda54 [To rel/0.13] change default concurrent_sub_rawQuery_thread
and concurrent_query_thread to 0 (#9621)
743bfeda54 is described below
commit 743bfeda54024a61b06ace2da3b1eb7971e1c55a
Author: Jialin Qiao <[email protected]>
AuthorDate: Mon Apr 17 09:57:23 2023 +0800
[To rel/0.13] change default concurrent_sub_rawQuery_thread and
concurrent_query_thread to 0 (#9621)
---
docs/UserGuide/Reference/Config-Manual.md | 4 ++--
docs/zh/UserGuide/Reference/Config-Manual.md | 4 ++--
server/src/assembly/resources/conf/iotdb-engine.properties | 4 ++--
server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 4 ++--
.../main/java/org/apache/iotdb/db/query/pool/QueryTaskManager.java | 5 +----
.../org/apache/iotdb/db/query/pool/RawQueryReadTaskPoolManager.java | 5 +----
6 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/docs/UserGuide/Reference/Config-Manual.md
b/docs/UserGuide/Reference/Config-Manual.md
index b266b08390..1621b0c4a7 100644
--- a/docs/UserGuide/Reference/Config-Manual.md
+++ b/docs/UserGuide/Reference/Config-Manual.md
@@ -559,7 +559,7 @@ The permission definitions are in
${IOTDB\_CONF}/conf/jmx.access.
|:---:|:---------------------------------------------------------------------------------------------------------------------|
|Description| The thread number which can concurrently execute query
statement. When <= 0, use CPU core number. The default is 16. |
|Type| Int32
|
-|Default| 16
|
+|Default| 0
|
|Effective| After restarting system
|
* concurrent\_sub\_rawQuery\_thread
@@ -568,7 +568,7 @@ The permission definitions are in
${IOTDB\_CONF}/conf/jmx.access.
|:---:|:-------------------------------------------------------------------------------------------------------------------------|
|Description| The thread number which can concurrently read data for raw data
query. When <= 0, use CPU core number. The default is 8. |
|Type| Int32
|
-|Default| 8
|
+|Default| 0
|
|Effective| After restarting system
|
* tsfile\_storage\_fs
diff --git a/docs/zh/UserGuide/Reference/Config-Manual.md
b/docs/zh/UserGuide/Reference/Config-Manual.md
index 33f71497b7..2d9d448d9d 100644
--- a/docs/zh/UserGuide/Reference/Config-Manual.md
+++ b/docs/zh/UserGuide/Reference/Config-Manual.md
@@ -535,7 +535,7 @@ Server，客户端的使用方式详见 [SQL 命令行终端（CLI）](https://i
|:---:|:----------------------------------------------------------------------------|
|描述| 当 IoTDB 对内存中的数据进行查询时，最多启动多少个线程来执行该操作。如果该值小于等于 0，那么采用机器所安装的 CPU 核的数量。默认值为
16。 |
|类型| Int32
|
-|默认值| 16
|
+|默认值| 0
|
|改后生效方式| 重启服务生效
|
* concurrent\_sub\_rawQuery\_thread
@@ -544,7 +544,7 @@ Server，客户端的使用方式详见 [SQL 命令行终端（CLI）](https://i
|:---:|:--|
|描述| 原始数据查询时，最多启动多少个线程来执行该操作。如果设置小于等于 0，会采用机器 CPU 核数。|
|类型| Int32 |
-|默认值| 8 |
+|默认值| 0 |
|改后生效方式|重启服务生效|
* raw\_query\_blocking\_queue\_capacity
diff --git a/server/src/assembly/resources/conf/iotdb-engine.properties
b/server/src/assembly/resources/conf/iotdb-engine.properties
index ac166426b3..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
@@ -281,7 +281,7 @@ timestamp_precision=ms
# How many threads can concurrently read data for raw data query. When <= 0,
use CPU core number.
# Datatype: int
-# concurrent_sub_rawQuery_thread=8
+# concurrent_sub_rawQuery_thread=0
# Blocking queue size for read task in raw data query. Must >= 1.
# 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 b195d3df55..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,12 +277,12 @@ 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.
*/
- private int concurrentSubRawQueryThread = 8;
+ private int concurrentSubRawQueryThread = 0;
/** Blocking queue size for read task in raw data query. */
private int rawQueryBlockingQueueCapacity = 5;
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());
}
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 7ce306fac2..82699c7a9c 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
@@ -40,10 +40,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());
