You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/10/31 09:11:26 UTC
[iotdb] branch master updated: Unify thread number configurations to thread_count && Fix clusterIT NPE (#7817)
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 1b1d9bffad Unify thread number configurations to thread_count && Fix clusterIT NPE (#7817)
1b1d9bffad is described below
commit 1b1d9bffadbb7b5b9294a76e58cd2c130c6ea187
Author: Haonan <hh...@outlook.com>
AuthorDate: Mon Oct 31 17:11:20 2022 +0800
Unify thread number configurations to thread_count && Fix clusterIT NPE (#7817)
---
.../iotdb/confignode/conf/ConfigNodeConfig.java | 10 +-
.../confignode/conf/ConfigNodeDescriptor.java | 83 ++++++-------
.../iotdb/confignode/manager/ProcedureManager.java | 2 +-
.../java/org/apache/iotdb/it/env/MppConfig.java | 4 +-
.../org/apache/iotdb/itbase/env/BaseConfig.java | 2 +-
.../iotdb/db/it/env/StandaloneEnvConfig.java | 8 +-
.../db/integration/IoTDBLoadExternalTsfileIT.java | 5 +-
.../IoTDBLoadExternalTsfileWithVirtualSGIT.java | 3 +-
.../integration/IoTDBManageTsFileResourceIT.java | 8 +-
.../integration/IoTDBSizeTieredCompactionIT.java | 12 +-
.../aligned/IoTDBLoadExternalAlignedTsFileIT.java | 5 +-
.../session/IoTDBSessionAlignedABDeviceIT.java | 6 +-
.../session/IoTDBSessionAlignedAggregationIT.java | 6 +-
.../IoTDBSessionAlignedAggregationWithUnSeqIT.java | 6 +-
.../resources/conf/iotdb-common.properties | 26 ++---
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 72 ++++++------
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 129 +++++++++++----------
.../db/consensus/DataRegionConsensusImpl.java | 2 +-
.../engine/compaction/CompactionTaskManager.java | 9 +-
.../RewriteCrossSpaceCompactionSelector.java | 4 +-
.../impl/ReadChunkCompactionPerformer.java | 2 +-
.../writer/CrossSpaceCompactionWriter.java | 2 +-
.../writer/InnerSpaceCompactionWriter.java | 2 +-
.../db/engine/flush/pool/FlushTaskPoolManager.java | 4 +-
.../db/mpp/execution/schedule/DriverScheduler.java | 2 +-
.../iotdb/db/query/pool/QueryTaskManager.java | 4 +-
.../db/query/pool/RawQueryReadTaskPoolManager.java | 4 +-
.../org/apache/iotdb/db/service/UpgradeSevice.java | 2 +-
.../runtime/WindowEvaluationTaskPoolManager.java | 5 +-
.../engine/compaction/CompactionSchedulerTest.java | 92 +++++++--------
.../cross/RewriteCompactionFileSelectorTest.java | 14 +--
.../inner/InnerCompactionSchedulerTest.java | 10 +-
.../compaction/utils/CompactionConfigRestorer.java | 2 +-
33 files changed, 270 insertions(+), 277 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
index a5d848236d..c4313e4b2c 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
@@ -129,7 +129,7 @@ public class ConfigNodeConfig {
private int procedureCompletedCleanInterval = 30;
/** Procedure core worker threads size */
- private int procedureCoreWorkerThreadsSize =
+ private int procedureCoreWorkerThreadsCount =
Math.max(Runtime.getRuntime().availableProcessors() / 4, 16);
/** The heartbeat interval in milliseconds */
@@ -496,12 +496,12 @@ public class ConfigNodeConfig {
this.procedureCompletedCleanInterval = procedureCompletedCleanInterval;
}
- public int getProcedureCoreWorkerThreadsSize() {
- return procedureCoreWorkerThreadsSize;
+ public int getProcedureCoreWorkerThreadsCount() {
+ return procedureCoreWorkerThreadsCount;
}
- public void setProcedureCoreWorkerThreadsSize(int procedureCoreWorkerThreadsSize) {
- this.procedureCoreWorkerThreadsSize = procedureCoreWorkerThreadsSize;
+ public void setProcedureCoreWorkerThreadsCount(int procedureCoreWorkerThreadsCount) {
+ this.procedureCoreWorkerThreadsCount = procedureCoreWorkerThreadsCount;
}
public long getHeartbeatIntervalInMs() {
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
index 4ca0ca022b..5310933a14 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
@@ -93,48 +93,49 @@ public class ConfigNodeDescriptor {
private void loadProps() {
URL url = getPropsUrl(CommonConfig.CONFIG_NAME);
- if (url == null) {
- LOGGER.warn("Couldn't load the configuration from any of the known sources.");
- }
Properties commonProperties = new Properties();
- try (InputStream inputStream = url.openStream()) {
-
- LOGGER.info("Start to read config file {}", url);
- commonProperties.load(inputStream);
-
- } catch (FileNotFoundException e) {
- LOGGER.warn("Fail to find config file {}", url, e);
- } catch (IOException e) {
- LOGGER.warn("Cannot load config file, use default configuration", e);
- } catch (Exception e) {
- LOGGER.warn("Incorrect format in config file, use default configuration", e);
+ if (url != null) {
+ try (InputStream inputStream = url.openStream()) {
+
+ LOGGER.info("Start to read config file {}", url);
+ commonProperties.load(inputStream);
+
+ } catch (FileNotFoundException e) {
+ LOGGER.warn("Fail to find config file {}", url, e);
+ } catch (IOException e) {
+ LOGGER.warn("Cannot load config file, use default configuration", e);
+ } catch (Exception e) {
+ LOGGER.warn("Incorrect format in config file, use default configuration", e);
+ }
+ } else {
+ LOGGER.warn(
+ "Couldn't load the configuration {} from any of the known sources.",
+ CommonConfig.CONFIG_NAME);
}
url = getPropsUrl(ConfigNodeConstant.CONF_FILE_NAME);
- if (url == null) {
+ if (url != null) {
+ try (InputStream inputStream = url.openStream()) {
+ LOGGER.info("start reading ConfigNode conf file: {}", url);
+ Properties properties = new Properties();
+ properties.load(inputStream);
+ commonProperties.putAll(properties);
+ loadProperties(commonProperties);
+ } catch (IOException | BadNodeUrlException e) {
+ LOGGER.warn("Couldn't load ConfigNode conf file, use default config", e);
+ } finally {
+ conf.updatePath();
+ commonDescriptor
+ .getConfig()
+ .updatePath(System.getProperty(ConfigNodeConstant.CONFIGNODE_HOME, null));
+ MetricConfigDescriptor.getInstance()
+ .getMetricConfig()
+ .updateRpcInstance(conf.getInternalAddress(), conf.getInternalPort());
+ }
+ } else {
LOGGER.warn(
- "Couldn't load the ConfigNode configuration from any of the known sources. Use default configuration.");
- return;
- }
-
- try (InputStream inputStream = url.openStream()) {
-
- LOGGER.info("start reading ConfigNode conf file: {}", url);
-
- Properties properties = new Properties();
- properties.load(inputStream);
- commonProperties.putAll(properties);
- loadProperties(commonProperties);
- } catch (IOException | BadNodeUrlException e) {
- LOGGER.warn("Couldn't load ConfigNode conf file, use default config", e);
- } finally {
- conf.updatePath();
- commonDescriptor
- .getConfig()
- .updatePath(System.getProperty(ConfigNodeConstant.CONFIGNODE_HOME, null));
- MetricConfigDescriptor.getInstance()
- .getMetricConfig()
- .updateRpcInstance(conf.getInternalAddress(), conf.getInternalPort());
+ "Couldn't load the configuration {} from any of the known sources.",
+ ConfigNodeConstant.CONF_FILE_NAME);
}
}
@@ -292,11 +293,11 @@ public class ConfigNodeDescriptor {
"procedure_completed_clean_interval",
String.valueOf(conf.getProcedureCompletedCleanInterval()))));
- conf.setProcedureCoreWorkerThreadsSize(
+ conf.setProcedureCoreWorkerThreadsCount(
Integer.parseInt(
properties.getProperty(
- "procedure_core_worker_thread_size",
- String.valueOf(conf.getProcedureCoreWorkerThreadsSize()))));
+ "procedure_core_worker_thread_count",
+ String.valueOf(conf.getProcedureCoreWorkerThreadsCount()))));
loadRatisConsensusConfig(properties);
loadCQConfig(properties);
@@ -534,7 +535,7 @@ public class ConfigNodeDescriptor {
int cqSubmitThread =
Integer.parseInt(
properties.getProperty(
- "continuous_query_submit_thread", String.valueOf(conf.getCqSubmitThread())));
+ "continuous_query_submit_thread_count", String.valueOf(conf.getCqSubmitThread())));
if (cqSubmitThread <= 0) {
LOGGER.warn(
"continuous_query_submit_thread should be greater than 0, but current value is {}, ignore that and use the default value {}",
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
index 524a4e0fa9..4f9fbf490b 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ProcedureManager.java
@@ -118,7 +118,7 @@ public class ProcedureManager {
public void shiftExecutor(boolean running) {
if (running) {
if (!executor.isRunning()) {
- executor.init(CONFIG_NODE_CONFIG.getProcedureCoreWorkerThreadsSize());
+ executor.init(CONFIG_NODE_CONFIG.getProcedureCoreWorkerThreadsCount());
executor.startWorkers();
executor.startCompletedCleaner(
CONFIG_NODE_CONFIG.getProcedureCompletedCleanInterval(),
diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/MppConfig.java b/integration-test/src/main/java/org/apache/iotdb/it/env/MppConfig.java
index e24496ffd1..306e4be413 100644
--- a/integration-test/src/main/java/org/apache/iotdb/it/env/MppConfig.java
+++ b/integration-test/src/main/java/org/apache/iotdb/it/env/MppConfig.java
@@ -271,9 +271,9 @@ public class MppConfig implements BaseConfig {
}
@Override
- public BaseConfig setConcurrentCompactionThread(int concurrentCompactionThread) {
+ public BaseConfig setCompactionThreadCount(int concurrentCompactionThread) {
confignodeProperties.setProperty(
- "concurrent_compaction_thread", String.valueOf(concurrentCompactionThread));
+ "compaction_thread_count", String.valueOf(concurrentCompactionThread));
return this;
}
diff --git a/integration-test/src/main/java/org/apache/iotdb/itbase/env/BaseConfig.java b/integration-test/src/main/java/org/apache/iotdb/itbase/env/BaseConfig.java
index c9c8baf40c..d4fc88ac64 100644
--- a/integration-test/src/main/java/org/apache/iotdb/itbase/env/BaseConfig.java
+++ b/integration-test/src/main/java/org/apache/iotdb/itbase/env/BaseConfig.java
@@ -271,7 +271,7 @@ public interface BaseConfig {
return 4000;
}
- default BaseConfig setConcurrentCompactionThread(int concurrentCompactionThread) {
+ default BaseConfig setCompactionThreadCount(int compactionThreadCount) {
return this;
}
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/env/StandaloneEnvConfig.java b/integration-test/src/test/java/org/apache/iotdb/db/it/env/StandaloneEnvConfig.java
index 3938002f8f..a90d7d0734 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/env/StandaloneEnvConfig.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/env/StandaloneEnvConfig.java
@@ -249,16 +249,14 @@ public class StandaloneEnvConfig implements BaseConfig {
}
@Override
- public BaseConfig setConcurrentCompactionThread(int concurrentCompactionThread) {
- IoTDBDescriptor.getInstance()
- .getConfig()
- .setConcurrentCompactionThread(concurrentCompactionThread);
+ public BaseConfig setCompactionThreadCount(int concurrentCompactionThread) {
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(concurrentCompactionThread);
return this;
}
@Override
public int getConcurrentCompactionThread() {
- return IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread();
+ return IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
}
@Override
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileIT.java
index 26286b2327..70793e6bab 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileIT.java
@@ -142,8 +142,7 @@ public class IoTDBLoadExternalTsfileIT {
public void setUp() throws Exception {
prevVirtualPartitionNum = IoTDBDescriptor.getInstance().getConfig().getDataRegionNum();
IoTDBDescriptor.getInstance().getConfig().setDataRegionNum(1);
- prevCompactionThread =
- IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread();
+ prevCompactionThread = IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
prepareData(insertSequenceSqls);
@@ -152,7 +151,7 @@ public class IoTDBLoadExternalTsfileIT {
@After
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(prevCompactionThread);
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(prevCompactionThread);
IoTDBDescriptor.getInstance().getConfig().setDataRegionNum(prevVirtualPartitionNum);
}
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileWithVirtualSGIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileWithVirtualSGIT.java
index 36ab81f9a6..20f5040e91 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileWithVirtualSGIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBLoadExternalTsfileWithVirtualSGIT.java
@@ -49,8 +49,7 @@ public class IoTDBLoadExternalTsfileWithVirtualSGIT extends IoTDBLoadExternalTsf
public void setUp() throws Exception {
prevVirtualPartitionNum = IoTDBDescriptor.getInstance().getConfig().getDataRegionNum();
IoTDBDescriptor.getInstance().getConfig().setDataRegionNum(2);
- prevCompactionThread =
- IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread();
+ prevCompactionThread = IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
EnvironmentUtils.envSetUp();
StorageEngine.getInstance().reset();
Class.forName(Config.JDBC_DRIVER_NAME);
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBManageTsFileResourceIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBManageTsFileResourceIT.java
index 96031214e7..a7f64d2392 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBManageTsFileResourceIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBManageTsFileResourceIT.java
@@ -89,7 +89,7 @@ public class IoTDBManageTsFileResourceIT {
public void setUp() throws ClassNotFoundException {
EnvironmentUtils.envSetUp();
prevTimeIndexMemoryThreshold = CONFIG.getAllocateMemoryForTimeIndex();
- prevCompactionThreadNum = CONFIG.getConcurrentCompactionThread();
+ prevCompactionThreadNum = CONFIG.getCompactionThreadCount();
Class.forName(Config.JDBC_DRIVER_NAME);
}
@@ -97,7 +97,7 @@ public class IoTDBManageTsFileResourceIT {
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
tsFileResourceManager.setTimeIndexMemoryThreshold(prevTimeIndexMemoryThreshold);
- CONFIG.setConcurrentCompactionThread(prevCompactionThreadNum);
+ CONFIG.setCompactionThreadCount(prevCompactionThreadNum);
}
@Test
@@ -106,7 +106,7 @@ public class IoTDBManageTsFileResourceIT {
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
Statement statement = connection.createStatement()) {
- CONFIG.setConcurrentCompactionThread(0);
+ CONFIG.setCompactionThreadCount(0);
double curTimeIndexMemoryThreshold = 1288.5;
tsFileResourceManager.setTimeIndexMemoryThreshold(curTimeIndexMemoryThreshold);
for (String sql : unSeqSQLs) {
@@ -199,7 +199,7 @@ public class IoTDBManageTsFileResourceIT {
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
Statement statement = connection.createStatement()) {
- CONFIG.setConcurrentCompactionThread(0);
+ CONFIG.setCompactionThreadCount(0);
double curTimeIndexMemoryThreshold = 1288.5;
tsFileResourceManager.setTimeIndexMemoryThreshold(curTimeIndexMemoryThreshold);
for (int i = 0; i < unSeqSQLs.length - 1; i++) {
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSizeTieredCompactionIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSizeTieredCompactionIT.java
index 6cb6c5488f..3d25cbda98 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSizeTieredCompactionIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSizeTieredCompactionIT.java
@@ -1010,10 +1010,10 @@ public class IoTDBSizeTieredCompactionIT {
@Test
public void testSequenceInnerCompactionContinously() throws SQLException {
- int oriThreadNum = IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread();
+ int oriThreadNum = IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
long oriTargetFileSize =
IoTDBDescriptor.getInstance().getConfig().getTargetCompactionFileSize();
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(2);
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(2);
IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(600);
int originCandidateNum =
IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
@@ -1088,7 +1088,7 @@ public class IoTDBSizeTieredCompactionIT {
}
} finally {
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(oriThreadNum);
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(oriThreadNum);
IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(oriTargetFileSize);
IoTDBDescriptor.getInstance().getConfig().setCompactionPriority(compactionPriority);
IoTDBDescriptor.getInstance()
@@ -1162,10 +1162,10 @@ public class IoTDBSizeTieredCompactionIT {
@Test
public void testUnsequenceInnerCompactionContinously() throws SQLException {
- int oriThreadNum = IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread();
+ int oriThreadNum = IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
long oriTargetFileSize =
IoTDBDescriptor.getInstance().getConfig().getTargetCompactionFileSize();
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(2);
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(2);
IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(600);
long originFinishCount = CompactionTaskManager.getInstance().getFinishedTaskNum();
CompactionPriority compactionPriority =
@@ -1226,7 +1226,7 @@ public class IoTDBSizeTieredCompactionIT {
}
}
} finally {
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(oriThreadNum);
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(oriThreadNum);
IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(oriTargetFileSize);
IoTDBDescriptor.getInstance()
.getConfig()
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBLoadExternalAlignedTsFileIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBLoadExternalAlignedTsFileIT.java
index 1898992922..041d7347b6 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBLoadExternalAlignedTsFileIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/aligned/IoTDBLoadExternalAlignedTsFileIT.java
@@ -140,8 +140,7 @@ public class IoTDBLoadExternalAlignedTsFileIT {
public void setUp() throws Exception {
prevVirtualPartitionNum = IoTDBDescriptor.getInstance().getConfig().getDataRegionNum();
IoTDBDescriptor.getInstance().getConfig().setDataRegionNum(1);
- prevCompactionThread =
- IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread();
+ prevCompactionThread = IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
prepareData(insertSequenceSqls);
@@ -150,7 +149,7 @@ public class IoTDBLoadExternalAlignedTsFileIT {
@After
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(prevCompactionThread);
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(prevCompactionThread);
IoTDBDescriptor.getInstance().getConfig().setDataRegionNum(prevVirtualPartitionNum);
}
diff --git a/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedABDeviceIT.java b/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedABDeviceIT.java
index 7ddfb8e249..2afeb5d23d 100644
--- a/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedABDeviceIT.java
+++ b/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedABDeviceIT.java
@@ -49,8 +49,8 @@ public class IoTDBSessionAlignedABDeviceIT {
@BeforeClass
public static void setUp() throws Exception {
- originCompactionThreadNum = CONFIG.getConcurrentCompactionThread();
- CONFIG.setConcurrentCompactionThread(0);
+ originCompactionThreadNum = CONFIG.getCompactionThreadCount();
+ CONFIG.setCompactionThreadCount(0);
EnvironmentUtils.envSetUp();
session = new Session("127.0.0.1", 6667, "root", "root");
session.open();
@@ -63,7 +63,7 @@ public class IoTDBSessionAlignedABDeviceIT {
public static void tearDown() throws Exception {
session.close();
EnvironmentUtils.cleanEnv();
- CONFIG.setConcurrentCompactionThread(originCompactionThreadNum);
+ CONFIG.setCompactionThreadCount(originCompactionThreadNum);
}
@Test
diff --git a/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationIT.java b/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationIT.java
index 012c4a59e8..6387c97ba8 100644
--- a/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationIT.java
+++ b/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationIT.java
@@ -49,8 +49,8 @@ public class IoTDBSessionAlignedAggregationIT {
@BeforeClass
public static void setUp() throws Exception {
- originCompactionThreadNum = CONFIG.getConcurrentCompactionThread();
- CONFIG.setConcurrentCompactionThread(0);
+ originCompactionThreadNum = CONFIG.getCompactionThreadCount();
+ CONFIG.setCompactionThreadCount(0);
EnvironmentUtils.envSetUp();
session = new Session("127.0.0.1", 6667, "root", "root");
session.open();
@@ -62,7 +62,7 @@ public class IoTDBSessionAlignedAggregationIT {
public static void tearDown() throws Exception {
session.close();
EnvironmentUtils.cleanEnv();
- CONFIG.setConcurrentCompactionThread(originCompactionThreadNum);
+ CONFIG.setCompactionThreadCount(originCompactionThreadNum);
}
@Test
diff --git a/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationWithUnSeqIT.java b/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationWithUnSeqIT.java
index 533ffd5760..108e4c5112 100644
--- a/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationWithUnSeqIT.java
+++ b/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationWithUnSeqIT.java
@@ -48,8 +48,8 @@ public class IoTDBSessionAlignedAggregationWithUnSeqIT {
@BeforeClass
public static void setUp() throws Exception {
- originCompactionThreadNum = CONFIG.getConcurrentCompactionThread();
- CONFIG.setConcurrentCompactionThread(0);
+ originCompactionThreadNum = CONFIG.getCompactionThreadCount();
+ CONFIG.setCompactionThreadCount(0);
EnvironmentUtils.envSetUp();
session = new Session("127.0.0.1", 6667, "root", "root");
session.open();
@@ -61,7 +61,7 @@ public class IoTDBSessionAlignedAggregationWithUnSeqIT {
public static void tearDown() throws Exception {
session.close();
EnvironmentUtils.cleanEnv();
- CONFIG.setConcurrentCompactionThread(originCompactionThreadNum);
+ CONFIG.setCompactionThreadCount(originCompactionThreadNum);
}
@Test
diff --git a/node-commons/src/assembly/resources/conf/iotdb-common.properties b/node-commons/src/assembly/resources/conf/iotdb-common.properties
index d9774d2dbb..addf0d83d6 100644
--- a/node-commons/src/assembly/resources/conf/iotdb-common.properties
+++ b/node-commons/src/assembly/resources/conf/iotdb-common.properties
@@ -30,7 +30,7 @@
# rpc_advanced_compression_enable=false
# Datatype: int
-# rpc_selector_thread_num=1
+# rpc_selector_thread_count=1
# Datatype: int
# rpc_min_concurrent_client_num=1
@@ -61,7 +61,7 @@
# selector thread (TAsyncClientManager) nums for async thread in a clientManager
# Datatype: int
-# selector_thread_nums_of_client_manager=1
+# selector_thread_count_of_client_manager=1
####################
### Procedure Configuration
@@ -70,7 +70,7 @@
# Default number of worker thread count
# Datatype: int
-# procedure_core_worker_thread_size=4
+# procedure_core_worker_thread_count=4
# Default time interval of completed procedure cleaner work in, time unit is second
@@ -99,10 +99,6 @@
### Continuous Query Configuration
####################
-# How many thread will be set up to perform continuous queries. When <= 0, use max(1, CPU core number / 2).
-# Datatype: int
-# continuous_query_execution_thread=2
-
# Maximum number of continuous query tasks that can be pending for execution. When <= 0, the value is
# 64 by default.
# Datatype: int
@@ -116,7 +112,7 @@
# The number of threads in the scheduled thread pool that submit continuous query tasks periodically
# Datatype: int
-# continuous_query_submit_thread=2
+# continuous_query_submit_thread_count=2
# The minimum value of the continuous query execution time interval
# Datatype: long(duration)
@@ -195,15 +191,15 @@
# How many threads can concurrently flush. When <= 0, use CPU core number.
# Datatype: int
-# concurrent_flush_thread=0
+# flush_thread_count=0
# How many threads can concurrently execute query statement. When <= 0, use CPU core number.
# Datatype: int
-# concurrent_query_thread=0
+# query_thread_count=0
# How many threads can concurrently read data for raw data query. When <= 0, use CPU core number.
# Datatype: int
-# concurrent_sub_rawQuery_thread=8
+# sub_rawQuery_thread_count=8
# Blocking queue size for read task in raw data query. Must >= 1.
# Datatype: int
@@ -242,7 +238,7 @@
# When there exists old version(0.9.x/v1) data, how many thread will be set up to perform upgrade tasks, 1 by default.
# Set to 1 when less than or equal to 0.
# Datatype: int
-# upgrade_thread_num=1
+# upgrade_thread_count=1
####################
### Schema Engine Configuration
@@ -479,7 +475,7 @@
# How many threads will be set up to perform compaction, 10 by default.
# Set to 1 when less than or equal to 0.
# Datatype: int
-# concurrent_compaction_thread=10
+# compaction_thread_count=10
# The interval of compaction task schedule
# Datatype: long, Unit: ms
@@ -505,7 +501,7 @@
# Currently only works for nonAligned data in cross space compaction and unseq inner space compaction.
# Set to 1 when less than or equal to 0.
# Datatype: int
-# sub_compaction_thread_num=4
+# sub_compaction_thread_count=4
####################
@@ -931,7 +927,7 @@ timestamp_precision=ms
# How many threads can be used for evaluating sliding windows. When <= 0, use CPU core number.
# Datatype: int
-# concurrent_window_evaluation_thread=0
+# window_evaluation_thread_count=0
# Max number of window evaluation tasks that can be pending for execution. When <= 0, the value is
# 64 by default.
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 60bc735da1..f21c5a738d 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
@@ -118,7 +118,7 @@ public class IoTDBConfig {
private int influxDBRpcPort = 8086;
/** Rpc Selector thread num */
- private int rpcSelectorThreadNum = 1;
+ private int rpcSelectorThreadCount = 1;
/** Min concurrent client number */
private int rpcMinConcurrentClientNum = Runtime.getRuntime().availableProcessors();
@@ -305,10 +305,10 @@ public class IoTDBConfig {
private int batchSize = 100000;
/** How many threads can concurrently flush. When <= 0, use CPU core number. */
- private int concurrentFlushThread = Runtime.getRuntime().availableProcessors();
+ private int flushThreadCount = Runtime.getRuntime().availableProcessors();
/** How many threads can concurrently execute query statement. When <= 0, use CPU core number. */
- private int concurrentQueryThread = Runtime.getRuntime().availableProcessors();
+ private int queryThreadCount = Runtime.getRuntime().availableProcessors();
/** How many queries can be concurrently executed. When <= 0, use 1000. */
private int maxAllowedConcurrentQueries = 1000;
@@ -316,13 +316,13 @@ public class IoTDBConfig {
/**
* How many threads can concurrently read data for raw data query. When <= 0, use CPU core number.
*/
- private int concurrentSubRawQueryThread = 8;
+ private int subRawQueryThreadCount = 8;
/** Blocking queue size for read task in raw data query. */
private int rawQueryBlockingQueueCapacity = 5;
/** How many threads can concurrently evaluate windows. When <= 0, use CPU core number. */
- private int concurrentWindowEvaluationThread = Runtime.getRuntime().availableProcessors();
+ private int windowEvaluationThreadCount = Runtime.getRuntime().availableProcessors();
/**
* Max number of window evaluation tasks that can be pending for execution. When <= 0, the value
@@ -630,7 +630,7 @@ public class IoTDBConfig {
private TSEncoding defaultTextEncoding = TSEncoding.PLAIN;
/** How many threads will be set up to perform upgrade tasks. */
- private int upgradeThreadNum = 1;
+ private int upgradeThreadCount = 1;
/** How many threads will be set up to perform settle tasks. */
private int settleThreadNum = 1;
@@ -655,7 +655,7 @@ public class IoTDBConfig {
* How many thread will be set up to perform compaction, 10 by default. Set to 1 when less than or
* equal to 0.
*/
- private int concurrentCompactionThread = 10;
+ private int compactionThreadCount = 10;
/*
* How many thread will be set up to perform continuous queries. When <= 0, use max(1, CPU core number / 2).
@@ -1460,20 +1460,20 @@ public class IoTDBConfig {
this.maxMemtableNumber = maxMemtableNumber;
}
- public int getConcurrentFlushThread() {
- return concurrentFlushThread;
+ public int getFlushThreadCount() {
+ return flushThreadCount;
}
- void setConcurrentFlushThread(int concurrentFlushThread) {
- this.concurrentFlushThread = concurrentFlushThread;
+ void setFlushThreadCount(int flushThreadCount) {
+ this.flushThreadCount = flushThreadCount;
}
- public int getConcurrentQueryThread() {
- return concurrentQueryThread;
+ public int getQueryThreadCount() {
+ return queryThreadCount;
}
- public void setConcurrentQueryThread(int concurrentQueryThread) {
- this.concurrentQueryThread = concurrentQueryThread;
+ public void setQueryThreadCount(int queryThreadCount) {
+ this.queryThreadCount = queryThreadCount;
}
public int getMaxAllowedConcurrentQueries() {
@@ -1484,16 +1484,16 @@ public class IoTDBConfig {
this.maxAllowedConcurrentQueries = maxAllowedConcurrentQueries;
}
- public int getConcurrentSubRawQueryThread() {
- return concurrentSubRawQueryThread;
+ public int getSubRawQueryThreadCount() {
+ return subRawQueryThreadCount;
}
- void setConcurrentSubRawQueryThread(int concurrentSubRawQueryThread) {
- this.concurrentSubRawQueryThread = concurrentSubRawQueryThread;
+ void setSubRawQueryThreadCount(int subRawQueryThreadCount) {
+ this.subRawQueryThreadCount = subRawQueryThreadCount;
}
public long getMaxBytesPerQuery() {
- return allocateMemoryForDataExchange / concurrentQueryThread;
+ return allocateMemoryForDataExchange / queryThreadCount;
}
public int getRawQueryBlockingQueueCapacity() {
@@ -1504,12 +1504,12 @@ public class IoTDBConfig {
this.rawQueryBlockingQueueCapacity = rawQueryBlockingQueueCapacity;
}
- public int getConcurrentWindowEvaluationThread() {
- return concurrentWindowEvaluationThread;
+ public int getWindowEvaluationThreadCount() {
+ return windowEvaluationThreadCount;
}
- public void setConcurrentWindowEvaluationThread(int concurrentWindowEvaluationThread) {
- this.concurrentWindowEvaluationThread = concurrentWindowEvaluationThread;
+ public void setWindowEvaluationThreadCount(int windowEvaluationThreadCount) {
+ this.windowEvaluationThreadCount = windowEvaluationThreadCount;
}
public int getMaxPendingWindowEvaluationTasks() {
@@ -1536,12 +1536,12 @@ public class IoTDBConfig {
this.unSeqTsFileSize = unSeqTsFileSize;
}
- public int getRpcSelectorThreadNum() {
- return rpcSelectorThreadNum;
+ public int getRpcSelectorThreadCount() {
+ return rpcSelectorThreadCount;
}
- public void setRpcSelectorThreadNum(int rpcSelectorThreadNum) {
- this.rpcSelectorThreadNum = rpcSelectorThreadNum;
+ public void setRpcSelectorThreadCount(int rpcSelectorThreadCount) {
+ this.rpcSelectorThreadCount = rpcSelectorThreadCount;
}
public int getRpcMinConcurrentClientNum() {
@@ -1857,12 +1857,12 @@ public class IoTDBConfig {
this.enablePartialInsert = enablePartialInsert;
}
- public int getConcurrentCompactionThread() {
- return concurrentCompactionThread;
+ public int getCompactionThreadCount() {
+ return compactionThreadCount;
}
- public void setConcurrentCompactionThread(int concurrentCompactionThread) {
- this.concurrentCompactionThread = concurrentCompactionThread;
+ public void setCompactionThreadCount(int compactionThreadCount) {
+ this.compactionThreadCount = compactionThreadCount;
}
public int getContinuousQueryThreadNum() {
@@ -2341,16 +2341,16 @@ public class IoTDBConfig {
this.hdfsPort = hdfsPort;
}
- public int getUpgradeThreadNum() {
- return upgradeThreadNum;
+ public int getUpgradeThreadCount() {
+ return upgradeThreadCount;
}
public int getSettleThreadNum() {
return settleThreadNum;
}
- void setUpgradeThreadNum(int upgradeThreadNum) {
- this.upgradeThreadNum = upgradeThreadNum;
+ void setUpgradeThreadCount(int upgradeThreadCount) {
+ this.upgradeThreadCount = upgradeThreadCount;
}
String getDfsNameServices() {
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
index 7b4af1888b..766cbf7ab8 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBDescriptor.java
@@ -151,44 +151,49 @@ public class IoTDBDescriptor {
@SuppressWarnings("squid:S3776") // Suppress high Cognitive Complexity warning
private void loadProps() {
URL url = getPropsUrl(CommonConfig.CONFIG_NAME);
- if (url == null) {
- logger.warn("Couldn't load the configuration from any of the known sources.");
- }
Properties commonProperties = new Properties();
- try (InputStream inputStream = url.openStream()) {
-
- logger.info("Start to read config file {}", url);
- commonProperties.load(inputStream);
-
- } catch (FileNotFoundException e) {
- logger.warn("Fail to find config file {}", url, e);
- } catch (IOException e) {
- logger.warn("Cannot load config file, use default configuration", e);
- } catch (Exception e) {
- logger.warn("Incorrect format in config file, use default configuration", e);
+ if (url != null) {
+ try (InputStream inputStream = url.openStream()) {
+ logger.info("Start to read config file {}", url);
+ commonProperties.load(inputStream);
+ } catch (FileNotFoundException e) {
+ logger.warn("Fail to find config file {}", url, e);
+ } catch (IOException e) {
+ logger.warn("Cannot load config file, use default configuration", e);
+ } catch (Exception e) {
+ logger.warn("Incorrect format in config file, use default configuration", e);
+ }
+ } else {
+ logger.warn(
+ "Couldn't load the configuration {} from any of the known sources.",
+ CommonConfig.CONFIG_NAME);
}
-
url = getPropsUrl(IoTDBConfig.CONFIG_NAME);
- try (InputStream inputStream = url.openStream()) {
- logger.info("Start to read config file {}", url);
- Properties properties = new Properties();
- properties.load(inputStream);
- commonProperties.putAll(properties);
- loadProperties(commonProperties);
-
- } catch (FileNotFoundException e) {
- logger.warn("Fail to find config file {}", url, e);
- } catch (IOException e) {
- logger.warn("Cannot load config file, use default configuration", e);
- } catch (Exception e) {
- logger.warn("Incorrect format in config file, use default configuration", e);
- } finally {
- // update all data seriesPath
- conf.updatePath();
- commonDescriptor.getConfig().updatePath(System.getProperty(IoTDBConstant.IOTDB_HOME, null));
- MetricConfigDescriptor.getInstance()
- .getMetricConfig()
- .updateRpcInstance(conf.getRpcAddress(), conf.getRpcPort());
+ if (url != null) {
+ try (InputStream inputStream = url.openStream()) {
+ logger.info("Start to read config file {}", url);
+ Properties properties = new Properties();
+ properties.load(inputStream);
+ commonProperties.putAll(properties);
+ loadProperties(commonProperties);
+ } catch (FileNotFoundException e) {
+ logger.warn("Fail to find config file {}", url, e);
+ } catch (IOException e) {
+ logger.warn("Cannot load config file, use default configuration", e);
+ } catch (Exception e) {
+ logger.warn("Incorrect format in config file, use default configuration", e);
+ } finally {
+ // update all data seriesPath
+ conf.updatePath();
+ commonDescriptor.getConfig().updatePath(System.getProperty(IoTDBConstant.IOTDB_HOME, null));
+ MetricConfigDescriptor.getInstance()
+ .getMetricConfig()
+ .updateRpcInstance(conf.getRpcAddress(), conf.getRpcPort());
+ }
+ } else {
+ logger.warn(
+ "Couldn't load the configuration {} from any of the known sources.",
+ IoTDBConfig.CONFIG_NAME);
}
}
@@ -235,7 +240,7 @@ public class IoTDBDescriptor {
conf.setSelectorNumOfClientManager(
Integer.parseInt(
properties.getProperty(
- "selector_thread_nums_of_client_manager",
+ "selector_thread_count_of_client_manager",
String.valueOf(conf.getSelectorNumOfClientManager()))));
conf.setRpcPort(
@@ -471,7 +476,7 @@ public class IoTDBDescriptor {
int subtaskNum =
Integer.parseInt(
properties.getProperty(
- "sub_compaction_thread_num", Integer.toString(conf.getSubCompactionTaskNum())));
+ "sub_compaction_thread_count", Integer.toString(conf.getSubCompactionTaskNum())));
subtaskNum = subtaskNum <= 0 ? 1 : subtaskNum;
conf.setSubCompactionTaskNum(subtaskNum);
@@ -494,13 +499,13 @@ public class IoTDBDescriptor {
conf.setIpWhiteList(properties.getProperty("ip_white_list", conf.getIpWhiteList()));
- conf.setConcurrentFlushThread(
+ conf.setFlushThreadCount(
Integer.parseInt(
properties.getProperty(
- "concurrent_flush_thread", Integer.toString(conf.getConcurrentFlushThread()))));
+ "flush_thread_count", Integer.toString(conf.getFlushThreadCount()))));
- if (conf.getConcurrentFlushThread() <= 0) {
- conf.setConcurrentFlushThread(Runtime.getRuntime().availableProcessors());
+ if (conf.getFlushThreadCount() <= 0) {
+ conf.setFlushThreadCount(Runtime.getRuntime().availableProcessors());
}
// start: index parameter setting
@@ -525,13 +530,13 @@ public class IoTDBDescriptor {
"default_index_window_range",
Integer.toString(conf.getDefaultIndexWindowRange()))));
- conf.setConcurrentQueryThread(
+ conf.setQueryThreadCount(
Integer.parseInt(
properties.getProperty(
- "concurrent_query_thread", Integer.toString(conf.getConcurrentQueryThread()))));
+ "query_thread_count", Integer.toString(conf.getQueryThreadCount()))));
- if (conf.getConcurrentQueryThread() <= 0) {
- conf.setConcurrentQueryThread(Runtime.getRuntime().availableProcessors());
+ if (conf.getQueryThreadCount() <= 0) {
+ conf.setQueryThreadCount(Runtime.getRuntime().availableProcessors());
}
conf.setMaxAllowedConcurrentQueries(
@@ -544,14 +549,13 @@ public class IoTDBDescriptor {
conf.setMaxAllowedConcurrentQueries(1000);
}
- conf.setConcurrentSubRawQueryThread(
+ conf.setSubRawQueryThreadCount(
Integer.parseInt(
properties.getProperty(
- "concurrent_sub_rawQuery_thread",
- Integer.toString(conf.getConcurrentSubRawQueryThread()))));
+ "sub_rawQuery_thread_count", Integer.toString(conf.getSubRawQueryThreadCount()))));
- if (conf.getConcurrentSubRawQueryThread() <= 0) {
- conf.setConcurrentSubRawQueryThread(Runtime.getRuntime().availableProcessors());
+ if (conf.getSubRawQueryThreadCount() <= 0) {
+ conf.setSubRawQueryThreadCount(Runtime.getRuntime().availableProcessors());
}
conf.setRawQueryBlockingQueueCapacity(
@@ -591,10 +595,10 @@ public class IoTDBDescriptor {
Integer.parseInt(
properties.getProperty(
"external_sort_threshold", Integer.toString(conf.getExternalSortThreshold()))));
- conf.setUpgradeThreadNum(
+ conf.setUpgradeThreadCount(
Integer.parseInt(
properties.getProperty(
- "upgrade_thread_num", Integer.toString(conf.getUpgradeThreadNum()))));
+ "upgrade_thread_count", Integer.toString(conf.getUpgradeThreadCount()))));
conf.setCrossCompactionFileSelectionTimeBudget(
Long.parseLong(
properties.getProperty(
@@ -604,11 +608,10 @@ public class IoTDBDescriptor {
Long.parseLong(
properties.getProperty(
"merge_interval_sec", Long.toString(conf.getMergeIntervalSec()))));
- conf.setConcurrentCompactionThread(
+ conf.setCompactionThreadCount(
Integer.parseInt(
properties.getProperty(
- "concurrent_compaction_thread",
- Integer.toString(conf.getConcurrentCompactionThread()))));
+ "compaction_thread_count", Integer.toString(conf.getCompactionThreadCount()))));
conf.setChunkMetadataSizeProportion(
Double.parseDouble(
properties.getProperty(
@@ -665,13 +668,13 @@ public class IoTDBDescriptor {
int rpcSelectorThreadNum =
Integer.parseInt(
properties.getProperty(
- "rpc_selector_thread_num",
- Integer.toString(conf.getRpcSelectorThreadNum()).trim()));
+ "rpc_selector_thread_count",
+ Integer.toString(conf.getRpcSelectorThreadCount()).trim()));
if (rpcSelectorThreadNum <= 0) {
rpcSelectorThreadNum = 1;
}
- conf.setRpcSelectorThreadNum(rpcSelectorThreadNum);
+ conf.setRpcSelectorThreadCount(rpcSelectorThreadNum);
int minConcurrentClientNum =
Integer.parseInt(
@@ -801,13 +804,13 @@ public class IoTDBDescriptor {
"enable_discard_out_of_order_data",
Boolean.toString(conf.isEnableDiscardOutOfOrderData()))));
- conf.setConcurrentWindowEvaluationThread(
+ conf.setWindowEvaluationThreadCount(
Integer.parseInt(
properties.getProperty(
- "concurrent_window_evaluation_thread",
- Integer.toString(conf.getConcurrentWindowEvaluationThread()))));
- if (conf.getConcurrentWindowEvaluationThread() <= 0) {
- conf.setConcurrentWindowEvaluationThread(Runtime.getRuntime().availableProcessors());
+ "window_evaluation_thread_count",
+ Integer.toString(conf.getWindowEvaluationThreadCount()))));
+ if (conf.getWindowEvaluationThreadCount() <= 0) {
+ conf.setWindowEvaluationThreadCount(Runtime.getRuntime().availableProcessors());
}
conf.setMaxPendingWindowEvaluationTasks(
diff --git a/server/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java b/server/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java
index 1364c5ccd6..719052a9fb 100644
--- a/server/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/consensus/DataRegionConsensusImpl.java
@@ -70,7 +70,7 @@ public class DataRegionConsensusImpl {
.setRpc(
RPC.newBuilder()
.setConnectionTimeoutInMs(conf.getConnectionTimeoutInMS())
- .setRpcSelectorThreadNum(conf.getRpcSelectorThreadNum())
+ .setRpcSelectorThreadNum(conf.getRpcSelectorThreadCount())
.setRpcMinConcurrentClientNum(
conf.getRpcMinConcurrentClientNum())
.setRpcMaxConcurrentClientNum(
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionTaskManager.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionTaskManager.java
index 46250806e9..a63f15e974 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionTaskManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/CompactionTaskManager.java
@@ -87,7 +87,7 @@ public class CompactionTaskManager implements IService {
@Override
public synchronized void start() {
if (taskExecutionPool == null
- && IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread() > 0
+ && IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount() > 0
&& (config.isEnableSeqSpaceCompaction()
|| config.isEnableUnseqSpaceCompaction()
|| config.isEnableCrossSpaceCompaction())) {
@@ -105,8 +105,7 @@ public class CompactionTaskManager implements IService {
}
private void initThreadPool() {
- int compactionThreadNum =
- IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread();
+ int compactionThreadNum = IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
this.taskExecutionPool =
(WrappedThreadPoolExecutor)
IoTDBThreadPoolFactory.newFixedThreadPool(
@@ -114,7 +113,7 @@ public class CompactionTaskManager implements IService {
this.subCompactionTaskExecutionPool =
(WrappedThreadPoolExecutor)
IoTDBThreadPoolFactory.newFixedThreadPool(
- IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread()
+ IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount()
* IoTDBDescriptor.getInstance().getConfig().getSubCompactionTaskNum(),
ThreadName.COMPACTION_SUB_SERVICE.getName());
for (int i = 0; i < compactionThreadNum; ++i) {
@@ -353,7 +352,7 @@ public class CompactionTaskManager implements IService {
@TestOnly
public void restart() throws InterruptedException {
- if (IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread() > 0) {
+ if (IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount() > 0) {
if (taskExecutionPool != null) {
this.taskExecutionPool.shutdownNow();
if (!this.taskExecutionPool.awaitTermination(MAX_WAITING_TIME, TimeUnit.MILLISECONDS)) {
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/rewrite/RewriteCrossSpaceCompactionSelector.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/rewrite/RewriteCrossSpaceCompactionSelector.java
index 50beb34a19..fba0e10cfe 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/rewrite/RewriteCrossSpaceCompactionSelector.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/rewrite/RewriteCrossSpaceCompactionSelector.java
@@ -84,7 +84,7 @@ public class RewriteCrossSpaceCompactionSelector implements ICrossSpaceSelector
(long)
((double)
(SystemInfo.getInstance().getMemorySizeForCompaction()
- / IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread())
+ / IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount())
* config.getUsableCompactionMemoryProportion());
this.maxCrossCompactionFileNum =
IoTDBDescriptor.getInstance().getConfig().getMaxCrossCompactionCandidateFileNum();
@@ -366,7 +366,7 @@ public class RewriteCrossSpaceCompactionSelector implements ICrossSpaceSelector
@Override
public List selectCrossSpaceTask(
List<TsFileResource> sequenceFileList, List<TsFileResource> unsequenceFileList) {
- if ((CompactionTaskManager.currentTaskNum.get() >= config.getConcurrentCompactionThread())
+ if ((CompactionTaskManager.currentTaskNum.get() >= config.getCompactionThreadCount())
|| (!config.isEnableCrossSpaceCompaction())) {
return Collections.emptyList();
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/performer/impl/ReadChunkCompactionPerformer.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/performer/impl/ReadChunkCompactionPerformer.java
index dbd4b1831a..389cb7f87c 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/performer/impl/ReadChunkCompactionPerformer.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/performer/impl/ReadChunkCompactionPerformer.java
@@ -68,7 +68,7 @@ public class ReadChunkCompactionPerformer implements ISeqCompactionPerformer {
long sizeForFileWriter =
(long)
(SystemInfo.getInstance().getMemorySizeForCompaction()
- / IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread()
+ / IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount()
* IoTDBDescriptor.getInstance().getConfig().getChunkMetadataSizeProportion());
try (MultiTsFileDeviceIterator deviceIterator = new MultiTsFileDeviceIterator(seqFiles);
TsFileIOWriter writer =
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/writer/CrossSpaceCompactionWriter.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/writer/CrossSpaceCompactionWriter.java
index b85cbffb73..cd6058833d 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/writer/CrossSpaceCompactionWriter.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/writer/CrossSpaceCompactionWriter.java
@@ -78,7 +78,7 @@ public class CrossSpaceCompactionWriter extends AbstractCompactionWriter {
long memorySizeForEachWriter =
(long)
(SystemInfo.getInstance().getMemorySizeForCompaction()
- / IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread()
+ / IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount()
* IoTDBDescriptor.getInstance().getConfig().getChunkMetadataSizeProportion()
/ targetResources.size());
for (int i = 0; i < targetResources.size(); i++) {
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/writer/InnerSpaceCompactionWriter.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/writer/InnerSpaceCompactionWriter.java
index d48e609316..90b5fdd7d0 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/writer/InnerSpaceCompactionWriter.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/writer/InnerSpaceCompactionWriter.java
@@ -47,7 +47,7 @@ public class InnerSpaceCompactionWriter extends AbstractCompactionWriter {
long sizeForFileWriter =
(long)
(SystemInfo.getInstance().getMemorySizeForCompaction()
- / IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread()
+ / IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount()
* IoTDBDescriptor.getInstance().getConfig().getChunkMetadataSizeProportion());
this.fileWriter = new TsFileIOWriter(targetFileResource.getTsFile(), true, sizeForFileWriter);
isEmptyFile = true;
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/flush/pool/FlushTaskPoolManager.java b/server/src/main/java/org/apache/iotdb/db/engine/flush/pool/FlushTaskPoolManager.java
index bf0c925bd8..2d67223aa1 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/flush/pool/FlushTaskPoolManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/flush/pool/FlushTaskPoolManager.java
@@ -31,7 +31,7 @@ public class FlushTaskPoolManager extends AbstractPoolManager {
private static final Logger LOGGER = LoggerFactory.getLogger(FlushTaskPoolManager.class);
private FlushTaskPoolManager() {
- int threadCnt = IoTDBDescriptor.getInstance().getConfig().getConcurrentFlushThread();
+ int threadCnt = IoTDBDescriptor.getInstance().getConfig().getFlushThreadCount();
pool = IoTDBThreadPoolFactory.newFixedThreadPool(threadCnt, ThreadName.FLUSH_SERVICE.getName());
}
@@ -52,7 +52,7 @@ public class FlushTaskPoolManager extends AbstractPoolManager {
@Override
public void start() {
if (pool == null) {
- int threadCnt = IoTDBDescriptor.getInstance().getConfig().getConcurrentFlushThread();
+ int threadCnt = IoTDBDescriptor.getInstance().getConfig().getFlushThreadCount();
pool =
IoTDBThreadPoolFactory.newFixedThreadPool(threadCnt, ThreadName.FLUSH_SERVICE.getName());
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/DriverScheduler.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/DriverScheduler.java
index 5344cbde56..a93f3ec69c 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/DriverScheduler.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/DriverScheduler.java
@@ -69,7 +69,7 @@ public class DriverScheduler implements IDriverScheduler, IService {
private static final int MAX_CAPACITY =
IoTDBDescriptor.getInstance().getConfig().getMaxAllowedConcurrentQueries();
private static final int WORKER_THREAD_NUM =
- IoTDBDescriptor.getInstance().getConfig().getConcurrentQueryThread();
+ IoTDBDescriptor.getInstance().getConfig().getQueryThreadCount();
private static final long QUERY_TIMEOUT_MS =
IoTDBDescriptor.getInstance().getConfig().getQueryTimeoutThreshold();
private final ThreadGroup workerGroups;
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 61cfe0898f..987eaae4fa 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
@@ -41,7 +41,7 @@ public class QueryTaskManager extends AbstractPoolManager {
int threadCnt =
Math.min(
Runtime.getRuntime().availableProcessors(),
- IoTDBDescriptor.getInstance().getConfig().getConcurrentQueryThread());
+ IoTDBDescriptor.getInstance().getConfig().getQueryThreadCount());
pool = IoTDBThreadPoolFactory.newFixedThreadPool(threadCnt, ThreadName.QUERY_SERVICE.getName());
}
@@ -65,7 +65,7 @@ public class QueryTaskManager extends AbstractPoolManager {
int threadCnt =
Math.min(
Runtime.getRuntime().availableProcessors(),
- IoTDBDescriptor.getInstance().getConfig().getConcurrentQueryThread());
+ IoTDBDescriptor.getInstance().getConfig().getQueryThreadCount());
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 a58ecf3dea..16a6b2be35 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
@@ -43,7 +43,7 @@ public class RawQueryReadTaskPoolManager extends AbstractPoolManager {
int threadCnt =
Math.min(
Runtime.getRuntime().availableProcessors(),
- IoTDBDescriptor.getInstance().getConfig().getConcurrentSubRawQueryThread());
+ IoTDBDescriptor.getInstance().getConfig().getSubRawQueryThreadCount());
pool =
IoTDBThreadPoolFactory.newFixedThreadPool(
threadCnt, ThreadName.SUB_RAW_QUERY_SERVICE.getName());
@@ -78,7 +78,7 @@ public class RawQueryReadTaskPoolManager extends AbstractPoolManager {
int threadCnt =
Math.min(
Runtime.getRuntime().availableProcessors(),
- IoTDBDescriptor.getInstance().getConfig().getConcurrentSubRawQueryThread());
+ IoTDBDescriptor.getInstance().getConfig().getSubRawQueryThreadCount());
pool =
IoTDBThreadPoolFactory.newFixedThreadPool(
threadCnt, ThreadName.SUB_RAW_QUERY_SERVICE.getName());
diff --git a/server/src/main/java/org/apache/iotdb/db/service/UpgradeSevice.java b/server/src/main/java/org/apache/iotdb/db/service/UpgradeSevice.java
index 1e11c8fce5..c32cd5db70 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/UpgradeSevice.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/UpgradeSevice.java
@@ -55,7 +55,7 @@ public class UpgradeSevice implements IService {
@Override
public void start() {
- int updateThreadNum = IoTDBDescriptor.getInstance().getConfig().getUpgradeThreadNum();
+ int updateThreadNum = IoTDBDescriptor.getInstance().getConfig().getUpgradeThreadCount();
if (updateThreadNum <= 0) {
updateThreadNum = 1;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/windowing/runtime/WindowEvaluationTaskPoolManager.java b/server/src/main/java/org/apache/iotdb/db/utils/windowing/runtime/WindowEvaluationTaskPoolManager.java
index 7c5a97efc5..9fba7a2a73 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/windowing/runtime/WindowEvaluationTaskPoolManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/windowing/runtime/WindowEvaluationTaskPoolManager.java
@@ -39,8 +39,7 @@ public class WindowEvaluationTaskPoolManager extends AbstractPoolManager {
LoggerFactory.getLogger(WindowEvaluationTaskPoolManager.class);
private WindowEvaluationTaskPoolManager() {
- final int nThreads =
- IoTDBDescriptor.getInstance().getConfig().getConcurrentWindowEvaluationThread();
+ final int nThreads = IoTDBDescriptor.getInstance().getConfig().getWindowEvaluationThreadCount();
LOGGER.info("WindowEvaluationTaskPoolManager is initializing, thread number: {}", nThreads);
pool =
new ThreadPoolExecutor(
@@ -79,7 +78,7 @@ public class WindowEvaluationTaskPoolManager extends AbstractPoolManager {
pool =
IoTDBThreadPoolFactory.newFixedThreadPool(
- IoTDBDescriptor.getInstance().getConfig().getConcurrentWindowEvaluationThread(),
+ IoTDBDescriptor.getInstance().getConfig().getWindowEvaluationThreadCount(),
ThreadName.WINDOW_EVALUATION_SERVICE.getName());
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/CompactionSchedulerTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/CompactionSchedulerTest.java
index f82d8b7b77..8fe816e4ec 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/CompactionSchedulerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/CompactionSchedulerTest.java
@@ -149,8 +149,8 @@ public class CompactionSchedulerTest {
IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(true);
IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(true);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread();
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(50);
+ IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
@@ -258,7 +258,7 @@ public class CompactionSchedulerTest {
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
.getConfig()
- .setConcurrentCompactionThread(prevCompactionConcurrentThread);
+ .setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
.getConfig()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
@@ -280,8 +280,8 @@ public class CompactionSchedulerTest {
IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(true);
IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(true);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread();
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(50);
+ IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
@@ -292,7 +292,7 @@ public class CompactionSchedulerTest {
* 1024
* 1024L
* 1024L
- * IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread());
+ * IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount());
try {
String sgName = COMPACTION_TEST_SG + "test2";
try {
@@ -388,7 +388,7 @@ public class CompactionSchedulerTest {
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
.getConfig()
- .setConcurrentCompactionThread(prevCompactionConcurrentThread);
+ .setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
.getConfig()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
@@ -412,8 +412,8 @@ public class CompactionSchedulerTest {
IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread();
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(50);
+ IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
@@ -499,7 +499,7 @@ public class CompactionSchedulerTest {
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
.getConfig()
- .setConcurrentCompactionThread(prevCompactionConcurrentThread);
+ .setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
.getConfig()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
@@ -520,8 +520,8 @@ public class CompactionSchedulerTest {
IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread();
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(50);
+ IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
@@ -597,7 +597,7 @@ public class CompactionSchedulerTest {
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
.getConfig()
- .setConcurrentCompactionThread(prevCompactionConcurrentThread);
+ .setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
.getConfig()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
@@ -618,8 +618,8 @@ public class CompactionSchedulerTest {
IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(true);
IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(true);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread();
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(1);
+ IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(1);
int prevMaxCompactionCandidateFileNum =
IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
@@ -723,7 +723,7 @@ public class CompactionSchedulerTest {
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
.getConfig()
- .setConcurrentCompactionThread(prevCompactionConcurrentThread);
+ .setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
.getConfig()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
@@ -745,8 +745,8 @@ public class CompactionSchedulerTest {
IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(true);
IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(true);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread();
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(1);
+ IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(1);
int prevMaxCompactionCandidateFileNum =
IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
@@ -842,7 +842,7 @@ public class CompactionSchedulerTest {
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
.getConfig()
- .setConcurrentCompactionThread(prevCompactionConcurrentThread);
+ .setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
.getConfig()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
@@ -862,8 +862,8 @@ public class CompactionSchedulerTest {
IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread();
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(1);
+ IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(1);
int prevMaxCompactionCandidateFileNum =
IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
@@ -955,7 +955,7 @@ public class CompactionSchedulerTest {
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
.getConfig()
- .setConcurrentCompactionThread(prevCompactionConcurrentThread);
+ .setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
.getConfig()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
@@ -975,8 +975,8 @@ public class CompactionSchedulerTest {
IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread();
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(1);
+ IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(1);
int prevMaxCompactionCandidateFileNum =
IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
@@ -1054,7 +1054,7 @@ public class CompactionSchedulerTest {
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
.getConfig()
- .setConcurrentCompactionThread(prevCompactionConcurrentThread);
+ .setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
.getConfig()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
@@ -1074,8 +1074,8 @@ public class CompactionSchedulerTest {
IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread();
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(50);
+ IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
@@ -1166,7 +1166,7 @@ public class CompactionSchedulerTest {
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
.getConfig()
- .setConcurrentCompactionThread(prevCompactionConcurrentThread);
+ .setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
.getConfig()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
@@ -1189,8 +1189,8 @@ public class CompactionSchedulerTest {
IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(false);
IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(true);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread();
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(50);
+ IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
@@ -1285,7 +1285,7 @@ public class CompactionSchedulerTest {
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
.getConfig()
- .setConcurrentCompactionThread(prevCompactionConcurrentThread);
+ .setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
.getConfig()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
@@ -1308,8 +1308,8 @@ public class CompactionSchedulerTest {
IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread();
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(50);
+ IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
@@ -1403,7 +1403,7 @@ public class CompactionSchedulerTest {
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
.getConfig()
- .setConcurrentCompactionThread(prevCompactionConcurrentThread);
+ .setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
.getConfig()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
@@ -1424,8 +1424,8 @@ public class CompactionSchedulerTest {
IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread();
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(50);
+ IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
@@ -1521,7 +1521,7 @@ public class CompactionSchedulerTest {
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
.getConfig()
- .setConcurrentCompactionThread(prevCompactionConcurrentThread);
+ .setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
.getConfig()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
@@ -1542,8 +1542,8 @@ public class CompactionSchedulerTest {
IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(true);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread();
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(1);
+ IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(1);
int prevMaxCompactionCandidateFileNum =
IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
@@ -1643,7 +1643,7 @@ public class CompactionSchedulerTest {
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
.getConfig()
- .setConcurrentCompactionThread(prevCompactionConcurrentThread);
+ .setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
.getConfig()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
@@ -1663,8 +1663,8 @@ public class CompactionSchedulerTest {
IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread();
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(1);
+ IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(1);
int prevMaxCompactionCandidateFileNum =
IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
@@ -1772,7 +1772,7 @@ public class CompactionSchedulerTest {
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
.getConfig()
- .setConcurrentCompactionThread(prevCompactionConcurrentThread);
+ .setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
.getConfig()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
@@ -1792,8 +1792,8 @@ public class CompactionSchedulerTest {
IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread();
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(1);
+ IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(1);
int prevMaxCompactionCandidateFileNum =
IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
@@ -1889,7 +1889,7 @@ public class CompactionSchedulerTest {
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
.getConfig()
- .setConcurrentCompactionThread(prevCompactionConcurrentThread);
+ .setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
.getConfig()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCompactionFileSelectorTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCompactionFileSelectorTest.java
index b105033a1a..e6417aca11 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCompactionFileSelectorTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCompactionFileSelectorTest.java
@@ -305,7 +305,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
long originMemoryBudget = SystemInfo.getInstance().getMemorySizeForCompaction();
SystemInfo.getInstance()
.setMemorySizeForCompaction(
- 29000L * IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread());
+ 29000L * IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount());
try {
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
@@ -388,7 +388,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
500L
* 1024
* 1024
- * IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread());
+ * IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount());
try {
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
@@ -461,7 +461,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
500L
* 1024
* 1024
- * IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread());
+ * IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount());
try {
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
@@ -536,7 +536,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
500L
* 1024
* 1024
- * IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread());
+ * IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount());
try {
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
@@ -612,7 +612,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
500L
* 1024
* 1024
- * IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread());
+ * IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount());
try {
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
@@ -691,7 +691,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
500L
* 1024
* 1024
- * IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread());
+ * IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount());
try {
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
@@ -923,7 +923,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
500L
* 1024
* 1024
- * IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread());
+ * IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount());
try {
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionSchedulerTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionSchedulerTest.java
index c68db5edcd..69972a511c 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionSchedulerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerCompactionSchedulerTest.java
@@ -45,7 +45,7 @@ public class InnerCompactionSchedulerTest extends AbstractCompactionTest {
boolean oldEnableUnSeqSpaceCompaction =
IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
int oldConcurrentCompactionThread =
- IoTDBDescriptor.getInstance().getConfig().getConcurrentCompactionThread();
+ IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
int oldMaxCompactionCandidateFileNum =
IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
@@ -69,7 +69,7 @@ public class InnerCompactionSchedulerTest extends AbstractCompactionTest {
.setEnableUnseqSpaceCompaction(oldEnableUnSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
.getConfig()
- .setConcurrentCompactionThread(oldConcurrentCompactionThread);
+ .setCompactionThreadCount(oldConcurrentCompactionThread);
IoTDBDescriptor.getInstance()
.getConfig()
.setMaxInnerCompactionCandidateFileNum(oldMaxCompactionCandidateFileNum);
@@ -81,7 +81,7 @@ public class InnerCompactionSchedulerTest extends AbstractCompactionTest {
throws IOException, MetadataException, WriteProcessException, InterruptedException {
IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(true);
IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(true);
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(50);
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(4);
IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(1000000);
createFiles(2, 2, 3, 100, 0, 0, 50, 50, false, true);
@@ -105,7 +105,7 @@ public class InnerCompactionSchedulerTest extends AbstractCompactionTest {
@Test
public void testFileSelector2()
throws IOException, MetadataException, WriteProcessException, InterruptedException {
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(50);
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(50);
TsFileResourceList tsFileResources = new TsFileResourceList();
createFiles(2, 2, 3, 100, 0, 0, 50, 50, false, true);
@@ -135,7 +135,7 @@ public class InnerCompactionSchedulerTest extends AbstractCompactionTest {
@Test
public void testFileSelectorWithUnclosedFile()
throws IOException, MetadataException, WriteProcessException, InterruptedException {
- IoTDBDescriptor.getInstance().getConfig().setConcurrentCompactionThread(50);
+ IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(50);
TsFileResourceList tsFileResources = new TsFileResourceList();
createFiles(2, 2, 3, 100, 0, 0, 50, 50, false, true);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/utils/CompactionConfigRestorer.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/utils/CompactionConfigRestorer.java
index 8820d198d7..a809d10262 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/utils/CompactionConfigRestorer.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/utils/CompactionConfigRestorer.java
@@ -62,7 +62,7 @@ public class CompactionConfigRestorer {
config.setChunkPointNumLowerBoundInCompaction(chunkPointNumLowerBoundInCompaction);
config.setMaxInnerCompactionCandidateFileNum(maxInnerCompactionCandidateFileNum);
config.setMaxCrossCompactionCandidateFileNum(maxCrossCompactionCandidateFileNum);
- config.setConcurrentCompactionThread(concurrentCompactionThread);
+ config.setCompactionThreadCount(concurrentCompactionThread);
config.setCompactionScheduleIntervalInMs(compactionScheduleIntervalInMs);
config.setCompactionSubmissionIntervalInMs(compactionSubmissionIntervalInMs);
config.setCompactionWriteThroughputMbPerSec(compactionWriteThroughputMbPerSec);