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:14 UTC
[iotdb] 02/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 fd9688b3504ab12b7250a9e91d09faa988aa815d
Author: YongzaoDan <53...@qq.com>
AuthorDate: Thu Jan 12 23:17:39 2023 +0800
stash
---
.../confignode/conf/ConfigNodeStartupCheck.java | 41 +++++++++---
.../confignode/conf/SystemPropertiesUtils.java | 35 ++++++-----
.../statemachine/ConfigNodeRegionStateMachine.java | 17 +++--
.../confignode/manager/ClusterSchemaManager.java | 5 +-
.../iotdb/confignode/manager/ConfigManager.java | 22 ++++---
.../iotdb/confignode/manager/ConsensusManager.java | 72 ++++++++++++++--------
.../iotdb/confignode/manager/ProcedureManager.java | 10 +--
.../confignode/manager/RetryFailedTasksThread.java | 5 +-
.../iotdb/confignode/manager/UDFManager.java | 5 +-
.../iotdb/confignode/manager/load/LoadManager.java | 5 +-
.../manager/load/balancer/RouteBalancer.java | 4 +-
.../partition/GreedyPartitionAllocator.java | 2 +-
.../manager/partition/PartitionManager.java | 14 +++--
.../iotdb/confignode/persistence/TriggerInfo.java | 3 +-
.../iotdb/confignode/persistence/UDFInfo.java | 3 +-
.../confignode/procedure/store/ProcedureStore.java | 3 +-
.../iotdb/confignode/service/ConfigNode.java | 35 +++++++----
.../apache/iotdb/db/it/IoTDBRecoverUnclosedIT.java | 2 -
.../iotdb/session/it/IoTDBSessionSimpleIT.java | 1 -
.../iotdb/db/integration/IoTDBMaxTimeQueryIT.java | 3 +-
.../IoTDBMultiOverlappedChunkInUnseqIT.java | 1 -
.../db/integration/IoTDBMultiOverlappedPageIT.java | 1 -
.../db/integration/IoTDBNewTsFileCompactionIT.java | 30 ++++-----
.../integration/IoTDBSizeTieredCompactionIT.java | 19 ++----
.../db/integration/env/StandaloneEnvConfig.java | 4 +-
.../db/integration/sync/IoTDBSyncReceiverIT.java | 3 +-
.../sync/IoTDBSyncReceiverLoaderIT.java | 3 +-
.../db/integration/sync/IoTDBSyncSenderIT.java | 3 +-
.../apache/iotdb/commons/conf/CommonConfig.java | 4 ++
.../iotdb/commons/conf/CommonDescriptor.java | 16 ++---
.../schemaregion/rocksdb/RSchemaConfLoader.java | 2 +-
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 3 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 18 ++++--
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 4 +-
.../org/apache/iotdb/db/conf/IoTDBStartCheck.java | 33 ++++++----
.../db/consensus/DataRegionConsensusImpl.java | 68 ++++++++++++--------
.../apache/iotdb/db/engine/cache/ChunkCache.java | 2 -
.../db/engine/cache/TimeSeriesMetadataCache.java | 2 -
.../readchunk/SingleSeriesCompactionExecutor.java | 3 +-
.../impl/RewriteCrossSpaceCompactionSelector.java | 3 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 1 -
.../db/engine/trigger/utils/BatchHandlerQueue.java | 4 +-
.../engine/trigger/utils/HTTPConnectionPool.java | 1 -
.../store/disk/schemafile/SchemaFileConfig.java | 4 +-
.../schemaregion/SchemaRegionMemoryImpl.java | 14 +++--
.../schemaregion/SchemaRegionSchemaFileImpl.java | 9 ++-
.../apache/iotdb/db/metadata/tag/TagLogFile.java | 1 -
.../db/mpp/execution/exchange/SinkHandle.java | 2 +-
.../db/mpp/execution/exchange/SourceHandle.java | 2 +-
.../fragment/FragmentInstanceManager.java | 1 -
.../operator/process/AbstractIntoOperator.java | 1 -
.../operator/process/TransformOperator.java | 4 +-
.../db/mpp/execution/schedule/DriverScheduler.java | 5 +-
.../mpp/execution/schedule/DriverTaskThread.java | 1 -
.../db/mpp/plan/analyze/cache/PartitionCache.java | 2 -
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 8 ++-
.../db/mpp/plan/planner/OperatorTreeGenerator.java | 7 +--
.../SimpleFragmentParallelPlanner.java | 1 -
.../metedata/write/CreateMultiTimeSeriesNode.java | 3 +-
.../plan/statement/crud/LoadTsFileStatement.java | 1 -
.../influxdb/parser/InfluxDBAstVisitor.java | 2 -
.../iotdb/db/rescon/PrimitiveArrayManager.java | 5 +-
.../org/apache/iotdb/db/rescon/SystemInfo.java | 7 ++-
.../java/org/apache/iotdb/db/service/DataNode.java | 48 ++++++++++-----
.../iotdb/db/service/InfluxDBRPCService.java | 2 +-
.../org/apache/iotdb/db/service/MQTTService.java | 4 +-
.../org/apache/iotdb/db/service/UpgradeSevice.java | 1 -
.../db/sync/transport/server/ReceiverManager.java | 6 +-
.../trigger/service/TriggerClassLoaderManager.java | 2 -
.../apache/iotdb/db/utils/TypeInferenceUtils.java | 11 ++--
.../org/apache/iotdb/db/wal/buffer/WALBuffer.java | 2 -
.../java/org/apache/iotdb/db/wal/io/WALReader.java | 1 -
.../engine/compaction/CompactionSchedulerTest.java | 8 +--
.../CompactionSchedulerWithFastPerformerTest.java | 8 +--
.../cross/RewriteCompactionFileSelectorTest.java | 4 +-
.../inner/InnerCompactionSchedulerTest.java | 4 +-
.../InnerSeqCompactionWithFastPerformerTest.java | 3 +-
...nerSeqCompactionWithReadChunkPerformerTest.java | 3 +-
.../compaction/utils/CompactionClearUtils.java | 1 -
.../mtree/multimode/MTreeDiskModeTest.java | 4 +-
.../mtree/multimode/MTreeMemoryModeTest.java | 4 +-
.../mtree/schemafile/AliasIndexPageTest.java | 4 +-
.../mtree/schemafile/InternalPageTest.java | 4 +-
.../mtree/schemafile/SchemaFileLogTest.java | 4 +-
.../metadata/mtree/schemafile/SchemaFileTest.java | 4 +-
.../mtree/schemafile/WrappedSegmentTest.java | 4 +-
.../db/mpp/execution/exchange/SinkHandleTest.java | 12 ++--
.../mpp/execution/exchange/SourceHandleTest.java | 15 ++---
.../mpp/plan/analyze/QueryTimePartitionTest.java | 12 ++--
.../org/apache/iotdb/db/qp/sql/ASTVisitorTest.java | 1 -
.../iotdb/db/tools/SchemaFileSketchTest.java | 4 +-
.../iotdb/db/utils/EncodingInferenceUtilsTest.java | 2 -
.../iotdb/db/utils/TypeInferenceUtilsTest.java | 1 -
.../datastructure/PrimitiveArrayManagerTest.java | 9 ++-
.../org/apache/iotdb/db/wal/DisableWALTest.java | 2 -
95 files changed, 411 insertions(+), 378 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java
index 474c4cebbc..db1888c937 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeStartupCheck.java
@@ -42,7 +42,8 @@ public class ConfigNodeStartupCheck {
private static final Logger LOGGER = LoggerFactory.getLogger(ConfigNodeStartupCheck.class);
private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
- private static final ConfigNodeConfig CONFIG_NODE_CONFIG = ConfigNodeDescriptor.getInstance().getConf();
+ private static final ConfigNodeConfig CONFIG_NODE_CONFIG =
+ ConfigNodeDescriptor.getInstance().getConf();
public void startUpCheck() throws StartupException, IOException, ConfigurationException {
checkGlobalConfig();
@@ -56,18 +57,29 @@ public class ConfigNodeStartupCheck {
private void checkGlobalConfig() throws ConfigurationException {
// When the ConfigNode consensus protocol is set to SIMPLE_CONSENSUS,
// the target_config_node_list needs to point to itself
- if (COMMON_CONFIG.getConfigNodeConsensusProtocolClass().getProtocol().equals(ConsensusFactory.SIMPLE_CONSENSUS)
- && (!CONFIG_NODE_CONFIG.getCnInternalAddress().equals(CONFIG_NODE_CONFIG.getCnTargetConfigNode().getIp())
- || CONFIG_NODE_CONFIG.getCnInternalPort() != CONFIG_NODE_CONFIG.getCnTargetConfigNode().getPort())) {
+ if (COMMON_CONFIG
+ .getConfigNodeConsensusProtocolClass()
+ .getProtocol()
+ .equals(ConsensusFactory.SIMPLE_CONSENSUS)
+ && (!CONFIG_NODE_CONFIG
+ .getCnInternalAddress()
+ .equals(CONFIG_NODE_CONFIG.getCnTargetConfigNode().getIp())
+ || CONFIG_NODE_CONFIG.getCnInternalPort()
+ != CONFIG_NODE_CONFIG.getCnTargetConfigNode().getPort())) {
throw new ConfigurationException(
IoTDBConstant.CN_TARGET_CONFIG_NODE_LIST,
- CONFIG_NODE_CONFIG.getCnTargetConfigNode().getIp() + ":" + CONFIG_NODE_CONFIG.getCnTargetConfigNode().getPort(),
+ CONFIG_NODE_CONFIG.getCnTargetConfigNode().getIp()
+ + ":"
+ + CONFIG_NODE_CONFIG.getCnTargetConfigNode().getPort(),
CONFIG_NODE_CONFIG.getCnInternalAddress() + ":" + CONFIG_NODE_CONFIG.getCnInternalPort());
}
// When the data region consensus protocol is set to SIMPLE_CONSENSUS,
// the data replication factor must be 1
- if (COMMON_CONFIG.getDataRegionConsensusProtocolClass().getProtocol().equals(ConsensusFactory.SIMPLE_CONSENSUS)
+ if (COMMON_CONFIG
+ .getDataRegionConsensusProtocolClass()
+ .getProtocol()
+ .equals(ConsensusFactory.SIMPLE_CONSENSUS)
&& COMMON_CONFIG.getDataReplicationFactor() != 1) {
throw new ConfigurationException(
"data_replication_factor",
@@ -77,7 +89,10 @@ public class ConfigNodeStartupCheck {
// When the schema region consensus protocol is set to SIMPLE_CONSENSUS,
// the schema replication factor must be 1
- if (COMMON_CONFIG.getSchemaRegionConsensusProtocolClass().getProtocol().equals(ConsensusFactory.SIMPLE_CONSENSUS)
+ if (COMMON_CONFIG
+ .getSchemaRegionConsensusProtocolClass()
+ .getProtocol()
+ .equals(ConsensusFactory.SIMPLE_CONSENSUS)
&& COMMON_CONFIG.getSchemaReplicationFactor() != 1) {
throw new ConfigurationException(
"schema_replication_factor",
@@ -87,7 +102,10 @@ public class ConfigNodeStartupCheck {
// When the schema region consensus protocol is set to IoTConsensus,
// we should report an error
- if (COMMON_CONFIG.getSchemaRegionConsensusProtocolClass().getProtocol().equals(ConsensusFactory.IOT_CONSENSUS)) {
+ if (COMMON_CONFIG
+ .getSchemaRegionConsensusProtocolClass()
+ .getProtocol()
+ .equals(ConsensusFactory.IOT_CONSENSUS)) {
throw new ConfigurationException(
"schema_region_consensus_protocol_class",
String.valueOf(COMMON_CONFIG.getSchemaRegionConsensusProtocolClass()),
@@ -97,9 +115,12 @@ public class ConfigNodeStartupCheck {
// The leader distribution policy is limited
if (!LeaderDistributionPolicy.GREEDY.equals(COMMON_CONFIG.getLeaderDistributionPolicy())
- && !LeaderDistributionPolicy.MIN_COST_FLOW.equals(COMMON_CONFIG.getLeaderDistributionPolicy())) {
+ && !LeaderDistributionPolicy.MIN_COST_FLOW.equals(
+ COMMON_CONFIG.getLeaderDistributionPolicy())) {
throw new ConfigurationException(
- "leader_distribution_policy", CONFIG_NODE_CONFIG.getRoutePriorityPolicy(), "GREEDY or MIN_COST_FLOW");
+ "leader_distribution_policy",
+ CONFIG_NODE_CONFIG.getRoutePriorityPolicy(),
+ "GREEDY or MIN_COST_FLOW");
}
// The route priority policy is limited
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/SystemPropertiesUtils.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/SystemPropertiesUtils.java
index dd1d50de53..95db18a133 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/SystemPropertiesUtils.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/SystemPropertiesUtils.java
@@ -51,7 +51,8 @@ public class SystemPropertiesUtils {
+ ConfigNodeConstant.SYSTEM_FILE_NAME);
private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
- private static final ConfigNodeConfig CONFIG_NODE_CONFIG = ConfigNodeDescriptor.getInstance().getConf();
+ private static final ConfigNodeConfig CONFIG_NODE_CONFIG =
+ ConfigNodeDescriptor.getInstance().getConf();
/**
* Check if the ConfigNode is restarted
@@ -117,10 +118,10 @@ public class SystemPropertiesUtils {
if (configNodeConsensusProtocolClass == null) {
needReWrite = true;
} else if (!configNodeConsensusProtocolClass.equals(
- COMMON_CONFIG.getConfigNodeConsensusProtocolClass().getProtocol())) {
+ COMMON_CONFIG.getConfigNodeConsensusProtocolClass().getProtocol())) {
throw new ConfigurationException(
"config_node_consensus_protocol_class",
- COMMON_CONFIG.getConfigNodeConsensusProtocolClass().getProtocol(),
+ COMMON_CONFIG.getConfigNodeConsensusProtocolClass().getProtocol(),
configNodeConsensusProtocolClass);
}
@@ -129,10 +130,10 @@ public class SystemPropertiesUtils {
if (dataRegionConsensusProtocolClass == null) {
needReWrite = true;
} else if (!dataRegionConsensusProtocolClass.equals(
- COMMON_CONFIG.getDataRegionConsensusProtocolClass().getProtocol())) {
+ COMMON_CONFIG.getDataRegionConsensusProtocolClass().getProtocol())) {
throw new ConfigurationException(
"data_region_consensus_protocol_class",
- COMMON_CONFIG.getDataRegionConsensusProtocolClass().getProtocol(),
+ COMMON_CONFIG.getDataRegionConsensusProtocolClass().getProtocol(),
dataRegionConsensusProtocolClass);
}
@@ -141,10 +142,10 @@ public class SystemPropertiesUtils {
if (schemaRegionConsensusProtocolClass == null) {
needReWrite = true;
} else if (!schemaRegionConsensusProtocolClass.equals(
- COMMON_CONFIG.getSchemaRegionConsensusProtocolClass().getProtocol())) {
+ COMMON_CONFIG.getSchemaRegionConsensusProtocolClass().getProtocol())) {
throw new ConfigurationException(
"schema_region_consensus_protocol_class",
- COMMON_CONFIG.getSchemaRegionConsensusProtocolClass().getProtocol(),
+ COMMON_CONFIG.getSchemaRegionConsensusProtocolClass().getProtocol(),
schemaRegionConsensusProtocolClass);
}
@@ -170,7 +171,7 @@ public class SystemPropertiesUtils {
seriesPartitionSlotExecutorClass, COMMON_CONFIG.getSeriesPartitionExecutorClass())) {
throw new ConfigurationException(
"series_partition_executor_class",
- COMMON_CONFIG.getSeriesPartitionExecutorClass(),
+ COMMON_CONFIG.getSeriesPartitionExecutorClass(),
seriesPartitionSlotExecutorClass);
}
@@ -209,7 +210,8 @@ public class SystemPropertiesUtils {
// Cluster configuration
systemProperties.setProperty("cluster_name", COMMON_CONFIG.getClusterName());
- systemProperties.setProperty("config_node_id", String.valueOf(CONFIG_NODE_CONFIG.getConfigNodeId()));
+ systemProperties.setProperty(
+ "config_node_id", String.valueOf(CONFIG_NODE_CONFIG.getConfigNodeId()));
systemProperties.setProperty(
"is_seed_config_node",
String.valueOf(ConfigNodeDescriptor.getInstance().isSeedConfigNode()));
@@ -217,16 +219,21 @@ public class SystemPropertiesUtils {
// Startup configuration
systemProperties.setProperty(
"cn_internal_address", String.valueOf(CONFIG_NODE_CONFIG.getCnInternalAddress()));
- systemProperties.setProperty("cn_internal_port", String.valueOf(CONFIG_NODE_CONFIG.getCnInternalPort()));
- systemProperties.setProperty("cn_consensus_port", String.valueOf(CONFIG_NODE_CONFIG.getCnConsensusPort()));
+ systemProperties.setProperty(
+ "cn_internal_port", String.valueOf(CONFIG_NODE_CONFIG.getCnInternalPort()));
+ systemProperties.setProperty(
+ "cn_consensus_port", String.valueOf(CONFIG_NODE_CONFIG.getCnConsensusPort()));
// Consensus protocol configuration
systemProperties.setProperty(
- "config_node_consensus_protocol_class", COMMON_CONFIG.getConfigNodeConsensusProtocolClass().getProtocol());
+ "config_node_consensus_protocol_class",
+ COMMON_CONFIG.getConfigNodeConsensusProtocolClass().getProtocol());
systemProperties.setProperty(
- "data_region_consensus_protocol_class", COMMON_CONFIG.getDataRegionConsensusProtocolClass().getProtocol());
+ "data_region_consensus_protocol_class",
+ COMMON_CONFIG.getDataRegionConsensusProtocolClass().getProtocol());
systemProperties.setProperty(
- "schema_region_consensus_protocol_class", COMMON_CONFIG.getSchemaRegionConsensusProtocolClass().getProtocol());
+ "schema_region_consensus_protocol_class",
+ COMMON_CONFIG.getSchemaRegionConsensusProtocolClass().getProtocol());
// PartitionSlot configuration
systemProperties.setProperty(
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/ConfigNodeRegionStateMachine.java b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/ConfigNodeRegionStateMachine.java
index 4a75cb4865..0a35aebefe 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/ConfigNodeRegionStateMachine.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/consensus/statemachine/ConfigNodeRegionStateMachine.java
@@ -63,7 +63,8 @@ public class ConfigNodeRegionStateMachine
IoTDBThreadPoolFactory.newCachedThreadPool("CQ-recovery");
private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
- private static final ConfigNodeConfig CONFIG_NODE_CONFIG = ConfigNodeDescriptor.getInstance().getConf();
+ private static final ConfigNodeConfig CONFIG_NODE_CONFIG =
+ ConfigNodeDescriptor.getInstance().getConf();
private final ConfigPlanExecutor executor;
private ConfigManager configManager;
private LogWriter logWriter;
@@ -72,12 +73,16 @@ public class ConfigNodeRegionStateMachine
private int endIndex;
private static final String CURRENT_FILE_DIR =
- CONFIG_NODE_CONFIG.getCnConsensusDir() + File.separator + "simple" + File.separator + "current";
+ CONFIG_NODE_CONFIG.getCnConsensusDir()
+ + File.separator
+ + "simple"
+ + File.separator
+ + "current";
private static final String PROGRESS_FILE_PATH =
CURRENT_FILE_DIR + File.separator + "log_inprogress_";
private static final String FILE_PATH = CURRENT_FILE_DIR + File.separator + "log_";
private static final long LOG_FILE_MAX_SIZE =
- COMMON_CONFIG.getConfigNodeSimpleConsensusLogSegmentSizeMax();
+ COMMON_CONFIG.getConfigNodeSimpleConsensusLogSegmentSizeMax();
private final TEndPoint currentNodeTEndPoint;
public ConfigNodeRegionStateMachine(ConfigManager configManager, ConfigPlanExecutor executor) {
@@ -133,7 +138,8 @@ public class ConfigNodeRegionStateMachine
result = new TSStatus(TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
}
- if (ConsensusFactory.SIMPLE_CONSENSUS.equals(COMMON_CONFIG.getConfigNodeConsensusProtocolClass().getProtocol())) {
+ if (ConsensusFactory.SIMPLE_CONSENSUS.equals(
+ COMMON_CONFIG.getConfigNodeConsensusProtocolClass().getProtocol())) {
writeLogForSimpleConsensus(plan);
}
return result;
@@ -229,7 +235,8 @@ public class ConfigNodeRegionStateMachine
@Override
public void start() {
- if (ConsensusFactory.SIMPLE_CONSENSUS.equals(COMMON_CONFIG.getConfigNodeConsensusProtocolClass().getProtocol())) {
+ if (ConsensusFactory.SIMPLE_CONSENSUS.equals(
+ COMMON_CONFIG.getConfigNodeConsensusProtocolClass().getProtocol())) {
initStandAloneConfigNode();
}
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterSchemaManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterSchemaManager.java
index d7fe3e0528..55cbf4cb0e 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterSchemaManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ClusterSchemaManager.java
@@ -100,7 +100,8 @@ public class ClusterSchemaManager {
private static final Logger LOGGER = LoggerFactory.getLogger(ClusterSchemaManager.class);
private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
- private static final double SCHEMA_REGION_PER_DATA_NODE = COMMON_CONFIG.getSchemaRegionPerDataNode();
+ private static final double SCHEMA_REGION_PER_DATA_NODE =
+ COMMON_CONFIG.getSchemaRegionPerDataNode();
private static final double DATA_REGION_PER_PROCESSOR = COMMON_CONFIG.getDataRegionPerProcessor();
private final IManager configManager;
@@ -374,7 +375,7 @@ public class ClusterSchemaManager {
.getRegionGroupCount(storageGroupSchema.getName(), TConsensusGroupType.DataRegion);
int maxDataRegionGroupNum =
calcMaxRegionGroupNum(
- COMMON_CONFIG.getLeastDataRegionGroupNum(),
+ COMMON_CONFIG.getLeastDataRegionGroupNum(),
DATA_REGION_PER_PROCESSOR,
totalCpuCoreNum,
storageGroupNum,
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
index cacc165a58..607e8f1dc4 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConfigManager.java
@@ -422,13 +422,14 @@ public class ConfigManager implements IManager {
TClusterParameters clusterParameters = new TClusterParameters();
clusterParameters.setClusterName(COMMON_CONF.getClusterName());
clusterParameters.setConfigNodeConsensusProtocolClass(
- COMMON_CONF.getConfigNodeConsensusProtocolClass().getProtocol());
+ COMMON_CONF.getConfigNodeConsensusProtocolClass().getProtocol());
clusterParameters.setDataRegionConsensusProtocolClass(
- COMMON_CONF.getDataRegionConsensusProtocolClass().getProtocol());
+ COMMON_CONF.getDataRegionConsensusProtocolClass().getProtocol());
clusterParameters.setSchemaRegionConsensusProtocolClass(
- COMMON_CONF.getSchemaRegionConsensusProtocolClass().getProtocol());
+ COMMON_CONF.getSchemaRegionConsensusProtocolClass().getProtocol());
clusterParameters.setSeriesPartitionSlotNum(COMMON_CONF.getSeriesSlotNum());
- clusterParameters.setSeriesPartitionExecutorClass(COMMON_CONF.getSeriesPartitionExecutorClass());
+ clusterParameters.setSeriesPartitionExecutorClass(
+ COMMON_CONF.getSeriesPartitionExecutorClass());
clusterParameters.setDefaultTTL(COMMON_CONF.getDefaultTtlInMs());
clusterParameters.setTimePartitionInterval(COMMON_CONF.getTimePartitionInterval());
clusterParameters.setDataReplicationFactor(COMMON_CONF.getDataReplicationFactor());
@@ -911,21 +912,25 @@ public class ConfigManager implements IManager {
return errorStatus.setMessage(errorPrefix + "time_partition_interval" + errorSuffix);
}
- if (clusterParameters.getSchemaReplicationFactor() != COMMON_CONF.getSchemaReplicationFactor()) {
+ if (clusterParameters.getSchemaReplicationFactor()
+ != COMMON_CONF.getSchemaReplicationFactor()) {
return errorStatus.setMessage(errorPrefix + "schema_replication_factor" + errorSuffix);
}
if (clusterParameters.getDataReplicationFactor() != COMMON_CONF.getDataReplicationFactor()) {
return errorStatus.setMessage(errorPrefix + "data_replication_factor" + errorSuffix);
}
- if (clusterParameters.getSchemaRegionPerDataNode() != COMMON_CONF.getSchemaRegionPerDataNode()) {
+ if (clusterParameters.getSchemaRegionPerDataNode()
+ != COMMON_CONF.getSchemaRegionPerDataNode()) {
return errorStatus.setMessage(errorPrefix + "schema_region_per_data_node" + errorSuffix);
}
if (clusterParameters.getDataRegionPerProcessor() != COMMON_CONF.getDataRegionPerProcessor()) {
return errorStatus.setMessage(errorPrefix + "data_region_per_processor" + errorSuffix);
}
- if (!clusterParameters.getReadConsistencyLevel().equals(COMMON_CONF.getReadConsistencyLevel())) {
+ if (!clusterParameters
+ .getReadConsistencyLevel()
+ .equals(COMMON_CONF.getReadConsistencyLevel())) {
return errorStatus.setMessage(errorPrefix + "read_consistency_level" + errorSuffix);
}
@@ -934,7 +939,8 @@ public class ConfigManager implements IManager {
return errorStatus.setMessage(errorPrefix + "disk_space_warning_threshold" + errorSuffix);
}
- if (clusterParameters.getLeastDataRegionGroupNum() != COMMON_CONF.getLeastDataRegionGroupNum()) {
+ if (clusterParameters.getLeastDataRegionGroupNum()
+ != COMMON_CONF.getLeastDataRegionGroupNum()) {
return errorStatus.setMessage(errorPrefix + "least_data_region_group_num" + errorSuffix);
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
index f2b2869a66..4e420ed7a0 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/ConsensusManager.java
@@ -62,7 +62,8 @@ public class ConsensusManager {
private static final Logger LOGGER = LoggerFactory.getLogger(ConsensusManager.class);
private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
- private static final ConfigNodeConfig CONFIG_NODE_CONFIG = ConfigNodeDescriptor.getInstance().getConf();
+ private static final ConfigNodeConfig CONFIG_NODE_CONFIG =
+ ConfigNodeDescriptor.getInstance().getConf();
private static final int SEED_CONFIG_NODE_ID = 0;
private final IManager configManager;
@@ -85,13 +86,16 @@ public class ConsensusManager {
// There is only one ConfigNodeGroup
consensusGroupId = new ConfigNodeRegionId(CONFIG_NODE_CONFIG.getConfigNodeRegionId());
- if (SIMPLE_CONSENSUS.equals(COMMON_CONFIG.getConfigNodeConsensusProtocolClass().getProtocol())) {
+ if (SIMPLE_CONSENSUS.equals(
+ COMMON_CONFIG.getConfigNodeConsensusProtocolClass().getProtocol())) {
consensusImpl =
ConsensusFactory.getConsensusImpl(
SIMPLE_CONSENSUS,
ConsensusConfig.newBuilder()
.setThisNode(
- new TEndPoint(CONFIG_NODE_CONFIG.getCnInternalAddress(), CONFIG_NODE_CONFIG.getCnConsensusPort()))
+ new TEndPoint(
+ CONFIG_NODE_CONFIG.getCnInternalAddress(),
+ CONFIG_NODE_CONFIG.getCnConsensusPort()))
.setStorageDir("target" + java.io.File.separator + "simple")
.build(),
gid -> stateMachine)
@@ -103,81 +107,90 @@ public class ConsensusManager {
// Implement local ConsensusLayer by ConfigNodeConfig
consensusImpl =
ConsensusFactory.getConsensusImpl(
- COMMON_CONFIG.getConfigNodeConsensusProtocolClass().getProtocol(),
+ COMMON_CONFIG.getConfigNodeConsensusProtocolClass().getProtocol(),
ConsensusConfig.newBuilder()
.setThisNodeId(CONFIG_NODE_CONFIG.getConfigNodeId())
.setThisNode(
- new TEndPoint(CONFIG_NODE_CONFIG.getCnInternalAddress(), CONFIG_NODE_CONFIG.getCnConsensusPort()))
+ new TEndPoint(
+ CONFIG_NODE_CONFIG.getCnInternalAddress(),
+ CONFIG_NODE_CONFIG.getCnConsensusPort()))
.setRatisConfig(
RatisConfig.newBuilder()
.setLeaderLogAppender(
RatisConfig.LeaderLogAppender.newBuilder()
.setBufferByteLimit(
- COMMON_CONFIG.getConfigNodeRatisConsensusLogAppenderBufferSize())
+ COMMON_CONFIG
+ .getConfigNodeRatisConsensusLogAppenderBufferSize())
.build())
.setSnapshot(
RatisConfig.Snapshot.newBuilder()
.setAutoTriggerThreshold(
- COMMON_CONFIG.getConfigNodeRatisSnapshotTriggerThreshold())
+ COMMON_CONFIG
+ .getConfigNodeRatisSnapshotTriggerThreshold())
.build())
.setLog(
RatisConfig.Log.newBuilder()
.setUnsafeFlushEnabled(
- COMMON_CONFIG.isConfigNodeRatisLogUnsafeFlushEnable())
+ COMMON_CONFIG.isConfigNodeRatisLogUnsafeFlushEnable())
.setSegmentCacheSizeMax(
SizeInBytes.valueOf(
- COMMON_CONFIG.getConfigNodeRatisLogSegmentSizeMax()))
+ COMMON_CONFIG.getConfigNodeRatisLogSegmentSizeMax()))
.setPreserveNumsWhenPurge(
- COMMON_CONFIG.getConfigNodeRatisPreserveLogsWhenPurge())
+ COMMON_CONFIG.getConfigNodeRatisPreserveLogsWhenPurge())
.build())
.setGrpc(
RatisConfig.Grpc.newBuilder()
.setFlowControlWindow(
SizeInBytes.valueOf(
- COMMON_CONFIG.getConfigNodeRatisGrpcFlowControlWindow()))
+ COMMON_CONFIG
+ .getConfigNodeRatisGrpcFlowControlWindow()))
.build())
.setRpc(
RatisConfig.Rpc.newBuilder()
.setTimeoutMin(
TimeDuration.valueOf(
- COMMON_CONFIG
+ COMMON_CONFIG
.getConfigNodeRatisRpcLeaderElectionTimeoutMinMs(),
TimeUnit.MILLISECONDS))
.setTimeoutMax(
TimeDuration.valueOf(
- COMMON_CONFIG
+ COMMON_CONFIG
.getConfigNodeRatisRpcLeaderElectionTimeoutMaxMs(),
TimeUnit.MILLISECONDS))
.setRequestTimeout(
TimeDuration.valueOf(
- COMMON_CONFIG.getConfigNodeRatisRequestTimeoutMs(),
+ COMMON_CONFIG.getConfigNodeRatisRequestTimeoutMs(),
TimeUnit.MILLISECONDS))
.setFirstElectionTimeoutMin(
TimeDuration.valueOf(
- COMMON_CONFIG.getRatisFirstElectionTimeoutMinMs(),
+ COMMON_CONFIG.getRatisFirstElectionTimeoutMinMs(),
TimeUnit.MILLISECONDS))
.setFirstElectionTimeoutMax(
TimeDuration.valueOf(
- COMMON_CONFIG.getRatisFirstElectionTimeoutMaxMs(),
+ COMMON_CONFIG.getRatisFirstElectionTimeoutMaxMs(),
TimeUnit.MILLISECONDS))
.build())
.setClient(
RatisConfig.Client.newBuilder()
.setClientRequestTimeoutMillis(
- COMMON_CONFIG.getConfigNodeRatisRequestTimeoutMs())
+ COMMON_CONFIG.getConfigNodeRatisRequestTimeoutMs())
.setClientMaxRetryAttempt(
- COMMON_CONFIG.getConfigNodeRatisMaxRetryAttempts())
+ COMMON_CONFIG.getConfigNodeRatisMaxRetryAttempts())
.setClientRetryInitialSleepTimeMs(
- COMMON_CONFIG.getConfigNodeRatisInitialSleepTimeMs())
+ COMMON_CONFIG.getConfigNodeRatisInitialSleepTimeMs())
.setClientRetryMaxSleepTimeMs(
- COMMON_CONFIG.getConfigNodeRatisMaxSleepTimeMs())
+ COMMON_CONFIG.getConfigNodeRatisMaxSleepTimeMs())
.setCoreClientNumForEachNode(
- CONFIG_NODE_CONFIG.getCnCoreClientCountForEachNodeInClientManager())
- .setMaxClientNumForEachNode(CONFIG_NODE_CONFIG.getCnMaxClientCountForEachNodeInClientManager())
+ CONFIG_NODE_CONFIG
+ .getCnCoreClientCountForEachNodeInClientManager())
+ .setMaxClientNumForEachNode(
+ CONFIG_NODE_CONFIG
+ .getCnMaxClientCountForEachNodeInClientManager())
.build())
.setImpl(
RatisConfig.Impl.newBuilder()
- .setTriggerSnapshotFileSize(COMMON_CONFIG.getConfigNodeRatisLogMax())
+ .setTriggerSnapshotFileSize(
+ COMMON_CONFIG.getConfigNodeRatisLogMax())
.build())
.build())
.setStorageDir(CONFIG_NODE_CONFIG.getCnConsensusDir())
@@ -188,13 +201,14 @@ public class ConsensusManager {
new IllegalArgumentException(
String.format(
ConsensusFactory.CONSTRUCT_FAILED_MSG,
- COMMON_CONFIG.getConfigNodeConsensusProtocolClass())));
+ COMMON_CONFIG.getConfigNodeConsensusProtocolClass())));
}
consensusImpl.start();
if (SystemPropertiesUtils.isRestarted()) {
// TODO: @Itami-Sho Check and notify if current ConfigNode's ip or port has changed
- if (SIMPLE_CONSENSUS.equals(COMMON_CONFIG.getConfigNodeConsensusProtocolClass().getProtocol())) {
+ if (SIMPLE_CONSENSUS.equals(
+ COMMON_CONFIG.getConfigNodeConsensusProtocolClass().getProtocol())) {
// Only SIMPLE_CONSENSUS need invoking `createPeerForConsensusGroup` when restarted,
// but RATIS_CONSENSUS doesn't need it
try {
@@ -211,8 +225,12 @@ public class ConsensusManager {
Collections.singletonList(
new TConfigNodeLocation(
SEED_CONFIG_NODE_ID,
- new TEndPoint(CONFIG_NODE_CONFIG.getCnInternalAddress(), CONFIG_NODE_CONFIG.getCnInternalPort()),
- new TEndPoint(CONFIG_NODE_CONFIG.getCnInternalAddress(), CONFIG_NODE_CONFIG.getCnConsensusPort()))));
+ new TEndPoint(
+ CONFIG_NODE_CONFIG.getCnInternalAddress(),
+ CONFIG_NODE_CONFIG.getCnInternalPort()),
+ new TEndPoint(
+ CONFIG_NODE_CONFIG.getCnInternalAddress(),
+ CONFIG_NODE_CONFIG.getCnConsensusPort()))));
}
}
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 bfb4552475..867ba7debd 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
@@ -34,8 +34,6 @@ import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
import org.apache.iotdb.commons.trigger.TriggerInformation;
import org.apache.iotdb.commons.utils.StatusUtils;
-import org.apache.iotdb.confignode.conf.ConfigNodeConfig;
-import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
import org.apache.iotdb.confignode.consensus.request.write.confignode.RemoveConfigNodePlan;
import org.apache.iotdb.confignode.consensus.request.write.datanode.RemoveDataNodePlan;
import org.apache.iotdb.confignode.consensus.request.write.procedure.UpdateProcedurePlan;
@@ -119,9 +117,7 @@ public class ProcedureManager {
this.env = new ConfigNodeProcedureEnv(configManager, scheduler);
this.executor = new ProcedureExecutor<>(env, store, scheduler);
this.planSizeLimit =
- CommonDescriptor.getInstance()
- .getConf()
- .getConfigNodeRatisConsensusLogAppenderBufferSize()
+ CommonDescriptor.getInstance().getConf().getConfigNodeRatisConsensusLogAppenderBufferSize()
- IoTDBConstant.RAFT_LOG_BASIC_SIZE;
}
@@ -131,8 +127,8 @@ public class ProcedureManager {
executor.init(COMMON_CONFIG.getProcedureCoreWorkerThreadsCount());
executor.startWorkers();
executor.startCompletedCleaner(
- COMMON_CONFIG.getProcedureCompletedCleanInterval(),
- COMMON_CONFIG.getProcedureCompletedEvictTTL());
+ COMMON_CONFIG.getProcedureCompletedCleanInterval(),
+ COMMON_CONFIG.getProcedureCompletedEvictTTL());
store.start();
LOGGER.info("ProcedureManager is started successfully.");
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/RetryFailedTasksThread.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/RetryFailedTasksThread.java
index c78dfd2721..944bf85504 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/RetryFailedTasksThread.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/RetryFailedTasksThread.java
@@ -27,8 +27,6 @@ import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.confignode.client.DataNodeRequestType;
import org.apache.iotdb.confignode.client.async.AsyncDataNodeClientPool;
import org.apache.iotdb.confignode.client.async.handlers.AsyncClientHandler;
-import org.apache.iotdb.confignode.conf.ConfigNodeConfig;
-import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
import org.apache.iotdb.confignode.manager.node.NodeManager;
import org.apache.iotdb.confignode.manager.node.heartbeat.BaseNodeCache;
import org.apache.iotdb.mpp.rpc.thrift.TOperatePipeOnDataNodeReq;
@@ -58,7 +56,8 @@ public class RetryFailedTasksThread {
private static final Logger LOGGER = LoggerFactory.getLogger(RetryFailedTasksThread.class);
- private static final long HEARTBEAT_INTERVAL = CommonDescriptor.getInstance().getConf().getHeartbeatIntervalInMs();
+ private static final long HEARTBEAT_INTERVAL =
+ CommonDescriptor.getInstance().getConf().getHeartbeatIntervalInMs();
private final IManager configManager;
private final NodeManager nodeManager;
private final ScheduledExecutorService retryFailTasksExecutor =
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/UDFManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/UDFManager.java
index 7e63fcd135..9c766818f8 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/UDFManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/UDFManager.java
@@ -27,7 +27,6 @@ import org.apache.iotdb.commons.udf.UDFInformation;
import org.apache.iotdb.confignode.client.DataNodeRequestType;
import org.apache.iotdb.confignode.client.async.AsyncDataNodeClientPool;
import org.apache.iotdb.confignode.client.async.handlers.AsyncClientHandler;
-import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
import org.apache.iotdb.confignode.consensus.request.read.function.GetFunctionTablePlan;
import org.apache.iotdb.confignode.consensus.request.read.udf.GetUDFJarPlan;
import org.apache.iotdb.confignode.consensus.request.write.function.CreateFunctionPlan;
@@ -61,9 +60,7 @@ public class UDFManager {
private final UDFInfo udfInfo;
private final long planSizeLimit =
- CommonDescriptor.getInstance()
- .getConf()
- .getConfigNodeRatisConsensusLogAppenderBufferSize()
+ CommonDescriptor.getInstance().getConf().getConfigNodeRatisConsensusLogAppenderBufferSize()
- IoTDBConstant.RAFT_LOG_BASIC_SIZE;
public UDFManager(ConfigManager configManager, UDFInfo udfInfo) {
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/LoadManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/LoadManager.java
index 0b16aae240..a2a37f7c2f 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/LoadManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/LoadManager.java
@@ -34,8 +34,6 @@ import org.apache.iotdb.commons.service.metric.MetricService;
import org.apache.iotdb.confignode.client.DataNodeRequestType;
import org.apache.iotdb.confignode.client.async.AsyncDataNodeClientPool;
import org.apache.iotdb.confignode.client.async.handlers.AsyncClientHandler;
-import org.apache.iotdb.confignode.conf.ConfigNodeConfig;
-import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
import org.apache.iotdb.confignode.consensus.request.write.region.CreateRegionGroupsPlan;
import org.apache.iotdb.confignode.exception.NoAvailableRegionGroupException;
import org.apache.iotdb.confignode.exception.NotEnoughDataNodeException;
@@ -79,7 +77,8 @@ public class LoadManager {
private static final Logger LOGGER = LoggerFactory.getLogger(LoadManager.class);
- private static final long HEARTBEAT_INTERVAL = CommonDescriptor.getInstance().getConf().getHeartbeatIntervalInMs();
+ private static final long HEARTBEAT_INTERVAL =
+ CommonDescriptor.getInstance().getConf().getHeartbeatIntervalInMs();
private final IManager configManager;
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RouteBalancer.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RouteBalancer.java
index 4c3986343e..9d68162ec8 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RouteBalancer.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/RouteBalancer.java
@@ -76,9 +76,9 @@ public class RouteBalancer {
private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private static final ConfigNodeConfig CONF = ConfigNodeDescriptor.getInstance().getConf();
private static final String SCHEMA_REGION_CONSENSUS_PROTOCOL_CLASS =
- COMMON_CONFIG.getSchemaRegionConsensusProtocolClass().getProtocol();
+ COMMON_CONFIG.getSchemaRegionConsensusProtocolClass().getProtocol();
private static final String DATA_REGION_CONSENSUS_PROTOCOL_CLASS =
- COMMON_CONFIG.getDataRegionConsensusProtocolClass().getProtocol();
+ COMMON_CONFIG.getDataRegionConsensusProtocolClass().getProtocol();
private static final boolean IS_ENABLE_AUTO_LEADER_BALANCE_FOR_DATA_REGION =
(COMMON_CONFIG.isEnableAutoLeaderBalanceForRatisConsensus()
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/partition/GreedyPartitionAllocator.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/partition/GreedyPartitionAllocator.java
index 3745dbff12..5f1b8c622a 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/partition/GreedyPartitionAllocator.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/load/balancer/partition/GreedyPartitionAllocator.java
@@ -44,7 +44,7 @@ public class GreedyPartitionAllocator implements IPartitionAllocator {
private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private static final boolean ENABLE_DATA_PARTITION_INHERIT_POLICY =
- COMMON_CONFIG.isEnableDataPartitionInheritPolicy();
+ COMMON_CONFIG.isEnableDataPartitionInheritPolicy();
private static final long TIME_PARTITION_INTERVAL = COMMON_CONFIG.getTimePartitionInterval();
private final IManager configManager;
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java
index 3a654d0c6a..36dbf2e018 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/partition/PartitionManager.java
@@ -107,12 +107,13 @@ public class PartitionManager {
private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private static final RegionGroupExtensionPolicy SCHEMA_REGION_GROUP_EXTENSION_POLICY =
- COMMON_CONFIG.getSchemaRegionGroupExtensionPolicy();
+ COMMON_CONFIG.getSchemaRegionGroupExtensionPolicy();
private static final int SCHEMA_REGION_GROUP_PER_DATABASE =
- COMMON_CONFIG.getSchemaRegionGroupPerDatabase();
+ COMMON_CONFIG.getSchemaRegionGroupPerDatabase();
private static final RegionGroupExtensionPolicy DATA_REGION_GROUP_EXTENSION_POLICY =
- COMMON_CONFIG.getDataRegionGroupExtensionPolicy();
- private static final int DATA_REGION_GROUP_PER_DATABASE = COMMON_CONFIG.getDataRegionGroupPerDatabase();
+ COMMON_CONFIG.getDataRegionGroupExtensionPolicy();
+ private static final int DATA_REGION_GROUP_PER_DATABASE =
+ COMMON_CONFIG.getDataRegionGroupPerDatabase();
private final IManager configManager;
private final PartitionInfo partitionInfo;
@@ -143,7 +144,7 @@ public class PartitionManager {
private void setSeriesPartitionExecutor() {
this.executor =
SeriesPartitionExecutor.getSeriesPartitionExecutor(
- COMMON_CONFIG.getSeriesPartitionExecutorClass(), COMMON_CONFIG.getSeriesSlotNum());
+ COMMON_CONFIG.getSeriesPartitionExecutorClass(), COMMON_CONFIG.getSeriesSlotNum());
}
// ======================================================
@@ -702,7 +703,8 @@ public class PartitionManager {
? req.getTimeSlotId()
: (req.isSetTimeStamp()
? new TTimePartitionSlot(
- req.getTimeStamp() - req.getTimeStamp() % COMMON_CONFIG.getTimePartitionInterval())
+ req.getTimeStamp()
+ - req.getTimeStamp() % COMMON_CONFIG.getTimePartitionInterval())
: null));
return (GetRegionIdResp) getConsensusManager().read(plan).getDataset();
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/TriggerInfo.java b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/TriggerInfo.java
index 5d029397cc..92d1b50b40 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/TriggerInfo.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/TriggerInfo.java
@@ -69,8 +69,7 @@ import java.util.concurrent.locks.ReentrantLock;
public class TriggerInfo implements SnapshotProcessor {
private static final Logger LOGGER = LoggerFactory.getLogger(TriggerInfo.class);
- private static final CommonConfig COMMON_CONFIG =
- CommonDescriptor.getInstance().getConf();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private final TriggerTable triggerTable;
private final Map<String, String> existedJarToMD5;
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/UDFInfo.java b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/UDFInfo.java
index b1344fd5bc..31ada5ce73 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/UDFInfo.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/UDFInfo.java
@@ -59,8 +59,7 @@ public class UDFInfo implements SnapshotProcessor {
private static final Logger LOGGER = LoggerFactory.getLogger(UDFInfo.class);
- private static final CommonConfig COMMON_CONFIG =
- CommonDescriptor.getInstance().getConf();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private final UDFTable udfTable;
private final Map<String, String> existedJarToMD5;
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/store/ProcedureStore.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/store/ProcedureStore.java
index ceff41d5b5..d8b115d586 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/store/ProcedureStore.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/store/ProcedureStore.java
@@ -39,8 +39,7 @@ import java.util.stream.Stream;
public class ProcedureStore implements IProcedureStore {
private static final Logger LOG = LoggerFactory.getLogger(ProcedureStore.class);
- private String procedureWalDir =
- CommonDescriptor.getInstance().getConf().getProcedureWalFolder();
+ private String procedureWalDir = CommonDescriptor.getInstance().getConf().getProcedureWalFolder();
private final ConcurrentHashMap<Long, ProcedureWAL> procWALMap = new ConcurrentHashMap<>();
public static final String PROCEDURE_WAL_SUFFIX = ".proc.wal";
private final IProcedureFactory procedureFactory;
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java b/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
index 8c18ae25da..8638c24a1a 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
@@ -58,7 +58,8 @@ public class ConfigNode implements ConfigNodeMBean {
private static final Logger LOGGER = LoggerFactory.getLogger(ConfigNode.class);
private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
- private static final ConfigNodeConfig CONFIG_NODE_CONFIG = ConfigNodeDescriptor.getInstance().getConf();
+ private static final ConfigNodeConfig CONFIG_NODE_CONFIG =
+ ConfigNodeDescriptor.getInstance().getConf();
private static final int STARTUP_RETRY_NUM = 10;
private static final int SCHEDULE_WAITING_RETRY_NUM = 20;
@@ -112,7 +113,7 @@ public class ConfigNode implements ConfigNodeMBean {
LOGGER.info(
"{} has successfully restarted and joined the cluster: {}.",
ConfigNodeConstant.GLOBAL_NAME,
- COMMON_CONFIG.getClusterName());
+ COMMON_CONFIG.getClusterName());
return;
}
@@ -136,8 +137,12 @@ public class ConfigNode implements ConfigNodeMBean {
.applyConfigNode(
new TConfigNodeLocation(
SEED_CONFIG_NODE_ID,
- new TEndPoint(CONFIG_NODE_CONFIG.getCnInternalAddress(), CONFIG_NODE_CONFIG.getCnInternalPort()),
- new TEndPoint(CONFIG_NODE_CONFIG.getCnInternalAddress(), CONFIG_NODE_CONFIG.getCnConsensusPort())));
+ new TEndPoint(
+ CONFIG_NODE_CONFIG.getCnInternalAddress(),
+ CONFIG_NODE_CONFIG.getCnInternalPort()),
+ new TEndPoint(
+ CONFIG_NODE_CONFIG.getCnInternalAddress(),
+ CONFIG_NODE_CONFIG.getCnConsensusPort())));
// We always set up Seed-ConfigNode's RPC service lastly to ensure that
// the external service is not provided until Seed-ConfigNode is fully initialized
setUpRPCService();
@@ -146,7 +151,7 @@ public class ConfigNode implements ConfigNodeMBean {
LOGGER.info(
"{} has successfully started and joined the cluster: {}.",
ConfigNodeConstant.GLOBAL_NAME,
- COMMON_CONFIG.getClusterName());
+ COMMON_CONFIG.getClusterName());
return;
}
@@ -161,7 +166,7 @@ public class ConfigNode implements ConfigNodeMBean {
"{} {} has registered successfully. Waiting for the leader's scheduling to join the cluster: {}.",
ConfigNodeConstant.GLOBAL_NAME,
CONFIG_NODE_CONFIG.getConfigNodeId(),
- COMMON_CONFIG.getClusterName());
+ COMMON_CONFIG.getClusterName());
boolean isJoinedCluster = false;
for (int retry = 0; retry < SCHEDULE_WAITING_RETRY_NUM; retry++) {
@@ -240,8 +245,12 @@ public class ConfigNode implements ConfigNodeMBean {
new TConfigNodeRegisterReq(
new TConfigNodeLocation(
INIT_NON_SEED_CONFIG_NODE_ID,
- new TEndPoint(CONFIG_NODE_CONFIG.getCnInternalAddress(), CONFIG_NODE_CONFIG.getCnInternalPort()),
- new TEndPoint(CONFIG_NODE_CONFIG.getCnInternalAddress(), CONFIG_NODE_CONFIG.getCnConsensusPort())),
+ new TEndPoint(
+ CONFIG_NODE_CONFIG.getCnInternalAddress(),
+ CONFIG_NODE_CONFIG.getCnInternalPort()),
+ new TEndPoint(
+ CONFIG_NODE_CONFIG.getCnInternalAddress(),
+ CONFIG_NODE_CONFIG.getCnConsensusPort())),
configManager.getClusterParameters());
TEndPoint targetConfigNode = CONFIG_NODE_CONFIG.getCnTargetConfigNode();
@@ -297,11 +306,15 @@ public class ConfigNode implements ConfigNodeMBean {
private void sendRestartConfigNodeRequest() throws IOException, StartupException {
TConfigNodeRestartReq req =
new TConfigNodeRestartReq(
- COMMON_CONFIG.getClusterName(),
+ COMMON_CONFIG.getClusterName(),
new TConfigNodeLocation(
CONFIG_NODE_CONFIG.getConfigNodeId(),
- new TEndPoint(CONFIG_NODE_CONFIG.getCnInternalAddress(), CONFIG_NODE_CONFIG.getCnInternalPort()),
- new TEndPoint(CONFIG_NODE_CONFIG.getCnInternalAddress(), CONFIG_NODE_CONFIG.getCnConsensusPort())));
+ new TEndPoint(
+ CONFIG_NODE_CONFIG.getCnInternalAddress(),
+ CONFIG_NODE_CONFIG.getCnInternalPort()),
+ new TEndPoint(
+ CONFIG_NODE_CONFIG.getCnInternalAddress(),
+ CONFIG_NODE_CONFIG.getCnConsensusPort())));
TEndPoint targetConfigNode = CONFIG_NODE_CONFIG.getCnTargetConfigNode();
if (targetConfigNode == null) {
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRecoverUnclosedIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRecoverUnclosedIT.java
index b7a8953bd1..c7d773e60e 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRecoverUnclosedIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRecoverUnclosedIT.java
@@ -22,8 +22,6 @@ package org.apache.iotdb.db.it;
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.it.env.EnvFactory;
import org.apache.iotdb.it.framework.IoTDBTestRunner;
import org.apache.iotdb.itbase.category.ClusterIT;
diff --git a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSimpleIT.java b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSimpleIT.java
index 6662c772e2..ec4015ddea 100644
--- a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSimpleIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionSimpleIT.java
@@ -20,7 +20,6 @@ package org.apache.iotdb.session.it;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.conf.IoTDBConstant;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.conf.OperationType;
import org.apache.iotdb.isession.ISession;
import org.apache.iotdb.isession.SessionDataSet;
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMaxTimeQueryIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMaxTimeQueryIT.java
index 3eeb865eef..a8462505fb 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMaxTimeQueryIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMaxTimeQueryIT.java
@@ -67,8 +67,7 @@ public class IoTDBMaxTimeQueryIT {
public static void setUp() throws Exception {
EnvironmentUtils.envSetUp();
// TODO When the aligned time series support compaction, we need to set compaction to true
- enableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ enableSeqSpaceCompaction = IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
enableUnseqSpaceCompaction =
IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
enableCrossSpaceCompaction =
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiOverlappedChunkInUnseqIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiOverlappedChunkInUnseqIT.java
index 255cbae398..f223e7dadc 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiOverlappedChunkInUnseqIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiOverlappedChunkInUnseqIT.java
@@ -20,7 +20,6 @@
package org.apache.iotdb.db.integration;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.integration.env.ConfigFactory;
import org.apache.iotdb.integration.env.EnvFactory;
import org.apache.iotdb.itbase.category.ClusterTest;
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiOverlappedPageIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiOverlappedPageIT.java
index 184e96f79a..64c6c3c73c 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiOverlappedPageIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiOverlappedPageIT.java
@@ -20,7 +20,6 @@
package org.apache.iotdb.db.integration;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.integration.env.ConfigFactory;
import org.apache.iotdb.integration.env.EnvFactory;
import org.apache.iotdb.itbase.category.ClusterTest;
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBNewTsFileCompactionIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBNewTsFileCompactionIT.java
index 024e62d22d..f8a88e021a 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBNewTsFileCompactionIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBNewTsFileCompactionIT.java
@@ -101,7 +101,7 @@ public class IoTDBNewTsFileCompactionIT {
{"2", "2"}
};
int preAvgSeriesPointNumberThreshold =
- CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -155,7 +155,7 @@ public class IoTDBNewTsFileCompactionIT {
{"3", "3"}
};
int preAvgSeriesPointNumberThreshold =
- CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -211,7 +211,7 @@ public class IoTDBNewTsFileCompactionIT {
{"3", "3"},
};
int preAvgSeriesPointNumberThreshold =
- CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -327,7 +327,7 @@ public class IoTDBNewTsFileCompactionIT {
{"3", "3"},
};
int preAvgSeriesPointNumberThreshold =
- CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -384,7 +384,7 @@ public class IoTDBNewTsFileCompactionIT {
{"4", "4"},
};
int preAvgSeriesPointNumberThreshold =
- CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -445,7 +445,7 @@ public class IoTDBNewTsFileCompactionIT {
{"4", "4"}
};
int preAvgSeriesPointNumberThreshold =
- CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -504,7 +504,7 @@ public class IoTDBNewTsFileCompactionIT {
{"6", "6"}
};
int preAvgSeriesPointNumberThreshold =
- CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -565,7 +565,7 @@ public class IoTDBNewTsFileCompactionIT {
{"3", "3"},
};
int preAvgSeriesPointNumberThreshold =
- CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -623,7 +623,7 @@ public class IoTDBNewTsFileCompactionIT {
{"4", "4"}
};
int preAvgSeriesPointNumberThreshold =
- CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -689,7 +689,7 @@ public class IoTDBNewTsFileCompactionIT {
{"4", "4"}
};
int preAvgSeriesPointNumberThreshold =
- CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -748,7 +748,7 @@ public class IoTDBNewTsFileCompactionIT {
{"6", "6"}
};
int preAvgSeriesPointNumberThreshold =
- CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -811,7 +811,7 @@ public class IoTDBNewTsFileCompactionIT {
{"5", "5"}
};
int preAvgSeriesPointNumberThreshold =
- CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -874,7 +874,7 @@ public class IoTDBNewTsFileCompactionIT {
{"6", "6"}
};
int preAvgSeriesPointNumberThreshold =
- CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -939,7 +939,7 @@ public class IoTDBNewTsFileCompactionIT {
{"6", "6"}
};
int preAvgSeriesPointNumberThreshold =
- CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
@@ -1006,7 +1006,7 @@ public class IoTDBNewTsFileCompactionIT {
{"8", "8"}
};
int preAvgSeriesPointNumberThreshold =
- CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
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 737eafe3a7..96f8b096f6 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
@@ -1011,8 +1011,7 @@ public class IoTDBSizeTieredCompactionIT {
@Test
public void testSequenceInnerCompactionContinously() throws SQLException {
int oriThreadNum = IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
- long oriTargetFileSize =
- IoTDBDescriptor.getInstance().getConf().getTargetCompactionFileSize();
+ long oriTargetFileSize = IoTDBDescriptor.getInstance().getConf().getTargetCompactionFileSize();
IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(2);
IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(600);
int originCandidateNum =
@@ -1099,8 +1098,7 @@ public class IoTDBSizeTieredCompactionIT {
@Test
public void testSequenceInnerCompactionConcurrently() throws SQLException {
- long oriTargetFileSize =
- IoTDBDescriptor.getInstance().getConf().getTargetCompactionFileSize();
+ long oriTargetFileSize = IoTDBDescriptor.getInstance().getConf().getTargetCompactionFileSize();
IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(600);
long originCompactionNum = CompactionTaskManager.getInstance().getFinishedTaskNum();
try (Connection connection = EnvFactory.getEnv().getConnection();
@@ -1163,8 +1161,7 @@ public class IoTDBSizeTieredCompactionIT {
@Test
public void testUnsequenceInnerCompactionContinously() throws SQLException {
int oriThreadNum = IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
- long oriTargetFileSize =
- IoTDBDescriptor.getInstance().getConf().getTargetCompactionFileSize();
+ long oriTargetFileSize = IoTDBDescriptor.getInstance().getConf().getTargetCompactionFileSize();
IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(2);
IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(600);
long originFinishCount = CompactionTaskManager.getInstance().getFinishedTaskNum();
@@ -1228,16 +1225,13 @@ public class IoTDBSizeTieredCompactionIT {
} finally {
IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(oriThreadNum);
IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(oriTargetFileSize);
- IoTDBDescriptor.getInstance()
- .getConf()
- .setCompactionPriority(CompactionPriority.INNER_CROSS);
+ IoTDBDescriptor.getInstance().getConf().setCompactionPriority(CompactionPriority.INNER_CROSS);
}
}
@Test
public void testUnsequenceInnerCompactionConcurrently() throws SQLException {
- long oriTargetFileSize =
- IoTDBDescriptor.getInstance().getConf().getTargetCompactionFileSize();
+ long oriTargetFileSize = IoTDBDescriptor.getInstance().getConf().getTargetCompactionFileSize();
IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(600);
long originCompactionNum = CompactionTaskManager.getInstance().getFinishedTaskNum();
try (Connection connection = EnvFactory.getEnv().getConnection();
@@ -1302,8 +1296,7 @@ public class IoTDBSizeTieredCompactionIT {
// Test concurrent compaction in sequence space and unsequence space
@Test
public void testSequenceAndUnsequenceInnerCompactionConcurrently() throws SQLException {
- long oriTargetFileSize =
- IoTDBDescriptor.getInstance().getConf().getTargetCompactionFileSize();
+ long oriTargetFileSize = IoTDBDescriptor.getInstance().getConf().getTargetCompactionFileSize();
IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(600);
long originCompactionNum = CompactionTaskManager.getInstance().getFinishedTaskNum();
try (Connection connection = EnvFactory.getEnv().getConnection();
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/env/StandaloneEnvConfig.java b/integration/src/test/java/org/apache/iotdb/db/integration/env/StandaloneEnvConfig.java
index 843806ca9b..4177190484 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/env/StandaloneEnvConfig.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/env/StandaloneEnvConfig.java
@@ -57,9 +57,7 @@ public class StandaloneEnvConfig implements BaseConfig {
}
public BaseConfig setMaxQueryDeduplicatedPathNum(int maxQueryDeduplicatedPathNum) {
- CommonDescriptor.getInstance()
- .getConf()
- .setMaxDeduplicatedPathNum(maxQueryDeduplicatedPathNum);
+ CommonDescriptor.getInstance().getConf().setMaxDeduplicatedPathNum(maxQueryDeduplicatedPathNum);
return this;
}
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/sync/IoTDBSyncReceiverIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/sync/IoTDBSyncReceiverIT.java
index e7ab7ba17c..853924987a 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/sync/IoTDBSyncReceiverIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/sync/IoTDBSyncReceiverIT.java
@@ -63,8 +63,7 @@ public class IoTDBSyncReceiverIT {
@Before
public void setUp() throws Exception {
EnvironmentUtils.envSetUp();
- enableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ enableSeqSpaceCompaction = IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
enableUnseqSpaceCompaction =
IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
enableCrossSpaceCompaction =
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/sync/IoTDBSyncReceiverLoaderIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/sync/IoTDBSyncReceiverLoaderIT.java
index bf3f65c123..6d33008096 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/sync/IoTDBSyncReceiverLoaderIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/sync/IoTDBSyncReceiverLoaderIT.java
@@ -51,8 +51,7 @@ public class IoTDBSyncReceiverLoaderIT {
@Before
public void setUp() throws Exception {
EnvironmentUtils.envSetUp();
- enableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ enableSeqSpaceCompaction = IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
enableUnseqSpaceCompaction =
IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
enableCrossSpaceCompaction =
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/sync/IoTDBSyncSenderIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/sync/IoTDBSyncSenderIT.java
index 41b44c10bb..ba93a2d883 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/sync/IoTDBSyncSenderIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/sync/IoTDBSyncSenderIT.java
@@ -72,8 +72,7 @@ public class IoTDBSyncSenderIT {
@Before
public void setUp() throws Exception {
EnvironmentUtils.envSetUp();
- enableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ enableSeqSpaceCompaction = IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
enableUnseqSpaceCompaction =
IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
enableCrossSpaceCompaction =
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java b/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
index a958cbe0e8..e3ef286ed3 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java
@@ -1768,6 +1768,10 @@ public class CommonConfig {
this.chunkMetadataSizeProportion = chunkMetadataSizeProportion;
}
+ public double getUsableCompactionMemoryProportion() {
+ return 1.0d - chunkMetadataSizeProportion;
+ }
+
public double getFlushProportion() {
return flushProportion;
}
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java b/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java
index 2bc039f730..464967f200 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java
@@ -1896,12 +1896,12 @@ public class CommonDescriptor {
public void loadRatisConfig(TRatisConfig ratisConfig) {
CONF.setDataRegionRatisConsensusLogAppenderBufferSize(ratisConfig.getDataAppenderBufferSize());
- CONF.setSchemaRegionRatisConsensusLogAppenderBufferSize(ratisConfig.getSchemaAppenderBufferSize());
+ CONF.setSchemaRegionRatisConsensusLogAppenderBufferSize(
+ ratisConfig.getSchemaAppenderBufferSize());
- CONF.setDataRegionRatisSnapshotTriggerThreshold(
- ratisConfig.getDataSnapshotTriggerThreshold());
+ CONF.setDataRegionRatisSnapshotTriggerThreshold(ratisConfig.getDataSnapshotTriggerThreshold());
CONF.setSchemaRegionRatisSnapshotTriggerThreshold(
- ratisConfig.getSchemaSnapshotTriggerThreshold());
+ ratisConfig.getSchemaSnapshotTriggerThreshold());
CONF.setDataRegionRatisLogUnsafeFlushEnable(ratisConfig.isDataLogUnsafeFlushEnable());
CONF.setSchemaRegionRatisLogUnsafeFlushEnable(ratisConfig.isSchemaLogUnsafeFlushEnable());
@@ -1913,14 +1913,14 @@ public class CommonDescriptor {
CONF.setSchemaRegionRatisGrpcFlowControlWindow(ratisConfig.getSchemaGrpcFlowControlWindow());
CONF.setDataRegionRatisRpcLeaderElectionTimeoutMinMs(
- ratisConfig.getDataLeaderElectionTimeoutMin());
+ ratisConfig.getDataLeaderElectionTimeoutMin());
CONF.setSchemaRegionRatisRpcLeaderElectionTimeoutMinMs(
- ratisConfig.getSchemaLeaderElectionTimeoutMin());
+ ratisConfig.getSchemaLeaderElectionTimeoutMin());
CONF.setDataRegionRatisRpcLeaderElectionTimeoutMaxMs(
- ratisConfig.getDataLeaderElectionTimeoutMax());
+ ratisConfig.getDataLeaderElectionTimeoutMax());
CONF.setSchemaRegionRatisRpcLeaderElectionTimeoutMaxMs(
- ratisConfig.getSchemaLeaderElectionTimeoutMax());
+ ratisConfig.getSchemaLeaderElectionTimeoutMax());
CONF.setDataRegionRatisRequestTimeoutMs(ratisConfig.getDataRequestTimeout());
CONF.setSchemaRegionRatisRequestTimeoutMs(ratisConfig.getSchemaRequestTimeout());
diff --git a/schema-engine-rocksdb/src/main/java/org/apache/iotdb/db/metadata/schemaregion/rocksdb/RSchemaConfLoader.java b/schema-engine-rocksdb/src/main/java/org/apache/iotdb/db/metadata/schemaregion/rocksdb/RSchemaConfLoader.java
index 47d700374f..490804f28b 100644
--- a/schema-engine-rocksdb/src/main/java/org/apache/iotdb/db/metadata/schemaregion/rocksdb/RSchemaConfLoader.java
+++ b/schema-engine-rocksdb/src/main/java/org/apache/iotdb/db/metadata/schemaregion/rocksdb/RSchemaConfLoader.java
@@ -48,7 +48,7 @@ public class RSchemaConfLoader {
private long blockCache =
CommonDescriptor.getInstance().getConf().getAllocateMemoryForSchemaRegion() * 2 / 3;
private long blockCacheCompressed =
- CommonDescriptor.getInstance().getConf().getAllocateMemoryForSchemaRegion() / 3;
+ CommonDescriptor.getInstance().getConf().getAllocateMemoryForSchemaRegion() / 3;
private static final String ROCKSDB_CONFIG_FILE_NAME = "schema-rocksdb.properties";
private static final Logger logger = LoggerFactory.getLogger(RSchemaConfLoader.class);
diff --git a/server/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java b/server/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
index 29af2914e4..f2f92f326a 100644
--- a/server/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
+++ b/server/src/main/java/org/apache/iotdb/db/auth/AuthorityChecker.java
@@ -42,8 +42,7 @@ import static org.apache.iotdb.db.utils.ErrorHandlingUtils.onQueryException;
public class AuthorityChecker {
- private static final String SUPER_USER =
- CommonDescriptor.getInstance().getConf().getAdminName();
+ private static final String SUPER_USER = CommonDescriptor.getInstance().getConf().getAdminName();
private static final Logger logger = LoggerFactory.getLogger(AuthorityChecker.class);
private static final AuthorizerManager authorizerManager = AuthorizerManager.getInstance();
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 2bd00e8d04..9ad289702d 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
@@ -313,7 +313,8 @@ public class IoTDBConfig {
// How many threads can concurrently evaluate windows. When <= 0, use CPU core number
private int windowEvaluationThreadCount = Runtime.getRuntime().availableProcessors();
- // Max number of window evaluation tasks that can be pending for execution. When <= 0, the value is 64 by default
+ // Max number of window evaluation tasks that can be pending for execution. When <= 0, the value
+ // is 64 by default
private int maxPendingWindowEvaluationTasks = 64;
// When a unSequence TsFile's file size (in byte) exceed this, the TsFile is forced closed
@@ -331,10 +332,12 @@ public class IoTDBConfig {
// indicate whether current mode is cluster
private boolean isClusterMode = false;
- // The cluster name that this DataNode joined in the cluster mode. The default value "defaultCluster" will be changed after join cluster
+ // The cluster name that this DataNode joined in the cluster mode. The default value
+ // "defaultCluster" will be changed after join cluster
private String clusterName = "defaultCluster";
- // The DataNodeId of this DataNode for cluster mode. The default value -1 will be changed after join cluster
+ // The DataNodeId of this DataNode for cluster mode. The default value -1 will be changed after
+ // join cluster
private int dataNodeId = -1;
// Replace implementation class of influxdb protocol service
@@ -346,7 +349,8 @@ public class IoTDBConfig {
// The limit of compaction merge can reach per second
private int compactionWriteThroughputMbPerSec = 16;
- // How many thread will be set up to perform compaction, 10 by default. Set to 1 when less than or equal to 0
+ // 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 compactionThreadCount = 10;
// Default DFS NameServices is hdfsnamespace
@@ -358,7 +362,8 @@ public class IoTDBConfig {
// Default DFS HA automatic failover is enabled
private boolean dfsHaAutomaticFailoverEnabled = true;
- // Default DFS client failover proxy provider is "org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider"
+ // Default DFS client failover proxy provider is
+ // "org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider"
private String dfsClientFailoverProxyProvider =
"org.apache.hadoop.hdfs.server.namenode.ha.ConfiguredFailoverProxyProvider";
@@ -387,7 +392,8 @@ public class IoTDBConfig {
// time in nanosecond precision when starting up
private final long startUpNanosecond = System.nanoTime();
- // Whether enable the rpc service. This parameter has no a corresponding field in the iotdb-common.properties
+ // Whether enable the rpc service. This parameter has no a corresponding field in the
+ // iotdb-common.properties
private boolean enableRpcService = true;
// The method to transform device path to device id, can be 'Plain' or 'SHA256'
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 e0b78ab7b2..e65b443d8f 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
@@ -753,8 +753,8 @@ public class IoTDBDescriptor {
// These configurations are received from config node when registering
public void loadGlobalConfig(TGlobalConfig globalConfig) {
CONF.setDnTimePartitionInterval(
- DateTimeUtils.convertMilliTimeWithPrecision(
- globalConfig.timePartitionInterval, COMMON_CONFIG.getTimestampPrecision()));
+ DateTimeUtils.convertMilliTimeWithPrecision(
+ globalConfig.timePartitionInterval, COMMON_CONFIG.getTimestampPrecision()));
}
public void loadCQConfig(TCQConfig cqConfig) {
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java
index 7da07e559b..ae4c28778a 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java
@@ -95,11 +95,13 @@ public class IoTDBStartCheck {
constantParamValueTable.put(
TAG_ATTRIBUTE_SIZE_STRING, () -> String.valueOf(COMMON_CONFIG.getTagAttributeTotalSize()));
constantParamValueTable.put(
- TAG_ATTRIBUTE_FLUSH_INTERVAL, () -> String.valueOf(COMMON_CONFIG.getTagAttributeFlushInterval()));
+ TAG_ATTRIBUTE_FLUSH_INTERVAL,
+ () -> String.valueOf(COMMON_CONFIG.getTagAttributeFlushInterval()));
constantParamValueTable.put(
MAX_DEGREE_OF_INDEX_STRING,
() -> String.valueOf(TSFileDescriptor.getInstance().getConfig().getMaxDegreeOfIndexNode()));
- constantParamValueTable.put(ENABLE_ID_TABLE, () -> String.valueOf(IOTDB_CONFIG.isEnableIDTable()));
+ constantParamValueTable.put(
+ ENABLE_ID_TABLE, () -> String.valueOf(IOTDB_CONFIG.isEnableIDTable()));
constantParamValueTable.put(
ENABLE_ID_TABLE_LOG_FILE, () -> String.valueOf(IOTDB_CONFIG.isEnableIDTableLogFile()));
constantParamValueTable.put(
@@ -121,7 +123,8 @@ public class IoTDBStartCheck {
static {
variableParamValueTable.put(
INTERNAL_ADDRESS, () -> String.valueOf(IOTDB_CONFIG.getDnInternalAddress()));
- variableParamValueTable.put(INTERNAL_PORT, () -> String.valueOf(IOTDB_CONFIG.getDnInternalPort()));
+ variableParamValueTable.put(
+ INTERNAL_PORT, () -> String.valueOf(IOTDB_CONFIG.getDnInternalPort()));
variableParamValueTable.put(RPC_ADDRESS, () -> String.valueOf(IOTDB_CONFIG.getDnRpcAddress()));
variableParamValueTable.put(RPC_PORT, () -> String.valueOf(IOTDB_CONFIG.getDnRpcPort()));
variableParamValueTable.put(
@@ -130,7 +133,8 @@ public class IoTDBStartCheck {
SCHEMA_REGION_CONSENSUS_PORT,
() -> String.valueOf(IOTDB_CONFIG.getDnSchemaRegionConsensusPort()));
variableParamValueTable.put(
- DATA_REGION_CONSENSUS_PORT, () -> String.valueOf(IOTDB_CONFIG.getDnDataRegionConsensusPort()));
+ DATA_REGION_CONSENSUS_PORT,
+ () -> String.valueOf(IOTDB_CONFIG.getDnDataRegionConsensusPort()));
}
// endregion
// region params don't need checking, determined by the system
@@ -259,7 +263,10 @@ public class IoTDBStartCheck {
DirectoryChecker.getInstance().registerDirectory(new File(dataDir));
}
if (IOTDB_CONFIG.isClusterMode()
- && COMMON_CONFIG.getDataRegionConsensusProtocolClass().getProtocol().equals(ConsensusFactory.RATIS_CONSENSUS)) {
+ && COMMON_CONFIG
+ .getDataRegionConsensusProtocolClass()
+ .getProtocol()
+ .equals(ConsensusFactory.RATIS_CONSENSUS)) {
if (DirectoryChecker.getInstance().isCrossDisk(IOTDB_CONFIG.getDnDataDirs())) {
throw new ConfigurationException(
"Configuring the data directories as cross-disk directories is not supported under RatisConsensus(it will be supported in a later version).");
@@ -270,7 +277,8 @@ public class IoTDBStartCheck {
// check WAL dir
if (!(IOTDB_CONFIG.isClusterMode()
&& COMMON_CONFIG
- .getDataRegionConsensusProtocolClass().getProtocol()
+ .getDataRegionConsensusProtocolClass()
+ .getProtocol()
.equals(ConsensusFactory.RATIS_CONSENSUS))
&& !COMMON_CONFIG.getWalMode().equals(WALMode.DISABLE)) {
for (String walDir : IOTDB_CONFIG.getDnWalDirs()) {
@@ -306,7 +314,10 @@ public class IoTDBStartCheck {
properties.store(outputStream, SYSTEM_PROPERTIES_STRING);
}
if (IOTDB_CONFIG.isClusterMode()
- && COMMON_CONFIG.getDataRegionConsensusProtocolClass().getProtocol().equals(ConsensusFactory.IOT_CONSENSUS)
+ && COMMON_CONFIG
+ .getDataRegionConsensusProtocolClass()
+ .getProtocol()
+ .equals(ConsensusFactory.IOT_CONSENSUS)
&& COMMON_CONFIG.getWalMode().equals(WALMode.DISABLE)) {
throw new ConfigurationException(
"Configuring the WALMode as disable is not supported under IoTConsensus");
@@ -436,13 +447,13 @@ public class IoTDBStartCheck {
}
if (properties.containsKey(SCHEMA_REGION_CONSENSUS_PROTOCOL)) {
- COMMON_CONFIG.setSchemaRegionConsensusProtocolClass(ConsensusProtocolClass.parse(
- properties.getProperty(SCHEMA_REGION_CONSENSUS_PROTOCOL)));
+ COMMON_CONFIG.setSchemaRegionConsensusProtocolClass(
+ ConsensusProtocolClass.parse(properties.getProperty(SCHEMA_REGION_CONSENSUS_PROTOCOL)));
}
if (properties.containsKey(DATA_REGION_CONSENSUS_PROTOCOL)) {
- COMMON_CONFIG.setDataRegionConsensusProtocolClass(ConsensusProtocolClass.parse(
- properties.getProperty(DATA_REGION_CONSENSUS_PROTOCOL)));
+ COMMON_CONFIG.setDataRegionConsensusProtocolClass(
+ ConsensusProtocolClass.parse(properties.getProperty(DATA_REGION_CONSENSUS_PROTOCOL)));
}
}
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 e82be60944..3c959ee81c 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
@@ -62,19 +62,22 @@ public class DataRegionConsensusImpl {
if (INSTANCE == null) {
INSTANCE =
ConsensusFactory.getConsensusImpl(
- COMMON_CONFIG.getDataRegionConsensusProtocolClass().getProtocol(),
+ COMMON_CONFIG.getDataRegionConsensusProtocolClass().getProtocol(),
ConsensusConfig.newBuilder()
.setThisNodeId(IOTDB_CONFIG.getDataNodeId())
.setThisNode(
new TEndPoint(
- IOTDB_CONFIG.getDnInternalAddress(), IOTDB_CONFIG.getDnDataRegionConsensusPort()))
+ IOTDB_CONFIG.getDnInternalAddress(),
+ IOTDB_CONFIG.getDnDataRegionConsensusPort()))
.setStorageDir(IOTDB_CONFIG.getDataRegionConsensusDir())
.setIoTConsensusConfig(
IoTConsensusConfig.newBuilder()
.setRpc(
RPC.newBuilder()
- .setConnectionTimeoutInMs(IOTDB_CONFIG.getDnConnectionTimeoutInMS())
- .setRpcSelectorThreadNum(IOTDB_CONFIG.getDnRpcSelectorThreadCount())
+ .setConnectionTimeoutInMs(
+ IOTDB_CONFIG.getDnConnectionTimeoutInMS())
+ .setRpcSelectorThreadNum(
+ IOTDB_CONFIG.getDnRpcSelectorThreadCount())
.setRpcMinConcurrentClientNum(
IOTDB_CONFIG.getDnRpcMinConcurrentClientNum())
.setRpcMaxConcurrentClientNum(
@@ -87,14 +90,18 @@ public class DataRegionConsensusImpl {
IOTDB_CONFIG.getThriftServerAwaitTimeForStopService())
.setThriftMaxFrameSize(IOTDB_CONFIG.getDnThriftMaxFrameSize())
.setCoreClientNumForEachNode(
- IOTDB_CONFIG.getDnCoreClientCountForEachNodeInClientManager())
- .setMaxClientNumForEachNode(IOTDB_CONFIG.getDnMaxClientCountForEachNodeInClientManager())
+ IOTDB_CONFIG
+ .getDnCoreClientCountForEachNodeInClientManager())
+ .setMaxClientNumForEachNode(
+ IOTDB_CONFIG
+ .getDnMaxClientCountForEachNodeInClientManager())
.build())
.setReplication(
IoTConsensusConfig.Replication.newBuilder()
- .setWalThrottleThreshold(COMMON_CONFIG.getIotConsensusThrottleThresholdInByte())
+ .setWalThrottleThreshold(
+ COMMON_CONFIG.getIotConsensusThrottleThresholdInByte())
.setAllocateMemoryForConsensus(
- COMMON_CONFIG.getAllocateMemoryForConsensus())
+ COMMON_CONFIG.getAllocateMemoryForConsensus())
.build())
.build())
.setRatisConfig(
@@ -106,71 +113,78 @@ public class DataRegionConsensusImpl {
Snapshot.newBuilder()
.setCreationGap(1)
.setAutoTriggerThreshold(
- COMMON_CONFIG.getDataRegionRatisSnapshotTriggerThreshold())
+ COMMON_CONFIG
+ .getDataRegionRatisSnapshotTriggerThreshold())
.build())
.setLog(
RatisConfig.Log.newBuilder()
.setUnsafeFlushEnabled(
- COMMON_CONFIG.isDataRegionRatisLogUnsafeFlushEnable())
+ COMMON_CONFIG.isDataRegionRatisLogUnsafeFlushEnable())
.setSegmentSizeMax(
SizeInBytes.valueOf(
- COMMON_CONFIG.getDataRegionRatisLogSegmentSizeMax()))
+ COMMON_CONFIG.getDataRegionRatisLogSegmentSizeMax()))
.setPreserveNumsWhenPurge(
- COMMON_CONFIG.getDataRegionRatisPreserveLogsWhenPurge())
+ COMMON_CONFIG.getDataRegionRatisPreserveLogsWhenPurge())
.build())
.setGrpc(
RatisConfig.Grpc.newBuilder()
.setFlowControlWindow(
SizeInBytes.valueOf(
- COMMON_CONFIG.getDataRegionRatisGrpcFlowControlWindow()))
+ COMMON_CONFIG
+ .getDataRegionRatisGrpcFlowControlWindow()))
.build())
.setRpc(
RatisConfig.Rpc.newBuilder()
.setTimeoutMin(
TimeDuration.valueOf(
- COMMON_CONFIG
+ COMMON_CONFIG
.getDataRegionRatisRpcLeaderElectionTimeoutMinMs(),
TimeUnit.MILLISECONDS))
.setTimeoutMax(
TimeDuration.valueOf(
- COMMON_CONFIG
+ COMMON_CONFIG
.getDataRegionRatisRpcLeaderElectionTimeoutMaxMs(),
TimeUnit.MILLISECONDS))
.setRequestTimeout(
TimeDuration.valueOf(
- COMMON_CONFIG.getDataRegionRatisRequestTimeoutMs(),
+ COMMON_CONFIG.getDataRegionRatisRequestTimeoutMs(),
TimeUnit.MILLISECONDS))
.setFirstElectionTimeoutMin(
TimeDuration.valueOf(
- COMMON_CONFIG.getRatisFirstElectionTimeoutMinMs(),
+ COMMON_CONFIG.getRatisFirstElectionTimeoutMinMs(),
TimeUnit.MILLISECONDS))
.setFirstElectionTimeoutMax(
TimeDuration.valueOf(
- COMMON_CONFIG.getRatisFirstElectionTimeoutMaxMs(),
+ COMMON_CONFIG.getRatisFirstElectionTimeoutMaxMs(),
TimeUnit.MILLISECONDS))
.build())
.setClient(
RatisConfig.Client.newBuilder()
.setClientRequestTimeoutMillis(
- COMMON_CONFIG.getDataRegionRatisRequestTimeoutMs())
+ COMMON_CONFIG.getDataRegionRatisRequestTimeoutMs())
.setClientMaxRetryAttempt(
- COMMON_CONFIG.getDataRegionRatisMaxRetryAttempts())
+ COMMON_CONFIG.getDataRegionRatisMaxRetryAttempts())
.setClientRetryInitialSleepTimeMs(
- COMMON_CONFIG.getDataRegionRatisInitialSleepTimeMs())
+ COMMON_CONFIG.getDataRegionRatisInitialSleepTimeMs())
.setClientRetryMaxSleepTimeMs(
- COMMON_CONFIG.getDataRegionRatisMaxSleepTimeMs())
+ COMMON_CONFIG.getDataRegionRatisMaxSleepTimeMs())
.setCoreClientNumForEachNode(
- IOTDB_CONFIG.getDnCoreClientCountForEachNodeInClientManager())
- .setMaxClientNumForEachNode(IOTDB_CONFIG.getDnMaxClientCountForEachNodeInClientManager())
+ IOTDB_CONFIG
+ .getDnCoreClientCountForEachNodeInClientManager())
+ .setMaxClientNumForEachNode(
+ IOTDB_CONFIG
+ .getDnMaxClientCountForEachNodeInClientManager())
.build())
.setImpl(
RatisConfig.Impl.newBuilder()
- .setTriggerSnapshotFileSize(COMMON_CONFIG.getDataRegionRatisLogMax())
+ .setTriggerSnapshotFileSize(
+ COMMON_CONFIG.getDataRegionRatisLogMax())
.build())
.setLeaderLogAppender(
RatisConfig.LeaderLogAppender.newBuilder()
.setBufferByteLimit(
- COMMON_CONFIG.getDataRegionRatisConsensusLogAppenderBufferSize())
+ COMMON_CONFIG
+ .getDataRegionRatisConsensusLogAppenderBufferSize())
.build())
.build())
.build(),
@@ -182,7 +196,7 @@ public class DataRegionConsensusImpl {
new IllegalArgumentException(
String.format(
ConsensusFactory.CONSTRUCT_FAILED_MSG,
- COMMON_CONFIG.getDataRegionConsensusProtocolClass())));
+ COMMON_CONFIG.getDataRegionConsensusProtocolClass())));
}
return INSTANCE;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkCache.java b/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkCache.java
index 153a5ec9d5..50047e6851 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkCache.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/cache/ChunkCache.java
@@ -23,8 +23,6 @@ import org.apache.iotdb.commons.conf.CommonConfig;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.service.metric.MetricService;
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.mpp.metric.ChunkCacheMetrics;
import org.apache.iotdb.db.mpp.metric.QueryMetricsManager;
import org.apache.iotdb.db.query.control.FileReaderManager;
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java b/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java
index 001ce29d46..b5f73f77da 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/cache/TimeSeriesMetadataCache.java
@@ -24,8 +24,6 @@ import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.service.metric.MetricService;
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.mpp.metric.QueryMetricsManager;
import org.apache.iotdb.db.mpp.metric.TimeSeriesMetadataCacheMetrics;
import org.apache.iotdb.db.query.control.FileReaderManager;
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/executor/readchunk/SingleSeriesCompactionExecutor.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/executor/readchunk/SingleSeriesCompactionExecutor.java
index 382fef5285..35ff424260 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/executor/readchunk/SingleSeriesCompactionExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/executor/readchunk/SingleSeriesCompactionExecutor.java
@@ -64,8 +64,7 @@ public class SingleSeriesCompactionExecutor {
private long maxEndTimestamp = Long.MIN_VALUE;
private long pointCountInChunkWriter = 0;
- private final long targetChunkSize =
- IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
+ private final long targetChunkSize = IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
private final long targetChunkPointNum =
IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
private final long chunkSizeLowerBound =
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 a054c13781..fd9ee62960 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
@@ -18,6 +18,7 @@
*/
package org.apache.iotdb.db.engine.compaction.selector.impl;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
@@ -74,7 +75,7 @@ public class RewriteCrossSpaceCompactionSelector implements ICrossSpaceSelector
(long)
((double) SystemInfo.getInstance().getMemorySizeForCompaction()
/ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount()
- * config.getUsableCompactionMemoryProportion());
+ * CommonDescriptor.getInstance().getConf().getUsableCompactionMemoryProportion());
this.maxCrossCompactionFileNum =
IoTDBDescriptor.getInstance().getConf().getMaxCrossCompactionCandidateFileNum();
this.maxCrossCompactionFileSize =
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java b/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
index eb4a199596..2dffe7ebc2 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/memtable/AbstractMemTable.java
@@ -24,7 +24,6 @@ import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.service.metric.MetricService;
import org.apache.iotdb.commons.service.metric.enums.Metric;
import org.apache.iotdb.commons.service.metric.enums.Tag;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.flush.FlushStatus;
import org.apache.iotdb.db.engine.flush.NotifyFlushMemTable;
import org.apache.iotdb.db.engine.modification.Modification;
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/trigger/utils/BatchHandlerQueue.java b/server/src/main/java/org/apache/iotdb/db/engine/trigger/utils/BatchHandlerQueue.java
index 52e56ab01e..d1546e810a 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/trigger/utils/BatchHandlerQueue.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/trigger/utils/BatchHandlerQueue.java
@@ -20,7 +20,6 @@
package org.apache.iotdb.db.engine.trigger.utils;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.trigger.sink.api.Event;
import org.apache.iotdb.db.engine.trigger.sink.api.Handler;
@@ -57,8 +56,7 @@ public class BatchHandlerQueue<T extends Event> {
CommonDescriptor.getInstance().getConf().getTriggerForwardMaxQueueNumber());
this.queueSize =
Math.min(
- queueSize,
- CommonDescriptor.getInstance().getConf().getTriggerForwardMaxSizePerQueue());
+ queueSize, CommonDescriptor.getInstance().getConf().getTriggerForwardMaxSizePerQueue());
this.batchSize =
Math.min(batchSize, CommonDescriptor.getInstance().getConf().getTriggerForwardBatchSize());
this.handler = handler;
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/trigger/utils/HTTPConnectionPool.java b/server/src/main/java/org/apache/iotdb/db/engine/trigger/utils/HTTPConnectionPool.java
index cbb456fdb9..bbf0f0c3ce 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/trigger/utils/HTTPConnectionPool.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/trigger/utils/HTTPConnectionPool.java
@@ -20,7 +20,6 @@
package org.apache.iotdb.db.engine.trigger.utils;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFileConfig.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFileConfig.java
index 01fed09c3f..43d0bc8114 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFileConfig.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFileConfig.java
@@ -34,9 +34,7 @@ public class SchemaFileConfig {
public static int FILE_HEADER_SIZE = 256; // size of file header in bytes
public static final int PAGE_CACHE_SIZE =
- IoTDBDescriptor.getInstance()
- .getConf()
- .getPageCacheSizeInSchemaFile(); // size of page cache
+ IoTDBDescriptor.getInstance().getConf().getPageCacheSizeInSchemaFile(); // size of page cache
// size of page within one redo log, restricting log around 1GB
public static final int SCHEMA_FILE_LOG_SIZE =
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionMemoryImpl.java b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionMemoryImpl.java
index 562c3d3fd2..5fefcd9aa7 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionMemoryImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionMemoryImpl.java
@@ -169,7 +169,8 @@ public class SchemaRegionMemoryImpl implements ISchemaRegion {
// be clear first
if (IOTDB_CONFIG.isClusterMode()
&& COMMON_CONFIG
- .getSchemaRegionConsensusProtocolClass().getProtocol()
+ .getSchemaRegionConsensusProtocolClass()
+ .getProtocol()
.equals(ConsensusFactory.RATIS_CONSENSUS)) {
File schemaRegionDir = new File(schemaRegionDirPath);
if (schemaRegionDir.exists()) {
@@ -202,7 +203,8 @@ public class SchemaRegionMemoryImpl implements ISchemaRegion {
if (!(IOTDB_CONFIG.isClusterMode()
&& COMMON_CONFIG
- .getSchemaRegionConsensusProtocolClass().getProtocol()
+ .getSchemaRegionConsensusProtocolClass()
+ .getProtocol()
.equals(ConsensusFactory.RATIS_CONSENSUS))) {
usingMLog = true;
initMLog();
@@ -254,7 +256,7 @@ public class SchemaRegionMemoryImpl implements ISchemaRegion {
schemaRegionDirPath,
MetadataConstant.METADATA_LOG,
new FakeCRC32Serializer<>(new SchemaRegionPlanSerializer()),
- COMMON_CONFIG.getSyncMlogPeriodInMs() == 0);
+ COMMON_CONFIG.getSyncMlogPeriodInMs() == 0);
}
public void writeToMLog(ISchemaRegionPlan schemaRegionPlan) throws IOException {
@@ -586,7 +588,8 @@ public class SchemaRegionMemoryImpl implements ISchemaRegion {
}
// update id table if not in recovering or disable id table log file
- if (IOTDB_CONFIG.isEnableIDTable() && (!isRecovering || !IOTDB_CONFIG.isEnableIDTableLogFile())) {
+ if (IOTDB_CONFIG.isEnableIDTable()
+ && (!isRecovering || !IOTDB_CONFIG.isEnableIDTableLogFile())) {
IDTable idTable = IDTableManager.getInstance().getIDTable(plan.getPath().getDevicePath());
idTable.createTimeseries(plan);
}
@@ -691,7 +694,8 @@ public class SchemaRegionMemoryImpl implements ISchemaRegion {
}
// update id table if not in recovering or disable id table log file
- if (IOTDB_CONFIG.isEnableIDTable() && (!isRecovering || !IOTDB_CONFIG.isEnableIDTableLogFile())) {
+ if (IOTDB_CONFIG.isEnableIDTable()
+ && (!isRecovering || !IOTDB_CONFIG.isEnableIDTableLogFile())) {
IDTable idTable = IDTableManager.getInstance().getIDTable(plan.getDevicePath());
idTable.createAlignedTimeseries(plan);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionSchemaFileImpl.java b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionSchemaFileImpl.java
index 6cfdf2c627..27bc09023c 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionSchemaFileImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaRegionSchemaFileImpl.java
@@ -190,7 +190,8 @@ public class SchemaRegionSchemaFileImpl implements ISchemaRegion {
if (!(IOTDB_CONFIG.isClusterMode()
&& COMMON_CONFIG
- .getSchemaRegionConsensusProtocolClass().getProtocol()
+ .getSchemaRegionConsensusProtocolClass()
+ .getProtocol()
.equals(ConsensusFactory.RATIS_CONSENSUS))) {
usingMLog = true;
initMLog();
@@ -603,7 +604,8 @@ public class SchemaRegionSchemaFileImpl implements ISchemaRegion {
}
// update id table if not in recovering or disable id table log file
- if (IOTDB_CONFIG.isEnableIDTable() && (!isRecovering || !IOTDB_CONFIG.isEnableIDTableLogFile())) {
+ if (IOTDB_CONFIG.isEnableIDTable()
+ && (!isRecovering || !IOTDB_CONFIG.isEnableIDTableLogFile())) {
IDTable idTable = IDTableManager.getInstance().getIDTable(plan.getPath().getDevicePath());
idTable.createTimeseries(plan);
}
@@ -748,7 +750,8 @@ public class SchemaRegionSchemaFileImpl implements ISchemaRegion {
}
// update id table if not in recovering or disable id table log file
- if (IOTDB_CONFIG.isEnableIDTable() && (!isRecovering || !IOTDB_CONFIG.isEnableIDTableLogFile())) {
+ if (IOTDB_CONFIG.isEnableIDTable()
+ && (!isRecovering || !IOTDB_CONFIG.isEnableIDTableLogFile())) {
IDTable idTable = IDTableManager.getInstance().getIDTable(plan.getDevicePath());
idTable.createAlignedTimeseries(plan);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/tag/TagLogFile.java b/server/src/main/java/org/apache/iotdb/db/metadata/tag/TagLogFile.java
index edaf9637bc..ce40d7770b 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/tag/TagLogFile.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/tag/TagLogFile.java
@@ -21,7 +21,6 @@ package org.apache.iotdb.db.metadata.tag;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.file.SystemFileFactory;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.tsfile.utils.Pair;
import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SinkHandle.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SinkHandle.java
index b326c4872c..091d4c1a07 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SinkHandle.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SinkHandle.java
@@ -100,7 +100,7 @@ public class SinkHandle implements ISinkHandle {
/** max bytes this SourceHandle can reserve. */
private long maxBytesCanReserve =
- CommonDescriptor.getInstance().getConf().getMaxBytesPerFragmentInstance();
+ CommonDescriptor.getInstance().getConf().getMaxBytesPerFragmentInstance();
private static final QueryMetricsManager QUERY_METRICS = QueryMetricsManager.getInstance();
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SourceHandle.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SourceHandle.java
index 8a798e512e..0291245b73 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SourceHandle.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SourceHandle.java
@@ -97,7 +97,7 @@ public class SourceHandle implements ISourceHandle {
/** max bytes this SourceHandle can reserve. */
private long maxBytesCanReserve =
- CommonDescriptor.getInstance().getConf().getMaxBytesPerFragmentInstance();
+ CommonDescriptor.getInstance().getConf().getMaxBytesPerFragmentInstance();
/**
* this is set to true after calling isBlocked() at least once which indicates that this
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/fragment/FragmentInstanceManager.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/fragment/FragmentInstanceManager.java
index 6f360ead5c..450faf9b8a 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/fragment/FragmentInstanceManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/fragment/FragmentInstanceManager.java
@@ -21,7 +21,6 @@ package org.apache.iotdb.db.mpp.execution.fragment;
import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory;
import org.apache.iotdb.commons.concurrent.threadpool.ScheduledExecutorUtil;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.storagegroup.IDataRegionForQuery;
import org.apache.iotdb.db.metadata.schemaregion.ISchemaRegion;
import org.apache.iotdb.db.mpp.common.FragmentInstanceId;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/AbstractIntoOperator.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/AbstractIntoOperator.java
index f095c898e6..878a7e8cf7 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/AbstractIntoOperator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/AbstractIntoOperator.java
@@ -23,7 +23,6 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.client.DataNodeInternalClient;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.IntoProcessException;
import org.apache.iotdb.db.mpp.execution.operator.Operator;
import org.apache.iotdb.db.mpp.execution.operator.OperatorContext;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/TransformOperator.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/TransformOperator.java
index ba9570edf8..86d7c4b83a 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/TransformOperator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/TransformOperator.java
@@ -61,9 +61,9 @@ public class TransformOperator implements ProcessOperator {
protected final float udfReaderMemoryBudgetInMB =
CommonDescriptor.getInstance().getConf().getUdfReaderMemoryBudgetInMB();
protected final float udfTransformerMemoryBudgetInMB =
- CommonDescriptor.getInstance().getConf().getUdfTransformerMemoryBudgetInMB();
+ CommonDescriptor.getInstance().getConf().getUdfTransformerMemoryBudgetInMB();
protected final float udfCollectorMemoryBudgetInMB =
- CommonDescriptor.getInstance().getConf().getUdfCollectorMemoryBudgetInMB();
+ CommonDescriptor.getInstance().getConf().getUdfCollectorMemoryBudgetInMB();
protected final OperatorContext operatorContext;
protected final Operator inputOperator;
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 3be447c99c..45beb52fa3 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
@@ -23,7 +23,6 @@ import org.apache.iotdb.commons.exception.StartupException;
import org.apache.iotdb.commons.service.IService;
import org.apache.iotdb.commons.service.ServiceType;
import org.apache.iotdb.commons.utils.TestOnly;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.mpp.common.FragmentInstanceId;
import org.apache.iotdb.db.mpp.common.QueryId;
import org.apache.iotdb.db.mpp.execution.driver.IDriver;
@@ -83,9 +82,9 @@ public class DriverScheduler implements IDriverScheduler, IService {
private static final int MAX_CAPACITY =
CommonDescriptor.getInstance().getConf().getMaxAllowedConcurrentQueries();
private static final int WORKER_THREAD_NUM =
- CommonDescriptor.getInstance().getConf().getQueryThreadCount();
+ CommonDescriptor.getInstance().getConf().getQueryThreadCount();
private static final long QUERY_TIMEOUT_MS =
- CommonDescriptor.getInstance().getConf().getQueryTimeoutThreshold();
+ CommonDescriptor.getInstance().getConf().getQueryTimeoutThreshold();
private final ThreadGroup workerGroups;
private final List<AbstractDriverThread> threads;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/DriverTaskThread.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/DriverTaskThread.java
index 6649cf2890..b292a2bbab 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/DriverTaskThread.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/DriverTaskThread.java
@@ -20,7 +20,6 @@ package org.apache.iotdb.db.mpp.execution.schedule;
import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.mpp.execution.driver.IDriver;
import org.apache.iotdb.db.mpp.execution.schedule.queue.IndexedBlockingQueue;
import org.apache.iotdb.db.mpp.execution.schedule.task.DriverTask;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/cache/PartitionCache.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/cache/PartitionCache.java
index b4a95a4f3c..755c0e4a79 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/cache/PartitionCache.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/cache/PartitionCache.java
@@ -46,8 +46,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchemaResp;
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.metadata.utils.MetaUtils;
import org.apache.iotdb.db.service.metrics.recorder.CacheMetricsRecorder;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java
index d01c8adbf8..df2d0ec132 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/parser/ASTVisitor.java
@@ -312,7 +312,8 @@ public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
}
createTimeSeriesStatement.setEncoding(
- CommonDescriptor.getInstance().getDefaultEncodingByType(createTimeSeriesStatement.getDataType()));
+ CommonDescriptor.getInstance()
+ .getDefaultEncodingByType(createTimeSeriesStatement.getDataType()));
if (props != null
&& props.containsKey(IoTDBConstant.COLUMN_TIMESERIES_ENCODING.toLowerCase())) {
String encodingString =
@@ -2316,7 +2317,10 @@ public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
private Expression parseRealLiteral(String value) {
// 3.33 is float by default
return new ConstantOperand(
- CommonDescriptor.getInstance().getConf().getFloatingStringInferType().equals(TSDataType.DOUBLE)
+ CommonDescriptor.getInstance()
+ .getConf()
+ .getFloatingStringInferType()
+ .equals(TSDataType.DOUBLE)
? TSDataType.DOUBLE
: TSDataType.FLOAT,
value);
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/OperatorTreeGenerator.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/OperatorTreeGenerator.java
index 8bcbed5ad1..c978a641c6 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/OperatorTreeGenerator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/OperatorTreeGenerator.java
@@ -23,7 +23,6 @@ import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.path.AlignedPath;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.query.QueryProcessException;
import org.apache.iotdb.db.metadata.cache.DataNodeSchemaCache;
import org.apache.iotdb.db.mpp.aggregation.AccumulatorFactory;
@@ -1500,8 +1499,7 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
sourceColumnToInputLocationMap,
context.getTypeProvider());
- int rowLimit =
- CommonDescriptor.getInstance().getConf().getSelectIntoInsertTabletPlanRowLimit();
+ int rowLimit = CommonDescriptor.getInstance().getConf().getSelectIntoInsertTabletPlanRowLimit();
long maxStatementSize = calculateStatementSizePerLine(targetPathToDataTypeMap) * rowLimit;
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
@@ -1559,8 +1557,7 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
statementSizePerLine += calculateStatementSizePerLine(targetPathToDataTypeMap);
}
- int rowLimit =
- CommonDescriptor.getInstance().getConf().getSelectIntoInsertTabletPlanRowLimit();
+ int rowLimit = CommonDescriptor.getInstance().getConf().getSelectIntoInsertTabletPlanRowLimit();
long maxStatementSize = statementSizePerLine * rowLimit;
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/SimpleFragmentParallelPlanner.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/SimpleFragmentParallelPlanner.java
index 904f778071..4cd40d2e0c 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/SimpleFragmentParallelPlanner.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/SimpleFragmentParallelPlanner.java
@@ -24,7 +24,6 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.partition.QueryExecutor;
import org.apache.iotdb.commons.partition.StorageExecutor;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.mpp.common.DataNodeEndPoints;
import org.apache.iotdb.db.mpp.common.MPPQueryContext;
import org.apache.iotdb.db.mpp.common.PlanFragmentId;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/CreateMultiTimeSeriesNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/CreateMultiTimeSeriesNode.java
index eba225c22a..1b7d208f36 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/CreateMultiTimeSeriesNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/metedata/write/CreateMultiTimeSeriesNode.java
@@ -23,7 +23,6 @@ import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathDeserializeUtil;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.mpp.plan.analyze.Analysis;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId;
@@ -48,7 +47,7 @@ import java.util.Objects;
public class CreateMultiTimeSeriesNode extends WritePlanNode {
private static final int SPLIT_SIZE =
- CommonDescriptor.getInstance().getConf().getMaxMeasurementNumOfInternalRequest();
+ CommonDescriptor.getInstance().getConf().getMaxMeasurementNumOfInternalRequest();
private final Map<PartialPath, MeasurementGroup> measurementGroupMap;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/LoadTsFileStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/LoadTsFileStatement.java
index 79aac15dd9..71fe087ca2 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/LoadTsFileStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/crud/LoadTsFileStatement.java
@@ -21,7 +21,6 @@ package org.apache.iotdb.db.mpp.plan.statement.crud;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import org.apache.iotdb.db.mpp.plan.statement.Statement;
import org.apache.iotdb.db.mpp.plan.statement.StatementType;
diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/parser/InfluxDBAstVisitor.java b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/parser/InfluxDBAstVisitor.java
index 2c45fbfffa..6d87e2a4bb 100644
--- a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/parser/InfluxDBAstVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/parser/InfluxDBAstVisitor.java
@@ -21,8 +21,6 @@ package org.apache.iotdb.db.protocol.influxdb.parser;
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.constant.SqlConstant;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.mpp.plan.analyze.ExpressionAnalyzer;
diff --git a/server/src/main/java/org/apache/iotdb/db/rescon/PrimitiveArrayManager.java b/server/src/main/java/org/apache/iotdb/db/rescon/PrimitiveArrayManager.java
index 9340335a29..2b38c92275 100644
--- a/server/src/main/java/org/apache/iotdb/db/rescon/PrimitiveArrayManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/rescon/PrimitiveArrayManager.java
@@ -44,7 +44,8 @@ public class PrimitiveArrayManager {
public static final int ARRAY_SIZE = COMMON_CONFIG.getPrimitiveArraySize();
- public static final TVListSortAlgorithm TVLIST_SORT_ALGORITHM = COMMON_CONFIG.getTvListSortAlgorithm();
+ public static final TVListSortAlgorithm TVLIST_SORT_ALGORITHM =
+ COMMON_CONFIG.getTvListSortAlgorithm();
/**
* The actual used memory will be 50% larger than the statistic, so we need to limit the size of
@@ -54,7 +55,7 @@ public class PrimitiveArrayManager {
/** threshold total size of arrays for all data types */
private static final double POOLED_ARRAYS_MEMORY_THRESHOLD =
- COMMON_CONFIG.getAllocateMemoryForStorageEngine()
+ COMMON_CONFIG.getAllocateMemoryForStorageEngine()
* COMMON_CONFIG.getBufferedArraysMemoryProportion()
/ AMPLIFICATION_FACTOR;
diff --git a/server/src/main/java/org/apache/iotdb/db/rescon/SystemInfo.java b/server/src/main/java/org/apache/iotdb/db/rescon/SystemInfo.java
index cd4f02a766..250a436e71 100644
--- a/server/src/main/java/org/apache/iotdb/db/rescon/SystemInfo.java
+++ b/server/src/main/java/org/apache/iotdb/db/rescon/SystemInfo.java
@@ -205,9 +205,12 @@ public class SystemInfo {
public void allocateWriteMemory() {
memorySizeForMemtable =
(long)
- (COMMON_CONFIG.getAllocateMemoryForStorageEngine() * COMMON_CONFIG.getWriteProportionForMemtable());
+ (COMMON_CONFIG.getAllocateMemoryForStorageEngine()
+ * COMMON_CONFIG.getWriteProportionForMemtable());
memorySizeForCompaction =
- (long) (COMMON_CONFIG.getAllocateMemoryForStorageEngine() * COMMON_CONFIG.getCompactionProportion());
+ (long)
+ (COMMON_CONFIG.getAllocateMemoryForStorageEngine()
+ * COMMON_CONFIG.getCompactionProportion());
FLUSH_THERSHOLD = memorySizeForMemtable * COMMON_CONFIG.getFlushProportion();
REJECT_THERSHOLD = memorySizeForMemtable * COMMON_CONFIG.getRejectProportion();
}
diff --git a/server/src/main/java/org/apache/iotdb/db/service/DataNode.java b/server/src/main/java/org/apache/iotdb/db/service/DataNode.java
index a8ed07deae..f0d356a609 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/DataNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/DataNode.java
@@ -120,7 +120,8 @@ public class DataNode implements DataNodeMBean {
*/
private static final int DEFAULT_RETRY = 10;
- private static final long DEFAULT_RETRY_INTERVAL_IN_MS = IOTDB_CONFIG.getDnJoinClusterRetryIntervalMs();
+ private static final long DEFAULT_RETRY_INTERVAL_IN_MS =
+ IOTDB_CONFIG.getDnJoinClusterRetryIntervalMs();
private final TEndPoint thisNode = new TEndPoint();
@@ -272,15 +273,17 @@ public class DataNode implements DataNodeMBean {
/* Set cluster consensus protocol class */
try {
if (!IoTDBStartCheck.getInstance()
- .checkConsensusProtocolExists(TConsensusGroupType.DataRegion)) {
- COMMON_CONFIG.setDataRegionConsensusProtocolClass(ConsensusProtocolClass.parse(
- configurationResp.globalConfig.getDataRegionConsensusProtocolClass()));
+ .checkConsensusProtocolExists(TConsensusGroupType.DataRegion)) {
+ COMMON_CONFIG.setDataRegionConsensusProtocolClass(
+ ConsensusProtocolClass.parse(
+ configurationResp.globalConfig.getDataRegionConsensusProtocolClass()));
}
if (!IoTDBStartCheck.getInstance()
- .checkConsensusProtocolExists(TConsensusGroupType.SchemaRegion)) {
- COMMON_CONFIG.setSchemaRegionConsensusProtocolClass(ConsensusProtocolClass.parse(
- configurationResp.globalConfig.getSchemaRegionConsensusProtocolClass()));
+ .checkConsensusProtocolExists(TConsensusGroupType.SchemaRegion)) {
+ COMMON_CONFIG.setSchemaRegionConsensusProtocolClass(
+ ConsensusProtocolClass.parse(
+ configurationResp.globalConfig.getSchemaRegionConsensusProtocolClass()));
}
} catch (IOException e) {
throw new StartupException(e);
@@ -292,7 +295,10 @@ public class DataNode implements DataNodeMBean {
IoTDBStartCheck.getInstance().checkDirectory();
IoTDBStartCheck.getInstance().serializeGlobalConfig(configurationResp.globalConfig);
CommonDescriptor.getInstance().initClusterSchemaMemoryAllocate();
- if (!COMMON_CONFIG.getDataRegionConsensusProtocolClass().getProtocol().equals(ConsensusFactory.IOT_CONSENSUS)) {
+ if (!COMMON_CONFIG
+ .getDataRegionConsensusProtocolClass()
+ .getProtocol()
+ .equals(ConsensusFactory.IOT_CONSENSUS)) {
// In current implementation, only IoTConsensus need separated memory from Consensus
CommonDescriptor.getInstance().reclaimConsensusMemory();
SystemInfo.getInstance().allocateWriteMemory();
@@ -404,7 +410,9 @@ public class DataNode implements DataNodeMBean {
int retry = DEFAULT_RETRY;
TDataNodeRestartReq req = new TDataNodeRestartReq();
req.setClusterName(
- IOTDB_CONFIG.getClusterName() == null ? DEFAULT_CLUSTER_NAME : IOTDB_CONFIG.getClusterName());
+ IOTDB_CONFIG.getClusterName() == null
+ ? DEFAULT_CLUSTER_NAME
+ : IOTDB_CONFIG.getClusterName());
req.setDataNodeConfiguration(generateDataNodeConfiguration());
TDataNodeRestartResp dataNodeRestartResp = null;
while (retry > 0) {
@@ -496,7 +504,10 @@ public class DataNode implements DataNodeMBean {
// close wal when using ratis consensus
if (IOTDB_CONFIG.isClusterMode()
- && COMMON_CONFIG.getDataRegionConsensusProtocolClass().getProtocol().equals(ConsensusFactory.RATIS_CONSENSUS)) {
+ && COMMON_CONFIG
+ .getDataRegionConsensusProtocolClass()
+ .getProtocol()
+ .equals(ConsensusFactory.RATIS_CONSENSUS)) {
COMMON_CONFIG.setWalMode(WALMode.DISABLE);
}
registerManager.register(WALManager.getInstance());
@@ -571,15 +582,19 @@ public class DataNode implements DataNodeMBean {
private TDataNodeLocation generateDataNodeLocation() {
TDataNodeLocation location = new TDataNodeLocation();
location.setDataNodeId(IOTDB_CONFIG.getDataNodeId());
- location.setClientRpcEndPoint(new TEndPoint(IOTDB_CONFIG.getDnRpcAddress(), IOTDB_CONFIG.getDnRpcPort()));
+ location.setClientRpcEndPoint(
+ new TEndPoint(IOTDB_CONFIG.getDnRpcAddress(), IOTDB_CONFIG.getDnRpcPort()));
location.setInternalEndPoint(
new TEndPoint(IOTDB_CONFIG.getDnInternalAddress(), IOTDB_CONFIG.getDnInternalPort()));
location.setMPPDataExchangeEndPoint(
- new TEndPoint(IOTDB_CONFIG.getDnInternalAddress(), IOTDB_CONFIG.getDnMppDataExchangePort()));
+ new TEndPoint(
+ IOTDB_CONFIG.getDnInternalAddress(), IOTDB_CONFIG.getDnMppDataExchangePort()));
location.setDataRegionConsensusEndPoint(
- new TEndPoint(IOTDB_CONFIG.getDnInternalAddress(), IOTDB_CONFIG.getDnDataRegionConsensusPort()));
+ new TEndPoint(
+ IOTDB_CONFIG.getDnInternalAddress(), IOTDB_CONFIG.getDnDataRegionConsensusPort()));
location.setSchemaRegionConsensusEndPoint(
- new TEndPoint(IOTDB_CONFIG.getDnInternalAddress(), IOTDB_CONFIG.getDnSchemaRegionConsensusPort()));
+ new TEndPoint(
+ IOTDB_CONFIG.getDnInternalAddress(), IOTDB_CONFIG.getDnSchemaRegionConsensusPort()));
return location;
}
@@ -607,7 +622,8 @@ public class DataNode implements DataNodeMBean {
private void initUDFRelatedInstance() throws StartupException {
try {
- UDFExecutableManager.setupAndGetInstance(COMMON_CONFIG.getUdfTemporaryLibDir(), COMMON_CONFIG.getUdfDir());
+ UDFExecutableManager.setupAndGetInstance(
+ COMMON_CONFIG.getUdfTemporaryLibDir(), COMMON_CONFIG.getUdfDir());
UDFClassLoaderManager.setupAndGetInstance(COMMON_CONFIG.getUdfDir());
} catch (IOException e) {
throw new StartupException(e);
@@ -708,7 +724,7 @@ public class DataNode implements DataNodeMBean {
private void initTriggerRelatedInstance() throws StartupException {
try {
TriggerExecutableManager.setupAndGetInstance(
- COMMON_CONFIG.getTriggerTemporaryLibDir(), COMMON_CONFIG.getTriggerDir());
+ COMMON_CONFIG.getTriggerTemporaryLibDir(), COMMON_CONFIG.getTriggerDir());
} catch (IOException e) {
throw new StartupException(e);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/service/InfluxDBRPCService.java b/server/src/main/java/org/apache/iotdb/db/service/InfluxDBRPCService.java
index c4b7be836a..c91f2191fb 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/InfluxDBRPCService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/InfluxDBRPCService.java
@@ -72,7 +72,7 @@ public class InfluxDBRPCService extends ThriftService implements InfluxDBRPCServ
getID().getName(),
ThreadName.INFLUXDB_RPC_PROCESSOR.getName(),
config.getDnRpcAddress(),
- commonConfig.getInfluxDBRpcPort(),
+ commonConfig.getInfluxDBRpcPort(),
config.getDnRpcMaxConcurrentClientNum(),
config.getThriftServerAwaitTimeForStopService(),
new InfluxDBServiceThriftHandler(impl),
diff --git a/server/src/main/java/org/apache/iotdb/db/service/MQTTService.java b/server/src/main/java/org/apache/iotdb/db/service/MQTTService.java
index 146edd3d47..ad87ed5b53 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/MQTTService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/MQTTService.java
@@ -66,8 +66,8 @@ public class MQTTService implements IService {
LOG.info(
"Start MQTT service successfully, listening on ip {} port {}",
- commonConfig.getMqttHost(),
- commonConfig.getMqttPort());
+ commonConfig.getMqttHost(),
+ commonConfig.getMqttPort());
Runtime.getRuntime()
.addShutdownHook(
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 a139b5474d..494b1bf306 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
@@ -22,7 +22,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.service.IService;
import org.apache.iotdb.commons.service.ServiceType;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.upgrade.UpgradeLog;
import org.apache.iotdb.db.engine.upgrade.UpgradeTask;
import org.apache.iotdb.db.utils.UpgradeUtils;
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/transport/server/ReceiverManager.java b/server/src/main/java/org/apache/iotdb/db/sync/transport/server/ReceiverManager.java
index b336f1f1ae..4725807bff 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/transport/server/ReceiverManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/transport/server/ReceiverManager.java
@@ -169,7 +169,9 @@ public class ReceiverManager {
identityInfo.getRemoteAddress(), COMMON_CONFIG.getIpWhiteList()));
}
// Version check
- if (!IOTDB_CONFIG.getIoTDBMajorVersion(identityInfo.version).equals(IOTDB_CONFIG.getIoTDBMajorVersion())) {
+ if (!IOTDB_CONFIG
+ .getIoTDBMajorVersion(identityInfo.version)
+ .equals(IOTDB_CONFIG.getIoTDBMajorVersion())) {
return RpcUtils.getStatus(
TSStatusCode.PIPESERVER_ERROR,
String.format(
@@ -437,7 +439,7 @@ public class ReceiverManager {
"",
partitionFetcher,
schemaFetcher,
- COMMON_CONFIG.getQueryTimeoutThreshold());
+ COMMON_CONFIG.getQueryTimeoutThreshold());
if (result.status.code != TSStatusCode.SUCCESS_STATUS.getStatusCode()
&& result.status.code != TSStatusCode.DATABASE_ALREADY_EXISTS.getStatusCode()) {
logger.error("Create Database error, statement: {}.", statement);
diff --git a/server/src/main/java/org/apache/iotdb/db/trigger/service/TriggerClassLoaderManager.java b/server/src/main/java/org/apache/iotdb/db/trigger/service/TriggerClassLoaderManager.java
index dfb1a3d404..0c386767eb 100644
--- a/server/src/main/java/org/apache/iotdb/db/trigger/service/TriggerClassLoaderManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/trigger/service/TriggerClassLoaderManager.java
@@ -22,8 +22,6 @@ package org.apache.iotdb.db.trigger.service;
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.db.conf.IoTDBConfig;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java b/server/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java
index f83e44041c..f0a0431045 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/TypeInferenceUtils.java
@@ -20,7 +20,6 @@
package org.apache.iotdb.db.utils;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.constant.SqlConstant;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.tsfile.common.constant.TsFileConstant;
@@ -31,19 +30,19 @@ import org.apache.commons.lang3.StringUtils;
public class TypeInferenceUtils {
private static TSDataType booleanStringInferType =
- CommonDescriptor.getInstance().getConf().getBooleanStringInferType();
+ CommonDescriptor.getInstance().getConf().getBooleanStringInferType();
private static TSDataType integerStringInferType =
- CommonDescriptor.getInstance().getConf().getIntegerStringInferType();
+ CommonDescriptor.getInstance().getConf().getIntegerStringInferType();
private static TSDataType longStringInferType =
- CommonDescriptor.getInstance().getConf().getLongStringInferType();
+ CommonDescriptor.getInstance().getConf().getLongStringInferType();
private static TSDataType floatingStringInferType =
- CommonDescriptor.getInstance().getConf().getFloatingStringInferType();
+ CommonDescriptor.getInstance().getConf().getFloatingStringInferType();
private static TSDataType nanStringInferType =
- CommonDescriptor.getInstance().getConf().getNanStringInferType();
+ CommonDescriptor.getInstance().getConf().getNanStringInferType();
private TypeInferenceUtils() {}
diff --git a/server/src/main/java/org/apache/iotdb/db/wal/buffer/WALBuffer.java b/server/src/main/java/org/apache/iotdb/db/wal/buffer/WALBuffer.java
index e8e35d1f29..3255127531 100644
--- a/server/src/main/java/org/apache/iotdb/db/wal/buffer/WALBuffer.java
+++ b/server/src/main/java/org/apache/iotdb/db/wal/buffer/WALBuffer.java
@@ -22,8 +22,6 @@ 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.db.conf.IoTDBConfig;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.DeleteDataNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertNode;
import org.apache.iotdb.db.utils.MmapUtil;
diff --git a/server/src/main/java/org/apache/iotdb/db/wal/io/WALReader.java b/server/src/main/java/org/apache/iotdb/db/wal/io/WALReader.java
index 01c5e43405..2bb51fbdd4 100644
--- a/server/src/main/java/org/apache/iotdb/db/wal/io/WALReader.java
+++ b/server/src/main/java/org/apache/iotdb/db/wal/io/WALReader.java
@@ -20,7 +20,6 @@ package org.apache.iotdb.db.wal.io;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.exception.IllegalPathException;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.wal.buffer.WALEntry;
import org.apache.iotdb.db.wal.buffer.WALEntryType;
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 59d2436284..bef71a4eda 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
@@ -141,9 +141,7 @@ public class CompactionSchedulerTest {
int prevMaxCompactionCandidateFileNum =
IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(100);
- IoTDBDescriptor.getInstance()
- .getConf()
- .setTargetCompactionFileSize(2L * 1024L * 1024L * 1024L);
+ IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(2L * 1024L * 1024L * 1024L);
String sgName = COMPACTION_TEST_SG + "test1";
try {
CompactionTaskManager.getInstance().restart();
@@ -475,9 +473,7 @@ public class CompactionSchedulerTest {
int prevMaxCompactionCandidateFileNum =
IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(100);
- IoTDBDescriptor.getInstance()
- .getConf()
- .setTargetCompactionFileSize(2L * 1024L * 1024L * 1024L);
+ IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(2L * 1024L * 1024L * 1024L);
String sgName = COMPACTION_TEST_SG + "test4";
try {
CompactionTaskManager.getInstance().restart();
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/CompactionSchedulerWithFastPerformerTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/CompactionSchedulerWithFastPerformerTest.java
index 6d7f260154..e3482bf0e7 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/CompactionSchedulerWithFastPerformerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/CompactionSchedulerWithFastPerformerTest.java
@@ -142,9 +142,7 @@ public class CompactionSchedulerWithFastPerformerTest {
int prevMaxCompactionCandidateFileNum =
IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(100);
- IoTDBDescriptor.getInstance()
- .getConf()
- .setTargetCompactionFileSize(2L * 1024L * 1024L * 1024L);
+ IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(2L * 1024L * 1024L * 1024L);
String sgName = COMPACTION_TEST_SG + "test1";
try {
CompactionTaskManager.getInstance().restart();
@@ -476,9 +474,7 @@ public class CompactionSchedulerWithFastPerformerTest {
int prevMaxCompactionCandidateFileNum =
IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(100);
- IoTDBDescriptor.getInstance()
- .getConf()
- .setTargetCompactionFileSize(2L * 1024L * 1024L * 1024L);
+ IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(2L * 1024L * 1024L * 1024L);
String sgName = COMPACTION_TEST_SG + "test4";
try {
CompactionTaskManager.getInstance().restart();
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 2d996927b3..c6fd3bfb8f 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
@@ -974,9 +974,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
assertEquals(1, seqSelected.size());
assertEquals(1, unseqSelected.size());
- IoTDBDescriptor.getInstance()
- .getConf()
- .setMaxCrossCompactionCandidateFileNum(maxCrossFilesNum);
+ IoTDBDescriptor.getInstance().getConf().setMaxCrossCompactionCandidateFileNum(maxCrossFilesNum);
}
@Test
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 897997c7d7..4ef6772e46 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
@@ -68,9 +68,7 @@ public class InnerCompactionSchedulerTest extends AbstractCompactionTest {
IoTDBDescriptor.getInstance()
.getConf()
.setEnableUnseqSpaceCompaction(oldEnableUnSeqSpaceCompaction);
- IoTDBDescriptor.getInstance()
- .getConf()
- .setCompactionThreadCount(oldConcurrentCompactionThread);
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(oldConcurrentCompactionThread);
IoTDBDescriptor.getInstance()
.getConf()
.setMaxInnerCompactionCandidateFileNum(oldMaxCompactionCandidateFileNum);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java
index 66e5ce5d58..71416c5b76 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerSeqCompactionWithFastPerformerTest.java
@@ -630,8 +630,7 @@ public class InnerSeqCompactionWithFastPerformerTest {
long prevChunkSizeLowerBoundInCompaction =
IoTDBDescriptor.getInstance().getConf().getChunkSizeLowerBoundInCompaction();
IoTDBDescriptor.getInstance().getConf().setChunkSizeLowerBoundInCompaction(10000);
- long prevTargetChunkPointNum =
- IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
+ long prevTargetChunkPointNum = IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
long prevTargetChunkSize = IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(10000);
IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(100);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java
index d725df6af8..59ce57a764 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/InnerSeqCompactionWithReadChunkPerformerTest.java
@@ -620,8 +620,7 @@ public class InnerSeqCompactionWithReadChunkPerformerTest {
long prevChunkSizeLowerBoundInCompaction =
IoTDBDescriptor.getInstance().getConf().getChunkSizeLowerBoundInCompaction();
IoTDBDescriptor.getInstance().getConf().setChunkSizeLowerBoundInCompaction(1);
- long prevTargetChunkPointNum =
- IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
+ long prevTargetChunkPointNum = IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
long prevTargetChunkSize = IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(1);
IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(1);
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/utils/CompactionClearUtils.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/utils/CompactionClearUtils.java
index bf4d3ee1ac..5bd34aee3b 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/utils/CompactionClearUtils.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/utils/CompactionClearUtils.java
@@ -21,7 +21,6 @@ package org.apache.iotdb.db.engine.compaction.utils;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.conf.IoTDBConstant;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.cache.BloomFilterCache;
import org.apache.iotdb.db.engine.cache.ChunkCache;
import org.apache.iotdb.db.engine.cache.TimeSeriesMetadataCache;
diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/multimode/MTreeDiskModeTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/multimode/MTreeDiskModeTest.java
index 07d5393069..16b25c56c5 100644
--- a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/multimode/MTreeDiskModeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/multimode/MTreeDiskModeTest.java
@@ -33,9 +33,7 @@ public abstract class MTreeDiskModeTest extends MTreeBelowSGTest {
@Override
protected void rollBackConfig() {
- IoTDBDescriptor.getInstance()
- .getConf()
- .setSchemaEngineMode(SchemaEngineMode.Memory.toString());
+ IoTDBDescriptor.getInstance().getConf().setSchemaEngineMode(SchemaEngineMode.Memory.toString());
}
protected abstract void setMemSize();
diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/multimode/MTreeMemoryModeTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/multimode/MTreeMemoryModeTest.java
index 2109a4c883..a4fceafb40 100644
--- a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/multimode/MTreeMemoryModeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/multimode/MTreeMemoryModeTest.java
@@ -25,9 +25,7 @@ import org.apache.iotdb.db.metadata.schemaregion.SchemaEngineMode;
public class MTreeMemoryModeTest extends MTreeBelowSGTest {
@Override
protected void setConfig() {
- IoTDBDescriptor.getInstance()
- .getConf()
- .setSchemaEngineMode(SchemaEngineMode.Memory.toString());
+ IoTDBDescriptor.getInstance().getConf().setSchemaEngineMode(SchemaEngineMode.Memory.toString());
}
@Override
diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/AliasIndexPageTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/AliasIndexPageTest.java
index 9c398fbe87..94b64b43df 100644
--- a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/AliasIndexPageTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/AliasIndexPageTest.java
@@ -45,9 +45,7 @@ public class AliasIndexPageTest {
@After
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance()
- .getConf()
- .setSchemaEngineMode(SchemaEngineMode.Memory.toString());
+ IoTDBDescriptor.getInstance().getConf().setSchemaEngineMode(SchemaEngineMode.Memory.toString());
}
@Test
diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/InternalPageTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/InternalPageTest.java
index 560a2f1106..dc352dd266 100644
--- a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/InternalPageTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/InternalPageTest.java
@@ -45,9 +45,7 @@ public class InternalPageTest {
@After
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance()
- .getConf()
- .setSchemaEngineMode(SchemaEngineMode.Memory.toString());
+ IoTDBDescriptor.getInstance().getConf().setSchemaEngineMode(SchemaEngineMode.Memory.toString());
}
@Test
diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileLogTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileLogTest.java
index 1ec59630fb..530da88cb9 100644
--- a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileLogTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileLogTest.java
@@ -62,9 +62,7 @@ public class SchemaFileLogTest {
@After
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance()
- .getConf()
- .setSchemaEngineMode(SchemaEngineMode.Memory.toString());
+ IoTDBDescriptor.getInstance().getConf().setSchemaEngineMode(SchemaEngineMode.Memory.toString());
}
@Test
diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileTest.java
index e86273f41d..91e9699509 100644
--- a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/SchemaFileTest.java
@@ -76,9 +76,7 @@ public class SchemaFileTest {
@After
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance()
- .getConf()
- .setSchemaEngineMode(SchemaEngineMode.Memory.toString());
+ IoTDBDescriptor.getInstance().getConf().setSchemaEngineMode(SchemaEngineMode.Memory.toString());
}
@Test
diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/WrappedSegmentTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/WrappedSegmentTest.java
index c8060390c8..b608e483f2 100644
--- a/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/WrappedSegmentTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metadata/mtree/schemafile/WrappedSegmentTest.java
@@ -55,9 +55,7 @@ public class WrappedSegmentTest {
@After
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance()
- .getConf()
- .setSchemaEngineMode(SchemaEngineMode.Memory.toString());
+ IoTDBDescriptor.getInstance().getConf().setSchemaEngineMode(SchemaEngineMode.Memory.toString());
}
@Test
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/execution/exchange/SinkHandleTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/execution/exchange/SinkHandleTest.java
index 1b9b4f8aa8..8cff1388b9 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/execution/exchange/SinkHandleTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/execution/exchange/SinkHandleTest.java
@@ -52,8 +52,7 @@ public class SinkHandleTest {
final long mockTsBlockSize = 128 * 1024L;
final int numOfMockTsBlock = 1;
final TEndPoint remoteEndpoint =
- new TEndPoint(
- "remote", IoTDBDescriptor.getInstance().getConf().getDnMppDataExchangePort());
+ new TEndPoint("remote", IoTDBDescriptor.getInstance().getConf().getDnMppDataExchangePort());
final TFragmentInstanceId remoteFragmentInstanceId = new TFragmentInstanceId(queryId, 0, "0");
final String remotePlanNodeId = "exchange_0";
final String localPlanNodeId = "fragmentSink_0";
@@ -191,8 +190,7 @@ public class SinkHandleTest {
final long mockTsBlockSize = 128 * 1024L;
final int numOfMockTsBlock = 1;
final TEndPoint remoteEndpoint =
- new TEndPoint(
- "remote", IoTDBDescriptor.getInstance().getConf().getDnMppDataExchangePort());
+ new TEndPoint("remote", IoTDBDescriptor.getInstance().getConf().getDnMppDataExchangePort());
final TFragmentInstanceId remoteFragmentInstanceId = new TFragmentInstanceId(queryId, 0, "0");
final String remotePlanNodeId = "exchange_0";
final String localPlanNodeId = "fragmentSink_0";
@@ -392,8 +390,7 @@ public class SinkHandleTest {
final long mockTsBlockSize = 1024L * 1024L;
final int numOfMockTsBlock = 1;
final TEndPoint remoteEndpoint =
- new TEndPoint(
- "remote", IoTDBDescriptor.getInstance().getConf().getDnMppDataExchangePort());
+ new TEndPoint("remote", IoTDBDescriptor.getInstance().getConf().getDnMppDataExchangePort());
final TFragmentInstanceId remoteFragmentInstanceId = new TFragmentInstanceId(queryId, 0, "0");
final String remotePlanNodeId = "exchange_0";
final String localPlanNodeId = "fragmentSink_0";
@@ -505,8 +502,7 @@ public class SinkHandleTest {
final long mockTsBlockSize = 1024L * 1024L;
final int numOfMockTsBlock = 1;
final TEndPoint remoteEndpoint =
- new TEndPoint(
- "remote", IoTDBDescriptor.getInstance().getConf().getDnMppDataExchangePort());
+ new TEndPoint("remote", IoTDBDescriptor.getInstance().getConf().getDnMppDataExchangePort());
final TFragmentInstanceId remoteFragmentInstanceId = new TFragmentInstanceId(queryId, 0, "0");
final String remotePlanNodeId = "exchange_0";
final String localPlanNodeId = "fragmentSink_0";
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/execution/exchange/SourceHandleTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/execution/exchange/SourceHandleTest.java
index f0fe73d9fb..5bd246f59d 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/execution/exchange/SourceHandleTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/execution/exchange/SourceHandleTest.java
@@ -70,8 +70,7 @@ public class SourceHandleTest {
final String queryId = "q0";
final int numOfMockTsBlock = 10;
final TEndPoint remoteEndpoint =
- new TEndPoint(
- "remote", IoTDBDescriptor.getInstance().getConf().getDnMppDataExchangePort());
+ new TEndPoint("remote", IoTDBDescriptor.getInstance().getConf().getDnMppDataExchangePort());
final TFragmentInstanceId remoteFragmentInstanceId = new TFragmentInstanceId(queryId, 1, "0");
final String localPlanNodeId = "exchange_0";
final TFragmentInstanceId localFragmentInstanceId = new TFragmentInstanceId(queryId, 0, "0");
@@ -185,8 +184,7 @@ public class SourceHandleTest {
final String queryId = "q0";
final int numOfMockTsBlock = 10;
final TEndPoint remoteEndpoint =
- new TEndPoint(
- "remote", IoTDBDescriptor.getInstance().getConf().getDnMppDataExchangePort());
+ new TEndPoint("remote", IoTDBDescriptor.getInstance().getConf().getDnMppDataExchangePort());
final TFragmentInstanceId remoteFragmentInstanceId = new TFragmentInstanceId(queryId, 1, "0");
final String localPlanNodeId = "exchange_0";
final TFragmentInstanceId localFragmentInstanceId = new TFragmentInstanceId(queryId, 0, "0");
@@ -342,8 +340,7 @@ public class SourceHandleTest {
final long MOCK_TSBLOCK_SIZE = 1024L * 1024L;
final int numOfMockTsBlock = 10;
final TEndPoint remoteEndpoint =
- new TEndPoint(
- "remote", IoTDBDescriptor.getInstance().getConf().getDnMppDataExchangePort());
+ new TEndPoint("remote", IoTDBDescriptor.getInstance().getConf().getDnMppDataExchangePort());
final TFragmentInstanceId remoteFragmentInstanceId = new TFragmentInstanceId(queryId, 1, "0");
final String localPlanNodeId = "exchange_0";
final TFragmentInstanceId localFragmentInstanceId = new TFragmentInstanceId(queryId, 0, "0");
@@ -523,8 +520,7 @@ public class SourceHandleTest {
final long MOCK_TSBLOCK_SIZE = 1024L * 1024L;
final int numOfMockTsBlock = 10;
final TEndPoint remoteEndpoint =
- new TEndPoint(
- "remote", IoTDBDescriptor.getInstance().getConf().getDnMppDataExchangePort());
+ new TEndPoint("remote", IoTDBDescriptor.getInstance().getConf().getDnMppDataExchangePort());
final TFragmentInstanceId remoteFragmentInstanceId = new TFragmentInstanceId(queryId, 1, "0");
final String localPlanNodeId = "exchange_0";
final TFragmentInstanceId localFragmentInstanceId = new TFragmentInstanceId(queryId, 0, "0");
@@ -603,8 +599,7 @@ public class SourceHandleTest {
final String queryId = "q0";
final long MOCK_TSBLOCK_SIZE = 1024L * 1024L;
final TEndPoint remoteEndpoint =
- new TEndPoint(
- "remote", IoTDBDescriptor.getInstance().getConf().getDnMppDataExchangePort());
+ new TEndPoint("remote", IoTDBDescriptor.getInstance().getConf().getDnMppDataExchangePort());
final TFragmentInstanceId remoteFragmentInstanceId = new TFragmentInstanceId(queryId, 1, "0");
final String localPlanNodeId = "exchange_0";
final TFragmentInstanceId localFragmentInstanceId = new TFragmentInstanceId(queryId, 0, "0");
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/plan/analyze/QueryTimePartitionTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/plan/analyze/QueryTimePartitionTest.java
index 6ddd2bc516..e1773d31a9 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/plan/analyze/QueryTimePartitionTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/plan/analyze/QueryTimePartitionTest.java
@@ -397,8 +397,7 @@ public class QueryTimePartitionTest {
new AndFilter(
TimeFilter.gt(0),
TimeFilter.ltEq(
- IoTDBDescriptor.getInstance().getConf().getDnTimePartitionInterval() * 3
- + 1)));
+ IoTDBDescriptor.getInstance().getConf().getDnTimePartitionInterval() * 3 + 1)));
expected =
Arrays.asList(
new TTimePartitionSlot(0),
@@ -512,8 +511,7 @@ public class QueryTimePartitionTest {
TimeFilter.lt(
IoTDBDescriptor.getInstance().getConf().getDnTimePartitionInterval())),
new AndFilter(
- TimeFilter.gt(
- IoTDBDescriptor.getInstance().getConf().getDnTimePartitionInterval()),
+ TimeFilter.gt(IoTDBDescriptor.getInstance().getConf().getDnTimePartitionInterval()),
TimeFilter.lt(
IoTDBDescriptor.getInstance().getConf().getDnTimePartitionInterval() * 2
- 100)));
@@ -522,8 +520,7 @@ public class QueryTimePartitionTest {
orFilter1,
new AndFilter(
TimeFilter.gt(
- IoTDBDescriptor.getInstance().getConf().getDnTimePartitionInterval() * 2
- - 50),
+ IoTDBDescriptor.getInstance().getConf().getDnTimePartitionInterval() * 2 - 50),
TimeFilter.ltEq(
IoTDBDescriptor.getInstance().getConf().getDnTimePartitionInterval() * 2
- 40)));
@@ -532,8 +529,7 @@ public class QueryTimePartitionTest {
orFilter2,
new AndFilter(
TimeFilter.gt(
- IoTDBDescriptor.getInstance().getConf().getDnTimePartitionInterval() * 2
- - 20),
+ IoTDBDescriptor.getInstance().getConf().getDnTimePartitionInterval() * 2 - 20),
TimeFilter.ltEq(
IoTDBDescriptor.getInstance().getConf().getDnTimePartitionInterval() * 3
+ 10)));
diff --git a/server/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java b/server/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java
index e7e6bdb47b..2c05a1d812 100644
--- a/server/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/qp/sql/ASTVisitorTest.java
@@ -20,7 +20,6 @@
package org.apache.iotdb.db.qp.sql;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.constant.SqlConstant;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.mpp.plan.parser.ASTVisitor;
diff --git a/server/src/test/java/org/apache/iotdb/db/tools/SchemaFileSketchTest.java b/server/src/test/java/org/apache/iotdb/db/tools/SchemaFileSketchTest.java
index d4cc07054d..8d07cb50a3 100644
--- a/server/src/test/java/org/apache/iotdb/db/tools/SchemaFileSketchTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/tools/SchemaFileSketchTest.java
@@ -66,9 +66,7 @@ public class SchemaFileSketchTest {
File sketch = new File("sketch_schemafile.txt");
sketch.deleteOnExit();
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance()
- .getConf()
- .setSchemaEngineMode(SchemaEngineMode.Memory.toString());
+ IoTDBDescriptor.getInstance().getConf().setSchemaEngineMode(SchemaEngineMode.Memory.toString());
}
private void prepareData() throws IOException, MetadataException {
diff --git a/server/src/test/java/org/apache/iotdb/db/utils/EncodingInferenceUtilsTest.java b/server/src/test/java/org/apache/iotdb/db/utils/EncodingInferenceUtilsTest.java
index 13bb9b2369..d3a9e10950 100644
--- a/server/src/test/java/org/apache/iotdb/db/utils/EncodingInferenceUtilsTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/utils/EncodingInferenceUtilsTest.java
@@ -20,8 +20,6 @@ package org.apache.iotdb.db.utils;
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.tsfile.file.metadata.enums.TSDataType;
import org.junit.Assert;
diff --git a/server/src/test/java/org/apache/iotdb/db/utils/TypeInferenceUtilsTest.java b/server/src/test/java/org/apache/iotdb/db/utils/TypeInferenceUtilsTest.java
index b49081cf28..08e370e68b 100644
--- a/server/src/test/java/org/apache/iotdb/db/utils/TypeInferenceUtilsTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/utils/TypeInferenceUtilsTest.java
@@ -20,7 +20,6 @@
package org.apache.iotdb.db.utils;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.tsfile.common.constant.TsFileConstant;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
diff --git a/server/src/test/java/org/apache/iotdb/db/utils/datastructure/PrimitiveArrayManagerTest.java b/server/src/test/java/org/apache/iotdb/db/utils/datastructure/PrimitiveArrayManagerTest.java
index 4c3792711c..36cc5bdc22 100644
--- a/server/src/test/java/org/apache/iotdb/db/utils/datastructure/PrimitiveArrayManagerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/utils/datastructure/PrimitiveArrayManagerTest.java
@@ -34,12 +34,15 @@ public class PrimitiveArrayManagerTest {
Assert.assertEquals(
1224827,
- PrimitiveArrayManager.getArrayRowCount(1224826 * COMMON_CONFIG.getPrimitiveArraySize() + 1));
+ PrimitiveArrayManager.getArrayRowCount(
+ 1224826 * COMMON_CONFIG.getPrimitiveArraySize() + 1));
Assert.assertEquals(
- 1224826, PrimitiveArrayManager.getArrayRowCount(1224826 * COMMON_CONFIG.getPrimitiveArraySize()));
+ 1224826,
+ PrimitiveArrayManager.getArrayRowCount(1224826 * COMMON_CONFIG.getPrimitiveArraySize()));
- Assert.assertEquals(1, PrimitiveArrayManager.getArrayRowCount(COMMON_CONFIG.getPrimitiveArraySize()));
+ Assert.assertEquals(
+ 1, PrimitiveArrayManager.getArrayRowCount(COMMON_CONFIG.getPrimitiveArraySize()));
Assert.assertEquals(
1, PrimitiveArrayManager.getArrayRowCount(COMMON_CONFIG.getPrimitiveArraySize() - 1));
diff --git a/server/src/test/java/org/apache/iotdb/db/wal/DisableWALTest.java b/server/src/test/java/org/apache/iotdb/db/wal/DisableWALTest.java
index e2d429c79e..26a551a75b 100644
--- a/server/src/test/java/org/apache/iotdb/db/wal/DisableWALTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/wal/DisableWALTest.java
@@ -21,8 +21,6 @@ package org.apache.iotdb.db.wal;
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.wal.node.IWALNode;
import org.apache.iotdb.db.wal.node.WALFakeNode;