[iotdb] branch master updated: Change default query execute threads to cpu cores (#6889)

[haonan]

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

haonan 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 8c1b616f9d Change default query execute threads to cpu cores (#6889)
8c1b616f9d is described below

commit 8c1b616f9d9b89c90ace8cf1163c8b4ee47017ce
Author: Jackie Tien <jackietie...@gmail.com>
AuthorDate: Thu Aug 4 07:35:37 2022 +0800

    Change default query execute threads to cpu cores (#6889)
---
 server/src/assembly/resources/conf/iotdb-datanode.properties   | 2 +-
 server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +-
 server/src/main/java/org/apache/iotdb/db/service/NewIoTDB.java | 2 --
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/server/src/assembly/resources/conf/iotdb-datanode.properties 
b/server/src/assembly/resources/conf/iotdb-datanode.properties
index 212e503163..57448902cd 100644
--- a/server/src/assembly/resources/conf/iotdb-datanode.properties
+++ b/server/src/assembly/resources/conf/iotdb-datanode.properties
@@ -357,7 +357,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 read data for raw data query. When <= 0, 
use CPU core number.
 # 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 44842dddab..cb2583e4d9 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
@@ -300,7 +300,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 = 
Runtime.getRuntime().availableProcessors();
 
   /** How many queries can be concurrently executed. When <= 0, use 1000. */
   private int maxAllowedConcurrentQueries = 1000;
diff --git a/server/src/main/java/org/apache/iotdb/db/service/NewIoTDB.java 
b/server/src/main/java/org/apache/iotdb/db/service/NewIoTDB.java
index 4c13029d79..38456057e7 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/NewIoTDB.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/NewIoTDB.java
@@ -42,7 +42,6 @@ import 
org.apache.iotdb.db.engine.trigger.service.TriggerRegistrationService;
 import org.apache.iotdb.db.exception.query.QueryProcessException;
 import org.apache.iotdb.db.localconfignode.LocalConfigNode;
 import org.apache.iotdb.db.metadata.LocalSchemaProcessor;
-import org.apache.iotdb.db.mpp.execution.exchange.MPPDataExchangeService;
 import org.apache.iotdb.db.mpp.execution.schedule.DriverScheduler;
 import org.apache.iotdb.db.protocol.mpprest.MPPRestService;
 import org.apache.iotdb.db.rescon.PrimitiveArrayManager;
@@ -134,7 +133,6 @@ public class NewIoTDB implements NewIoTDBMBean {
     registerManager.register(WALManager.getInstance());
 
     registerManager.register(StorageEngineV2.getInstance());
-    registerManager.register(MPPDataExchangeService.getInstance());
     registerManager.register(DataNodeInternalRPCService.getInstance());
     registerManager.register(DriverScheduler.getInstance());