You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by yo...@apache.org on 2023/01/12 15:35:15 UTC
[iotdb] 03/04: stash
This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a commit to branch Move-ConfigNodeConfig-into-CommonConfig
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 79f1bb261dc249e1c82e4d347dbf252ba1633cca
Author: YongzaoDan <53...@qq.com>
AuthorDate: Thu Jan 12 23:18:26 2023 +0800
stash
---
.../iotdb/db/client/DataNodeClientPoolFactory.java | 8 ++++----
.../statemachine/DataRegionStateMachine.java | 2 +-
.../impl/RewriteCrossSpaceCompactionSelector.java | 3 ++-
.../db/exception/sql/PathNumOverLimitException.java | 4 ++--
.../db/metadata/cache/DataNodeLastCacheManager.java | 3 ++-
.../operator/process/last/LastQueryUtil.java | 4 ++--
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 9 +++++----
.../db/mpp/plan/analyze/ClusterPartitionFetcher.java | 20 +++++++++-----------
.../mpp/plan/analyze/ColumnPaginationController.java | 5 +++--
.../plan/analyze/schema/ClusterSchemaFetcher.java | 10 +++++-----
.../metadata/CreateContinuousQueryStatement.java | 6 +++---
.../db/protocol/rest/impl/GrafanaApiServiceImpl.java | 8 ++++----
.../db/protocol/rest/impl/RestApiServiceImpl.java | 6 +++---
.../db/service/basic/QueryFrequencyRecorder.java | 4 +++-
.../iotdb/db/sync/externalpipe/ExtPipePlugin.java | 4 ++--
.../iotdb/db/sync/pipedata/load/DeletionLoader.java | 2 +-
.../iotdb/db/sync/pipedata/load/TsFileLoader.java | 4 ++--
.../db/trigger/executor/TriggerFireVisitor.java | 4 ++--
.../org/apache/iotdb/db/utils/OpenFileNumUtil.java | 6 +++---
.../allocation/AbstractNodeAllocationStrategy.java | 8 ++++----
.../org/apache/iotdb/db/wal/buffer/WALInfoEntry.java | 6 +++---
.../iotdb/db/wal/recover/WALNodeRecoverTask.java | 6 ++++--
.../iotdb/db/wal/recover/WALRecoverManager.java | 9 +++++----
23 files changed, 74 insertions(+), 67 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/client/DataNodeClientPoolFactory.java b/server/src/main/java/org/apache/iotdb/db/client/DataNodeClientPoolFactory.java
index f8f77e1ff7..41d6857147 100644
--- a/server/src/main/java/org/apache/iotdb/db/client/DataNodeClientPoolFactory.java
+++ b/server/src/main/java/org/apache/iotdb/db/client/DataNodeClientPoolFactory.java
@@ -50,8 +50,8 @@ public class DataNodeClientPoolFactory {
.setRpcThriftCompressionEnabled(conf.isDnRpcThriftCompressionEnable())
.build()),
new ClientPoolProperty.Builder<ConfigNodeClient>()
- .setCoreClientNumForEachNode(conf.getCoreClientNumForEachNode())
- .setMaxClientNumForEachNode(conf.getMaxClientNumForEachNode())
+ .setCoreClientNumForEachNode(conf.getDnCoreClientCountForEachNodeInClientManager())
+ .setMaxClientNumForEachNode(conf.getDnMaxClientCountForEachNodeInClientManager())
.build()
.getConfig());
}
@@ -75,8 +75,8 @@ public class DataNodeClientPoolFactory {
: 1)
.build()),
new ClientPoolProperty.Builder<ConfigNodeClient>()
- .setCoreClientNumForEachNode(conf.getCoreClientNumForEachNode())
- .setMaxClientNumForEachNode(conf.getMaxClientNumForEachNode())
+ .setCoreClientNumForEachNode(conf.getDnCoreClientCountForEachNodeInClientManager())
+ .setMaxClientNumForEachNode(conf.getDnMaxClientCountForEachNodeInClientManager())
.build()
.getConfig());
}
diff --git a/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/DataRegionStateMachine.java b/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/DataRegionStateMachine.java
index d420207111..2d2844d97d 100644
--- a/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/DataRegionStateMachine.java
+++ b/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/DataRegionStateMachine.java
@@ -76,7 +76,7 @@ public class DataRegionStateMachine extends BaseStateMachine {
private static final int MAX_REQUEST_CACHE_SIZE = 5;
private static final long CACHE_WINDOW_TIME_IN_MS =
- IoTDBDescriptor.getInstance().getConf().getCacheWindowTimeInMs();
+ CommonDescriptor.getInstance().getConf().getIotConsensusCacheWindowTimeInMs();
private ConcurrentHashMap<String, SyncLogCacheQueue> cacheQueueMap;
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/impl/RewriteCrossSpaceCompactionSelector.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/impl/RewriteCrossSpaceCompactionSelector.java
index fd9ee62960..467965b794 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/impl/RewriteCrossSpaceCompactionSelector.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/impl/RewriteCrossSpaceCompactionSelector.java
@@ -17,7 +17,7 @@
* under the License.
*/
package org.apache.iotdb.db.engine.compaction.selector.impl;
-
+import org.apache.iotdb.commons.conf.CommonConfig;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.db.conf.IoTDBConfig;
@@ -46,6 +46,7 @@ import java.util.stream.Collectors;
public class RewriteCrossSpaceCompactionSelector implements ICrossSpaceSelector {
private static final Logger LOGGER =
LoggerFactory.getLogger(IoTDBConstant.COMPACTION_LOGGER_NAME);
+
private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private final int SELECT_WARN_THRESHOLD = 10;
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/sql/PathNumOverLimitException.java b/server/src/main/java/org/apache/iotdb/db/exception/sql/PathNumOverLimitException.java
index e0a4272ecd..9fa3f66160 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/sql/PathNumOverLimitException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/sql/PathNumOverLimitException.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.exception.sql;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
public class PathNumOverLimitException extends SemanticException {
@@ -28,6 +28,6 @@ public class PathNumOverLimitException extends SemanticException {
String.format(
"Too many paths in one query! Currently allowed max deduplicated path number is %d. "
+ "Please use slimit or adjust max_deduplicated_path_num in iotdb-common.properties.",
- IoTDBDescriptor.getInstance().getConf().getMaxQueryDeduplicatedPathNum()));
+ CommonDescriptor.getInstance().getConf().getMaxDeduplicatedPathNum()));
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeLastCacheManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeLastCacheManager.java
index 4a3db43783..7f7a58b2f5 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeLastCacheManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeLastCacheManager.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.db.metadata.cache;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.metadata.cache.lastCache.container.ILastCacheContainer;
import org.apache.iotdb.tsfile.read.TimeValuePair;
@@ -30,7 +31,7 @@ public class DataNodeLastCacheManager {
private static final Logger logger = LoggerFactory.getLogger(DataNodeLastCacheManager.class);
private static final boolean CACHE_ENABLED =
- IoTDBDescriptor.getInstance().getConf().isLastCacheEnabled();
+ CommonDescriptor.getInstance().getConf().isEnableLastCache();
/**
* get the last cache value from time series
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/last/LastQueryUtil.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/last/LastQueryUtil.java
index f685c29388..9268445d0e 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/last/LastQueryUtil.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/last/LastQueryUtil.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.db.mpp.execution.operator.process.last;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.db.mpp.aggregation.Aggregator;
import org.apache.iotdb.db.mpp.aggregation.LastValueDescAccumulator;
import org.apache.iotdb.db.mpp.aggregation.MaxTimeDescAccumulator;
@@ -43,7 +43,7 @@ import java.util.List;
public class LastQueryUtil {
private static final boolean CACHE_ENABLED =
- IoTDBDescriptor.getInstance().getConf().isLastCacheEnabled();
+ CommonDescriptor.getInstance().getConf().isEnableLastCache();
public static TsBlockBuilder createTsBlockBuilder() {
return new TsBlockBuilder(ImmutableList.of(TSDataType.TEXT, TSDataType.TEXT, TSDataType.TEXT));
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
index 53db286673..d67be07f85 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
@@ -21,6 +21,7 @@ package org.apache.iotdb.db.mpp.plan.analyze;
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot;
import org.apache.iotdb.commons.client.exception.ClientManagerException;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.exception.MetadataException;
@@ -1147,8 +1148,8 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
if (res.left.isEmpty() && !res.right.left) {
return new DataPartition(
Collections.emptyMap(),
- CONFIG.getSeriesPartitionExecutorClass(),
- CONFIG.getSeriesPartitionSlotNum());
+ CommonDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
+ CommonDescriptor.getInstance().getConf().getSeriesSlotNum());
}
Map<String, List<DataPartitionQueryParam>> sgNameToQueryParamsMap = new HashMap<>();
for (String devicePath : deviceSet) {
@@ -1815,7 +1816,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
try (TsFileSequenceReader reader = new TsFileSequenceReader(tsFile.getAbsolutePath())) {
Map<String, List<TimeseriesMetadata>> device2Metadata = reader.getAllTimeseriesMetadata(true);
- if (IoTDBDescriptor.getInstance().getConf().isAutoCreateSchemaEnabled()
+ if (CommonDescriptor.getInstance().getConf().isEnableAutoCreateSchema()
|| statement.isVerifySchema()) {
// construct schema
for (Map.Entry<String, List<TimeseriesMetadata>> entry : device2Metadata.entrySet()) {
@@ -1918,7 +1919,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
"",
partitionFetcher,
schemaFetcher,
- IoTDBDescriptor.getInstance().getConf().getQueryTimeoutThreshold());
+ CommonDescriptor.getInstance().getConf().getQueryTimeoutThreshold());
if (result.status.code != TSStatusCode.SUCCESS_STATUS.getStatusCode()
&& result.status.code != TSStatusCode.DATABASE_ALREADY_EXISTS.getStatusCode()) {
logger.warn(
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterPartitionFetcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterPartitionFetcher.java
index 943e5dbc2d..cd9e58256b 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterPartitionFetcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterPartitionFetcher.java
@@ -24,6 +24,8 @@ import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot;
import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot;
import org.apache.iotdb.commons.client.IClientManager;
import org.apache.iotdb.commons.client.exception.ClientManagerException;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.consensus.ConfigNodeRegionId;
import org.apache.iotdb.commons.exception.IoTDBException;
import org.apache.iotdb.commons.partition.DataPartition;
@@ -42,8 +44,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TTimeSlotList;
import org.apache.iotdb.db.client.ConfigNodeClient;
import org.apache.iotdb.db.client.ConfigNodeClientManager;
import org.apache.iotdb.db.client.ConfigNodeInfo;
-import org.apache.iotdb.db.conf.IoTDBConfig;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.sql.StatementAnalyzeException;
import org.apache.iotdb.db.mpp.plan.analyze.cache.PartitionCache;
import org.apache.iotdb.mpp.rpc.thrift.TRegionRouteReq;
@@ -65,7 +65,7 @@ import java.util.Map;
public class ClusterPartitionFetcher implements IPartitionFetcher {
private static final Logger logger = LoggerFactory.getLogger(ClusterPartitionFetcher.class);
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
+ private static final CommonConfig config = CommonDescriptor.getInstance().getConf();
private final SeriesPartitionExecutor partitionExecutor;
@@ -88,7 +88,7 @@ public class ClusterPartitionFetcher implements IPartitionFetcher {
private ClusterPartitionFetcher() {
this.partitionExecutor =
SeriesPartitionExecutor.getSeriesPartitionExecutor(
- config.getSeriesPartitionExecutorClass(), config.getSeriesPartitionSlotNum());
+ config.getSeriesPartitionExecutorClass(), config.getSeriesSlotNum());
this.partitionCache = new PartitionCache();
}
@@ -385,16 +385,16 @@ public class ClusterPartitionFetcher implements IPartitionFetcher {
return new SchemaPartition(
regionReplicaMap,
- IoTDBDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
- IoTDBDescriptor.getInstance().getConf().getSeriesPartitionSlotNum());
+ CommonDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
+ CommonDescriptor.getInstance().getConf().getSeriesSlotNum());
}
private SchemaNodeManagementPartition parseSchemaNodeManagementPartitionResp(
TSchemaNodeManagementResp schemaNodeManagementResp) {
return new SchemaNodeManagementPartition(
schemaNodeManagementResp.getSchemaRegionMap(),
- IoTDBDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
- IoTDBDescriptor.getInstance().getConf().getSeriesPartitionSlotNum(),
+ CommonDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
+ CommonDescriptor.getInstance().getConf().getSeriesSlotNum(),
schemaNodeManagementResp.getMatchedNode());
}
@@ -422,8 +422,6 @@ public class ClusterPartitionFetcher implements IPartitionFetcher {
}
return new DataPartition(
- regionReplicaSet,
- config.getSeriesPartitionExecutorClass(),
- config.getSeriesPartitionSlotNum());
+ regionReplicaSet, config.getSeriesPartitionExecutorClass(), config.getSeriesSlotNum());
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ColumnPaginationController.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ColumnPaginationController.java
index f8405391d1..1de6a6f81d 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ColumnPaginationController.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ColumnPaginationController.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.db.mpp.plan.analyze;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.sql.PathNumOverLimitException;
@@ -26,7 +27,7 @@ import org.apache.iotdb.db.exception.sql.PathNumOverLimitException;
public class ColumnPaginationController {
private int curLimit =
- IoTDBDescriptor.getInstance().getConf().getMaxQueryDeduplicatedPathNum() + 1;
+ CommonDescriptor.getInstance().getConf().getMaxDeduplicatedPathNum() + 1;
private int curOffset;
// records the path number that the SchemaProcessor totally returned
@@ -69,7 +70,7 @@ public class ColumnPaginationController {
public void consumeLimit() {
consumed++;
- if (consumed > IoTDBDescriptor.getInstance().getConf().getMaxQueryDeduplicatedPathNum()) {
+ if (consumed > CommonDescriptor.getInstance().getConf().getMaxDeduplicatedPathNum()) {
throw new PathNumOverLimitException();
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/ClusterSchemaFetcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/ClusterSchemaFetcher.java
index 0939b6e1c6..4bacc5c79a 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/ClusterSchemaFetcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/ClusterSchemaFetcher.java
@@ -18,10 +18,10 @@
*/
package org.apache.iotdb.db.mpp.plan.analyze.schema;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
-import org.apache.iotdb.db.conf.IoTDBConfig;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.metadata.cache.DataNodeSchemaCache;
import org.apache.iotdb.db.metadata.template.ClusterTemplateManager;
import org.apache.iotdb.db.metadata.template.ITemplateManager;
@@ -50,7 +50,7 @@ import java.util.stream.IntStream;
public class ClusterSchemaFetcher implements ISchemaFetcher {
- private final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
+ private final CommonConfig config = CommonDescriptor.getInstance().getConf();
private final Coordinator coordinator = Coordinator.getInstance();
private final DataNodeSchemaCache schemaCache = DataNodeSchemaCache.getInstance();
@@ -178,7 +178,7 @@ public class ClusterSchemaFetcher implements ISchemaFetcher {
schemaTree.mergeSchemaTree(remoteSchemaTree);
}
- if (!config.isAutoCreateSchemaEnabled()) {
+ if (!config.isEnableAutoCreateSchema()) {
return schemaTree;
}
@@ -247,7 +247,7 @@ public class ClusterSchemaFetcher implements ISchemaFetcher {
schemaTree.mergeSchemaTree(remoteSchemaTree);
}
- if (!config.isAutoCreateSchemaEnabled()) {
+ if (!config.isEnableAutoCreateSchema()) {
return schemaTree;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/CreateContinuousQueryStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/CreateContinuousQueryStatement.java
index 969ef478b8..7f4c0c2b9f 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/CreateContinuousQueryStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/CreateContinuousQueryStatement.java
@@ -19,9 +19,9 @@
package org.apache.iotdb.db.mpp.plan.statement.metadata;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.cq.TimeoutPolicy;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.mpp.plan.analyze.ExpressionAnalyzer;
import org.apache.iotdb.db.mpp.plan.analyze.QueryType;
@@ -175,12 +175,12 @@ public class CreateContinuousQueryStatement extends Statement implements IConfig
public void semanticCheck() {
if (everyInterval
- < IoTDBDescriptor.getInstance().getConf().getContinuousQueryMinimumEveryInterval()) {
+ < CommonDescriptor.getInstance().getConf().getContinuousQueryMinEveryIntervalInMs()) {
throw new SemanticException(
String.format(
"CQ: Every interval [%d] should not be lower than the `continuous_query_minimum_every_interval` [%d] configured.",
everyInterval,
- IoTDBDescriptor.getInstance().getConf().getContinuousQueryMinimumEveryInterval()));
+ CommonDescriptor.getInstance().getConf().getContinuousQueryMinEveryIntervalInMs()));
}
if (startTimeOffset <= 0) {
throw new SemanticException("CQ: The start time offset should be greater than 0.");
diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java
index a0f3808fdf..ee5a76b730 100644
--- a/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java
@@ -17,9 +17,9 @@
package org.apache.iotdb.db.protocol.rest.impl;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.db.conf.IoTDBConfig;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.mpp.plan.Coordinator;
import org.apache.iotdb.db.mpp.plan.analyze.ClusterPartitionFetcher;
import org.apache.iotdb.db.mpp.plan.analyze.IPartitionFetcher;
@@ -55,7 +55,7 @@ import java.util.List;
public class GrafanaApiServiceImpl extends GrafanaApiService {
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
+ private static final CommonConfig config = CommonDescriptor.getInstance().getConf();
private static final Coordinator COORDINATOR = Coordinator.getInstance();
@@ -73,7 +73,7 @@ public class GrafanaApiServiceImpl extends GrafanaApiService {
SCHEMA_FETCHER = ClusterSchemaFetcher.getInstance();
authorizationHandler = new AuthorizationHandler();
- switch (IoTDBDescriptor.getInstance().getConf().getTimestampPrecision()) {
+ switch (CommonDescriptor.getInstance().getConf().getTimestampPrecision()) {
case "ns":
timePrecision = 1000000;
break;
diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java
index 51f727444d..901e59f44a 100644
--- a/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java
@@ -17,8 +17,8 @@
package org.apache.iotdb.db.protocol.rest.impl;
-import org.apache.iotdb.db.conf.IoTDBConfig;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.db.conf.rest.IoTDBRestServiceDescriptor;
import org.apache.iotdb.db.mpp.plan.Coordinator;
import org.apache.iotdb.db.mpp.plan.analyze.ClusterPartitionFetcher;
@@ -51,7 +51,7 @@ import java.time.ZoneId;
public class RestApiServiceImpl extends RestApiService {
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
+ private static final CommonConfig config = CommonDescriptor.getInstance().getConf();
private static final Coordinator COORDINATOR = Coordinator.getInstance();
diff --git a/server/src/main/java/org/apache/iotdb/db/service/basic/QueryFrequencyRecorder.java b/server/src/main/java/org/apache/iotdb/db/service/basic/QueryFrequencyRecorder.java
index 5c4290f4c4..14444468db 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/basic/QueryFrequencyRecorder.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/basic/QueryFrequencyRecorder.java
@@ -20,8 +20,10 @@ package org.apache.iotdb.db.service.basic;
import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory;
import org.apache.iotdb.commons.concurrent.threadpool.ScheduledExecutorUtil;
+import org.apache.iotdb.commons.conf.CommonConfig;
import org.apache.iotdb.db.conf.IoTDBConfig;
+import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,7 +36,7 @@ public class QueryFrequencyRecorder {
private static final Logger QUERY_FREQUENCY_LOGGER = LoggerFactory.getLogger("QUERY_FREQUENCY");
private static final AtomicInteger QUERY_COUNT = new AtomicInteger(0);
- public QueryFrequencyRecorder(IoTDBConfig config) {
+ public QueryFrequencyRecorder(TSFileConfig config) {
ScheduledExecutorService timedQuerySqlCountThread =
IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor("timedQuerySqlCount");
ScheduledExecutorUtil.safelyScheduleAtFixedRate(
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePlugin.java b/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePlugin.java
index 9928e1ff87..e87b9e7073 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePlugin.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePlugin.java
@@ -21,9 +21,9 @@ package org.apache.iotdb.db.sync.externalpipe;
import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory;
import org.apache.iotdb.commons.concurrent.ThreadName;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.utils.TestOnly;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.sync.datasource.PipeOpManager;
import org.apache.iotdb.db.sync.datasource.PipeStorageGroupInfo;
import org.apache.iotdb.db.sync.externalpipe.operation.DeleteOperation;
@@ -93,7 +93,7 @@ public class ExtPipePlugin {
this.pipeOpManager = pipeOpManager;
this.extPipePluginManager = extPipePluginManager;
- String timePrecision = IoTDBDescriptor.getInstance().getConf().getTimestampPrecision();
+ String timePrecision = CommonDescriptor.getInstance().getConf().getTimestampPrecision();
switch (timePrecision) {
case "ms":
timestampDivisor = 1;
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/DeletionLoader.java b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/DeletionLoader.java
index 048a296f3d..832392d9ed 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/DeletionLoader.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/DeletionLoader.java
@@ -63,7 +63,7 @@ public class DeletionLoader implements ILoader {
"",
PARTITION_FETCHER,
SCHEMA_FETCHER,
- IoTDBDescriptor.getInstance().getConf().getQueryTimeoutThreshold());
+ CommonDescriptor.getInstance().getConf().getQueryTimeoutThreshold());
if (result.status.code != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
logger.error("Delete {} error, statement: {}.", deletion, statement);
logger.error("Delete result status : {}.", result.status);
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/TsFileLoader.java b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/TsFileLoader.java
index d17c4531e9..1413fa06f6 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/TsFileLoader.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/TsFileLoader.java
@@ -18,10 +18,10 @@
*/
package org.apache.iotdb.db.sync.pipedata.load;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.exception.sync.PipeDataLoadException;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.LoadFileException;
import org.apache.iotdb.db.mpp.plan.Coordinator;
import org.apache.iotdb.db.mpp.plan.execution.ExecutionResult;
@@ -66,7 +66,7 @@ public class TsFileLoader implements ILoader {
"",
PARTITION_FETCHER,
SCHEMA_FETCHER,
- IoTDBDescriptor.getInstance().getConf().getQueryTimeoutThreshold());
+ CommonDescriptor.getInstance().getConf().getQueryTimeoutThreshold());
if (result.status.code != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
logger.error("Load TsFile {} error, statement: {}.", tsFile.getPath(), statement);
logger.error("Load TsFile result status : {}.", result.status);
diff --git a/server/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java b/server/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java
index 4c1a3f6070..f6f0d49ea6 100644
--- a/server/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java
@@ -23,6 +23,7 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.commons.client.IClientManager;
import org.apache.iotdb.commons.client.exception.ClientManagerException;
import org.apache.iotdb.commons.client.sync.SyncDataNodeInternalServiceClient;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.consensus.ConfigNodeRegionId;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.trigger.TriggerInformation;
@@ -32,7 +33,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TTriggerState;
import org.apache.iotdb.db.client.ConfigNodeClient;
import org.apache.iotdb.db.client.ConfigNodeClientManager;
import org.apache.iotdb.db.client.ConfigNodeInfo;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.mpp.plan.Coordinator;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanVisitor;
@@ -75,7 +75,7 @@ public class TriggerFireVisitor extends PlanVisitor<TriggerFireResult, TriggerEv
* How many times should we retry when error occurred during firing a trigger on another datanode
*/
private static final int FIRE_RETRY_NUM =
- IoTDBDescriptor.getInstance().getConf().getRetryNumToFindStatefulTrigger();
+ CommonDescriptor.getInstance().getConf().getStatefulTriggerRetryNumWhenNotFound();
@Override
public TriggerFireResult process(PlanNode node, TriggerEvent context) {
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java b/server/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java
index 2d70e7cf1d..24a3cc5405 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java
@@ -52,8 +52,8 @@ public class OpenFileNumUtil {
// command 'lsof -p' is available on most Linux distro except CentOS.
private static final String SEARCH_OPEN_DATA_FILE_BY_PID = "lsof -p %d";
- private static IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
- private static CommonConfig commonConfig = CommonDescriptor.getInstance().getConf();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
+ private static final CommonConfig commonConfig = CommonDescriptor.getInstance().getConf();
private static DirectoryManager directoryManager = DirectoryManager.getInstance();
private static final String[] COMMAND_TEMPLATE = {"/bin/bash", "-c", ""};
private static boolean isOutputValid = false;
@@ -268,7 +268,7 @@ public class OpenFileNumUtil {
TOTAL_OPEN_FILE_NUM(null),
SEQUENCE_FILE_OPEN_NUM(directoryManager.getAllSequenceFileFolders()),
UNSEQUENCE_FILE_OPEN_NUM(directoryManager.getAllUnSequenceFileFolders()),
- WAL_OPEN_FILE_NUM(Arrays.asList(commonConfig.getWalDirs())),
+ WAL_OPEN_FILE_NUM(Arrays.asList(config.getDnWalDirs())),
DIGEST_OPEN_FILE_NUM(Collections.singletonList(config.getDnSystemDir())),
SOCKET_OPEN_FILE_NUM(null);
diff --git a/server/src/main/java/org/apache/iotdb/db/wal/allocation/AbstractNodeAllocationStrategy.java b/server/src/main/java/org/apache/iotdb/db/wal/allocation/AbstractNodeAllocationStrategy.java
index f63da81a0a..669b0d4046 100644
--- a/server/src/main/java/org/apache/iotdb/db/wal/allocation/AbstractNodeAllocationStrategy.java
+++ b/server/src/main/java/org/apache/iotdb/db/wal/allocation/AbstractNodeAllocationStrategy.java
@@ -18,8 +18,8 @@
*/
package org.apache.iotdb.db.wal.allocation;
-import org.apache.iotdb.commons.conf.CommonConfig;
-import org.apache.iotdb.commons.conf.CommonDescriptor;
+import org.apache.iotdb.db.conf.IoTDBConfig;
+import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.conf.directories.FolderManager;
import org.apache.iotdb.db.conf.directories.strategy.DirectoryStrategyType;
import org.apache.iotdb.db.exception.DiskSpaceInsufficientException;
@@ -37,7 +37,7 @@ import java.util.Arrays;
public abstract class AbstractNodeAllocationStrategy implements NodeAllocationStrategy {
private static final Logger logger =
LoggerFactory.getLogger(AbstractNodeAllocationStrategy.class);
- private static final CommonConfig commonConfig = CommonDescriptor.getInstance().getConf();
+ private static final IoTDBConfig iotdbConfig = IoTDBDescriptor.getInstance().getConf();
/** manage wal folders */
protected FolderManager folderManager;
@@ -46,7 +46,7 @@ public abstract class AbstractNodeAllocationStrategy implements NodeAllocationSt
try {
folderManager =
new FolderManager(
- Arrays.asList(commonConfig.getWalDirs()), DirectoryStrategyType.SEQUENCE_STRATEGY);
+ Arrays.asList(iotdbConfig.getDnWalDirs()), DirectoryStrategyType.SEQUENCE_STRATEGY);
} catch (DiskSpaceInsufficientException e) {
logger.error(
"Fail to create wal node allocation strategy because all disks of wal folders are full.",
diff --git a/server/src/main/java/org/apache/iotdb/db/wal/buffer/WALInfoEntry.java b/server/src/main/java/org/apache/iotdb/db/wal/buffer/WALInfoEntry.java
index 4036a9aed3..1e1ecb5f73 100644
--- a/server/src/main/java/org/apache/iotdb/db/wal/buffer/WALInfoEntry.java
+++ b/server/src/main/java/org/apache/iotdb/db/wal/buffer/WALInfoEntry.java
@@ -18,14 +18,14 @@
*/
package org.apache.iotdb.db.wal.buffer;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.wal.WALMode;
-import org.apache.iotdb.db.conf.IoTDBConfig;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertTabletNode;
/** This entry class stores info for persistence */
public class WALInfoEntry extends WALEntry {
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
+ private static final CommonConfig config = CommonDescriptor.getInstance().getConf();
/** wal entry type 1 byte, memTable id 8 bytes */
public static final int FIXED_SERIALIZED_SIZE = Byte.BYTES + Long.BYTES;
diff --git a/server/src/main/java/org/apache/iotdb/db/wal/recover/WALNodeRecoverTask.java b/server/src/main/java/org/apache/iotdb/db/wal/recover/WALNodeRecoverTask.java
index bd02dea8c2..aa37866f1c 100644
--- a/server/src/main/java/org/apache/iotdb/db/wal/recover/WALNodeRecoverTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/wal/recover/WALNodeRecoverTask.java
@@ -18,6 +18,8 @@
*/
package org.apache.iotdb.db.wal.recover;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.file.SystemFileFactory;
import org.apache.iotdb.commons.utils.FileUtils;
import org.apache.iotdb.consensus.ConsensusFactory;
@@ -53,7 +55,7 @@ import static org.apache.iotdb.consensus.iot.wal.ConsensusReqReader.DEFAULT_SEAR
/** This task is responsible for the recovery of one wal node. */
public class WALNodeRecoverTask implements Runnable {
private static final Logger logger = LoggerFactory.getLogger(WALNodeRecoverTask.class);
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
+ private static final CommonConfig config = CommonDescriptor.getInstance().getConf();
private static final WALRecoverManager walRecoverManger = WALRecoverManager.getInstance();
/** this directory store one wal node's .wal and .checkpoint files */
@@ -94,7 +96,7 @@ public class WALNodeRecoverTask implements Runnable {
}
}
- if (!config.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.IOT_CONSENSUS)) {
+ if (!config.getDataRegionConsensusProtocolClass().getProtocol().equals(ConsensusFactory.IOT_CONSENSUS)) {
// delete this wal node folder
FileUtils.deleteDirectory(logDirectory);
logger.info(
diff --git a/server/src/main/java/org/apache/iotdb/db/wal/recover/WALRecoverManager.java b/server/src/main/java/org/apache/iotdb/db/wal/recover/WALRecoverManager.java
index 860a1cdab0..8d1dae4507 100644
--- a/server/src/main/java/org/apache/iotdb/db/wal/recover/WALRecoverManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/wal/recover/WALRecoverManager.java
@@ -20,10 +20,10 @@ package org.apache.iotdb.db.wal.recover;
import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory;
import org.apache.iotdb.commons.concurrent.ThreadName;
-import org.apache.iotdb.commons.conf.CommonConfig;
-import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.file.SystemFileFactory;
import org.apache.iotdb.commons.utils.TestOnly;
+import org.apache.iotdb.db.conf.IoTDBConfig;
+import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.DataRegionException;
import org.apache.iotdb.db.exception.runtime.StorageEngineFailureException;
import org.apache.iotdb.db.wal.exception.WALRecoverException;
@@ -48,7 +48,8 @@ import java.util.concurrent.Future;
/** First set allVsgScannedLatch, then call recover method. */
public class WALRecoverManager {
private static final Logger logger = LoggerFactory.getLogger(WALRecoverManager.class);
- private static final CommonConfig commonConfig = CommonDescriptor.getInstance().getConf();
+
+ private static final IoTDBConfig IOTDB_CONFIG = IoTDBDescriptor.getInstance().getConf();
/** true when the recover procedure has started */
private volatile boolean hasStarted = false;
@@ -67,7 +68,7 @@ public class WALRecoverManager {
try {
// collect wal nodes' information
List<File> walNodeDirs = new ArrayList<>();
- for (String walDir : commonConfig.getWalDirs()) {
+ for (String walDir : IOTDB_CONFIG.getDnWalDirs()) {
File walDirFile = SystemFileFactory.INSTANCE.getFile(walDir);
File[] nodeDirs = walDirFile.listFiles(File::isDirectory);
if (nodeDirs == null) {