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:12 UTC
[iotdb] branch Move-ConfigNodeConfig-into-CommonConfig updated (6b8c7295e6 -> 1d82745221)
This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a change to branch Move-ConfigNodeConfig-into-CommonConfig
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 6b8c7295e6 Merge branch 'master' into Move-ConfigNodeConfig-into-CommonConfig
new 16371dc769 stash
new fd9688b350 stash
new 79f1bb261d stash
new 1d82745221 For test
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../iotdb/confignode/conf/ConfigNodeConfig.java | 2 +-
.../confignode/conf/ConfigNodeDescriptor.java | 2 +-
.../confignode/conf/ConfigNodeStartupCheck.java | 44 ++-
.../confignode/conf/SystemPropertiesUtils.java | 37 +-
.../statemachine/ConfigNodeRegionStateMachine.java | 22 +-
.../confignode/manager/ClusterSchemaManager.java | 11 +-
.../iotdb/confignode/manager/ConfigManager.java | 29 +-
.../iotdb/confignode/manager/ConsensusManager.java | 74 ++--
.../iotdb/confignode/manager/ProcedureManager.java | 17 +-
.../confignode/manager/RetryFailedTasksThread.java | 7 +-
.../iotdb/confignode/manager/UDFManager.java | 6 +-
.../iotdb/confignode/manager/load/LoadManager.java | 7 +-
.../manager/load/balancer/RouteBalancer.java | 7 +-
.../partition/GreedyPartitionAllocator.java | 10 +-
.../manager/node/ClusterNodeStartUtils.java | 3 +-
.../iotdb/confignode/manager/node/NodeManager.java | 2 +-
.../manager/partition/PartitionManager.java | 18 +-
.../iotdb/confignode/persistence/AuthorInfo.java | 2 +-
.../confignode/persistence/ProcedureInfo.java | 2 +-
.../iotdb/confignode/persistence/TriggerInfo.java | 9 +-
.../iotdb/confignode/persistence/UDFInfo.java | 9 +-
.../procedure/store/ConfigProcedureStore.java | 2 +-
.../confignode/procedure/store/ProcedureStore.java | 3 +-
.../iotdb/confignode/service/ConfigNode.java | 37 +-
.../service/thrift/ConfigNodeRPCService.java | 2 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 4 +-
.../iotdb/consensus/ratis/RatisConsensus.java | 2 +-
.../iotdb/influxdb/session/InfluxDBSession.java | 2 +-
.../apache/iotdb/db/it/IoTDBRecoverUnclosedIT.java | 6 +-
.../org/apache/iotdb/db/it/IoTDBRestartIT.java | 23 +-
.../iotdb/session/it/IoTDBSessionComplexIT.java | 6 +-
.../iotdb/session/it/IoTDBSessionSimpleIT.java | 8 +-
.../iotdb/db/integration/IoTDBCheckConfigIT.java | 2 +-
.../iotdb/db/integration/IoTDBCompactionIT.java | 2 +-
.../integration/IoTDBCompactionWithIDTableIT.java | 6 +-
.../iotdb/db/integration/IoTDBMaxTimeQueryIT.java | 19 +-
.../IoTDBMultiOverlappedChunkInUnseqIT.java | 4 +-
.../db/integration/IoTDBMultiOverlappedPageIT.java | 4 +-
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 2 +-
.../db/integration/IoTDBNewTsFileCompactionIT.java | 155 ++++----
.../db/integration/IoTDBQueryWithIDTableIT.java | 6 +-
.../db/integration/IoTDBRewriteTsFileToolIT.java | 2 +-
.../db/integration/IoTDBRpcCompressionIT.java | 4 +-
.../db/integration/IoTDBSessionTimeoutIT.java | 4 +-
.../integration/IoTDBSizeTieredCompactionIT.java | 69 ++--
.../iotdb/db/integration/IoTDBTimePartitionIT.java | 2 +-
.../apache/iotdb/db/integration/IoTDBTtlIT.java | 4 +-
.../db/integration/env/StandaloneEnvConfig.java | 30 +-
.../db/integration/sync/IoTDBSyncReceiverIT.java | 21 +-
.../sync/IoTDBSyncReceiverLoaderIT.java | 21 +-
.../db/integration/sync/IoTDBSyncSenderIT.java | 19 +-
.../IoTDBDeletionVersionAdaptionIT.java | 2 +-
.../session/IoTDBSessionAlignedABDeviceIT.java | 2 +-
.../session/IoTDBSessionAlignedAggregationIT.java | 2 +-
.../IoTDBSessionAlignedAggregationWithUnSeqIT.java | 2 +-
.../commons/auth/authorizer/BasicAuthorizer.java | 4 +-
.../auth/authorizer/LocalFileAuthorizer.java | 2 +-
.../commons/auth/authorizer/OpenIdAuthorizer.java | 2 +-
.../iotdb/commons/auth/user/BasicUserManager.java | 8 +-
.../iotdb/commons/client/ClientPoolFactory.java | 2 +-
.../apache/iotdb/commons/conf/CommonConfig.java | 12 +-
.../iotdb/commons/conf/CommonDescriptor.java | 56 ++-
.../commons/enums/HandleSystemErrorStrategy.java | 2 +-
.../iotdb/commons/file/SystemFileFactory.java | 4 +-
.../iotdb/commons/sync/utils/SyncPathUtil.java | 6 +-
.../org/apache/iotdb/commons/utils/AuthUtils.java | 8 +-
.../schemaregion/rocksdb/RSchemaConfLoader.java | 5 +-
.../rocksdb/RSchemaReadWriteHandler.java | 2 +-
.../schemaregion/rocksdb/RSchemaRegion.java | 2 +-
.../rocksdb/mnode/RStorageGroupMNode.java | 2 +-
.../metadata/tagSchemaRegion/TagSchemaRegion.java | 2 +-
.../tagSchemaRegion/TagSchemaRegionTest.java | 20 +-
.../idtable/IDTableWithDeviceIDListImplTest.java | 20 +-
.../tagIndex/TagTagInvertedIndexTest.java | 2 +-
.../org/apache/iotdb/db/audit/AuditLogger.java | 2 +-
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 3 +-
.../apache/iotdb/db/auth/BasicAuthorityCache.java | 3 +-
.../apache/iotdb/db/client/ConfigNodeClient.java | 4 +-
.../org/apache/iotdb/db/client/ConfigNodeInfo.java | 2 +-
.../iotdb/db/client/DataNodeClientPoolFactory.java | 10 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 18 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 9 +-
.../org/apache/iotdb/db/conf/IoTDBStartCheck.java | 37 +-
.../iotdb/db/conf/adapter/CompressionRatio.java | 2 +-
.../db/conf/directories/DirectoryManager.java | 20 +-
.../iotdb/db/conf/directories/FolderManager.java | 4 +-
.../directories/strategy/DirectoryStrategy.java | 2 +-
.../db/consensus/DataRegionConsensusImpl.java | 72 ++--
.../db/consensus/SchemaRegionConsensusImpl.java | 4 +-
.../statemachine/DataRegionStateMachine.java | 6 +-
.../statemachine/SchemaRegionStateMachine.java | 2 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 8 +-
.../iotdb/db/engine/cache/BloomFilterCache.java | 10 +-
.../apache/iotdb/db/engine/cache/ChunkCache.java | 6 +-
.../db/engine/cache/TimeSeriesMetadataCache.java | 6 +-
.../performer/impl/FastCompactionPerformer.java | 2 +-
.../impl/ReadChunkCompactionPerformer.java | 4 +-
.../impl/ReadPointCompactionPerformer.java | 2 +-
.../execute/recover/CompactionRecoverTask.java | 4 +-
.../execute/task/CrossSpaceCompactionTask.java | 2 +-
.../execute/task/InnerSpaceCompactionTask.java | 2 +-
.../readchunk/AlignedSeriesCompactionExecutor.java | 4 +-
.../readchunk/SingleSeriesCompactionExecutor.java | 9 +-
.../execute/utils/log/TsFileIdentifier.java | 2 +-
.../utils/writer/AbstractCompactionWriter.java | 10 +-
.../writer/AbstractCrossCompactionWriter.java | 6 +-
.../writer/AbstractInnerCompactionWriter.java | 6 +-
.../compaction/schedule/CompactionScheduler.java | 8 +-
.../compaction/schedule/CompactionTaskManager.java | 12 +-
.../DefaultCompactionTaskComparatorImpl.java | 2 +-
.../estimator/InplaceCompactionEstimator.java | 2 +-
.../ReadPointCrossCompactionEstimator.java | 2 +-
.../impl/RewriteCrossSpaceCompactionSelector.java | 14 +-
.../impl/SizeTieredCompactionSelector.java | 2 +-
.../apache/iotdb/db/engine/flush/FlushManager.java | 2 +-
.../iotdb/db/engine/flush/MemTableFlushTask.java | 2 +-
.../db/engine/flush/pool/FlushTaskPoolManager.java | 4 +-
.../iotdb/db/engine/load/LoadTsFileManager.java | 2 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 4 +-
.../apache/iotdb/db/engine/settle/SettleLog.java | 2 +-
.../db/engine/settle/SettleRequestHandler.java | 2 +-
.../iotdb/db/engine/snapshot/SnapshotLoader.java | 10 +-
.../iotdb/db/engine/snapshot/SnapshotTaker.java | 2 +-
.../iotdb/db/engine/storagegroup/DataRegion.java | 10 +-
.../db/engine/storagegroup/DataRegionInfo.java | 6 +-
.../engine/storagegroup/TimePartitionManager.java | 3 +-
.../db/engine/storagegroup/TsFileProcessor.java | 8 +-
.../db/engine/storagegroup/TsFileResource.java | 2 +-
.../db/engine/trigger/utils/BatchHandlerQueue.java | 9 +-
.../engine/trigger/utils/HTTPConnectionPool.java | 6 +-
.../engine/trigger/utils/MQTTConnectionPool.java | 2 +-
.../apache/iotdb/db/engine/upgrade/UpgradeLog.java | 2 +-
.../exception/sql/PathNumOverLimitException.java | 4 +-
.../metadata/cache/DataNodeLastCacheManager.java | 4 +-
.../db/metadata/cache/DataNodeSchemaCache.java | 2 +-
.../apache/iotdb/db/metadata/idtable/IDTable.java | 2 +-
.../db/metadata/idtable/IDTableHashmapImpl.java | 2 +-
.../iotdb/db/metadata/idtable/IDTableManager.java | 2 +-
.../db/metadata/idtable/entry/DeviceIDFactory.java | 8 +-
.../db/metadata/idtable/entry/SchemaEntry.java | 2 +-
.../metadata/mnode/container/MNodeContainers.java | 2 +-
.../iotdb/db/metadata/mtree/ConfigMTree.java | 2 +-
.../db/metadata/mtree/store/MemMTreeStore.java | 2 +-
.../store/disk/memcontrol/MemManagerHolder.java | 2 +-
.../memcontrol/MemManagerNodeNumBasedImpl.java | 2 +-
.../store/disk/schemafile/MockSchemaFile.java | 2 +-
.../mtree/store/disk/schemafile/SchemaFile.java | 4 +-
.../store/disk/schemafile/SchemaFileConfig.java | 12 +-
.../iotdb/db/metadata/rescon/MemoryStatistics.java | 3 +-
.../db/metadata/rescon/SchemaResourceManager.java | 4 +-
.../db/metadata/schemaregion/SchemaEngine.java | 4 +-
.../schemaregion/SchemaRegionMemoryImpl.java | 25 +-
.../schemaregion/SchemaRegionSchemaFileImpl.java | 20 +-
.../apache/iotdb/db/metadata/tag/TagLogFile.java | 6 +-
.../apache/iotdb/db/metadata/tag/TagManager.java | 24 +-
.../iotdb/db/mpp/common/DataNodeEndPoints.java | 8 +-
.../db/mpp/common/header/ColumnHeaderConstant.java | 2 +-
.../mpp/common/schematree/ClusterSchemaTree.java | 2 +-
.../iotdb/db/mpp/execution/QueryIdGenerator.java | 2 +-
.../execution/exchange/MPPDataExchangeService.java | 10 +-
.../mpp/execution/exchange/SharedTsBlockQueue.java | 2 +-
.../db/mpp/execution/exchange/SinkHandle.java | 3 +-
.../db/mpp/execution/exchange/SourceHandle.java | 3 +-
.../execution/executor/RegionWriteExecutor.java | 2 +-
.../fragment/FragmentInstanceManager.java | 6 +-
.../mpp/execution/memory/LocalMemoryManager.java | 4 +-
.../operator/process/AbstractIntoOperator.java | 4 +-
.../operator/process/TransformOperator.java | 7 +-
.../operator/process/last/LastQueryUtil.java | 4 +-
.../db/mpp/execution/schedule/DriverScheduler.java | 8 +-
.../mpp/execution/schedule/DriverTaskThread.java | 4 +-
.../org/apache/iotdb/db/mpp/plan/Coordinator.java | 4 +-
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 11 +-
.../mpp/plan/analyze/ClusterPartitionFetcher.java | 20 +-
.../plan/analyze/ColumnPaginationController.java | 7 +-
.../db/mpp/plan/analyze/cache/PartitionCache.java | 8 +-
.../plan/analyze/schema/ClusterSchemaFetcher.java | 10 +-
.../db/mpp/plan/execution/QueryExecution.java | 2 +-
.../mpp/plan/execution/config/ConfigExecution.java | 2 +-
.../config/metadata/GetTimeSlotListTask.java | 2 +-
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 28 +-
.../plan/planner/LocalExecutionPlanContext.java | 3 +-
.../db/mpp/plan/planner/LocalExecutionPlanner.java | 5 +-
.../db/mpp/plan/planner/OperatorTreeGenerator.java | 8 +-
.../SimpleFragmentParallelPlanner.java | 4 +-
.../db/mpp/plan/planner/plan/FragmentInstance.java | 2 +-
.../plan/node/load/LoadSingleTsFileNode.java | 4 +-
.../metedata/write/CreateMultiTimeSeriesNode.java | 4 +-
.../plan/planner/plan/node/write/InsertNode.java | 8 +-
.../planner/plan/node/write/InsertRowNode.java | 4 +-
.../scheduler/AbstractFragInsStateTracker.java | 4 +-
.../scheduler/FragmentInstanceDispatcherImpl.java | 4 +-
.../scheduler/load/LoadTsFileDispatcherImpl.java | 4 +-
.../plan/scheduler/load/LoadTsFileScheduler.java | 4 +-
.../plan/statement/crud/LoadTsFileStatement.java | 6 +-
.../metadata/CreateContinuousQueryStatement.java | 6 +-
.../datastructure/SerializableList.java | 3 +-
.../influxdb/handler/QueryHandlerFactory.java | 4 +-
.../influxdb/meta/InfluxDBMetaManagerFactory.java | 4 +-
.../influxdb/parser/InfluxDBAstVisitor.java | 6 +-
.../iotdb/db/protocol/mqtt/MPPPublishHandler.java | 4 +-
.../db/protocol/mqtt/PayloadFormatManager.java | 2 +-
.../protocol/rest/impl/GrafanaApiServiceImpl.java | 8 +-
.../db/protocol/rest/impl/RestApiServiceImpl.java | 6 +-
.../iotdb/db/query/control/SessionManager.java | 2 +-
.../apache/iotdb/db/rescon/MemTableManager.java | 4 +-
.../iotdb/db/rescon/PrimitiveArrayManager.java | 9 +-
.../org/apache/iotdb/db/rescon/SystemInfo.java | 11 +-
.../iotdb/db/rescon/TsFileResourceManager.java | 2 +-
.../java/org/apache/iotdb/db/service/DataNode.java | 114 +++---
.../db/service/DataNodeInternalRPCService.java | 6 +-
.../org/apache/iotdb/db/service/GetVersion.java | 2 +-
.../iotdb/db/service/InfluxDBRPCService.java | 17 +-
.../apache/iotdb/db/service/IoTDBShutdownHook.java | 10 +-
.../org/apache/iotdb/db/service/MQTTService.java | 8 +-
.../org/apache/iotdb/db/service/RPCService.java | 10 +-
.../org/apache/iotdb/db/service/SettleService.java | 2 +-
.../db/service/TemporaryQueryDataFileService.java | 2 +-
.../org/apache/iotdb/db/service/UpgradeSevice.java | 4 +-
.../db/service/basic/QueryFrequencyRecorder.java | 4 +-
.../iotdb/db/service/metrics/SystemMetrics.java | 2 +-
.../service/thrift/impl/ClientRPCServiceImpl.java | 8 +-
.../impl/DataNodeInternalRPCServiceImpl.java | 14 +-
.../java/org/apache/iotdb/db/sync/SyncService.java | 2 +-
.../iotdb/db/sync/externalpipe/ExtPipePlugin.java | 4 +-
.../sync/externalpipe/ExtPipePluginRegister.java | 2 +-
.../db/sync/pipedata/load/DeletionLoader.java | 5 +-
.../iotdb/db/sync/pipedata/load/TsFileLoader.java | 4 +-
.../db/sync/transport/client/IoTDBSyncClient.java | 2 +-
.../db/sync/transport/server/ReceiverManager.java | 17 +-
.../org/apache/iotdb/db/tools/TsFileSplitTool.java | 4 +-
.../watermark/GroupedLSBWatermarkEncoder.java | 8 +-
.../db/trigger/executor/TriggerFireVisitor.java | 4 +-
.../trigger/service/TriggerClassLoaderManager.java | 10 +-
.../trigger/service/TriggerManagementService.java | 2 +-
.../org/apache/iotdb/db/utils/DateTimeUtils.java | 10 +-
.../iotdb/db/utils/EncodingInferenceUtils.java | 2 +-
.../org/apache/iotdb/db/utils/OpenFileNumUtil.java | 6 +-
.../apache/iotdb/db/utils/TimePartitionUtils.java | 2 +-
.../apache/iotdb/db/utils/TypeInferenceUtils.java | 12 +-
.../iotdb/db/utils/datastructure/TVList.java | 2 +-
.../runtime/WindowEvaluationTaskPoolManager.java | 6 +-
.../java/org/apache/iotdb/db/wal/WALManager.java | 4 +-
.../allocation/AbstractNodeAllocationStrategy.java | 8 +-
.../org/apache/iotdb/db/wal/buffer/WALBuffer.java | 14 +-
.../apache/iotdb/db/wal/buffer/WALInfoEntry.java | 6 +-
.../iotdb/db/wal/checkpoint/CheckpointManager.java | 8 +-
.../java/org/apache/iotdb/db/wal/io/WALReader.java | 4 +-
.../java/org/apache/iotdb/db/wal/node/WALNode.java | 4 +-
.../iotdb/db/wal/recover/WALNodeRecoverTask.java | 11 +-
.../iotdb/db/wal/recover/WALRecoverManager.java | 9 +-
.../db/wal/recover/file/TsFilePlanRedoer.java | 4 +-
.../auth/authorizer/LocalFileAuthorizerTest.java | 2 +-
.../db/auth/authorizer/OpenIdAuthorizerTest.java | 2 +-
.../db/auth/user/LocalFileUserManagerTest.java | 2 +-
.../db/conf/adapter/CompressionRatioTest.java | 2 +-
.../engine/compaction/AbstractCompactionTest.java | 20 +-
.../engine/compaction/CompactionSchedulerTest.java | 404 ++++++++++-----------
.../CompactionSchedulerWithFastPerformerTest.java | 404 ++++++++++-----------
.../compaction/CompactionTaskComparatorTest.java | 2 +-
.../compaction/FastAlignedCrossCompactionTest.java | 6 +-
.../FastCrossCompactionPerformerTest.java | 4 +-
.../FastInnerCompactionPerformerTest.java | 4 +-
.../FastNonAlignedCrossCompactionTest.java | 6 +-
.../ReadPointCompactionPerformerTest.java | 4 +-
.../db/engine/compaction/TsFileIdentifierUT.java | 4 +-
.../cross/CrossSpaceCompactionExceptionTest.java | 2 +-
...eCompactionWithFastPerformerValidationTest.java | 14 +-
...actionWithReadPointPerformerValidationTest.java | 6 +-
.../cross/RewriteCompactionFileSelectorTest.java | 32 +-
.../RewriteCrossSpaceCompactionRecoverTest.java | 2 +-
...eCrossSpaceCompactionWithFastPerformerTest.java | 2 +-
...sSpaceCompactionWithReadPointPerformerTest.java | 2 +-
.../FastCompactionPerformerNoAlignedTest.java | 204 +++++------
.../inner/InnerCompactionSchedulerTest.java | 42 +--
.../InnerSeqCompactionWithFastPerformerTest.java | 37 +-
...nerSeqCompactionWithReadChunkPerformerTest.java | 37 +-
.../ReadChunkCompactionPerformerNoAlignedTest.java | 204 +++++------
.../SizeTieredCompactionSelectorTest.java | 4 +-
.../recover/SizeTieredCompactionRecoverTest.java | 2 +-
.../compaction/utils/CompactionClearUtils.java | 4 +-
.../compaction/utils/CompactionConfigRestorer.java | 8 +-
.../utils/MultiTsFileDeviceIteratorTest.java | 2 +-
.../db/engine/settle/SettleRequestHandlerTest.java | 2 +-
.../db/engine/snapshot/IoTDBSnapshotTest.java | 22 +-
.../db/engine/storagegroup/DataRegionTest.java | 99 ++---
.../iotdb/db/engine/storagegroup/TTLTest.java | 8 +-
.../storagegroup/TimePartitionManagerTest.java | 4 +-
.../iotdb/db/metadata/mtree/MTreeBelowSGTest.java | 2 +-
.../mtree/multimode/MTreeDiskModeTest.java | 6 +-
.../mtree/multimode/MTreeFullMemoryTest.java | 2 +-
.../mtree/multimode/MTreeMemoryModeTest.java | 4 +-
.../mtree/multimode/MTreeNonMemoryTest.java | 2 +-
.../mtree/multimode/MTreePartialMemoryTest.java | 2 +-
.../mtree/schemafile/AliasIndexPageTest.java | 6 +-
.../mtree/schemafile/InternalPageTest.java | 6 +-
.../mtree/schemafile/SchemaFileLogTest.java | 6 +-
.../metadata/mtree/schemafile/SchemaFileTest.java | 6 +-
.../mtree/schemafile/WrappedSegmentTest.java | 6 +-
.../schemaRegion/AbstractSchemaRegionTest.java | 4 +-
.../schemaRegion/SchemaRegionManagementTest.java | 24 +-
.../db/mpp/execution/exchange/SinkHandleTest.java | 12 +-
.../mpp/execution/exchange/SourceHandleTest.java | 23 +-
.../execution/operator/MergeSortOperatorTest.java | 6 +-
.../execution/schedule/DriverSchedulerTest.java | 3 +-
.../mpp/plan/analyze/FakePartitionFetcherImpl.java | 17 +-
.../mpp/plan/analyze/QueryTimePartitionTest.java | 62 ++--
.../mpp/plan/analyze/cache/PartitionCacheTest.java | 6 +-
.../mpp/plan/plan/FragmentInstanceSerdeTest.java | 4 +-
.../iotdb/db/mpp/plan/plan/distribution/Util.java | 13 +-
.../plan/node/write/WritePlanNodeSplitTest.java | 12 +-
.../org/apache/iotdb/db/qp/sql/ASTVisitorTest.java | 12 +-
.../db/query/control/FileReaderManagerTest.java | 2 +-
.../iotdb/db/rescon/ResourceManagerTest.java | 4 +-
.../security/encrypt/MessageDigestEncryptTest.java | 2 +-
.../DataNodeInternalRPCServiceImplTest.java | 2 +-
.../org/apache/iotdb/db/tools/MLogParserTest.java | 2 +-
.../iotdb/db/tools/SchemaFileSketchTest.java | 6 +-
.../iotdb/db/tools/TsFileAndModSettleToolTest.java | 2 +-
.../iotdb/db/utils/EncodingInferenceUtilsTest.java | 6 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 62 ++--
.../iotdb/db/utils/TypeInferenceUtilsTest.java | 24 +-
.../datastructure/PrimitiveArrayManagerTest.java | 13 +-
.../org/apache/iotdb/db/wal/DisableWALTest.java | 6 +-
.../org/apache/iotdb/db/wal/WALManagerTest.java | 10 +-
.../db/wal/allocation/ElasticStrategyTest.java | 12 +-
.../db/wal/allocation/FirstCreateStrategyTest.java | 10 +-
.../db/wal/allocation/RoundRobinStrategyTest.java | 11 +-
.../iotdb/db/wal/buffer/WALBufferCommonTest.java | 12 +-
.../db/wal/checkpoint/CheckpointManagerTest.java | 2 +-
.../org/apache/iotdb/db/wal/io/WALFileTest.java | 6 +-
.../iotdb/db/wal/node/ConsensusReqReaderTest.java | 16 +-
.../org/apache/iotdb/db/wal/node/WALNodeTest.java | 18 +-
.../db/wal/recover/WALRecoverManagerTest.java | 20 +-
.../db/wal/recover/file/TsFilePlanRedoerTest.java | 15 +-
.../file/UnsealedTsFileRecoverPerformerTest.java | 2 +-
336 files changed, 2228 insertions(+), 2070 deletions(-)
[iotdb] 01/04: stash
Posted by yo...@apache.org.
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 16371dc769d7f14ac3aec375eb94193d63d75a76
Author: YongzaoDan <53...@qq.com>
AuthorDate: Thu Jan 12 22:55:32 2023 +0800
stash
---
.../iotdb/confignode/conf/ConfigNodeConfig.java | 2 +-
.../confignode/conf/ConfigNodeDescriptor.java | 2 +-
.../confignode/conf/ConfigNodeStartupCheck.java | 3 +-
.../confignode/conf/SystemPropertiesUtils.java | 2 +-
.../statemachine/ConfigNodeRegionStateMachine.java | 15 +-
.../confignode/manager/ClusterSchemaManager.java | 8 +-
.../iotdb/confignode/manager/ConfigManager.java | 7 +-
.../iotdb/confignode/manager/ConsensusManager.java | 2 +-
.../iotdb/confignode/manager/ProcedureManager.java | 13 +-
.../confignode/manager/RetryFailedTasksThread.java | 4 +-
.../iotdb/confignode/manager/UDFManager.java | 3 +-
.../iotdb/confignode/manager/load/LoadManager.java | 4 +-
.../manager/load/balancer/RouteBalancer.java | 3 +-
.../partition/GreedyPartitionAllocator.java | 10 +-
.../manager/node/ClusterNodeStartUtils.java | 3 +-
.../iotdb/confignode/manager/node/NodeManager.java | 2 +-
.../manager/partition/PartitionManager.java | 4 +-
.../iotdb/confignode/persistence/AuthorInfo.java | 2 +-
.../confignode/persistence/ProcedureInfo.java | 2 +-
.../iotdb/confignode/persistence/TriggerInfo.java | 10 +-
.../iotdb/confignode/persistence/UDFInfo.java | 10 +-
.../procedure/store/ConfigProcedureStore.java | 2 +-
.../confignode/procedure/store/ProcedureStore.java | 2 +-
.../iotdb/confignode/service/ConfigNode.java | 2 +-
.../service/thrift/ConfigNodeRPCService.java | 2 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 4 +-
.../iotdb/consensus/ratis/RatisConsensus.java | 2 +-
.../iotdb/influxdb/session/InfluxDBSession.java | 2 +-
.../apache/iotdb/db/it/IoTDBRecoverUnclosedIT.java | 4 +-
.../org/apache/iotdb/db/it/IoTDBRestartIT.java | 23 +-
.../iotdb/session/it/IoTDBSessionComplexIT.java | 6 +-
.../iotdb/session/it/IoTDBSessionSimpleIT.java | 7 +-
.../iotdb/db/integration/IoTDBCheckConfigIT.java | 2 +-
.../iotdb/db/integration/IoTDBCompactionIT.java | 2 +-
.../integration/IoTDBCompactionWithIDTableIT.java | 6 +-
.../iotdb/db/integration/IoTDBMaxTimeQueryIT.java | 18 +-
.../IoTDBMultiOverlappedChunkInUnseqIT.java | 3 +-
.../db/integration/IoTDBMultiOverlappedPageIT.java | 3 +-
.../iotdb/db/integration/IoTDBMultiSeriesIT.java | 2 +-
.../db/integration/IoTDBNewTsFileCompactionIT.java | 155 ++++----
.../db/integration/IoTDBQueryWithIDTableIT.java | 6 +-
.../db/integration/IoTDBRewriteTsFileToolIT.java | 2 +-
.../db/integration/IoTDBRpcCompressionIT.java | 4 +-
.../db/integration/IoTDBSessionTimeoutIT.java | 4 +-
.../integration/IoTDBSizeTieredCompactionIT.java | 62 ++--
.../iotdb/db/integration/IoTDBTimePartitionIT.java | 2 +-
.../apache/iotdb/db/integration/IoTDBTtlIT.java | 4 +-
.../db/integration/env/StandaloneEnvConfig.java | 28 +-
.../db/integration/sync/IoTDBSyncReceiverIT.java | 20 +-
.../sync/IoTDBSyncReceiverLoaderIT.java | 20 +-
.../db/integration/sync/IoTDBSyncSenderIT.java | 18 +-
.../IoTDBDeletionVersionAdaptionIT.java | 2 +-
.../session/IoTDBSessionAlignedABDeviceIT.java | 2 +-
.../session/IoTDBSessionAlignedAggregationIT.java | 2 +-
.../IoTDBSessionAlignedAggregationWithUnSeqIT.java | 2 +-
.../commons/auth/authorizer/BasicAuthorizer.java | 4 +-
.../auth/authorizer/LocalFileAuthorizer.java | 2 +-
.../commons/auth/authorizer/OpenIdAuthorizer.java | 2 +-
.../iotdb/commons/auth/user/BasicUserManager.java | 8 +-
.../iotdb/commons/client/ClientPoolFactory.java | 2 +-
.../apache/iotdb/commons/conf/CommonConfig.java | 8 -
.../iotdb/commons/conf/CommonDescriptor.java | 56 ++-
.../commons/enums/HandleSystemErrorStrategy.java | 2 +-
.../iotdb/commons/file/SystemFileFactory.java | 4 +-
.../iotdb/commons/sync/utils/SyncPathUtil.java | 6 +-
.../org/apache/iotdb/commons/utils/AuthUtils.java | 8 +-
.../schemaregion/rocksdb/RSchemaConfLoader.java | 5 +-
.../rocksdb/RSchemaReadWriteHandler.java | 2 +-
.../schemaregion/rocksdb/RSchemaRegion.java | 2 +-
.../rocksdb/mnode/RStorageGroupMNode.java | 2 +-
.../metadata/tagSchemaRegion/TagSchemaRegion.java | 2 +-
.../tagSchemaRegion/TagSchemaRegionTest.java | 20 +-
.../idtable/IDTableWithDeviceIDListImplTest.java | 20 +-
.../tagIndex/TagTagInvertedIndexTest.java | 2 +-
.../org/apache/iotdb/db/audit/AuditLogger.java | 2 +-
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 2 +-
.../apache/iotdb/db/auth/BasicAuthorityCache.java | 3 +-
.../apache/iotdb/db/client/ConfigNodeClient.java | 4 +-
.../org/apache/iotdb/db/client/ConfigNodeInfo.java | 2 +-
.../iotdb/db/client/DataNodeClientPoolFactory.java | 2 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 11 +-
.../org/apache/iotdb/db/conf/IoTDBStartCheck.java | 4 +-
.../iotdb/db/conf/adapter/CompressionRatio.java | 2 +-
.../db/conf/directories/DirectoryManager.java | 20 +-
.../iotdb/db/conf/directories/FolderManager.java | 4 +-
.../directories/strategy/DirectoryStrategy.java | 2 +-
.../db/consensus/DataRegionConsensusImpl.java | 4 +-
.../db/consensus/SchemaRegionConsensusImpl.java | 4 +-
.../statemachine/DataRegionStateMachine.java | 6 +-
.../statemachine/SchemaRegionStateMachine.java | 2 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 8 +-
.../iotdb/db/engine/cache/BloomFilterCache.java | 10 +-
.../apache/iotdb/db/engine/cache/ChunkCache.java | 4 +-
.../db/engine/cache/TimeSeriesMetadataCache.java | 4 +-
.../performer/impl/FastCompactionPerformer.java | 2 +-
.../impl/ReadChunkCompactionPerformer.java | 4 +-
.../impl/ReadPointCompactionPerformer.java | 2 +-
.../execute/recover/CompactionRecoverTask.java | 4 +-
.../execute/task/CrossSpaceCompactionTask.java | 2 +-
.../execute/task/InnerSpaceCompactionTask.java | 2 +-
.../readchunk/AlignedSeriesCompactionExecutor.java | 4 +-
.../readchunk/SingleSeriesCompactionExecutor.java | 8 +-
.../execute/utils/log/TsFileIdentifier.java | 2 +-
.../utils/writer/AbstractCompactionWriter.java | 10 +-
.../writer/AbstractCrossCompactionWriter.java | 6 +-
.../writer/AbstractInnerCompactionWriter.java | 6 +-
.../compaction/schedule/CompactionScheduler.java | 8 +-
.../compaction/schedule/CompactionTaskManager.java | 12 +-
.../DefaultCompactionTaskComparatorImpl.java | 2 +-
.../estimator/InplaceCompactionEstimator.java | 2 +-
.../ReadPointCrossCompactionEstimator.java | 2 +-
.../impl/RewriteCrossSpaceCompactionSelector.java | 10 +-
.../impl/SizeTieredCompactionSelector.java | 2 +-
.../apache/iotdb/db/engine/flush/FlushManager.java | 2 +-
.../iotdb/db/engine/flush/MemTableFlushTask.java | 2 +-
.../db/engine/flush/pool/FlushTaskPoolManager.java | 4 +-
.../iotdb/db/engine/load/LoadTsFileManager.java | 2 +-
.../iotdb/db/engine/memtable/AbstractMemTable.java | 3 +-
.../apache/iotdb/db/engine/settle/SettleLog.java | 2 +-
.../db/engine/settle/SettleRequestHandler.java | 2 +-
.../iotdb/db/engine/snapshot/SnapshotLoader.java | 10 +-
.../iotdb/db/engine/snapshot/SnapshotTaker.java | 2 +-
.../iotdb/db/engine/storagegroup/DataRegion.java | 10 +-
.../db/engine/storagegroup/DataRegionInfo.java | 6 +-
.../engine/storagegroup/TimePartitionManager.java | 3 +-
.../db/engine/storagegroup/TsFileProcessor.java | 8 +-
.../db/engine/storagegroup/TsFileResource.java | 2 +-
.../db/engine/trigger/utils/BatchHandlerQueue.java | 7 +-
.../engine/trigger/utils/HTTPConnectionPool.java | 5 +-
.../engine/trigger/utils/MQTTConnectionPool.java | 2 +-
.../apache/iotdb/db/engine/upgrade/UpgradeLog.java | 2 +-
.../exception/sql/PathNumOverLimitException.java | 2 +-
.../metadata/cache/DataNodeLastCacheManager.java | 2 +-
.../db/metadata/cache/DataNodeSchemaCache.java | 2 +-
.../apache/iotdb/db/metadata/idtable/IDTable.java | 2 +-
.../db/metadata/idtable/IDTableHashmapImpl.java | 2 +-
.../iotdb/db/metadata/idtable/IDTableManager.java | 2 +-
.../db/metadata/idtable/entry/DeviceIDFactory.java | 8 +-
.../db/metadata/idtable/entry/SchemaEntry.java | 2 +-
.../metadata/mnode/container/MNodeContainers.java | 2 +-
.../iotdb/db/metadata/mtree/ConfigMTree.java | 2 +-
.../db/metadata/mtree/store/MemMTreeStore.java | 2 +-
.../store/disk/memcontrol/MemManagerHolder.java | 2 +-
.../memcontrol/MemManagerNodeNumBasedImpl.java | 2 +-
.../store/disk/schemafile/MockSchemaFile.java | 2 +-
.../mtree/store/disk/schemafile/SchemaFile.java | 4 +-
.../store/disk/schemafile/SchemaFileConfig.java | 10 +-
.../iotdb/db/metadata/rescon/MemoryStatistics.java | 3 +-
.../db/metadata/rescon/SchemaResourceManager.java | 4 +-
.../db/metadata/schemaregion/SchemaEngine.java | 4 +-
.../schemaregion/SchemaRegionMemoryImpl.java | 25 +-
.../schemaregion/SchemaRegionSchemaFileImpl.java | 19 +-
.../apache/iotdb/db/metadata/tag/TagLogFile.java | 5 +-
.../apache/iotdb/db/metadata/tag/TagManager.java | 24 +-
.../iotdb/db/mpp/common/DataNodeEndPoints.java | 8 +-
.../db/mpp/common/header/ColumnHeaderConstant.java | 2 +-
.../mpp/common/schematree/ClusterSchemaTree.java | 2 +-
.../iotdb/db/mpp/execution/QueryIdGenerator.java | 2 +-
.../execution/exchange/MPPDataExchangeService.java | 10 +-
.../mpp/execution/exchange/SharedTsBlockQueue.java | 2 +-
.../db/mpp/execution/exchange/SinkHandle.java | 3 +-
.../db/mpp/execution/exchange/SourceHandle.java | 3 +-
.../execution/executor/RegionWriteExecutor.java | 2 +-
.../fragment/FragmentInstanceManager.java | 5 +-
.../mpp/execution/memory/LocalMemoryManager.java | 4 +-
.../operator/process/AbstractIntoOperator.java | 3 +-
.../operator/process/TransformOperator.java | 7 +-
.../operator/process/last/LastQueryUtil.java | 2 +-
.../db/mpp/execution/schedule/DriverScheduler.java | 7 +-
.../mpp/execution/schedule/DriverTaskThread.java | 3 +-
.../org/apache/iotdb/db/mpp/plan/Coordinator.java | 4 +-
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 6 +-
.../mpp/plan/analyze/ClusterPartitionFetcher.java | 10 +-
.../plan/analyze/ColumnPaginationController.java | 4 +-
.../db/mpp/plan/analyze/cache/PartitionCache.java | 6 +-
.../plan/analyze/schema/ClusterSchemaFetcher.java | 2 +-
.../db/mpp/plan/execution/QueryExecution.java | 2 +-
.../mpp/plan/execution/config/ConfigExecution.java | 2 +-
.../config/metadata/GetTimeSlotListTask.java | 2 +-
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 24 +-
.../plan/planner/LocalExecutionPlanContext.java | 3 +-
.../db/mpp/plan/planner/LocalExecutionPlanner.java | 5 +-
.../db/mpp/plan/planner/OperatorTreeGenerator.java | 5 +-
.../SimpleFragmentParallelPlanner.java | 3 +-
.../db/mpp/plan/planner/plan/FragmentInstance.java | 2 +-
.../plan/node/load/LoadSingleTsFileNode.java | 4 +-
.../metedata/write/CreateMultiTimeSeriesNode.java | 3 +-
.../plan/planner/plan/node/write/InsertNode.java | 8 +-
.../planner/plan/node/write/InsertRowNode.java | 4 +-
.../scheduler/AbstractFragInsStateTracker.java | 4 +-
.../scheduler/FragmentInstanceDispatcherImpl.java | 4 +-
.../scheduler/load/LoadTsFileDispatcherImpl.java | 4 +-
.../plan/scheduler/load/LoadTsFileScheduler.java | 4 +-
.../plan/statement/crud/LoadTsFileStatement.java | 5 +-
.../metadata/CreateContinuousQueryStatement.java | 4 +-
.../datastructure/SerializableList.java | 3 +-
.../influxdb/handler/QueryHandlerFactory.java | 4 +-
.../influxdb/meta/InfluxDBMetaManagerFactory.java | 4 +-
.../influxdb/parser/InfluxDBAstVisitor.java | 4 +-
.../iotdb/db/protocol/mqtt/MPPPublishHandler.java | 4 +-
.../db/protocol/mqtt/PayloadFormatManager.java | 2 +-
.../protocol/rest/impl/GrafanaApiServiceImpl.java | 4 +-
.../db/protocol/rest/impl/RestApiServiceImpl.java | 2 +-
.../iotdb/db/query/control/SessionManager.java | 2 +-
.../apache/iotdb/db/rescon/MemTableManager.java | 4 +-
.../iotdb/db/rescon/PrimitiveArrayManager.java | 4 +-
.../org/apache/iotdb/db/rescon/SystemInfo.java | 4 +-
.../iotdb/db/rescon/TsFileResourceManager.java | 2 +-
.../java/org/apache/iotdb/db/service/DataNode.java | 94 ++---
.../db/service/DataNodeInternalRPCService.java | 6 +-
.../org/apache/iotdb/db/service/GetVersion.java | 2 +-
.../iotdb/db/service/InfluxDBRPCService.java | 17 +-
.../apache/iotdb/db/service/IoTDBShutdownHook.java | 10 +-
.../org/apache/iotdb/db/service/MQTTService.java | 4 +-
.../org/apache/iotdb/db/service/RPCService.java | 10 +-
.../org/apache/iotdb/db/service/SettleService.java | 2 +-
.../db/service/TemporaryQueryDataFileService.java | 2 +-
.../org/apache/iotdb/db/service/UpgradeSevice.java | 3 +-
.../iotdb/db/service/metrics/SystemMetrics.java | 2 +-
.../service/thrift/impl/ClientRPCServiceImpl.java | 8 +-
.../impl/DataNodeInternalRPCServiceImpl.java | 14 +-
.../java/org/apache/iotdb/db/sync/SyncService.java | 2 +-
.../iotdb/db/sync/externalpipe/ExtPipePlugin.java | 2 +-
.../sync/externalpipe/ExtPipePluginRegister.java | 2 +-
.../db/sync/pipedata/load/DeletionLoader.java | 4 +-
.../iotdb/db/sync/pipedata/load/TsFileLoader.java | 2 +-
.../db/sync/transport/client/IoTDBSyncClient.java | 2 +-
.../db/sync/transport/server/ReceiverManager.java | 15 +-
.../org/apache/iotdb/db/tools/TsFileSplitTool.java | 4 +-
.../watermark/GroupedLSBWatermarkEncoder.java | 8 +-
.../db/trigger/executor/TriggerFireVisitor.java | 2 +-
.../trigger/service/TriggerClassLoaderManager.java | 8 +-
.../trigger/service/TriggerManagementService.java | 2 +-
.../org/apache/iotdb/db/utils/DateTimeUtils.java | 10 +-
.../iotdb/db/utils/EncodingInferenceUtils.java | 2 +-
.../org/apache/iotdb/db/utils/OpenFileNumUtil.java | 4 +-
.../apache/iotdb/db/utils/TimePartitionUtils.java | 2 +-
.../apache/iotdb/db/utils/TypeInferenceUtils.java | 11 +-
.../iotdb/db/utils/datastructure/TVList.java | 2 +-
.../runtime/WindowEvaluationTaskPoolManager.java | 6 +-
.../java/org/apache/iotdb/db/wal/WALManager.java | 4 +-
.../allocation/AbstractNodeAllocationStrategy.java | 2 +-
.../org/apache/iotdb/db/wal/buffer/WALBuffer.java | 12 +-
.../apache/iotdb/db/wal/buffer/WALInfoEntry.java | 2 +-
.../iotdb/db/wal/checkpoint/CheckpointManager.java | 8 +-
.../java/org/apache/iotdb/db/wal/io/WALReader.java | 3 +-
.../java/org/apache/iotdb/db/wal/node/WALNode.java | 4 +-
.../iotdb/db/wal/recover/WALNodeRecoverTask.java | 2 +-
.../iotdb/db/wal/recover/WALRecoverManager.java | 2 +-
.../db/wal/recover/file/TsFilePlanRedoer.java | 4 +-
.../auth/authorizer/LocalFileAuthorizerTest.java | 2 +-
.../db/auth/authorizer/OpenIdAuthorizerTest.java | 2 +-
.../db/auth/user/LocalFileUserManagerTest.java | 2 +-
.../db/conf/adapter/CompressionRatioTest.java | 2 +-
.../engine/compaction/AbstractCompactionTest.java | 20 +-
.../engine/compaction/CompactionSchedulerTest.java | 400 ++++++++++-----------
.../CompactionSchedulerWithFastPerformerTest.java | 400 ++++++++++-----------
.../compaction/CompactionTaskComparatorTest.java | 2 +-
.../compaction/FastAlignedCrossCompactionTest.java | 6 +-
.../FastCrossCompactionPerformerTest.java | 4 +-
.../FastInnerCompactionPerformerTest.java | 4 +-
.../FastNonAlignedCrossCompactionTest.java | 6 +-
.../ReadPointCompactionPerformerTest.java | 4 +-
.../db/engine/compaction/TsFileIdentifierUT.java | 4 +-
.../cross/CrossSpaceCompactionExceptionTest.java | 2 +-
...eCompactionWithFastPerformerValidationTest.java | 14 +-
...actionWithReadPointPerformerValidationTest.java | 6 +-
.../cross/RewriteCompactionFileSelectorTest.java | 30 +-
.../RewriteCrossSpaceCompactionRecoverTest.java | 2 +-
...eCrossSpaceCompactionWithFastPerformerTest.java | 2 +-
...sSpaceCompactionWithReadPointPerformerTest.java | 2 +-
.../FastCompactionPerformerNoAlignedTest.java | 204 +++++------
.../inner/InnerCompactionSchedulerTest.java | 40 +--
.../InnerSeqCompactionWithFastPerformerTest.java | 36 +-
...nerSeqCompactionWithReadChunkPerformerTest.java | 36 +-
.../ReadChunkCompactionPerformerNoAlignedTest.java | 204 +++++------
.../SizeTieredCompactionSelectorTest.java | 4 +-
.../recover/SizeTieredCompactionRecoverTest.java | 2 +-
.../compaction/utils/CompactionClearUtils.java | 3 +-
.../compaction/utils/CompactionConfigRestorer.java | 8 +-
.../utils/MultiTsFileDeviceIteratorTest.java | 2 +-
.../db/engine/settle/SettleRequestHandlerTest.java | 2 +-
.../db/engine/snapshot/IoTDBSnapshotTest.java | 22 +-
.../db/engine/storagegroup/DataRegionTest.java | 99 ++---
.../iotdb/db/engine/storagegroup/TTLTest.java | 8 +-
.../storagegroup/TimePartitionManagerTest.java | 4 +-
.../iotdb/db/metadata/mtree/MTreeBelowSGTest.java | 2 +-
.../mtree/multimode/MTreeDiskModeTest.java | 4 +-
.../mtree/multimode/MTreeFullMemoryTest.java | 2 +-
.../mtree/multimode/MTreeMemoryModeTest.java | 2 +-
.../mtree/multimode/MTreeNonMemoryTest.java | 2 +-
.../mtree/multimode/MTreePartialMemoryTest.java | 2 +-
.../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 +-
.../schemaRegion/AbstractSchemaRegionTest.java | 4 +-
.../schemaRegion/SchemaRegionManagementTest.java | 2 +-
.../db/mpp/execution/exchange/SinkHandleTest.java | 8 +-
.../mpp/execution/exchange/SourceHandleTest.java | 18 +-
.../execution/operator/MergeSortOperatorTest.java | 6 +-
.../execution/schedule/DriverSchedulerTest.java | 2 +-
.../mpp/plan/analyze/FakePartitionFetcherImpl.java | 16 +-
.../mpp/plan/analyze/QueryTimePartitionTest.java | 58 +--
.../mpp/plan/analyze/cache/PartitionCacheTest.java | 2 +-
.../mpp/plan/plan/FragmentInstanceSerdeTest.java | 2 +-
.../iotdb/db/mpp/plan/plan/distribution/Util.java | 12 +-
.../plan/node/write/WritePlanNodeSplitTest.java | 10 +-
.../org/apache/iotdb/db/qp/sql/ASTVisitorTest.java | 11 +-
.../db/query/control/FileReaderManagerTest.java | 2 +-
.../iotdb/db/rescon/ResourceManagerTest.java | 4 +-
.../security/encrypt/MessageDigestEncryptTest.java | 2 +-
.../DataNodeInternalRPCServiceImplTest.java | 2 +-
.../org/apache/iotdb/db/tools/MLogParserTest.java | 2 +-
.../iotdb/db/tools/SchemaFileSketchTest.java | 4 +-
.../iotdb/db/tools/TsFileAndModSettleToolTest.java | 2 +-
.../iotdb/db/utils/EncodingInferenceUtilsTest.java | 4 +-
.../apache/iotdb/db/utils/EnvironmentUtils.java | 62 ++--
.../iotdb/db/utils/TypeInferenceUtilsTest.java | 23 +-
.../datastructure/PrimitiveArrayManagerTest.java | 4 +-
.../org/apache/iotdb/db/wal/DisableWALTest.java | 4 +-
.../org/apache/iotdb/db/wal/WALManagerTest.java | 4 +-
.../db/wal/allocation/ElasticStrategyTest.java | 2 +-
.../db/wal/allocation/FirstCreateStrategyTest.java | 2 +-
.../db/wal/allocation/RoundRobinStrategyTest.java | 2 +-
.../iotdb/db/wal/buffer/WALBufferCommonTest.java | 2 +-
.../db/wal/checkpoint/CheckpointManagerTest.java | 2 +-
.../org/apache/iotdb/db/wal/io/WALFileTest.java | 6 +-
.../iotdb/db/wal/node/ConsensusReqReaderTest.java | 16 +-
.../org/apache/iotdb/db/wal/node/WALNodeTest.java | 18 +-
.../db/wal/recover/WALRecoverManagerTest.java | 20 +-
.../db/wal/recover/file/TsFilePlanRedoerTest.java | 15 +-
.../file/UnsealedTsFileRecoverPerformerTest.java | 2 +-
334 files changed, 1853 insertions(+), 1756 deletions(-)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
index c802909183..33efe45e6d 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeConfig.java
@@ -87,7 +87,7 @@ public class ConfigNodeConfig {
// The unknown DataNode detect interval in milliseconds
private long unknownDataNodeDetectInterval =
- CommonDescriptor.getInstance().getConfig().getHeartbeatIntervalInMs();
+ CommonDescriptor.getInstance().getConf().getHeartbeatIntervalInMs();
// The route priority policy of cluster read/write requests
private String routePriorityPolicy = IPriorityBalancer.LEADER_POLICY;
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
index b97312ba70..feb5a0b04e 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/conf/ConfigNodeDescriptor.java
@@ -41,7 +41,7 @@ public class ConfigNodeDescriptor {
private static final Logger LOGGER = LoggerFactory.getLogger(ConfigNodeDescriptor.class);
private final ConfigNodeConfig CONF = new ConfigNodeConfig();
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private ConfigNodeDescriptor() {
loadProps();
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 3e3768849a..474c4cebbc 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
@@ -24,7 +24,6 @@ import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.exception.ConfigurationException;
import org.apache.iotdb.commons.exception.StartupException;
import org.apache.iotdb.commons.loadbalance.LeaderDistributionPolicy;
-import org.apache.iotdb.confignode.manager.load.balancer.router.leader.ILeaderBalancer;
import org.apache.iotdb.confignode.manager.load.balancer.router.priority.IPriorityBalancer;
import org.apache.iotdb.consensus.ConsensusFactory;
@@ -42,7 +41,7 @@ public class ConfigNodeStartupCheck {
private static final Logger LOGGER = LoggerFactory.getLogger(ConfigNodeStartupCheck.class);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private static final ConfigNodeConfig CONFIG_NODE_CONFIG = ConfigNodeDescriptor.getInstance().getConf();
public void startUpCheck() throws StartupException, IOException, ConfigurationException {
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 a88c8461c2..dd1d50de53 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
@@ -50,7 +50,7 @@ public class SystemPropertiesUtils {
+ File.separator
+ ConfigNodeConstant.SYSTEM_FILE_NAME);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private static final ConfigNodeConfig CONFIG_NODE_CONFIG = ConfigNodeDescriptor.getInstance().getConf();
/**
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 665a62006f..4a75cb4865 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
@@ -22,6 +22,7 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.auth.AuthException;
import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory;
+import org.apache.iotdb.commons.conf.CommonConfig;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.consensus.ConsensusGroupId;
import org.apache.iotdb.commons.file.SystemFileFactory;
@@ -60,7 +61,9 @@ public class ConfigNodeRegionStateMachine
private static final ExecutorService threadPool =
IoTDBThreadPoolFactory.newCachedThreadPool("CQ-recovery");
- private static final ConfigNodeConfig CONF = ConfigNodeDescriptor.getInstance().getConf();
+
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
+ private static final ConfigNodeConfig CONFIG_NODE_CONFIG = ConfigNodeDescriptor.getInstance().getConf();
private final ConfigPlanExecutor executor;
private ConfigManager configManager;
private LogWriter logWriter;
@@ -69,12 +72,12 @@ public class ConfigNodeRegionStateMachine
private int endIndex;
private static final String CURRENT_FILE_DIR =
- CONF.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 =
- CONF.getConfigNodeSimpleConsensusLogSegmentSizeMax();
+ COMMON_CONFIG.getConfigNodeSimpleConsensusLogSegmentSizeMax();
private final TEndPoint currentNodeTEndPoint;
public ConfigNodeRegionStateMachine(ConfigManager configManager, ConfigPlanExecutor executor) {
@@ -130,7 +133,7 @@ public class ConfigNodeRegionStateMachine
result = new TSStatus(TSStatusCode.INTERNAL_SERVER_ERROR.getStatusCode());
}
- if (ConsensusFactory.SIMPLE_CONSENSUS.equals(CONF.getConfigNodeConsensusProtocolClass())) {
+ if (ConsensusFactory.SIMPLE_CONSENSUS.equals(COMMON_CONFIG.getConfigNodeConsensusProtocolClass().getProtocol())) {
writeLogForSimpleConsensus(plan);
}
return result;
@@ -226,7 +229,7 @@ public class ConfigNodeRegionStateMachine
@Override
public void start() {
- if (ConsensusFactory.SIMPLE_CONSENSUS.equals(CONF.getConfigNodeConsensusProtocolClass())) {
+ if (ConsensusFactory.SIMPLE_CONSENSUS.equals(COMMON_CONFIG.getConfigNodeConsensusProtocolClass().getProtocol())) {
initStandAloneConfigNode();
}
}
@@ -238,7 +241,7 @@ public class ConfigNodeRegionStateMachine
@Override
public boolean isReadOnly() {
- return CommonDescriptor.getInstance().getConfig().isReadOnly();
+ return CommonDescriptor.getInstance().getConf().isReadOnly();
}
@Override
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 6f42d68514..d7fe3e0528 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
@@ -33,8 +33,6 @@ 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.client.sync.SyncDataNodeClientPool;
-import org.apache.iotdb.confignode.conf.ConfigNodeConfig;
-import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
import org.apache.iotdb.confignode.consensus.request.read.storagegroup.CountStorageGroupPlan;
import org.apache.iotdb.confignode.consensus.request.read.storagegroup.GetStorageGroupPlan;
import org.apache.iotdb.confignode.consensus.request.read.template.CheckTemplateSettablePlan;
@@ -101,7 +99,7 @@ public class ClusterSchemaManager {
private static final Logger LOGGER = LoggerFactory.getLogger(ClusterSchemaManager.class);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
+ 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 DATA_REGION_PER_PROCESSOR = COMMON_CONFIG.getDataRegionPerProcessor();
@@ -357,7 +355,7 @@ public class ClusterSchemaManager {
storageGroupSchema.getName(), TConsensusGroupType.SchemaRegion);
int maxSchemaRegionGroupNum =
calcMaxRegionGroupNum(
- CONF.getLeastSchemaRegionGroupNum(),
+ COMMON_CONFIG.getLeastSchemaRegionGroupNum(),
SCHEMA_REGION_PER_DATA_NODE,
dataNodeNum,
storageGroupNum,
@@ -376,7 +374,7 @@ public class ClusterSchemaManager {
.getRegionGroupCount(storageGroupSchema.getName(), TConsensusGroupType.DataRegion);
int maxDataRegionGroupNum =
calcMaxRegionGroupNum(
- CONF.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 47b8ad6e1e..cacc165a58 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
@@ -40,7 +40,6 @@ import org.apache.iotdb.commons.sync.pipe.PipeMessage;
import org.apache.iotdb.commons.utils.AuthUtils;
import org.apache.iotdb.commons.utils.PathUtils;
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.conf.SystemPropertiesUtils;
import org.apache.iotdb.confignode.consensus.request.auth.AuthorPlan;
@@ -179,7 +178,7 @@ public class ConfigManager implements IManager {
private static final Logger LOGGER = LoggerFactory.getLogger(ConfigManager.class);
- private static final CommonConfig COMMON_CONF = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONF = CommonDescriptor.getInstance().getConf();
/** Manage PartitionTable read/write requests through the ConsensusLayer */
private volatile ConsensusManager consensusManager;
@@ -905,7 +904,7 @@ public class ConfigManager implements IManager {
}
if (clusterParameters.getDefaultTTL()
- != CommonDescriptor.getInstance().getConfig().getDefaultTtlInMs()) {
+ != CommonDescriptor.getInstance().getConf().getDefaultTtlInMs()) {
return errorStatus.setMessage(errorPrefix + "default_ttl" + errorSuffix);
}
if (clusterParameters.getTimePartitionInterval() != COMMON_CONF.getTimePartitionInterval()) {
@@ -931,7 +930,7 @@ public class ConfigManager implements IManager {
}
if (clusterParameters.getDiskSpaceWarningThreshold()
- != CommonDescriptor.getInstance().getConfig().getDiskSpaceWarningThreshold()) {
+ != CommonDescriptor.getInstance().getConf().getDiskSpaceWarningThreshold()) {
return errorStatus.setMessage(errorPrefix + "disk_space_warning_threshold" + 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 443b80971c..f2b2869a66 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
@@ -61,7 +61,7 @@ public class ConsensusManager {
private static final Logger LOGGER = LoggerFactory.getLogger(ConsensusManager.class);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private static final ConfigNodeConfig CONFIG_NODE_CONFIG = ConfigNodeDescriptor.getInstance().getConf();
private static final int SEED_CONFIG_NODE_ID = 0;
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 e92c5eb51f..bfb4552475 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
@@ -25,6 +25,8 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeConfiguration;
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.cluster.NodeStatus;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.exception.IoTDBException;
import org.apache.iotdb.commons.exception.sync.PipeException;
@@ -97,8 +99,7 @@ import java.util.stream.Collectors;
public class ProcedureManager {
private static final Logger LOGGER = LoggerFactory.getLogger(ProcedureManager.class);
- private static final ConfigNodeConfig CONFIG_NODE_CONFIG =
- ConfigNodeDescriptor.getInstance().getConf();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private static final int PROCEDURE_WAIT_TIME_OUT = 30;
private static final int PROCEDURE_WAIT_RETRY_TIMEOUT = 250;
@@ -118,7 +119,7 @@ public class ProcedureManager {
this.env = new ConfigNodeProcedureEnv(configManager, scheduler);
this.executor = new ProcedureExecutor<>(env, store, scheduler);
this.planSizeLimit =
- ConfigNodeDescriptor.getInstance()
+ CommonDescriptor.getInstance()
.getConf()
.getConfigNodeRatisConsensusLogAppenderBufferSize()
- IoTDBConstant.RAFT_LOG_BASIC_SIZE;
@@ -127,11 +128,11 @@ public class ProcedureManager {
public void shiftExecutor(boolean running) {
if (running) {
if (!executor.isRunning()) {
- executor.init(CONFIG_NODE_CONFIG.getProcedureCoreWorkerThreadsCount());
+ executor.init(COMMON_CONFIG.getProcedureCoreWorkerThreadsCount());
executor.startWorkers();
executor.startCompletedCleaner(
- CONFIG_NODE_CONFIG.getProcedureCompletedCleanInterval(),
- CONFIG_NODE_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 97666a005b..c78dfd2721 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
@@ -23,6 +23,7 @@ import org.apache.iotdb.common.rpc.thrift.TSStatus;
import org.apache.iotdb.commons.cluster.NodeStatus;
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.confignode.client.DataNodeRequestType;
import org.apache.iotdb.confignode.client.async.AsyncDataNodeClientPool;
import org.apache.iotdb.confignode.client.async.handlers.AsyncClientHandler;
@@ -57,8 +58,7 @@ public class RetryFailedTasksThread {
private static final Logger LOGGER = LoggerFactory.getLogger(RetryFailedTasksThread.class);
- private static final ConfigNodeConfig CONF = ConfigNodeDescriptor.getInstance().getConf();
- private static final long HEARTBEAT_INTERVAL = CONF.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 38d177911c..7e63fcd135 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
@@ -21,6 +21,7 @@ package org.apache.iotdb.confignode.manager;
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.udf.UDFInformation;
import org.apache.iotdb.confignode.client.DataNodeRequestType;
@@ -60,7 +61,7 @@ public class UDFManager {
private final UDFInfo udfInfo;
private final long planSizeLimit =
- ConfigNodeDescriptor.getInstance()
+ CommonDescriptor.getInstance()
.getConf()
.getConfigNodeRatisConsensusLogAppenderBufferSize()
- IoTDBConstant.RAFT_LOG_BASIC_SIZE;
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 b23d2fa11f..0b16aae240 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
@@ -27,6 +27,7 @@ import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot;
import org.apache.iotdb.commons.cluster.NodeStatus;
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.commons.partition.DataPartitionTable;
import org.apache.iotdb.commons.partition.SchemaPartitionTable;
import org.apache.iotdb.commons.service.metric.MetricService;
@@ -78,8 +79,7 @@ public class LoadManager {
private static final Logger LOGGER = LoggerFactory.getLogger(LoadManager.class);
- private static final ConfigNodeConfig CONF = ConfigNodeDescriptor.getInstance().getConf();
- private static final long HEARTBEAT_INTERVAL = CONF.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 56bb87f033..4c3986343e 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
@@ -29,7 +29,6 @@ import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory;
import org.apache.iotdb.commons.concurrent.threadpool.ScheduledExecutorUtil;
import org.apache.iotdb.commons.conf.CommonConfig;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.commons.loadbalance.LeaderDistributionPolicy;
import org.apache.iotdb.confignode.client.DataNodeRequestType;
import org.apache.iotdb.confignode.client.async.AsyncDataNodeClientPool;
import org.apache.iotdb.confignode.client.async.handlers.AsyncClientHandler;
@@ -74,7 +73,7 @@ public class RouteBalancer {
private static final Logger LOGGER = LoggerFactory.getLogger(RouteBalancer.class);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
+ 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();
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 996cf57116..3745dbff12 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
@@ -22,11 +22,11 @@ import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType;
import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot;
import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.partition.DataPartitionTable;
import org.apache.iotdb.commons.partition.SchemaPartitionTable;
import org.apache.iotdb.commons.partition.SeriesPartitionTable;
-import org.apache.iotdb.confignode.conf.ConfigNodeConfig;
-import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
import org.apache.iotdb.confignode.exception.NoAvailableRegionGroupException;
import org.apache.iotdb.confignode.manager.IManager;
import org.apache.iotdb.confignode.manager.partition.PartitionManager;
@@ -42,10 +42,10 @@ import java.util.concurrent.ConcurrentHashMap;
/** Allocating new Partitions by greedy algorithm */
public class GreedyPartitionAllocator implements IPartitionAllocator {
- private static final ConfigNodeConfig CONF = ConfigNodeDescriptor.getInstance().getConf();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private static final boolean ENABLE_DATA_PARTITION_INHERIT_POLICY =
- CONF.isEnableDataPartitionInheritPolicy();
- private static final long TIME_PARTITION_INTERVAL = CONF.getTimePartitionInterval();
+ 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/node/ClusterNodeStartUtils.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/ClusterNodeStartUtils.java
index 8e660cbed7..b988e0ee11 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/ClusterNodeStartUtils.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/ClusterNodeStartUtils.java
@@ -28,7 +28,6 @@ import org.apache.iotdb.commons.cluster.NodeType;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.confignode.conf.ConfigNodeConstant;
-import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
import org.apache.iotdb.confignode.manager.ConfigManager;
import org.apache.iotdb.confignode.manager.node.heartbeat.BaseNodeCache;
import org.apache.iotdb.rpc.TSStatusCode;
@@ -42,7 +41,7 @@ import java.util.Set;
public class ClusterNodeStartUtils {
private static final String CLUSTER_NAME =
- CommonDescriptor.getInstance().getConfig().getClusterName();
+ CommonDescriptor.getInstance().getConf().getClusterName();
private static final String POSSIBLE_SOLUTIONS = " Possible solutions are as follows:\r\n";
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java b/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java
index 6e92301056..7805a3bee0 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java
@@ -107,7 +107,7 @@ public class NodeManager {
private static final Logger LOGGER = LoggerFactory.getLogger(NodeManager.class);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private static final ConfigNodeConfig CONFIG_NODE_CONFIG =
ConfigNodeDescriptor.getInstance().getConf();
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 384b4adf24..3a654d0c6a 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
@@ -38,8 +38,6 @@ import org.apache.iotdb.commons.partition.executor.SeriesPartitionExecutor;
import org.apache.iotdb.commons.service.metric.MetricService;
import org.apache.iotdb.confignode.client.DataNodeRequestType;
import org.apache.iotdb.confignode.client.sync.SyncDataNodeClientPool;
-import org.apache.iotdb.confignode.conf.ConfigNodeConfig;
-import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
import org.apache.iotdb.confignode.consensus.request.read.partition.GetDataPartitionPlan;
import org.apache.iotdb.confignode.consensus.request.read.partition.GetNodePathsPartitionPlan;
import org.apache.iotdb.confignode.consensus.request.read.partition.GetOrCreateDataPartitionPlan;
@@ -107,7 +105,7 @@ public class PartitionManager {
private static final Logger LOGGER = LoggerFactory.getLogger(PartitionManager.class);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private static final RegionGroupExtensionPolicy SCHEMA_REGION_GROUP_EXTENSION_POLICY =
COMMON_CONFIG.getSchemaRegionGroupExtensionPolicy();
private static final int SCHEMA_REGION_GROUP_PER_DATABASE =
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/AuthorInfo.java b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/AuthorInfo.java
index 3f7a473bc5..d46053de40 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/AuthorInfo.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/AuthorInfo.java
@@ -60,7 +60,7 @@ import java.util.Set;
public class AuthorInfo implements SnapshotProcessor {
private static final Logger logger = LoggerFactory.getLogger(AuthorInfo.class);
- private static final CommonConfig commonConfig = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig commonConfig = CommonDescriptor.getInstance().getConf();
private IAuthorizer authorizer;
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/ProcedureInfo.java b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/ProcedureInfo.java
index aebab36ddb..69b82019de 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/persistence/ProcedureInfo.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/persistence/ProcedureInfo.java
@@ -46,7 +46,7 @@ public class ProcedureInfo {
private final ProcedureFactory procedureFactory = ProcedureFactory.getInstance();
private final String procedureWalDir =
- CommonDescriptor.getInstance().getConfig().getProcedureWalFolder();
+ CommonDescriptor.getInstance().getConf().getProcedureWalFolder();
private final ConcurrentHashMap<Long, ProcedureWAL> procWALMap = new ConcurrentHashMap<>();
public void load(List<Procedure> procedureList) {
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 54fa77e2da..5d029397cc 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
@@ -21,6 +21,8 @@ package org.apache.iotdb.confignode.persistence;
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.executable.ExecutableManager;
import org.apache.iotdb.commons.snapshot.SnapshotProcessor;
import org.apache.iotdb.commons.trigger.TriggerInformation;
@@ -28,8 +30,6 @@ import org.apache.iotdb.commons.trigger.TriggerTable;
import org.apache.iotdb.commons.trigger.exception.TriggerManagementException;
import org.apache.iotdb.commons.trigger.service.TriggerExecutableManager;
import org.apache.iotdb.commons.utils.TestOnly;
-import org.apache.iotdb.confignode.conf.ConfigNodeConfig;
-import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
import org.apache.iotdb.confignode.consensus.request.read.trigger.GetTriggerJarPlan;
import org.apache.iotdb.confignode.consensus.request.read.trigger.GetTriggerLocationPlan;
import org.apache.iotdb.confignode.consensus.request.read.trigger.GetTriggerTablePlan;
@@ -69,8 +69,8 @@ import java.util.concurrent.locks.ReentrantLock;
public class TriggerInfo implements SnapshotProcessor {
private static final Logger LOGGER = LoggerFactory.getLogger(TriggerInfo.class);
- private static final ConfigNodeConfig CONFIG_NODE_CONF =
- ConfigNodeDescriptor.getInstance().getConf();
+ private static final CommonConfig COMMON_CONFIG =
+ CommonDescriptor.getInstance().getConf();
private final TriggerTable triggerTable;
private final Map<String, String> existedJarToMD5;
@@ -88,7 +88,7 @@ public class TriggerInfo implements SnapshotProcessor {
// jarReferenceTable = new ConcurrentHashMap<>();
triggerExecutableManager =
TriggerExecutableManager.setupAndGetInstance(
- CONFIG_NODE_CONF.getTriggerTemporaryLibDir(), CONFIG_NODE_CONF.getTriggerDir());
+ COMMON_CONFIG.getTriggerTemporaryLibDir(), COMMON_CONFIG.getTriggerDir());
}
public void acquireTriggerTableLock() {
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 dc9e695d4f..b1344fd5bc 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
@@ -20,14 +20,14 @@
package org.apache.iotdb.confignode.persistence;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.executable.ExecutableManager;
import org.apache.iotdb.commons.snapshot.SnapshotProcessor;
import org.apache.iotdb.commons.udf.UDFInformation;
import org.apache.iotdb.commons.udf.UDFTable;
import org.apache.iotdb.commons.udf.service.UDFExecutableManager;
import org.apache.iotdb.commons.utils.TestOnly;
-import org.apache.iotdb.confignode.conf.ConfigNodeConfig;
-import org.apache.iotdb.confignode.conf.ConfigNodeDescriptor;
import org.apache.iotdb.confignode.consensus.request.read.udf.GetUDFJarPlan;
import org.apache.iotdb.confignode.consensus.request.write.function.CreateFunctionPlan;
import org.apache.iotdb.confignode.consensus.request.write.function.DropFunctionPlan;
@@ -59,8 +59,8 @@ public class UDFInfo implements SnapshotProcessor {
private static final Logger LOGGER = LoggerFactory.getLogger(UDFInfo.class);
- private static final ConfigNodeConfig CONFIG_NODE_CONF =
- ConfigNodeDescriptor.getInstance().getConf();
+ private static final CommonConfig COMMON_CONFIG =
+ CommonDescriptor.getInstance().getConf();
private final UDFTable udfTable;
private final Map<String, String> existedJarToMD5;
@@ -76,7 +76,7 @@ public class UDFInfo implements SnapshotProcessor {
existedJarToMD5 = new HashMap<>();
udfExecutableManager =
UDFExecutableManager.setupAndGetInstance(
- CONFIG_NODE_CONF.getUdfTemporaryLibDir(), CONFIG_NODE_CONF.getUdfDir());
+ COMMON_CONFIG.getUdfTemporaryLibDir(), COMMON_CONFIG.getUdfDir());
}
public void acquireUDFTableLock() {
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/store/ConfigProcedureStore.java b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/store/ConfigProcedureStore.java
index ef27ed492f..1a6e4b6eaa 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/procedure/store/ConfigProcedureStore.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/procedure/store/ConfigProcedureStore.java
@@ -41,7 +41,7 @@ public class ConfigProcedureStore implements IProcedureStore {
private volatile boolean isRunning = false;
private final ProcedureInfo procedureInfo;
private final String procedureWalDir =
- CommonDescriptor.getInstance().getConfig().getProcedureWalFolder();
+ CommonDescriptor.getInstance().getConf().getProcedureWalFolder();
private final ConfigManager configManager;
public ConfigProcedureStore(ConfigManager configManager, ProcedureInfo procedureInfo) {
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 123199d841..ceff41d5b5 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
@@ -40,7 +40,7 @@ public class ProcedureStore implements IProcedureStore {
private static final Logger LOG = LoggerFactory.getLogger(ProcedureStore.class);
private String procedureWalDir =
- CommonDescriptor.getInstance().getConfig().getProcedureWalFolder();
+ 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 931b6966ef..8c18ae25da 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
@@ -57,7 +57,7 @@ public class ConfigNode implements ConfigNodeMBean {
private static final Logger LOGGER = LoggerFactory.getLogger(ConfigNode.class);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private static final ConfigNodeConfig CONFIG_NODE_CONFIG = ConfigNodeDescriptor.getInstance().getConf();
private static final int STARTUP_RETRY_NUM = 10;
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java
index dd15d36229..07ba7ac1b7 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java
@@ -35,7 +35,7 @@ import org.apache.iotdb.confignode.rpc.thrift.IConfigNodeRPCService;
public class ConfigNodeRPCService extends ThriftService implements ConfigNodeRPCServiceMBean {
private static final ConfigNodeConfig configConf = ConfigNodeDescriptor.getInstance().getConf();
- private static final CommonConfig commonConfig = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig commonConfig = CommonDescriptor.getInstance().getConf();
private ConfigNodeRPCServiceProcessor configNodeRPCServiceProcessor;
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
index 1c98553867..646bae2e1f 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
@@ -276,7 +276,7 @@ public class ConfigNodeRPCServiceProcessor implements IConfigNodeRPCService.Ifac
// Set default configurations if necessary
if (!storageGroupSchema.isSetTTL()) {
- storageGroupSchema.setTTL(CommonDescriptor.getInstance().getConfig().getDefaultTtlInMs());
+ storageGroupSchema.setTTL(CommonDescriptor.getInstance().getConf().getDefaultTtlInMs());
}
if (!storageGroupSchema.isSetSchemaReplicationFactor()) {
storageGroupSchema.setSchemaReplicationFactor(
@@ -487,7 +487,7 @@ public class ConfigNodeRPCServiceProcessor implements IConfigNodeRPCService.Ifac
LOGGER.info(
"{} has successfully started and joined the cluster: {}.",
ConfigNodeConstant.GLOBAL_NAME,
- CommonDescriptor.getInstance().getConfig().getClusterName());
+ CommonDescriptor.getInstance().getConf().getClusterName());
return StatusUtils.OK;
}
diff --git a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java
index 1375a88cca..e225c8cc27 100644
--- a/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java
+++ b/consensus/src/main/java/org/apache/iotdb/consensus/ratis/RatisConsensus.java
@@ -239,7 +239,7 @@ class RatisConsensus implements IConsensus {
}
// current Peer is group leader and in ReadOnly State
- if (isLeader(consensusGroupId) && CommonDescriptor.getInstance().getConfig().isReadOnly()) {
+ if (isLeader(consensusGroupId) && CommonDescriptor.getInstance().getConf().isReadOnly()) {
try {
forceStepDownLeader(raftGroup);
} catch (Exception e) {
diff --git a/influxdb-protocol/src/main/java/org/apache/iotdb/influxdb/session/InfluxDBSession.java b/influxdb-protocol/src/main/java/org/apache/iotdb/influxdb/session/InfluxDBSession.java
index 2ba99f1b19..614445fe06 100644
--- a/influxdb-protocol/src/main/java/org/apache/iotdb/influxdb/session/InfluxDBSession.java
+++ b/influxdb-protocol/src/main/java/org/apache/iotdb/influxdb/session/InfluxDBSession.java
@@ -135,7 +135,7 @@ public class InfluxDBSession {
throw new IoTDBConnectionException(e);
}
- if (IoTDBDescriptor.getInstance().getConfig().isDnRpcThriftCompressionEnable()) {
+ if (IoTDBDescriptor.getInstance().getConf().isDnRpcThriftCompressionEnable()) {
client = new InfluxDBService.Client(new TCompactProtocol(transport));
} else {
client = new InfluxDBService.Client(new TBinaryProtocol(transport));
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 667fe33d85..b7a8953bd1 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
@@ -19,6 +19,8 @@
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;
@@ -53,7 +55,7 @@ import static org.junit.Assert.fail;
@RunWith(IoTDBTestRunner.class)
@Category({LocalStandaloneIT.class, ClusterIT.class})
public class IoTDBRecoverUnclosedIT {
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final CommonConfig config = CommonDescriptor.getInstance().getConf();
private static final String TIMESTAMP_STR = "Time";
private static final String TEMPERATURE_STR = "root.ln.wf01.wt01.temperature";
diff --git a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRestartIT.java b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRestartIT.java
index e93497a5da..9f124960e8 100644
--- a/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRestartIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBRestartIT.java
@@ -18,6 +18,8 @@
*/
package org.apache.iotdb.db.it;
+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.it.env.EnvFactory;
@@ -314,13 +316,14 @@ public class IoTDBRestartIT {
@Test
public void testRecoverWALDeleteSchemaCheckResourceTime() throws Exception {
- IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
- int avgSeriesPointNumberThreshold = config.getAvgSeriesPointNumberThreshold();
- config.setAvgSeriesPointNumberThreshold(2);
- long tsFileSize = config.getSeqTsFileSize();
- long unFsFileSize = config.getSeqTsFileSize();
- config.setSeqTsFileSize(10000000);
- config.setUnSeqTsFileSize(10000000);
+ CommonConfig commonConfig = CommonDescriptor.getInstance().getConf();
+ IoTDBConfig iotdbConfig = IoTDBDescriptor.getInstance().getConf();
+ int avgSeriesPointNumberThreshold = commonConfig.getAvgSeriesPointNumberThreshold();
+ commonConfig.setAvgSeriesPointNumberThreshold(2);
+ long tsFileSize = iotdbConfig.getSeqTsFileSize();
+ long unFsFileSize = iotdbConfig.getSeqTsFileSize();
+ iotdbConfig.setSeqTsFileSize(10000000);
+ iotdbConfig.setUnSeqTsFileSize(10000000);
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
@@ -350,9 +353,9 @@ public class IoTDBRestartIT {
assertEquals(2, cnt);
}
- config.setAvgSeriesPointNumberThreshold(avgSeriesPointNumberThreshold);
- config.setSeqTsFileSize(tsFileSize);
- config.setUnSeqTsFileSize(unFsFileSize);
+ commonConfig.setAvgSeriesPointNumberThreshold(avgSeriesPointNumberThreshold);
+ iotdbConfig.setSeqTsFileSize(tsFileSize);
+ iotdbConfig.setUnSeqTsFileSize(unFsFileSize);
}
@Test
diff --git a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionComplexIT.java b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionComplexIT.java
index 2d2e8be5f3..edad069bd1 100644
--- a/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionComplexIT.java
+++ b/integration-test/src/test/java/org/apache/iotdb/session/it/IoTDBSessionComplexIT.java
@@ -268,7 +268,7 @@ public class IoTDBSessionComplexIT {
private void insertRecords(ISession session, List<String> deviceIdList)
throws IoTDBConnectionException, StatementExecutionException {
- long timePartition = IoTDBDescriptor.getInstance().getConfig().getDnTimePartitionInterval();
+ long timePartition = IoTDBDescriptor.getInstance().getConf().getDnTimePartitionInterval();
List<String> measurements = new ArrayList<>();
measurements.add("s1");
@@ -317,7 +317,7 @@ public class IoTDBSessionComplexIT {
private void insertMultiTablets(ISession session, List<String> deviceIdList)
throws IoTDBConnectionException, StatementExecutionException {
- long timePartition = IoTDBDescriptor.getInstance().getConfig().getDnTimePartitionInterval();
+ long timePartition = IoTDBDescriptor.getInstance().getConf().getDnTimePartitionInterval();
List<MeasurementSchema> schemaList = new ArrayList<>();
schemaList.add(new MeasurementSchema("s1", TSDataType.INT64));
schemaList.add(new MeasurementSchema("s2", TSDataType.INT64));
@@ -345,7 +345,7 @@ public class IoTDBSessionComplexIT {
private void insertRecordsOfOneDevice(ISession session, String deviceId)
throws IoTDBConnectionException, StatementExecutionException {
- long timePartition = IoTDBDescriptor.getInstance().getConfig().getDnTimePartitionInterval();
+ long timePartition = IoTDBDescriptor.getInstance().getConf().getDnTimePartitionInterval();
List<String> measurements = new ArrayList<>();
measurements.add("s1");
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 b7b9bd6090..6662c772e2 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
@@ -18,6 +18,7 @@
*/
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;
@@ -148,9 +149,9 @@ public class IoTDBSessionSimpleIT {
session.insertRecord(deviceId, 1L, measurements, values);
Set<String> expected = new HashSet<>();
- expected.add(IoTDBDescriptor.getInstance().getConfig().getIntegerStringInferType().name());
- expected.add(IoTDBDescriptor.getInstance().getConfig().getFloatingStringInferType().name());
- expected.add(IoTDBDescriptor.getInstance().getConfig().getBooleanStringInferType().name());
+ expected.add(CommonDescriptor.getInstance().getConf().getIntegerStringInferType().name());
+ expected.add(CommonDescriptor.getInstance().getConf().getFloatingStringInferType().name());
+ expected.add(CommonDescriptor.getInstance().getConf().getBooleanStringInferType().name());
expected.add(TSDataType.TEXT.name());
Set<String> actual = new HashSet<>();
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBCheckConfigIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBCheckConfigIT.java
index ad8b5709ed..1e3d3bffa2 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBCheckConfigIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBCheckConfigIT.java
@@ -50,7 +50,7 @@ import static org.junit.Assert.fail;
public class IoTDBCheckConfigIT {
private File propertiesFile =
SystemFileFactory.INSTANCE.getFile(
- IoTDBDescriptor.getInstance().getConfig().getSchemaDir()
+ IoTDBDescriptor.getInstance().getConf().getSchemaDir()
+ File.separator
+ "system.properties");
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBCompactionIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBCompactionIT.java
index d3f297d309..0d7aca8544 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBCompactionIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBCompactionIT.java
@@ -49,7 +49,7 @@ public class IoTDBCompactionIT {
@Before
public void setUp() throws Exception {
- prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getDnTimePartitionInterval();
+ prevPartitionInterval = IoTDBDescriptor.getInstance().getConf().getDnTimePartitionInterval();
ConfigFactory.getConfig().setPartitionInterval(1);
EnvFactory.getEnv().initBeforeTest();
}
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBCompactionWithIDTableIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBCompactionWithIDTableIT.java
index c6dd7ad71d..aa151ecce2 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBCompactionWithIDTableIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBCompactionWithIDTableIT.java
@@ -53,11 +53,11 @@ public class IoTDBCompactionWithIDTableIT {
@Before
public void setUp() throws Exception {
- prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getDnTimePartitionInterval();
+ prevPartitionInterval = IoTDBDescriptor.getInstance().getConf().getDnTimePartitionInterval();
ConfigFactory.getConfig().setPartitionInterval(1);
- isEnableIDTable = IoTDBDescriptor.getInstance().getConfig().isEnableIDTable();
+ isEnableIDTable = IoTDBDescriptor.getInstance().getConf().isEnableIDTable();
originalDeviceIDTransformationMethod =
- IoTDBDescriptor.getInstance().getConfig().getDeviceIDTransformationMethod();
+ IoTDBDescriptor.getInstance().getConf().getDeviceIDTransformationMethod();
ConfigFactory.getConfig().setEnableIDTable(true);
ConfigFactory.getConfig().setDeviceIDTransformationMethod("SHA256");
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 1a8603082b..3eeb865eef 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
@@ -68,27 +68,27 @@ public class IoTDBMaxTimeQueryIT {
EnvironmentUtils.envSetUp();
// TODO When the aligned time series support compaction, we need to set compaction to true
enableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
enableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
enableCrossSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableCrossSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().isEnableCrossSpaceCompaction();
numOfPointsPerPage = TSFileDescriptor.getInstance().getConfig().getMaxNumberOfPointsInPage();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false);
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
- IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().setEnableCrossSpaceCompaction(false);
TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(2);
insertData();
}
@AfterClass
public static void tearDown() throws Exception {
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction);
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableCrossSpaceCompaction(enableCrossSpaceCompaction);
TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(numOfPointsPerPage);
EnvironmentUtils.cleanEnv();
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 6d46814d0b..255cbae398 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
@@ -19,6 +19,7 @@
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;
@@ -50,7 +51,7 @@ public class IoTDBMultiOverlappedChunkInUnseqIT {
@BeforeClass
public static void setUp() throws Exception {
previousMemtableSizeThreshold =
- IoTDBDescriptor.getInstance().getConfig().getMemtableSizeThreshold();
+ CommonDescriptor.getInstance().getConf().getMemtableSizeThreshold();
ConfigFactory.getConfig().setMemtableSizeThreshold(1024);
EnvFactory.getEnv().initBeforeClass();
insertData();
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 31a37ce75c..184e96f79a 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
@@ -19,6 +19,7 @@
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;
@@ -53,7 +54,7 @@ public class IoTDBMultiOverlappedPageIT {
@BeforeClass
public static void setUp() throws Exception {
beforeMemtableSizeThreshold =
- IoTDBDescriptor.getInstance().getConfig().getMemtableSizeThreshold();
+ CommonDescriptor.getInstance().getConf().getMemtableSizeThreshold();
ConfigFactory.getConfig().setMemtableSizeThreshold(1024 * 16);
// max_number_of_points_in_page = 10
beforeMaxNumberOfPointsInPage =
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java
index eae5f483e8..7af8e5d4f0 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBMultiSeriesIT.java
@@ -71,7 +71,7 @@ public class IoTDBMultiSeriesIT {
ConfigFactory.getConfig().setPageSizeInByte(1024 * 150);
ConfigFactory.getConfig().setGroupSizeInByte(1024 * 1000);
ConfigFactory.getConfig().setMemtableSizeThreshold(1024 * 1000);
- prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getDnTimePartitionInterval();
+ prevPartitionInterval = IoTDBDescriptor.getInstance().getConf().getDnTimePartitionInterval();
ConfigFactory.getConfig().setPartitionInterval(100);
ConfigFactory.getConfig().setCompressor("LZ4");
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 7f0d6ab18b..024e62d22d 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
@@ -18,6 +18,7 @@
*/
package org.apache.iotdb.db.integration;
+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.exception.StorageEngineException;
@@ -61,10 +62,10 @@ public class IoTDBNewTsFileCompactionIT {
storageGroupPath = new PartialPath("root.newTsFileCompaction");
TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(1);
originCompactionFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- originSeqTsFileSize = IoTDBDescriptor.getInstance().getConfig().getSeqTsFileSize();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
- IoTDBDescriptor.getInstance().getConfig().setSeqTsFileSize(1);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ originSeqTsFileSize = IoTDBDescriptor.getInstance().getConf().getSeqTsFileSize();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(2);
+ IoTDBDescriptor.getInstance().getConf().setSeqTsFileSize(1);
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
@@ -81,12 +82,12 @@ public class IoTDBNewTsFileCompactionIT {
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(originCompactionFileNum);
TSFileDescriptor.getInstance()
.getConfig()
.setMaxNumberOfPointsInPage(preMaxNumberOfPointsInPage);
- IoTDBDescriptor.getInstance().getConfig().setSeqTsFileSize(originSeqTsFileSize);
+ IoTDBDescriptor.getInstance().getConf().setSeqTsFileSize(originSeqTsFileSize);
}
/**
@@ -100,13 +101,13 @@ public class IoTDBNewTsFileCompactionIT {
{"2", "2"}
};
int preAvgSeriesPointNumberThreshold =
- IoTDBDescriptor.getInstance().getConfig().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
Statement statement = connection.createStatement()) {
- IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(10000);
+ CommonDescriptor.getInstance().getConf().setAvgSeriesPointNumberThreshold(10000);
// first file
statement.execute("INSERT INTO root.newTsFileCompaction.d1(time,s1) values(1, 1)");
@@ -136,8 +137,8 @@ public class IoTDBNewTsFileCompactionIT {
e.printStackTrace();
fail();
} finally {
- IoTDBDescriptor.getInstance()
- .getConfig()
+ CommonDescriptor.getInstance()
+ .getConf()
.setAvgSeriesPointNumberThreshold(preAvgSeriesPointNumberThreshold);
}
}
@@ -154,13 +155,13 @@ public class IoTDBNewTsFileCompactionIT {
{"3", "3"}
};
int preAvgSeriesPointNumberThreshold =
- IoTDBDescriptor.getInstance().getConfig().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
Statement statement = connection.createStatement()) {
- IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(1);
+ CommonDescriptor.getInstance().getConf().setAvgSeriesPointNumberThreshold(1);
// first file
// two chunks
@@ -192,8 +193,8 @@ public class IoTDBNewTsFileCompactionIT {
e.printStackTrace();
fail();
} finally {
- IoTDBDescriptor.getInstance()
- .getConfig()
+ CommonDescriptor.getInstance()
+ .getConf()
.setAvgSeriesPointNumberThreshold(preAvgSeriesPointNumberThreshold);
}
}
@@ -210,13 +211,13 @@ public class IoTDBNewTsFileCompactionIT {
{"3", "3"},
};
int preAvgSeriesPointNumberThreshold =
- IoTDBDescriptor.getInstance().getConfig().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
Statement statement = connection.createStatement()) {
- IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(10000);
+ CommonDescriptor.getInstance().getConf().setAvgSeriesPointNumberThreshold(10000);
// first file
statement.execute("INSERT INTO root.newTsFileCompaction.d1(time,s1) values(1, 1)");
@@ -247,8 +248,8 @@ public class IoTDBNewTsFileCompactionIT {
e.printStackTrace();
fail();
} finally {
- IoTDBDescriptor.getInstance()
- .getConfig()
+ CommonDescriptor.getInstance()
+ .getConf()
.setAvgSeriesPointNumberThreshold(preAvgSeriesPointNumberThreshold);
}
}
@@ -267,13 +268,13 @@ public class IoTDBNewTsFileCompactionIT {
{"5", "5"},
};
int preAvgSeriesPointNumberThreshold =
- IoTDBDescriptor.getInstance().getConfig().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
Statement statement = connection.createStatement()) {
- IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(2);
+ CommonDescriptor.getInstance().getConf().setAvgSeriesPointNumberThreshold(2);
// first file
// one chunk with two pages
@@ -308,8 +309,8 @@ public class IoTDBNewTsFileCompactionIT {
e.printStackTrace();
fail();
} finally {
- IoTDBDescriptor.getInstance()
- .getConfig()
+ CommonDescriptor.getInstance()
+ .getConf()
.setAvgSeriesPointNumberThreshold(preAvgSeriesPointNumberThreshold);
}
}
@@ -326,13 +327,13 @@ public class IoTDBNewTsFileCompactionIT {
{"3", "3"},
};
int preAvgSeriesPointNumberThreshold =
- IoTDBDescriptor.getInstance().getConfig().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
Statement statement = connection.createStatement()) {
- IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(10000);
+ CommonDescriptor.getInstance().getConf().setAvgSeriesPointNumberThreshold(10000);
// first file
statement.execute("INSERT INTO root.newTsFileCompaction.d1(time,s1) values(1, 1)");
@@ -364,8 +365,8 @@ public class IoTDBNewTsFileCompactionIT {
e.printStackTrace();
fail();
} finally {
- IoTDBDescriptor.getInstance()
- .getConfig()
+ CommonDescriptor.getInstance()
+ .getConf()
.setAvgSeriesPointNumberThreshold(preAvgSeriesPointNumberThreshold);
}
}
@@ -383,13 +384,13 @@ public class IoTDBNewTsFileCompactionIT {
{"4", "4"},
};
int preAvgSeriesPointNumberThreshold =
- IoTDBDescriptor.getInstance().getConfig().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
Statement statement = connection.createStatement()) {
- IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(1);
+ CommonDescriptor.getInstance().getConf().setAvgSeriesPointNumberThreshold(1);
// first file
// two chunks
@@ -397,7 +398,7 @@ public class IoTDBNewTsFileCompactionIT {
statement.execute("INSERT INTO root.newTsFileCompaction.d1(time,s1) values(2, 2)");
statement.execute("FLUSH");
- IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(2);
+ CommonDescriptor.getInstance().getConf().setAvgSeriesPointNumberThreshold(2);
// second file
// two pages for one chunk
statement.execute("INSERT INTO root.newTsFileCompaction.d1(time,s1) values(3, 3)");
@@ -425,8 +426,8 @@ public class IoTDBNewTsFileCompactionIT {
e.printStackTrace();
fail();
} finally {
- IoTDBDescriptor.getInstance()
- .getConfig()
+ CommonDescriptor.getInstance()
+ .getConf()
.setAvgSeriesPointNumberThreshold(preAvgSeriesPointNumberThreshold);
}
}
@@ -444,13 +445,13 @@ public class IoTDBNewTsFileCompactionIT {
{"4", "4"}
};
int preAvgSeriesPointNumberThreshold =
- IoTDBDescriptor.getInstance().getConfig().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
Statement statement = connection.createStatement()) {
- IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(10000);
+ CommonDescriptor.getInstance().getConf().setAvgSeriesPointNumberThreshold(10000);
// first file
statement.execute("INSERT INTO root.newTsFileCompaction.d1(time,s1) values(1, 1)");
@@ -482,8 +483,8 @@ public class IoTDBNewTsFileCompactionIT {
e.printStackTrace();
fail();
} finally {
- IoTDBDescriptor.getInstance()
- .getConfig()
+ CommonDescriptor.getInstance()
+ .getConf()
.setAvgSeriesPointNumberThreshold(preAvgSeriesPointNumberThreshold);
}
}
@@ -503,13 +504,13 @@ public class IoTDBNewTsFileCompactionIT {
{"6", "6"}
};
int preAvgSeriesPointNumberThreshold =
- IoTDBDescriptor.getInstance().getConfig().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
Statement statement = connection.createStatement()) {
- IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(2);
+ CommonDescriptor.getInstance().getConf().setAvgSeriesPointNumberThreshold(2);
// first file
// one chunk with two pages
@@ -546,8 +547,8 @@ public class IoTDBNewTsFileCompactionIT {
e.printStackTrace();
fail();
} finally {
- IoTDBDescriptor.getInstance()
- .getConfig()
+ CommonDescriptor.getInstance()
+ .getConf()
.setAvgSeriesPointNumberThreshold(preAvgSeriesPointNumberThreshold);
}
}
@@ -564,19 +565,19 @@ public class IoTDBNewTsFileCompactionIT {
{"3", "3"},
};
int preAvgSeriesPointNumberThreshold =
- IoTDBDescriptor.getInstance().getConfig().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
Statement statement = connection.createStatement()) {
- IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(10000);
+ CommonDescriptor.getInstance().getConf().setAvgSeriesPointNumberThreshold(10000);
// first file
statement.execute("INSERT INTO root.newTsFileCompaction.d1(time,s1) values(1, 1)");
statement.execute("FLUSH");
- IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(1);
+ CommonDescriptor.getInstance().getConf().setAvgSeriesPointNumberThreshold(1);
// second file
// two pages for one chunk
statement.execute("INSERT INTO root.newTsFileCompaction.d1(time,s1) values(2, 2)");
@@ -603,8 +604,8 @@ public class IoTDBNewTsFileCompactionIT {
e.printStackTrace();
fail();
} finally {
- IoTDBDescriptor.getInstance()
- .getConfig()
+ CommonDescriptor.getInstance()
+ .getConf()
.setAvgSeriesPointNumberThreshold(preAvgSeriesPointNumberThreshold);
}
}
@@ -622,13 +623,13 @@ public class IoTDBNewTsFileCompactionIT {
{"4", "4"}
};
int preAvgSeriesPointNumberThreshold =
- IoTDBDescriptor.getInstance().getConfig().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
Statement statement = connection.createStatement()) {
- IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(1);
+ CommonDescriptor.getInstance().getConf().setAvgSeriesPointNumberThreshold(1);
// first file
// two chunks
@@ -669,8 +670,8 @@ public class IoTDBNewTsFileCompactionIT {
e.printStackTrace();
fail();
} finally {
- IoTDBDescriptor.getInstance()
- .getConfig()
+ CommonDescriptor.getInstance()
+ .getConf()
.setAvgSeriesPointNumberThreshold(preAvgSeriesPointNumberThreshold);
}
}
@@ -688,19 +689,19 @@ public class IoTDBNewTsFileCompactionIT {
{"4", "4"}
};
int preAvgSeriesPointNumberThreshold =
- IoTDBDescriptor.getInstance().getConfig().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
Statement statement = connection.createStatement()) {
- IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(10000);
+ CommonDescriptor.getInstance().getConf().setAvgSeriesPointNumberThreshold(10000);
// first file
statement.execute("INSERT INTO root.newTsFileCompaction.d1(time,s1) values(1, 1)");
statement.execute("INSERT INTO root.newTsFileCompaction.d1(time,s1) values(2, 2)");
statement.execute("FLUSH");
- IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(1);
+ CommonDescriptor.getInstance().getConf().setAvgSeriesPointNumberThreshold(1);
// second file
statement.execute("INSERT INTO root.newTsFileCompaction.d1(time,s1) values(3, 3)");
statement.execute("INSERT INTO root.newTsFileCompaction.d1(time,s1) values(4, 4)");
@@ -726,8 +727,8 @@ public class IoTDBNewTsFileCompactionIT {
e.printStackTrace();
fail();
} finally {
- IoTDBDescriptor.getInstance()
- .getConfig()
+ CommonDescriptor.getInstance()
+ .getConf()
.setAvgSeriesPointNumberThreshold(preAvgSeriesPointNumberThreshold);
}
}
@@ -747,13 +748,13 @@ public class IoTDBNewTsFileCompactionIT {
{"6", "6"}
};
int preAvgSeriesPointNumberThreshold =
- IoTDBDescriptor.getInstance().getConfig().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
Statement statement = connection.createStatement()) {
- IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(2);
+ CommonDescriptor.getInstance().getConf().setAvgSeriesPointNumberThreshold(2);
// first file
// one chunk with two pages
statement.execute("INSERT INTO root.newTsFileCompaction.d1(time,s1) values(1, 1)");
@@ -763,7 +764,7 @@ public class IoTDBNewTsFileCompactionIT {
statement.execute("INSERT INTO root.newTsFileCompaction.d1(time,s1) values(4, 4)");
statement.execute("FLUSH");
- IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(1);
+ CommonDescriptor.getInstance().getConf().setAvgSeriesPointNumberThreshold(1);
// second file
// two pages for one chunk
statement.execute("INSERT INTO root.newTsFileCompaction.d1(time,s1) values(5, 5)");
@@ -790,8 +791,8 @@ public class IoTDBNewTsFileCompactionIT {
e.printStackTrace();
fail();
} finally {
- IoTDBDescriptor.getInstance()
- .getConfig()
+ CommonDescriptor.getInstance()
+ .getConf()
.setAvgSeriesPointNumberThreshold(preAvgSeriesPointNumberThreshold);
}
}
@@ -810,19 +811,19 @@ public class IoTDBNewTsFileCompactionIT {
{"5", "5"}
};
int preAvgSeriesPointNumberThreshold =
- IoTDBDescriptor.getInstance().getConfig().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
Statement statement = connection.createStatement()) {
- IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(10000);
+ CommonDescriptor.getInstance().getConf().setAvgSeriesPointNumberThreshold(10000);
// first file
statement.execute("INSERT INTO root.newTsFileCompaction.d1(time,s1) values(1, 1)");
statement.execute("FLUSH");
- IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(2);
+ CommonDescriptor.getInstance().getConf().setAvgSeriesPointNumberThreshold(2);
// second file
// one chunk with two pages
statement.execute("INSERT INTO root.newTsFileCompaction.d1(time,s1) values(2, 2)");
@@ -852,8 +853,8 @@ public class IoTDBNewTsFileCompactionIT {
e.printStackTrace();
fail();
} finally {
- IoTDBDescriptor.getInstance()
- .getConfig()
+ CommonDescriptor.getInstance()
+ .getConf()
.setAvgSeriesPointNumberThreshold(preAvgSeriesPointNumberThreshold);
}
}
@@ -873,13 +874,13 @@ public class IoTDBNewTsFileCompactionIT {
{"6", "6"}
};
int preAvgSeriesPointNumberThreshold =
- IoTDBDescriptor.getInstance().getConfig().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
Statement statement = connection.createStatement()) {
- IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(1);
+ CommonDescriptor.getInstance().getConf().setAvgSeriesPointNumberThreshold(1);
// first file
// two chunks
@@ -887,7 +888,7 @@ public class IoTDBNewTsFileCompactionIT {
statement.execute("INSERT INTO root.newTsFileCompaction.d1(time,s1) values(2, 2)");
statement.execute("FLUSH");
- IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(2);
+ CommonDescriptor.getInstance().getConf().setAvgSeriesPointNumberThreshold(2);
// second file
// one chunk with two pages
statement.execute("INSERT INTO root.newTsFileCompaction.d1(time,s1) values(3, 3)");
@@ -917,8 +918,8 @@ public class IoTDBNewTsFileCompactionIT {
e.printStackTrace();
fail();
} finally {
- IoTDBDescriptor.getInstance()
- .getConfig()
+ CommonDescriptor.getInstance()
+ .getConf()
.setAvgSeriesPointNumberThreshold(preAvgSeriesPointNumberThreshold);
}
}
@@ -938,13 +939,13 @@ public class IoTDBNewTsFileCompactionIT {
{"6", "6"}
};
int preAvgSeriesPointNumberThreshold =
- IoTDBDescriptor.getInstance().getConfig().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
Statement statement = connection.createStatement()) {
- IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(10000);
+ CommonDescriptor.getInstance().getConf().setAvgSeriesPointNumberThreshold(10000);
// first file
// two pages for one chunk
@@ -952,7 +953,7 @@ public class IoTDBNewTsFileCompactionIT {
statement.execute("INSERT INTO root.newTsFileCompaction.d1(time,s1) values(2, 2)");
statement.execute("FLUSH");
- IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(2);
+ CommonDescriptor.getInstance().getConf().setAvgSeriesPointNumberThreshold(2);
// second file
// one chunk with two pages
statement.execute("INSERT INTO root.newTsFileCompaction.d1(time,s1) values(3, 3)");
@@ -982,8 +983,8 @@ public class IoTDBNewTsFileCompactionIT {
e.printStackTrace();
fail();
} finally {
- IoTDBDescriptor.getInstance()
- .getConfig()
+ CommonDescriptor.getInstance()
+ .getConf()
.setAvgSeriesPointNumberThreshold(preAvgSeriesPointNumberThreshold);
}
}
@@ -1005,13 +1006,13 @@ public class IoTDBNewTsFileCompactionIT {
{"8", "8"}
};
int preAvgSeriesPointNumberThreshold =
- IoTDBDescriptor.getInstance().getConfig().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
try (Connection connection =
DriverManager.getConnection(
Config.IOTDB_URL_PREFIX + "127.0.0.1:6667/", "root", "root");
Statement statement = connection.createStatement()) {
- IoTDBDescriptor.getInstance().getConfig().setAvgSeriesPointNumberThreshold(2);
+ CommonDescriptor.getInstance().getConf().setAvgSeriesPointNumberThreshold(2);
// first file
// one chunk with two pages
statement.execute("INSERT INTO root.newTsFileCompaction.d1(time,s1) values(1, 1)");
@@ -1051,8 +1052,8 @@ public class IoTDBNewTsFileCompactionIT {
fail();
} finally {
- IoTDBDescriptor.getInstance()
- .getConfig()
+ CommonDescriptor.getInstance()
+ .getConf()
.setAvgSeriesPointNumberThreshold(preAvgSeriesPointNumberThreshold);
}
}
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBQueryWithIDTableIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBQueryWithIDTableIT.java
index ac3b406f0c..892f6ef43c 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBQueryWithIDTableIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBQueryWithIDTableIT.java
@@ -108,10 +108,10 @@ public class IoTDBQueryWithIDTableIT {
@BeforeClass
public static void setUp() throws Exception {
- IoTDBDescriptor.getInstance().getConfig().setAutoCreateSchemaEnabled(true);
- isEnableIDTable = IoTDBDescriptor.getInstance().getConfig().isEnableIDTable();
+ IoTDBDescriptor.getInstance().getConf().setAutoCreateSchemaEnabled(true);
+ isEnableIDTable = IoTDBDescriptor.getInstance().getConf().isEnableIDTable();
originalDeviceIDTransformationMethod =
- IoTDBDescriptor.getInstance().getConfig().getDeviceIDTransformationMethod();
+ IoTDBDescriptor.getInstance().getConf().getDeviceIDTransformationMethod();
ConfigFactory.getConfig().setEnableIDTable(true);
ConfigFactory.getConfig().setDeviceIDTransformationMethod("SHA256");
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBRewriteTsFileToolIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBRewriteTsFileToolIT.java
index 24a19a674f..59deac5da7 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBRewriteTsFileToolIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBRewriteTsFileToolIT.java
@@ -40,7 +40,7 @@ import java.sql.SQLException;
import java.sql.Statement;
public class IoTDBRewriteTsFileToolIT {
- private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConf();
private String tmpDir;
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBRpcCompressionIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBRpcCompressionIT.java
index 88b26237e7..0418404b01 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBRpcCompressionIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBRpcCompressionIT.java
@@ -41,9 +41,9 @@ import static org.junit.Assert.assertEquals;
@Category({LocalStandaloneTest.class})
public class IoTDBRpcCompressionIT {
boolean rpcThriftCompression =
- IoTDBDescriptor.getInstance().getConfig().isDnRpcThriftCompressionEnable();
+ IoTDBDescriptor.getInstance().getConf().isDnRpcThriftCompressionEnable();
boolean rpcAdvancedCompression =
- IoTDBDescriptor.getInstance().getConfig().isDnRpcAdvancedCompressionEnable();
+ IoTDBDescriptor.getInstance().getConf().isDnRpcAdvancedCompressionEnable();
@Before
public void setUp() throws Exception {}
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSessionTimeoutIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSessionTimeoutIT.java
index 3f9e794045..16ed3944f3 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSessionTimeoutIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSessionTimeoutIT.java
@@ -44,7 +44,7 @@ public class IoTDBSessionTimeoutIT {
@Before
public void setUp() throws ClassNotFoundException {
- IoTDBDescriptor.getInstance().getConfig().setDnSessionTimeoutThreshold(1000);
+ IoTDBDescriptor.getInstance().getConf().setDnSessionTimeoutThreshold(1000);
EnvironmentUtils.envSetUp();
Class.forName(Config.JDBC_DRIVER_NAME);
}
@@ -52,7 +52,7 @@ public class IoTDBSessionTimeoutIT {
@After
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance().getConfig().setDnSessionTimeoutThreshold(0);
+ IoTDBDescriptor.getInstance().getConf().setDnSessionTimeoutThreshold(0);
}
@Test
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 f701878108..737eafe3a7 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
@@ -47,7 +47,7 @@ public class IoTDBSizeTieredCompactionIT {
@Before
public void setUp() throws Exception {
EnvFactory.getEnv().initBeforeTest();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(true);
}
@After
@@ -1010,17 +1010,17 @@ public class IoTDBSizeTieredCompactionIT {
@Test
public void testSequenceInnerCompactionContinously() throws SQLException {
- int oriThreadNum = IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
+ int oriThreadNum = IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
long oriTargetFileSize =
- IoTDBDescriptor.getInstance().getConfig().getTargetCompactionFileSize();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(2);
- IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(600);
+ IoTDBDescriptor.getInstance().getConf().getTargetCompactionFileSize();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(2);
+ IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(600);
int originCandidateNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(2);
CompactionPriority compactionPriority =
- IoTDBDescriptor.getInstance().getConfig().getCompactionPriority();
- IoTDBDescriptor.getInstance().getConfig().setCompactionPriority(CompactionPriority.INNER_CROSS);
+ IoTDBDescriptor.getInstance().getConf().getCompactionPriority();
+ IoTDBDescriptor.getInstance().getConf().setCompactionPriority(CompactionPriority.INNER_CROSS);
long originCompactionNum = CompactionTaskManager.getInstance().getFinishedTaskNum();
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
@@ -1088,11 +1088,11 @@ public class IoTDBSizeTieredCompactionIT {
}
} finally {
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(oriThreadNum);
- IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(oriTargetFileSize);
- IoTDBDescriptor.getInstance().getConfig().setCompactionPriority(compactionPriority);
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(oriThreadNum);
+ IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(oriTargetFileSize);
+ IoTDBDescriptor.getInstance().getConf().setCompactionPriority(compactionPriority);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(originCandidateNum);
}
}
@@ -1100,8 +1100,8 @@ public class IoTDBSizeTieredCompactionIT {
@Test
public void testSequenceInnerCompactionConcurrently() throws SQLException {
long oriTargetFileSize =
- IoTDBDescriptor.getInstance().getConfig().getTargetCompactionFileSize();
- IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(600);
+ IoTDBDescriptor.getInstance().getConf().getTargetCompactionFileSize();
+ IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(600);
long originCompactionNum = CompactionTaskManager.getInstance().getFinishedTaskNum();
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
@@ -1156,21 +1156,21 @@ public class IoTDBSizeTieredCompactionIT {
}
} finally {
- IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(oriTargetFileSize);
+ IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(oriTargetFileSize);
}
}
@Test
public void testUnsequenceInnerCompactionContinously() throws SQLException {
- int oriThreadNum = IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
+ int oriThreadNum = IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
long oriTargetFileSize =
- IoTDBDescriptor.getInstance().getConfig().getTargetCompactionFileSize();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(2);
- IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(600);
+ IoTDBDescriptor.getInstance().getConf().getTargetCompactionFileSize();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(2);
+ IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(600);
long originFinishCount = CompactionTaskManager.getInstance().getFinishedTaskNum();
CompactionPriority compactionPriority =
- IoTDBDescriptor.getInstance().getConfig().getCompactionPriority();
- IoTDBDescriptor.getInstance().getConfig().setCompactionPriority(CompactionPriority.INNER_CROSS);
+ IoTDBDescriptor.getInstance().getConf().getCompactionPriority();
+ IoTDBDescriptor.getInstance().getConf().setCompactionPriority(CompactionPriority.INNER_CROSS);
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
for (int i = 1; i <= 3; i++) {
@@ -1226,10 +1226,10 @@ public class IoTDBSizeTieredCompactionIT {
}
}
} finally {
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(oriThreadNum);
- IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(oriTargetFileSize);
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(oriThreadNum);
+ IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(oriTargetFileSize);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionPriority(CompactionPriority.INNER_CROSS);
}
}
@@ -1237,8 +1237,8 @@ public class IoTDBSizeTieredCompactionIT {
@Test
public void testUnsequenceInnerCompactionConcurrently() throws SQLException {
long oriTargetFileSize =
- IoTDBDescriptor.getInstance().getConfig().getTargetCompactionFileSize();
- IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(600);
+ IoTDBDescriptor.getInstance().getConf().getTargetCompactionFileSize();
+ IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(600);
long originCompactionNum = CompactionTaskManager.getInstance().getFinishedTaskNum();
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
@@ -1295,7 +1295,7 @@ public class IoTDBSizeTieredCompactionIT {
}
} finally {
- IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(oriTargetFileSize);
+ IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(oriTargetFileSize);
}
}
@@ -1303,8 +1303,8 @@ public class IoTDBSizeTieredCompactionIT {
@Test
public void testSequenceAndUnsequenceInnerCompactionConcurrently() throws SQLException {
long oriTargetFileSize =
- IoTDBDescriptor.getInstance().getConfig().getTargetCompactionFileSize();
- IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(600);
+ IoTDBDescriptor.getInstance().getConf().getTargetCompactionFileSize();
+ IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(600);
long originCompactionNum = CompactionTaskManager.getInstance().getFinishedTaskNum();
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
@@ -1364,7 +1364,7 @@ public class IoTDBSizeTieredCompactionIT {
}
} finally {
- IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(oriTargetFileSize);
+ IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(oriTargetFileSize);
}
}
}
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBTimePartitionIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBTimePartitionIT.java
index 5820226f29..71bd67909a 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBTimePartitionIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBTimePartitionIT.java
@@ -43,7 +43,7 @@ public class IoTDBTimePartitionIT {
@Before
public void setUp() throws Exception {
- prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getDnTimePartitionInterval();
+ prevPartitionInterval = IoTDBDescriptor.getInstance().getConf().getDnTimePartitionInterval();
ConfigFactory.getConfig().setPartitionInterval(2592000);
EnvFactory.getEnv().initBeforeTest();
}
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBTtlIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBTtlIT.java
index d95740fecf..eae907478b 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBTtlIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/IoTDBTtlIT.java
@@ -322,7 +322,7 @@ public class IoTDBTtlIT {
@Test
public void testDefaultTTL() throws SQLException {
- CommonDescriptor.getInstance().getConfig().setDefaultTtlInMs(10000);
+ CommonDescriptor.getInstance().getConf().setDefaultTtlInMs(10000);
try (Connection connection = EnvFactory.getEnv().getConnection();
Statement statement = connection.createStatement()) {
statement.execute("CREATE DATABASE root.group1");
@@ -333,7 +333,7 @@ public class IoTDBTtlIT {
result.equals("root.group1,10000\n" + "root.group2,10000\n")
|| result.equals("root.group2,10000\n" + "root.group1,10000\n"));
} finally {
- CommonDescriptor.getInstance().getConfig().setDefaultTtlInMs(Long.MAX_VALUE);
+ CommonDescriptor.getInstance().getConf().setDefaultTtlInMs(Long.MAX_VALUE);
}
}
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 fd67267428..843806ca9b 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
@@ -42,12 +42,12 @@ public class StandaloneEnvConfig implements BaseConfig {
}
public BaseConfig setMemtableSizeThreshold(long memtableSizeThreshold) {
- CommonDescriptor.getInstance().getConfig().setMemtableSizeThreshold(memtableSizeThreshold);
+ CommonDescriptor.getInstance().getConf().setMemtableSizeThreshold(memtableSizeThreshold);
return this;
}
public BaseConfig setPartitionInterval(long partitionInterval) {
- IoTDBDescriptor.getInstance().getConfig().setDnTimePartitionInterval(partitionInterval);
+ IoTDBDescriptor.getInstance().getConf().setDnTimePartitionInterval(partitionInterval);
return this;
}
@@ -58,79 +58,79 @@ public class StandaloneEnvConfig implements BaseConfig {
public BaseConfig setMaxQueryDeduplicatedPathNum(int maxQueryDeduplicatedPathNum) {
CommonDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxDeduplicatedPathNum(maxQueryDeduplicatedPathNum);
return this;
}
public BaseConfig setRpcThriftCompressionEnable(boolean rpcThriftCompressionEnable) {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setDnRpcThriftCompressionEnable(rpcThriftCompressionEnable);
return this;
}
public BaseConfig setRpcAdvancedCompressionEnable(boolean rpcAdvancedCompressionEnable) {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setDnRpcAdvancedCompressionEnable(rpcAdvancedCompressionEnable);
return this;
}
public BaseConfig setUdfCollectorMemoryBudgetInMB(float udfCollectorMemoryBudgetInMB) {
CommonDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setUdfCollectorMemoryBudgetInMB(udfCollectorMemoryBudgetInMB);
return this;
}
public BaseConfig setUdfTransformerMemoryBudgetInMB(float udfTransformerMemoryBudgetInMB) {
CommonDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setUdfTransformerMemoryBudgetInMB(udfTransformerMemoryBudgetInMB);
return this;
}
public BaseConfig setUdfReaderMemoryBudgetInMB(float udfReaderMemoryBudgetInMB) {
CommonDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setUdfReaderMemoryBudgetInMB(udfReaderMemoryBudgetInMB);
return this;
}
public BaseConfig setEnableSeqSpaceCompaction(boolean enableSeqSpaceCompaction) {
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction);
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction);
return this;
}
public BaseConfig setEnableUnseqSpaceCompaction(boolean enableUnseqSpaceCompaction) {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction);
return this;
}
public BaseConfig setEnableCrossSpaceCompaction(boolean enableCrossSpaceCompaction) {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableCrossSpaceCompaction(enableCrossSpaceCompaction);
return this;
}
public BaseConfig setEnableIDTable(boolean isEnableIDTable) {
- IoTDBDescriptor.getInstance().getConfig().setEnableIDTable(isEnableIDTable);
+ IoTDBDescriptor.getInstance().getConf().setEnableIDTable(isEnableIDTable);
return this;
}
public BaseConfig setDeviceIDTransformationMethod(String deviceIDTransformationMethod) {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setDeviceIDTransformationMethod(deviceIDTransformationMethod);
return this;
}
public BaseConfig setAutoCreateSchemaEnabled(boolean enableAutoCreateSchema) {
- CommonDescriptor.getInstance().getConfig().setEnableAutoCreateSchema(enableAutoCreateSchema);
+ CommonDescriptor.getInstance().getConf().setEnableAutoCreateSchema(enableAutoCreateSchema);
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 de4f6e10ee..e7ab7ba17c 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
@@ -64,17 +64,17 @@ public class IoTDBSyncReceiverIT {
public void setUp() throws Exception {
EnvironmentUtils.envSetUp();
enableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
enableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
enableCrossSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableCrossSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false);
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
- IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableCrossSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().setEnableCrossSpaceCompaction(false);
SyncTestUtil.insertData();
EnvironmentUtils.shutdownDaemon();
- File srcDir = new File(IoTDBDescriptor.getInstance().getConfig().getDnDataDirs()[0]);
+ File srcDir = new File(IoTDBDescriptor.getInstance().getConf().getDnDataDirs()[0]);
if (tmpDir.exists()) {
FileUtils.deleteDirectory(tmpDir);
}
@@ -89,12 +89,12 @@ public class IoTDBSyncReceiverIT {
@After
public void tearDown() throws Exception {
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction);
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableCrossSpaceCompaction(enableCrossSpaceCompaction);
FileUtils.deleteDirectory(tmpDir);
client.close();
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 8810d5874a..bf3f65c123 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
@@ -52,28 +52,28 @@ public class IoTDBSyncReceiverLoaderIT {
public void setUp() throws Exception {
EnvironmentUtils.envSetUp();
enableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
enableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
enableCrossSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableCrossSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false);
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
- IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableCrossSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().setEnableCrossSpaceCompaction(false);
SyncTestUtil.insertData();
EnvironmentUtils.shutdownDaemon();
- File srcDir = new File(IoTDBDescriptor.getInstance().getConfig().getDnDataDirs()[0]);
+ File srcDir = new File(IoTDBDescriptor.getInstance().getConf().getDnDataDirs()[0]);
FileUtils.moveDirectory(srcDir, tmpDir);
}
@After
public void tearDown() throws Exception {
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction);
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableCrossSpaceCompaction(enableCrossSpaceCompaction);
FileUtils.deleteDirectory(tmpDir);
EnvironmentUtils.cleanEnv();
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 5baf7413fa..41b44c10bb 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
@@ -73,14 +73,14 @@ public class IoTDBSyncSenderIT {
public void setUp() throws Exception {
EnvironmentUtils.envSetUp();
enableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
enableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
enableCrossSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableCrossSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false);
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
- IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableCrossSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().setEnableCrossSpaceCompaction(false);
Class.forName(Config.JDBC_DRIVER_NAME);
IoTDBPipeSink pipeSink = new IoTDBPipeSink(pipeSinkName);
@@ -90,12 +90,12 @@ public class IoTDBSyncSenderIT {
@After
public void tearDown() throws Exception {
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction);
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(enableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(enableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableCrossSpaceCompaction(enableCrossSpaceCompaction);
EnvironmentUtils.shutdownDaemon();
EnvironmentUtils.cleanEnv();
diff --git a/integration/src/test/java/org/apache/iotdb/db/integration/versionadaption/IoTDBDeletionVersionAdaptionIT.java b/integration/src/test/java/org/apache/iotdb/db/integration/versionadaption/IoTDBDeletionVersionAdaptionIT.java
index 8123f8f8c2..a9d93aa91c 100644
--- a/integration/src/test/java/org/apache/iotdb/db/integration/versionadaption/IoTDBDeletionVersionAdaptionIT.java
+++ b/integration/src/test/java/org/apache/iotdb/db/integration/versionadaption/IoTDBDeletionVersionAdaptionIT.java
@@ -65,7 +65,7 @@ public class IoTDBDeletionVersionAdaptionIT {
@Before
public void setUp() throws Exception {
Locale.setDefault(Locale.ENGLISH);
- prevPartitionInterval = IoTDBDescriptor.getInstance().getConfig().getDnTimePartitionInterval();
+ prevPartitionInterval = IoTDBDescriptor.getInstance().getConf().getDnTimePartitionInterval();
ConfigFactory.getConfig().setPartitionInterval(1000);
EnvFactory.getEnv().initBeforeTest();
prepareSeries();
diff --git a/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedABDeviceIT.java b/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedABDeviceIT.java
index 197b21d647..d3203f91f1 100644
--- a/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedABDeviceIT.java
+++ b/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedABDeviceIT.java
@@ -44,7 +44,7 @@ import static org.junit.Assert.fail;
public class IoTDBSessionAlignedABDeviceIT {
private static final String ROOT_SG1_D1 = "root.sg1.d1";
private static final String ROOT_SG1_D2 = "root.sg1.d2";
- private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConf();
private static Session session;
private static int originCompactionThreadNum;
diff --git a/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationIT.java b/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationIT.java
index 685c844401..ebb09e5c1a 100644
--- a/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationIT.java
+++ b/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationIT.java
@@ -44,7 +44,7 @@ public class IoTDBSessionAlignedAggregationIT {
private static final String ROOT_SG1_D1_VECTOR1 = "root.sg1.d1.vector1";
private static final String ROOT_SG1_D1 = "root.sg1.d1";
- private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConf();
private static Session session;
private static int originCompactionThreadNum;
diff --git a/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationWithUnSeqIT.java b/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationWithUnSeqIT.java
index c1ce505497..d9b58b2746 100644
--- a/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationWithUnSeqIT.java
+++ b/integration/src/test/java/org/apache/iotdb/session/IoTDBSessionAlignedAggregationWithUnSeqIT.java
@@ -43,7 +43,7 @@ import static org.junit.Assert.fail;
public class IoTDBSessionAlignedAggregationWithUnSeqIT {
private static final String ROOT_SG1_D1_VECTOR1 = "root.sg1.d1.vector1";
- private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConf();
private static Session session;
private static int originCompactionThreadNum;
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/auth/authorizer/BasicAuthorizer.java b/node-commons/src/main/java/org/apache/iotdb/commons/auth/authorizer/BasicAuthorizer.java
index 5e682da97f..f5dcf2bd05 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/auth/authorizer/BasicAuthorizer.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/auth/authorizer/BasicAuthorizer.java
@@ -93,10 +93,10 @@ public abstract class BasicAuthorizer implements IAuthorizer, IService {
try {
c =
(Class<BasicAuthorizer>)
- Class.forName(CommonDescriptor.getInstance().getConfig().getAuthorizerProvider());
+ Class.forName(CommonDescriptor.getInstance().getConf().getAuthorizerProvider());
logger.info(
"Authorizer provider class: {}",
- CommonDescriptor.getInstance().getConfig().getAuthorizerProvider());
+ CommonDescriptor.getInstance().getConf().getAuthorizerProvider());
instance = c.getDeclaredConstructor().newInstance();
} catch (Exception e) {
// startup failed.
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/auth/authorizer/LocalFileAuthorizer.java b/node-commons/src/main/java/org/apache/iotdb/commons/auth/authorizer/LocalFileAuthorizer.java
index cf1d8ec56d..83a830b93e 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/auth/authorizer/LocalFileAuthorizer.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/auth/authorizer/LocalFileAuthorizer.java
@@ -26,7 +26,7 @@ import org.apache.iotdb.commons.conf.CommonDescriptor;
public class LocalFileAuthorizer extends BasicAuthorizer {
- private static final CommonConfig config = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig config = CommonDescriptor.getInstance().getConf();
public LocalFileAuthorizer() throws AuthException {
super(
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/auth/authorizer/OpenIdAuthorizer.java b/node-commons/src/main/java/org/apache/iotdb/commons/auth/authorizer/OpenIdAuthorizer.java
index b1fd48e9b6..a418bec69a 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/auth/authorizer/OpenIdAuthorizer.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/auth/authorizer/OpenIdAuthorizer.java
@@ -57,7 +57,7 @@ public class OpenIdAuthorizer extends BasicAuthorizer {
public static final String IOTDB_ADMIN_ROLE_NAME = "iotdb_admin";
public static final String OPENID_USER_PREFIX = "openid-";
- private static final CommonConfig config = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig config = CommonDescriptor.getInstance().getConf();
private final RSAPublicKey providerKey;
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/auth/user/BasicUserManager.java b/node-commons/src/main/java/org/apache/iotdb/commons/auth/user/BasicUserManager.java
index 787eb560b2..132e56418b 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/auth/user/BasicUserManager.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/auth/user/BasicUserManager.java
@@ -72,7 +72,7 @@ public abstract class BasicUserManager implements IUserManager {
private void initAdmin() throws AuthException {
User admin;
try {
- admin = getUser(CommonDescriptor.getInstance().getConfig().getAdminName());
+ admin = getUser(CommonDescriptor.getInstance().getConf().getAdminName());
} catch (AuthException e) {
logger.warn("Cannot load admin, Creating a new one", e);
admin = null;
@@ -80,9 +80,9 @@ public abstract class BasicUserManager implements IUserManager {
if (admin == null) {
createUser(
- CommonDescriptor.getInstance().getConfig().getAdminName(),
- CommonDescriptor.getInstance().getConfig().getAdminPassword());
- setUserUseWaterMark(CommonDescriptor.getInstance().getConfig().getAdminName(), false);
+ CommonDescriptor.getInstance().getConf().getAdminName(),
+ CommonDescriptor.getInstance().getConf().getAdminPassword());
+ setUserUseWaterMark(CommonDescriptor.getInstance().getConf().getAdminName(), false);
}
logger.info("Admin initialized");
}
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/client/ClientPoolFactory.java b/node-commons/src/main/java/org/apache/iotdb/commons/client/ClientPoolFactory.java
index 8142f5a51d..2c73ea9880 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/client/ClientPoolFactory.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/client/ClientPoolFactory.java
@@ -39,7 +39,7 @@ import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
public class ClientPoolFactory {
- private static final CommonConfig conf = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig conf = CommonDescriptor.getInstance().getConf();
private ClientPoolFactory() {}
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 bbbd3562ed..a958cbe0e8 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
@@ -932,10 +932,6 @@ public class CommonConfig {
return udfTemporaryLibDir;
}
- public void setUdfTemporaryLibDir(String udfTemporaryLibDir) {
- this.udfTemporaryLibDir = udfTemporaryLibDir;
- }
-
public String getTriggerDir() {
return triggerDir;
}
@@ -953,10 +949,6 @@ public class CommonConfig {
return triggerTemporaryLibDir;
}
- public void setTriggerTemporaryLibDir(String triggerTemporaryLibDir) {
- this.triggerTemporaryLibDir = triggerTemporaryLibDir;
- }
-
public int getStatefulTriggerRetryNumWhenNotFound() {
return statefulTriggerRetryNumWhenNotFound;
}
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 4fae241b26..2bc039f730 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
@@ -26,6 +26,7 @@ import org.apache.iotdb.commons.loadbalance.RegionGroupExtensionPolicy;
import org.apache.iotdb.commons.utils.datastructure.TVListSortAlgorithm;
import org.apache.iotdb.commons.wal.WALMode;
import org.apache.iotdb.confignode.rpc.thrift.TGlobalConfig;
+import org.apache.iotdb.confignode.rpc.thrift.TRatisConfig;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
@@ -63,7 +64,7 @@ public class CommonDescriptor {
}
}
- public CommonConfig getConfig() {
+ public CommonConfig getConf() {
return CONF;
}
@@ -164,6 +165,7 @@ public class CommonDescriptor {
loadWatermarkConfiguration(properties);
/* Authorization Configuration */
+ loadAuthorizationConfiguration(properties);
/* UDF Configuration */
loadUDFConfiguration(properties);
@@ -1886,6 +1888,58 @@ public class CommonDescriptor {
}
public void loadGlobalConfig(TGlobalConfig globalConfig) {
+ CONF.setSeriesSlotNum(globalConfig.getSeriesPartitionSlotNum());
+ CONF.setSeriesPartitionExecutorClass(globalConfig.getSeriesPartitionExecutorClass());
+ CONF.setReadConsistencyLevel(globalConfig.getReadConsistencyLevel());
CONF.setDiskSpaceWarningThreshold(globalConfig.getDiskSpaceWarningThreshold());
}
+
+ public void loadRatisConfig(TRatisConfig ratisConfig) {
+ CONF.setDataRegionRatisConsensusLogAppenderBufferSize(ratisConfig.getDataAppenderBufferSize());
+ CONF.setSchemaRegionRatisConsensusLogAppenderBufferSize(ratisConfig.getSchemaAppenderBufferSize());
+
+ CONF.setDataRegionRatisSnapshotTriggerThreshold(
+ ratisConfig.getDataSnapshotTriggerThreshold());
+ CONF.setSchemaRegionRatisSnapshotTriggerThreshold(
+ ratisConfig.getSchemaSnapshotTriggerThreshold());
+
+ CONF.setDataRegionRatisLogUnsafeFlushEnable(ratisConfig.isDataLogUnsafeFlushEnable());
+ CONF.setSchemaRegionRatisLogUnsafeFlushEnable(ratisConfig.isSchemaLogUnsafeFlushEnable());
+
+ CONF.setDataRegionRatisLogSegmentSizeMax(ratisConfig.getDataLogSegmentSizeMax());
+ CONF.setConfigNodeRatisLogSegmentSizeMax(ratisConfig.getSchemaLogSegmentSizeMax());
+
+ CONF.setDataRegionRatisGrpcFlowControlWindow(ratisConfig.getDataGrpcFlowControlWindow());
+ CONF.setSchemaRegionRatisGrpcFlowControlWindow(ratisConfig.getSchemaGrpcFlowControlWindow());
+
+ CONF.setDataRegionRatisRpcLeaderElectionTimeoutMinMs(
+ ratisConfig.getDataLeaderElectionTimeoutMin());
+ CONF.setSchemaRegionRatisRpcLeaderElectionTimeoutMinMs(
+ ratisConfig.getSchemaLeaderElectionTimeoutMin());
+
+ CONF.setDataRegionRatisRpcLeaderElectionTimeoutMaxMs(
+ ratisConfig.getDataLeaderElectionTimeoutMax());
+ CONF.setSchemaRegionRatisRpcLeaderElectionTimeoutMaxMs(
+ ratisConfig.getSchemaLeaderElectionTimeoutMax());
+
+ CONF.setDataRegionRatisRequestTimeoutMs(ratisConfig.getDataRequestTimeout());
+ CONF.setSchemaRegionRatisRequestTimeoutMs(ratisConfig.getSchemaRequestTimeout());
+
+ CONF.setDataRegionRatisMaxRetryAttempts(ratisConfig.getDataMaxRetryAttempts());
+ CONF.setDataRegionRatisInitialSleepTimeMs(ratisConfig.getDataInitialSleepTime());
+ CONF.setDataRegionRatisMaxSleepTimeMs(ratisConfig.getDataMaxSleepTime());
+
+ CONF.setSchemaRegionRatisMaxRetryAttempts(ratisConfig.getSchemaMaxRetryAttempts());
+ CONF.setSchemaRegionRatisInitialSleepTimeMs(ratisConfig.getSchemaInitialSleepTime());
+ CONF.setSchemaRegionRatisMaxSleepTimeMs(ratisConfig.getSchemaMaxSleepTime());
+
+ CONF.setDataRegionRatisPreserveLogsWhenPurge(ratisConfig.getDataPreserveWhenPurge());
+ CONF.setSchemaRegionRatisPreserveLogsWhenPurge(ratisConfig.getSchemaPreserveWhenPurge());
+
+ CONF.setRatisFirstElectionTimeoutMinMs(ratisConfig.getFirstElectionTimeoutMin());
+ CONF.setRatisFirstElectionTimeoutMaxMs(ratisConfig.getFirstElectionTimeoutMax());
+
+ CONF.setSchemaRegionRatisLogMax(ratisConfig.getSchemaRegionRatisLogMax());
+ CONF.setDataRegionRatisLogMax(ratisConfig.getDataRegionRatisLogMax());
+ }
}
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/enums/HandleSystemErrorStrategy.java b/node-commons/src/main/java/org/apache/iotdb/commons/enums/HandleSystemErrorStrategy.java
index c176826c06..22f3a95b2f 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/enums/HandleSystemErrorStrategy.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/enums/HandleSystemErrorStrategy.java
@@ -37,7 +37,7 @@ public enum HandleSystemErrorStrategy {
logger.error(
"Unrecoverable error occurs! Change system status to read-only because handle_system_error is CHANGE_TO_READ_ONLY. Only query statements are permitted!",
new RuntimeException("System mode is set to READ_ONLY"));
- CommonDescriptor.getInstance().getConfig().setNodeStatus(NodeStatus.ReadOnly);
+ CommonDescriptor.getInstance().getConf().setNodeStatus(NodeStatus.ReadOnly);
} else if (this == HandleSystemErrorStrategy.SHUTDOWN) {
logger.error(
"Unrecoverable error occurs! Shutdown system directly because handle_system_error is SHUTDOWN.",
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/file/SystemFileFactory.java b/node-commons/src/main/java/org/apache/iotdb/commons/file/SystemFileFactory.java
index 54f2e139b5..26eeff422c 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/file/SystemFileFactory.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/file/SystemFileFactory.java
@@ -31,8 +31,8 @@ import java.net.URI;
public enum SystemFileFactory {
INSTANCE;
- private static FSType fsType =
- CommonDescriptor.getInstance().getConfig().getSystemFileStorageFs();
+ private static final FSType fsType =
+ CommonDescriptor.getInstance().getConf().getSystemFileStorageFs();
private static final String UNSUPPORT_FILE_SYSTEM = "Unsupported file system: ";
public File getFile(String pathname) {
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/sync/utils/SyncPathUtil.java b/node-commons/src/main/java/org/apache/iotdb/commons/sync/utils/SyncPathUtil.java
index 157110d498..00563b4adf 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/sync/utils/SyncPathUtil.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/sync/utils/SyncPathUtil.java
@@ -47,7 +47,7 @@ public class SyncPathUtil {
/** sender */
public static String getSenderDir() {
- return CommonDescriptor.getInstance().getConfig().getSyncDir()
+ return CommonDescriptor.getInstance().getConf().getSyncDir()
+ File.separator
+ SyncConstant.SENDER_DIR_NAME;
}
@@ -96,7 +96,7 @@ public class SyncPathUtil {
/** receiver */
public static String getReceiverDir() {
- return CommonDescriptor.getInstance().getConfig().getSyncDir()
+ return CommonDescriptor.getInstance().getConf().getSyncDir()
+ File.separator
+ SyncConstant.RECEIVER_DIR_NAME;
}
@@ -130,7 +130,7 @@ public class SyncPathUtil {
/** common */
public static String getSysDir() {
- return CommonDescriptor.getInstance().getConfig().getSyncDir()
+ return CommonDescriptor.getInstance().getConf().getSyncDir()
+ File.separator
+ SyncConstant.SYNC_SYS_DIR;
}
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/utils/AuthUtils.java b/node-commons/src/main/java/org/apache/iotdb/commons/utils/AuthUtils.java
index 849b2d5e8a..06f4577789 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/utils/AuthUtils.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/utils/AuthUtils.java
@@ -77,9 +77,9 @@ public class AuthUtils {
*/
public static boolean validatePassword(String originPassword, String encryptPassword) {
return AsymmetricEncryptFactory.getEncryptProvider(
- CommonDescriptor.getInstance().getConfig().getIotdbServerEncryptDecryptProvider(),
+ CommonDescriptor.getInstance().getConf().getIotdbServerEncryptDecryptProvider(),
CommonDescriptor.getInstance()
- .getConfig()
+ .getConf()
.getIotdbServerEncryptDecryptProviderParameter())
.validate(originPassword, encryptPassword);
}
@@ -202,9 +202,9 @@ public class AuthUtils {
*/
public static String encryptPassword(String password) {
return AsymmetricEncryptFactory.getEncryptProvider(
- CommonDescriptor.getInstance().getConfig().getIotdbServerEncryptDecryptProvider(),
+ CommonDescriptor.getInstance().getConf().getIotdbServerEncryptDecryptProvider(),
CommonDescriptor.getInstance()
- .getConfig()
+ .getConf()
.getIotdbServerEncryptDecryptProviderParameter())
.encrypt(password);
}
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 caee88cd9c..47d700374f 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
@@ -20,7 +20,6 @@ package org.apache.iotdb.db.metadata.schemaregion.rocksdb;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.conf.IoTDBConstant;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.rocksdb.util.SizeUnit;
import org.slf4j.Logger;
@@ -47,9 +46,9 @@ public class RSchemaConfLoader {
private long writeBufferSize = 64 * SizeUnit.KB;
private long maxTotalWalSize = 64 * SizeUnit.KB;
private long blockCache =
- CommonDescriptor.getInstance().getConfig().getAllocateMemoryForSchemaRegion() * 2 / 3;
+ CommonDescriptor.getInstance().getConf().getAllocateMemoryForSchemaRegion() * 2 / 3;
private long blockCacheCompressed =
- CommonDescriptor.getInstance().getConfig().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/schema-engine-rocksdb/src/main/java/org/apache/iotdb/db/metadata/schemaregion/rocksdb/RSchemaReadWriteHandler.java b/schema-engine-rocksdb/src/main/java/org/apache/iotdb/db/metadata/schemaregion/rocksdb/RSchemaReadWriteHandler.java
index 1dc7c7e741..7987cc5ebc 100644
--- a/schema-engine-rocksdb/src/main/java/org/apache/iotdb/db/metadata/schemaregion/rocksdb/RSchemaReadWriteHandler.java
+++ b/schema-engine-rocksdb/src/main/java/org/apache/iotdb/db/metadata/schemaregion/rocksdb/RSchemaReadWriteHandler.java
@@ -82,7 +82,7 @@ public class RSchemaReadWriteHandler {
private static final Logger logger = LoggerFactory.getLogger(RSchemaReadWriteHandler.class);
- protected static IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ protected static IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private static final String ROCKSDB_FOLDER = "rocksdb-schema";
diff --git a/schema-engine-rocksdb/src/main/java/org/apache/iotdb/db/metadata/schemaregion/rocksdb/RSchemaRegion.java b/schema-engine-rocksdb/src/main/java/org/apache/iotdb/db/metadata/schemaregion/rocksdb/RSchemaRegion.java
index 0887f34850..fb3160f33e 100644
--- a/schema-engine-rocksdb/src/main/java/org/apache/iotdb/db/metadata/schemaregion/rocksdb/RSchemaRegion.java
+++ b/schema-engine-rocksdb/src/main/java/org/apache/iotdb/db/metadata/schemaregion/rocksdb/RSchemaRegion.java
@@ -120,7 +120,7 @@ public class RSchemaRegion implements ISchemaRegion {
private static final Logger logger = LoggerFactory.getLogger(RSchemaRegion.class);
- protected static IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ protected static IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
// TODO: make it configurable
public static final int MAX_PATH_DEPTH = 10;
diff --git a/schema-engine-rocksdb/src/main/java/org/apache/iotdb/db/metadata/schemaregion/rocksdb/mnode/RStorageGroupMNode.java b/schema-engine-rocksdb/src/main/java/org/apache/iotdb/db/metadata/schemaregion/rocksdb/mnode/RStorageGroupMNode.java
index 209fcf7042..a3851e3dbe 100644
--- a/schema-engine-rocksdb/src/main/java/org/apache/iotdb/db/metadata/schemaregion/rocksdb/mnode/RStorageGroupMNode.java
+++ b/schema-engine-rocksdb/src/main/java/org/apache/iotdb/db/metadata/schemaregion/rocksdb/mnode/RStorageGroupMNode.java
@@ -50,7 +50,7 @@ public class RStorageGroupMNode extends RInternalMNode implements IStorageGroupM
super(fullPath, readWriteHandler);
Object ttl = RSchemaUtils.parseNodeValue(value, RMNodeValueType.TTL);
if (ttl == null) {
- ttl = CommonDescriptor.getInstance().getConfig().getDefaultTtlInMs();
+ ttl = CommonDescriptor.getInstance().getConf().getDefaultTtlInMs();
}
this.dataTTL = (long) ttl;
}
diff --git a/schema-engine-tag/src/main/java/org/apache/iotdb/db/metadata/tagSchemaRegion/TagSchemaRegion.java b/schema-engine-tag/src/main/java/org/apache/iotdb/db/metadata/tagSchemaRegion/TagSchemaRegion.java
index 2624de345e..d2ad2d319c 100644
--- a/schema-engine-tag/src/main/java/org/apache/iotdb/db/metadata/tagSchemaRegion/TagSchemaRegion.java
+++ b/schema-engine-tag/src/main/java/org/apache/iotdb/db/metadata/tagSchemaRegion/TagSchemaRegion.java
@@ -80,7 +80,7 @@ import java.util.Set;
public class TagSchemaRegion implements ISchemaRegion {
private static final Logger logger = LoggerFactory.getLogger(TagSchemaRegion.class);
- protected static IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ protected static IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
// when a path ends with ".**", it represents batch processing
private final String TAIL = ".**";
diff --git a/schema-engine-tag/src/test/java/org/apache/iotdb/db/metadata/tagSchemaRegion/TagSchemaRegionTest.java b/schema-engine-tag/src/test/java/org/apache/iotdb/db/metadata/tagSchemaRegion/TagSchemaRegionTest.java
index 8a95d53c09..e879fa3b7c 100644
--- a/schema-engine-tag/src/test/java/org/apache/iotdb/db/metadata/tagSchemaRegion/TagSchemaRegionTest.java
+++ b/schema-engine-tag/src/test/java/org/apache/iotdb/db/metadata/tagSchemaRegion/TagSchemaRegionTest.java
@@ -68,14 +68,14 @@ public class TagSchemaRegionTest {
@Before
public void before() {
compressionType = TSFileDescriptor.getInstance().getConfig().getCompressor();
- schemaDir = IoTDBDescriptor.getInstance().getConfig().getSchemaDir();
- isEnableIDTable = IoTDBDescriptor.getInstance().getConfig().isEnableIDTable();
+ schemaDir = IoTDBDescriptor.getInstance().getConf().getSchemaDir();
+ isEnableIDTable = IoTDBDescriptor.getInstance().getConf().isEnableIDTable();
originalDeviceIDTransformationMethod =
- IoTDBDescriptor.getInstance().getConfig().getDeviceIDTransformationMethod();
- isEnableIDTableLogFile = IoTDBDescriptor.getInstance().getConfig().isEnableIDTableLogFile();
- IoTDBDescriptor.getInstance().getConfig().setEnableIDTable(true);
- IoTDBDescriptor.getInstance().getConfig().setDeviceIDTransformationMethod("SHA256");
- IoTDBDescriptor.getInstance().getConfig().setEnableIDTableLogFile(true);
+ IoTDBDescriptor.getInstance().getConf().getDeviceIDTransformationMethod();
+ isEnableIDTableLogFile = IoTDBDescriptor.getInstance().getConf().isEnableIDTableLogFile();
+ IoTDBDescriptor.getInstance().getConf().setEnableIDTable(true);
+ IoTDBDescriptor.getInstance().getConf().setDeviceIDTransformationMethod("SHA256");
+ IoTDBDescriptor.getInstance().getConf().setEnableIDTableLogFile(true);
storageGroupDirPath = schemaDir + File.separator + storageGroupFullPath;
schemaRegionDirPath = storageGroupDirPath + File.separator + 0;
}
@@ -83,11 +83,11 @@ public class TagSchemaRegionTest {
@After
public void clean() {
tagSchemaRegion.clear();
- IoTDBDescriptor.getInstance().getConfig().setEnableIDTable(isEnableIDTable);
+ IoTDBDescriptor.getInstance().getConf().setEnableIDTable(isEnableIDTable);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setDeviceIDTransformationMethod(originalDeviceIDTransformationMethod);
- IoTDBDescriptor.getInstance().getConfig().setEnableIDTableLogFile(isEnableIDTableLogFile);
+ IoTDBDescriptor.getInstance().getConf().setEnableIDTableLogFile(isEnableIDTableLogFile);
FileUtils.deleteDirectoryAndEmptyParent(new File(schemaDir));
}
diff --git a/schema-engine-tag/src/test/java/org/apache/iotdb/db/metadata/tagSchemaRegion/idtable/IDTableWithDeviceIDListImplTest.java b/schema-engine-tag/src/test/java/org/apache/iotdb/db/metadata/tagSchemaRegion/idtable/IDTableWithDeviceIDListImplTest.java
index 529d9464c1..14a1436b79 100644
--- a/schema-engine-tag/src/test/java/org/apache/iotdb/db/metadata/tagSchemaRegion/idtable/IDTableWithDeviceIDListImplTest.java
+++ b/schema-engine-tag/src/test/java/org/apache/iotdb/db/metadata/tagSchemaRegion/idtable/IDTableWithDeviceIDListImplTest.java
@@ -67,14 +67,14 @@ public class IDTableWithDeviceIDListImplTest {
@Before
public void before() {
compressionType = TSFileDescriptor.getInstance().getConfig().getCompressor();
- schemaDir = IoTDBDescriptor.getInstance().getConfig().getSchemaDir();
- isEnableIDTable = IoTDBDescriptor.getInstance().getConfig().isEnableIDTable();
+ schemaDir = IoTDBDescriptor.getInstance().getConf().getSchemaDir();
+ isEnableIDTable = IoTDBDescriptor.getInstance().getConf().isEnableIDTable();
originalDeviceIDTransformationMethod =
- IoTDBDescriptor.getInstance().getConfig().getDeviceIDTransformationMethod();
- isEnableIDTableLogFile = IoTDBDescriptor.getInstance().getConfig().isEnableIDTableLogFile();
- IoTDBDescriptor.getInstance().getConfig().setEnableIDTable(true);
- IoTDBDescriptor.getInstance().getConfig().setDeviceIDTransformationMethod("SHA256");
- IoTDBDescriptor.getInstance().getConfig().setEnableIDTableLogFile(true);
+ IoTDBDescriptor.getInstance().getConf().getDeviceIDTransformationMethod();
+ isEnableIDTableLogFile = IoTDBDescriptor.getInstance().getConf().isEnableIDTableLogFile();
+ IoTDBDescriptor.getInstance().getConf().setEnableIDTable(true);
+ IoTDBDescriptor.getInstance().getConf().setDeviceIDTransformationMethod("SHA256");
+ IoTDBDescriptor.getInstance().getConf().setEnableIDTableLogFile(true);
storageGroupDirPath = schemaDir + File.separator + storageGroupFullPath;
schemaRegionDirPath = storageGroupDirPath + File.separator + 0;
idTableWithDeviceIDList = new IDTableWithDeviceIDListImpl(new File(schemaRegionDirPath));
@@ -83,11 +83,11 @@ public class IDTableWithDeviceIDListImplTest {
@After
public void clean() throws IOException, StorageEngineException {
idTableWithDeviceIDList.clear();
- IoTDBDescriptor.getInstance().getConfig().setEnableIDTable(isEnableIDTable);
+ IoTDBDescriptor.getInstance().getConf().setEnableIDTable(isEnableIDTable);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setDeviceIDTransformationMethod(originalDeviceIDTransformationMethod);
- IoTDBDescriptor.getInstance().getConfig().setEnableIDTableLogFile(isEnableIDTableLogFile);
+ IoTDBDescriptor.getInstance().getConf().setEnableIDTableLogFile(isEnableIDTableLogFile);
FileUtils.deleteDirectoryAndEmptyParent(new File(schemaDir));
}
diff --git a/schema-engine-tag/src/test/java/org/apache/iotdb/db/metadata/tagSchemaRegion/tagIndex/TagTagInvertedIndexTest.java b/schema-engine-tag/src/test/java/org/apache/iotdb/db/metadata/tagSchemaRegion/tagIndex/TagTagInvertedIndexTest.java
index b46d863b17..3f2258205f 100644
--- a/schema-engine-tag/src/test/java/org/apache/iotdb/db/metadata/tagSchemaRegion/tagIndex/TagTagInvertedIndexTest.java
+++ b/schema-engine-tag/src/test/java/org/apache/iotdb/db/metadata/tagSchemaRegion/tagIndex/TagTagInvertedIndexTest.java
@@ -77,7 +77,7 @@ public class TagTagInvertedIndexTest {
numOfDeviceIdsInMemTable =
TagSchemaDescriptor.getInstance().getTagSchemaConfig().getNumOfDeviceIdsInMemTable();
TagSchemaDescriptor.getInstance().getTagSchemaConfig().setNumOfDeviceIdsInMemTable(3);
- schemaDir = IoTDBDescriptor.getInstance().getConfig().getSchemaDir();
+ schemaDir = IoTDBDescriptor.getInstance().getConf().getSchemaDir();
storageGroupDirPath = schemaDir + File.separator + storageGroupFullPath;
schemaRegionDirPath = storageGroupDirPath + File.separator + 0;
tagInvertedIndex = new TagInvertedIndex(schemaRegionDirPath);
diff --git a/server/src/main/java/org/apache/iotdb/db/audit/AuditLogger.java b/server/src/main/java/org/apache/iotdb/db/audit/AuditLogger.java
index a407bd7b35..e5ba780fc3 100644
--- a/server/src/main/java/org/apache/iotdb/db/audit/AuditLogger.java
+++ b/server/src/main/java/org/apache/iotdb/db/audit/AuditLogger.java
@@ -55,7 +55,7 @@ public class AuditLogger {
private static final String ADDRESS = "address";
private static final String AUDIT_LOG_DEVICE = "root.__system.audit._%s";
private static final Coordinator COORDINATOR = Coordinator.getInstance();
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private static final List<AuditLogStorage> auditLogStorageList = config.getAuditLogStorage();
private static final List<AuditLogOperation> auditLogOperationList =
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 99e9fbbbb1..29af2914e4 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
@@ -43,7 +43,7 @@ import static org.apache.iotdb.db.utils.ErrorHandlingUtils.onQueryException;
public class AuthorityChecker {
private static final String SUPER_USER =
- CommonDescriptor.getInstance().getConfig().getAdminName();
+ 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/auth/BasicAuthorityCache.java b/server/src/main/java/org/apache/iotdb/db/auth/BasicAuthorityCache.java
index c57f572299..df72fb2104 100644
--- a/server/src/main/java/org/apache/iotdb/db/auth/BasicAuthorityCache.java
+++ b/server/src/main/java/org/apache/iotdb/db/auth/BasicAuthorityCache.java
@@ -23,7 +23,6 @@ import org.apache.iotdb.commons.auth.entity.Role;
import org.apache.iotdb.commons.auth.entity.User;
import org.apache.iotdb.commons.conf.CommonConfig;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
@@ -36,7 +35,7 @@ import java.util.concurrent.TimeUnit;
public class BasicAuthorityCache implements IAuthorCache {
private static final Logger logger = LoggerFactory.getLogger(BasicAuthorityCache.class);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private Cache<String, User> userCache =
Caffeine.newBuilder()
diff --git a/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java b/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java
index c7b5b30026..9d294c2454 100644
--- a/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java
+++ b/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java
@@ -163,7 +163,7 @@ public class ConfigNodeClient implements IConfigNodeRPCService.Iface, ThriftClie
private int cursor = 0;
- private final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
ClientManager<ConfigNodeRegionId, ConfigNodeClient> clientManager;
@@ -175,7 +175,7 @@ public class ConfigNodeClient implements IConfigNodeRPCService.Iface, ThriftClie
// Read config nodes from configuration
configNodes = ConfigNodeInfo.getInstance().getLatestConfigNodes();
protocolFactory =
- IoTDBDescriptor.getInstance().getConfig().isDnRpcThriftCompressionEnable()
+ IoTDBDescriptor.getInstance().getConf().isDnRpcThriftCompressionEnable()
? new TCompactProtocol.Factory()
: new TBinaryProtocol.Factory();
diff --git a/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeInfo.java b/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeInfo.java
index 78673bc32e..bfb7bdd3b8 100644
--- a/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeInfo.java
+++ b/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeInfo.java
@@ -62,7 +62,7 @@ public class ConfigNodeInfo {
this.onlineConfigNodes = new HashSet<>();
propertiesFile =
SystemFileFactory.INSTANCE.getFile(
- IoTDBDescriptor.getInstance().getConfig().getSchemaDir()
+ IoTDBDescriptor.getInstance().getConf().getSchemaDir()
+ File.separator
+ PROPERTIES_FILE_NAME);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/client/DataNodeClientPoolFactory.java b/server/src/main/java/org/apache/iotdb/db/client/DataNodeClientPoolFactory.java
index b477637d1c..f8f77e1ff7 100644
--- a/server/src/main/java/org/apache/iotdb/db/client/DataNodeClientPoolFactory.java
+++ b/server/src/main/java/org/apache/iotdb/db/client/DataNodeClientPoolFactory.java
@@ -32,7 +32,7 @@ import org.apache.commons.pool2.impl.GenericKeyedObjectPool;
public class DataNodeClientPoolFactory {
- private static final IoTDBConfig conf = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig conf = IoTDBDescriptor.getInstance().getConf();
private DataNodeClientPoolFactory() {}
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 7516d9e7bd..e0b78ab7b2 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
@@ -63,7 +63,7 @@ import java.util.ServiceLoader;
public class IoTDBDescriptor {
private static final Logger LOGGER = LoggerFactory.getLogger(IoTDBDescriptor.class);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private final IoTDBConfig CONF = new IoTDBConfig();
@@ -96,7 +96,7 @@ public class IoTDBDescriptor {
return IoTDBDescriptorHolder.INSTANCE;
}
- public IoTDBConfig getConfig() {
+ public IoTDBConfig getConf() {
return CONF;
}
@@ -752,12 +752,9 @@ public class IoTDBDescriptor {
// These configurations are received from config node when registering
public void loadGlobalConfig(TGlobalConfig globalConfig) {
- CONF.setSeriesPartitionExecutorClass(globalConfig.getSeriesPartitionExecutorClass());
- CONF.setSeriesPartitionSlotNum(globalConfig.getSeriesPartitionSlotNum());
CONF.setDnTimePartitionInterval(
- DateTimeUtils.convertMilliTimeWithPrecision(
- globalConfig.timePartitionInterval, CONF.getTimestampPrecision()));
- CONF.setReadConsistencyLevel(globalConfig.getReadConsistencyLevel());
+ 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 05d5860f98..7da07e559b 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
@@ -53,8 +53,8 @@ public class IoTDBStartCheck {
private static final Logger logger = LoggerFactory.getLogger(IoTDBStartCheck.class);
- private static final IoTDBConfig IOTDB_CONFIG = IoTDBDescriptor.getInstance().getConfig();
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig IOTDB_CONFIG = IoTDBDescriptor.getInstance().getConf();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
// this file is located in data/system/schema/system.properties
// If user delete folder "data", system.properties can reset.
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/adapter/CompressionRatio.java b/server/src/main/java/org/apache/iotdb/db/conf/adapter/CompressionRatio.java
index 871d57c730..9bad607021 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/adapter/CompressionRatio.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/adapter/CompressionRatio.java
@@ -46,7 +46,7 @@ public class CompressionRatio {
private static final Logger LOGGER = LoggerFactory.getLogger(CompressionRatio.class);
- private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConf();
static final String COMPRESSION_RATIO_DIR = "compression_ratio";
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/directories/DirectoryManager.java b/server/src/main/java/org/apache/iotdb/db/conf/directories/DirectoryManager.java
index e345059c8c..5ed7816d70 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/directories/DirectoryManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/directories/DirectoryManager.java
@@ -48,7 +48,7 @@ public class DirectoryManager {
private DirectoryManager() {
sequenceFileFolders =
- new ArrayList<>(Arrays.asList(IoTDBDescriptor.getInstance().getConfig().getDnDataDirs()));
+ new ArrayList<>(Arrays.asList(IoTDBDescriptor.getInstance().getConf().getDnDataDirs()));
for (int i = 0; i < sequenceFileFolders.size(); i++) {
sequenceFileFolders.set(
i, sequenceFileFolders.get(i) + File.separator + IoTDBConstant.SEQUENCE_FLODER_NAME);
@@ -56,7 +56,7 @@ public class DirectoryManager {
mkDataDirs(sequenceFileFolders);
unsequenceFileFolders =
- new ArrayList<>(Arrays.asList(IoTDBDescriptor.getInstance().getConfig().getDnDataDirs()));
+ new ArrayList<>(Arrays.asList(IoTDBDescriptor.getInstance().getConf().getDnDataDirs()));
for (int i = 0; i < unsequenceFileFolders.size(); i++) {
unsequenceFileFolders.set(
i, unsequenceFileFolders.get(i) + File.separator + IoTDBConstant.UNSEQUENCE_FLODER_NAME);
@@ -65,7 +65,7 @@ public class DirectoryManager {
String strategyName = "";
try {
- strategyName = IoTDBDescriptor.getInstance().getConfig().getDnMultiDirStrategyClassName();
+ strategyName = IoTDBDescriptor.getInstance().getConf().getDnMultiDirStrategyClassName();
Class<?> clazz = Class.forName(strategyName);
sequenceStrategy = (DirectoryStrategy) clazz.newInstance();
sequenceStrategy.setFolders(sequenceFileFolders);
@@ -81,7 +81,7 @@ public class DirectoryManager {
public void updateFileFolders() throws LoadConfigurationException {
try {
List<String> sequenceFileFolders =
- new ArrayList<>(Arrays.asList(IoTDBDescriptor.getInstance().getConfig().getDnDataDirs()));
+ new ArrayList<>(Arrays.asList(IoTDBDescriptor.getInstance().getConf().getDnDataDirs()));
for (int i = 0; i < sequenceFileFolders.size(); i++) {
sequenceFileFolders.set(
i, sequenceFileFolders.get(i) + File.separator + IoTDBConstant.SEQUENCE_FLODER_NAME);
@@ -89,7 +89,7 @@ public class DirectoryManager {
mkDataDirs(sequenceFileFolders);
List<String> unsequenceFileFolders =
- new ArrayList<>(Arrays.asList(IoTDBDescriptor.getInstance().getConfig().getDnDataDirs()));
+ new ArrayList<>(Arrays.asList(IoTDBDescriptor.getInstance().getConf().getDnDataDirs()));
for (int i = 0; i < unsequenceFileFolders.size(); i++) {
unsequenceFileFolders.set(
i,
@@ -111,7 +111,7 @@ public class DirectoryManager {
public void updateDirectoryStrategy() throws LoadConfigurationException {
String strategyName = "";
try {
- strategyName = IoTDBDescriptor.getInstance().getConfig().getDnMultiDirStrategyClassName();
+ strategyName = IoTDBDescriptor.getInstance().getConf().getDnMultiDirStrategyClassName();
Class<?> clazz = Class.forName(strategyName);
sequenceStrategy = (DirectoryStrategy) clazz.newInstance();
sequenceStrategy.setFolders(sequenceFileFolders);
@@ -148,7 +148,7 @@ public class DirectoryManager {
return sequenceFileFolders.get(sequenceStrategy.nextFolderIndex());
} catch (DiskSpaceInsufficientException e) {
logger.error("All disks of wal folders are full, change system mode to read-only.", e);
- CommonDescriptor.getInstance().getConfig().setNodeStatus(NodeStatus.ReadOnly);
+ CommonDescriptor.getInstance().getConf().setNodeStatus(NodeStatus.ReadOnly);
throw e;
}
}
@@ -162,7 +162,7 @@ public class DirectoryManager {
return unsequenceFileFolders.get(unsequenceStrategy.nextFolderIndex());
} catch (DiskSpaceInsufficientException e) {
logger.error("All disks of wal folders are full, change system mode to read-only.", e);
- CommonDescriptor.getInstance().getConfig().setNodeStatus(NodeStatus.ReadOnly);
+ CommonDescriptor.getInstance().getConf().setNodeStatus(NodeStatus.ReadOnly);
throw e;
}
}
@@ -180,13 +180,13 @@ public class DirectoryManager {
@TestOnly
public void resetFolders() {
sequenceFileFolders =
- new ArrayList<>(Arrays.asList(IoTDBDescriptor.getInstance().getConfig().getDnDataDirs()));
+ new ArrayList<>(Arrays.asList(IoTDBDescriptor.getInstance().getConf().getDnDataDirs()));
for (int i = 0; i < sequenceFileFolders.size(); i++) {
sequenceFileFolders.set(
i, sequenceFileFolders.get(i) + File.separator + IoTDBConstant.SEQUENCE_FLODER_NAME);
}
unsequenceFileFolders =
- new ArrayList<>(Arrays.asList(IoTDBDescriptor.getInstance().getConfig().getDnDataDirs()));
+ new ArrayList<>(Arrays.asList(IoTDBDescriptor.getInstance().getConf().getDnDataDirs()));
for (int i = 0; i < unsequenceFileFolders.size(); i++) {
unsequenceFileFolders.set(
i, unsequenceFileFolders.get(i) + File.separator + IoTDBConstant.UNSEQUENCE_FLODER_NAME);
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/directories/FolderManager.java b/server/src/main/java/org/apache/iotdb/db/conf/directories/FolderManager.java
index 571a07a9ad..1f1ec8b4e7 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/directories/FolderManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/directories/FolderManager.java
@@ -62,7 +62,7 @@ public class FolderManager {
this.selectStrategy.setFolders(folders);
} catch (DiskSpaceInsufficientException e) {
logger.error("All disks of wal folders are full, change system mode to read-only.", e);
- CommonDescriptor.getInstance().getConfig().setNodeStatus(NodeStatus.ReadOnly);
+ CommonDescriptor.getInstance().getConf().setNodeStatus(NodeStatus.ReadOnly);
throw e;
}
}
@@ -72,7 +72,7 @@ public class FolderManager {
return folders.get(selectStrategy.nextFolderIndex());
} catch (DiskSpaceInsufficientException e) {
logger.error("All disks of wal folders are full, change system mode to read-only.", e);
- CommonDescriptor.getInstance().getConfig().setNodeStatus(NodeStatus.ReadOnly);
+ CommonDescriptor.getInstance().getConf().setNodeStatus(NodeStatus.ReadOnly);
throw e;
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategy.java b/server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategy.java
index 8c15018577..3a6e8905a0 100644
--- a/server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategy.java
+++ b/server/src/main/java/org/apache/iotdb/db/conf/directories/strategy/DirectoryStrategy.java
@@ -56,7 +56,7 @@ public abstract class DirectoryStrategy {
}
if (!hasSpace) {
logger.error("Disk space is insufficient, change system mode to read-only");
- CommonDescriptor.getInstance().getConfig().setNodeStatus(NodeStatus.ReadOnly);
+ CommonDescriptor.getInstance().getConf().setNodeStatus(NodeStatus.ReadOnly);
throw new DiskSpaceInsufficientException(folders);
}
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 1f5c1d42cd..e82be60944 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
@@ -46,8 +46,8 @@ import java.util.concurrent.TimeUnit;
*/
public class DataRegionConsensusImpl {
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
- private static final IoTDBConfig IOTDB_CONFIG = IoTDBDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
+ private static final IoTDBConfig IOTDB_CONFIG = IoTDBDescriptor.getInstance().getConf();
private static IConsensus INSTANCE = null;
diff --git a/server/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java b/server/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java
index bcd8a20e3c..402e163355 100644
--- a/server/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/consensus/SchemaRegionConsensusImpl.java
@@ -43,8 +43,8 @@ import java.util.concurrent.TimeUnit;
*/
public class SchemaRegionConsensusImpl {
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
- private static final IoTDBConfig IOTDB_CONFIG = IoTDBDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
+ private static final IoTDBConfig IOTDB_CONFIG = IoTDBDescriptor.getInstance().getConf();
private static IConsensus INSTANCE = null;
diff --git a/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/DataRegionStateMachine.java b/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/DataRegionStateMachine.java
index c2c8bd0b7e..d420207111 100644
--- a/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/DataRegionStateMachine.java
+++ b/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/DataRegionStateMachine.java
@@ -76,7 +76,7 @@ public class DataRegionStateMachine extends BaseStateMachine {
private static final int MAX_REQUEST_CACHE_SIZE = 5;
private static final long CACHE_WINDOW_TIME_IN_MS =
- IoTDBDescriptor.getInstance().getConfig().getCacheWindowTimeInMs();
+ IoTDBDescriptor.getInstance().getConf().getCacheWindowTimeInMs();
private ConcurrentHashMap<String, SyncLogCacheQueue> cacheQueueMap;
@@ -93,7 +93,7 @@ public class DataRegionStateMachine extends BaseStateMachine {
@Override
public boolean isReadOnly() {
- return CommonDescriptor.getInstance().getConfig().isReadOnly();
+ return CommonDescriptor.getInstance().getConf().isReadOnly();
}
@Override
@@ -448,7 +448,7 @@ public class DataRegionStateMachine extends BaseStateMachine {
@Override
public File getSnapshotRoot() {
String snapshotDir =
- IoTDBDescriptor.getInstance().getConfig().getRatisDataRegionSnapshotDir()
+ IoTDBDescriptor.getInstance().getConf().getRatisDataRegionSnapshotDir()
+ File.separator
+ region.getDatabaseName()
+ "-"
diff --git a/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/SchemaRegionStateMachine.java b/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/SchemaRegionStateMachine.java
index c324b35d07..9412a1a744 100644
--- a/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/SchemaRegionStateMachine.java
+++ b/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/SchemaRegionStateMachine.java
@@ -54,7 +54,7 @@ public class SchemaRegionStateMachine extends BaseStateMachine {
@Override
public boolean isReadOnly() {
- return CommonDescriptor.getInstance().getConfig().isReadOnly();
+ return CommonDescriptor.getInstance().getConf().isReadOnly();
}
@Override
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
index 52f59aa841..5a6436c582 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/StorageEngine.java
@@ -97,8 +97,8 @@ import static org.apache.iotdb.commons.conf.IoTDBConstant.FILE_NAME_SEPARATOR;
public class StorageEngine implements IService {
private static final Logger logger = LoggerFactory.getLogger(StorageEngine.class);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private static final long TTL_CHECK_INTERVAL = 60 * 1000L;
/** Time range for dividing database, the time unit is the same with IoTDB's TimestampPrecision */
@@ -148,7 +148,7 @@ public class StorageEngine implements IService {
}
private static void initTimePartition() {
- timePartitionInterval = IoTDBDescriptor.getInstance().getConfig().getDnTimePartitionInterval();
+ timePartitionInterval = IoTDBDescriptor.getInstance().getConf().getDnTimePartitionInterval();
}
public static long getTimePartitionInterval() {
@@ -559,7 +559,7 @@ public class StorageEngine implements IService {
* @throws StorageEngineException StorageEngineException
*/
public void mergeAll() throws StorageEngineException {
- if (CommonDescriptor.getInstance().getConfig().isReadOnly()) {
+ if (CommonDescriptor.getInstance().getConf().isReadOnly()) {
throw new StorageEngineException("Current system mode is read only, does not support merge");
}
dataRegionMap.values().forEach(DataRegion::compact);
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/cache/BloomFilterCache.java b/server/src/main/java/org/apache/iotdb/db/engine/cache/BloomFilterCache.java
index 3980bdf6a6..d4e593f8d7 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/cache/BloomFilterCache.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/cache/BloomFilterCache.java
@@ -18,9 +18,9 @@
*/
package org.apache.iotdb.db.engine.cache;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
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.query.control.FileReaderManager;
import org.apache.iotdb.tsfile.read.TsFileSequenceReader;
import org.apache.iotdb.tsfile.utils.BloomFilter;
@@ -43,10 +43,10 @@ public class BloomFilterCache {
private static final Logger logger = LoggerFactory.getLogger(BloomFilterCache.class);
private static final Logger DEBUG_LOGGER = LoggerFactory.getLogger("QUERY_DEBUG");
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private static final long MEMORY_THRESHOLD_IN_BLOOM_FILTER_CACHE =
- config.getAllocateMemoryForBloomFilterCache();
- private static final boolean CACHE_ENABLE = config.isMetaDataCacheEnable();
+ COMMON_CONFIG.getAllocateMemoryForBloomFilterCache();
+ private static final boolean CACHE_ENABLE = COMMON_CONFIG.isMetaDataCacheEnable();
private final AtomicLong entryAverageSize = new AtomicLong(0);
private final LoadingCache<BloomFilterCacheKey, BloomFilter> lruCache;
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 5564df780c..153a5ec9d5 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
@@ -19,6 +19,8 @@
package org.apache.iotdb.db.engine.cache;
+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;
@@ -51,7 +53,7 @@ public class ChunkCache {
private static final Logger logger = LoggerFactory.getLogger(ChunkCache.class);
private static final Logger DEBUG_LOGGER = LoggerFactory.getLogger("QUERY_DEBUG");
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final CommonConfig config = CommonDescriptor.getInstance().getConf();
private static final long MEMORY_THRESHOLD_IN_CHUNK_CACHE =
config.getAllocateMemoryForChunkCache();
private static final boolean CACHE_ENABLE = config.isMetaDataCacheEnable();
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 89b7d52fa3..001ce29d46 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
@@ -19,6 +19,8 @@
package org.apache.iotdb.db.engine.cache;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.service.metric.MetricService;
import org.apache.iotdb.commons.utils.TestOnly;
@@ -63,7 +65,7 @@ public class TimeSeriesMetadataCache {
private static final Logger logger = LoggerFactory.getLogger(TimeSeriesMetadataCache.class);
private static final Logger DEBUG_LOGGER = LoggerFactory.getLogger("QUERY_DEBUG");
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final CommonConfig config = CommonDescriptor.getInstance().getConf();
private static final long MEMORY_THRESHOLD_IN_TIME_SERIES_METADATA_CACHE =
config.getAllocateMemoryForTimeSeriesMetaDataCache();
private static final boolean CACHE_ENABLE = config.isMetaDataCacheEnable();
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/performer/impl/FastCompactionPerformer.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/performer/impl/FastCompactionPerformer.java
index 9e5a115a0d..c4ecc9992a 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/performer/impl/FastCompactionPerformer.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/performer/impl/FastCompactionPerformer.java
@@ -71,7 +71,7 @@ public class FastCompactionPerformer
private List<TsFileResource> sortedSourceFiles = new ArrayList<>();
private static final int subTaskNum =
- IoTDBDescriptor.getInstance().getConfig().getSubCompactionTaskNum();
+ IoTDBDescriptor.getInstance().getConf().getSubCompactionTaskNum();
public Map<TsFileResource, TsFileSequenceReader> readerCacheMap = new ConcurrentHashMap<>();
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/performer/impl/ReadChunkCompactionPerformer.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/performer/impl/ReadChunkCompactionPerformer.java
index ba13ce09ca..85ae046d60 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/performer/impl/ReadChunkCompactionPerformer.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/performer/impl/ReadChunkCompactionPerformer.java
@@ -71,8 +71,8 @@ public class ReadChunkCompactionPerformer implements ISeqCompactionPerformer {
long sizeForFileWriter =
(long)
((double) SystemInfo.getInstance().getMemorySizeForCompaction()
- / IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount()
- * CommonDescriptor.getInstance().getConfig().getChunkMetadataSizeProportion());
+ / IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount()
+ * CommonDescriptor.getInstance().getConf().getChunkMetadataSizeProportion());
TsFileMetricManager.getInstance().addCompactionTempFileNum(true, true, 1);
try (MultiTsFileDeviceIterator deviceIterator = new MultiTsFileDeviceIterator(seqFiles);
TsFileIOWriter writer =
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/performer/impl/ReadPointCompactionPerformer.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/performer/impl/ReadPointCompactionPerformer.java
index 136f07967b..30888a33b1 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/performer/impl/ReadPointCompactionPerformer.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/performer/impl/ReadPointCompactionPerformer.java
@@ -70,7 +70,7 @@ public class ReadPointCompactionPerformer
private List<TsFileResource> unseqFiles = Collections.emptyList();
private static final int subTaskNum =
- IoTDBDescriptor.getInstance().getConfig().getSubCompactionTaskNum();
+ IoTDBDescriptor.getInstance().getConf().getSubCompactionTaskNum();
private CompactionTaskSummary summary;
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/recover/CompactionRecoverTask.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/recover/CompactionRecoverTask.java
index 7d1a81a388..500bc74cc9 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/recover/CompactionRecoverTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/recover/CompactionRecoverTask.java
@@ -275,7 +275,7 @@ public class CompactionRecoverTask {
* the file is not found, it will return null.
*/
private File getFileFromDataDirs(String filePath) {
- String[] dataDirs = IoTDBDescriptor.getInstance().getConfig().getDnDataDirs();
+ String[] dataDirs = IoTDBDescriptor.getInstance().getConf().getDnDataDirs();
for (String dataDir : dataDirs) {
File f = new File(dataDir, filePath);
if (f.exists()) {
@@ -304,7 +304,7 @@ public class CompactionRecoverTask {
"{} [Compaction][ExceptionHandler] target file {} is not complete, and some source files is lost, do nothing. Set allowCompaction to false",
fullStorageGroupName,
targetFileIdentifier.getFilePath());
- CommonDescriptor.getInstance().getConfig().setNodeStatus(NodeStatus.ReadOnly);
+ CommonDescriptor.getInstance().getConf().setNodeStatus(NodeStatus.ReadOnly);
return false;
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/CrossSpaceCompactionTask.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/CrossSpaceCompactionTask.java
index 21401ef335..4cd84ab989 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/CrossSpaceCompactionTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/CrossSpaceCompactionTask.java
@@ -168,7 +168,7 @@ public class CrossSpaceCompactionTask extends AbstractCompactionTask {
timePartition,
true);
- if (IoTDBDescriptor.getInstance().getConfig().isEnableCompactionValidation()
+ if (IoTDBDescriptor.getInstance().getConf().isEnableCompactionValidation()
&& !CompactionUtils.validateTsFileResources(
tsFileManager, storageGroupName, timePartition)) {
LOGGER.error(
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/InnerSpaceCompactionTask.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/InnerSpaceCompactionTask.java
index b8406abc00..3dd42ef816 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/InnerSpaceCompactionTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/task/InnerSpaceCompactionTask.java
@@ -177,7 +177,7 @@ public class InnerSpaceCompactionTask extends AbstractCompactionTask {
false);
}
- if (IoTDBDescriptor.getInstance().getConfig().isEnableCompactionValidation()
+ if (IoTDBDescriptor.getInstance().getConf().isEnableCompactionValidation()
&& !CompactionUtils.validateTsFileResources(
tsFileManager, storageGroupName, timePartition)) {
LOGGER.error(
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/executor/readchunk/AlignedSeriesCompactionExecutor.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/executor/readchunk/AlignedSeriesCompactionExecutor.java
index a35163ee7f..2655d501bd 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/executor/readchunk/AlignedSeriesCompactionExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/executor/readchunk/AlignedSeriesCompactionExecutor.java
@@ -66,9 +66,9 @@ public class AlignedSeriesCompactionExecutor {
CompactionTaskManager.getInstance().getMergeWriteRateLimiter();
private final long chunkSizeThreshold =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkSize();
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
private final long chunkPointNumThreshold =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkPointNum();
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
public AlignedSeriesCompactionExecutor(
String device,
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 e636e30086..382fef5285 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
@@ -65,13 +65,13 @@ public class SingleSeriesCompactionExecutor {
private long pointCountInChunkWriter = 0;
private final long targetChunkSize =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkSize();
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
private final long targetChunkPointNum =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkPointNum();
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
private final long chunkSizeLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkSizeLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkSizeLowerBoundInCompaction();
private final long chunkPointNumLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkPointNumLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkPointNumLowerBoundInCompaction();
public SingleSeriesCompactionExecutor(
PartialPath series,
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/log/TsFileIdentifier.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/log/TsFileIdentifier.java
index c710adcd7f..b6c8b420c9 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/log/TsFileIdentifier.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/log/TsFileIdentifier.java
@@ -180,7 +180,7 @@ public class TsFileIdentifier {
* the file is not found, it will return null.
*/
public File getFileFromDataDirs() {
- String[] dataDirs = IoTDBDescriptor.getInstance().getConfig().getDnDataDirs();
+ String[] dataDirs = IoTDBDescriptor.getInstance().getConf().getDnDataDirs();
String partialFileString =
(sequence ? IoTDBConstant.SEQUENCE_FLODER_NAME : IoTDBConstant.UNSEQUENCE_FLODER_NAME)
+ File.separator
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/writer/AbstractCompactionWriter.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/writer/AbstractCompactionWriter.java
index 92ff3008e5..41e315bc8c 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/writer/AbstractCompactionWriter.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/writer/AbstractCompactionWriter.java
@@ -46,7 +46,7 @@ import java.nio.ByteBuffer;
import java.util.List;
public abstract class AbstractCompactionWriter implements AutoCloseable {
- protected int subTaskNum = IoTDBDescriptor.getInstance().getConfig().getSubCompactionTaskNum();
+ protected int subTaskNum = IoTDBDescriptor.getInstance().getConf().getSubCompactionTaskNum();
private RateLimiter compactionRateLimiter =
CompactionTaskManager.getInstance().getMergeWriteRateLimiter();
@@ -63,11 +63,11 @@ public abstract class AbstractCompactionWriter implements AutoCloseable {
protected int[] chunkPointNumArray = new int[subTaskNum];
// used to control the target chunk size
- protected long targetChunkSize = IoTDBDescriptor.getInstance().getConfig().getTargetChunkSize();
+ protected long targetChunkSize = IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
// used to control the point num of target chunk
protected long targetChunkPointNum =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkPointNum();
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
// When num of points writing into target files reaches check point, then check chunk size
private final long checkPoint = (targetChunkPointNum >= 10 ? targetChunkPointNum : 10) / 10;
@@ -77,12 +77,12 @@ public abstract class AbstractCompactionWriter implements AutoCloseable {
// if unsealed chunk size is lower then this, then deserialize next chunk no matter it is
// overlapped or not
protected long chunkSizeLowerBoundInCompaction =
- IoTDBDescriptor.getInstance().getConfig().getChunkSizeLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkSizeLowerBoundInCompaction();
// if point num of unsealed chunk is lower then this, then deserialize next chunk no matter it is
// overlapped or not
protected long chunkPointNumLowerBoundInCompaction =
- IoTDBDescriptor.getInstance().getConfig().getChunkPointNumLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkPointNumLowerBoundInCompaction();
// if unsealed page size is lower then this, then deserialize next page no matter it is
// overlapped or not
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/writer/AbstractCrossCompactionWriter.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/writer/AbstractCrossCompactionWriter.java
index 70658d4a58..37e7a7678f 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/writer/AbstractCrossCompactionWriter.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/writer/AbstractCrossCompactionWriter.java
@@ -72,10 +72,10 @@ public abstract class AbstractCrossCompactionWriter extends AbstractCompactionWr
long memorySizeForEachWriter =
(long)
(SystemInfo.getInstance().getMemorySizeForCompaction()
- / IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount()
- * CommonDescriptor.getInstance().getConfig().getChunkMetadataSizeProportion()
+ / IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount()
+ * CommonDescriptor.getInstance().getConf().getChunkMetadataSizeProportion()
/ targetResources.size());
- boolean enableMemoryControl = CommonDescriptor.getInstance().getConfig().isEnableMemControl();
+ boolean enableMemoryControl = CommonDescriptor.getInstance().getConf().isEnableMemControl();
for (int i = 0; i < targetResources.size(); i++) {
this.targetFileWriters.add(
new TsFileIOWriter(
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/writer/AbstractInnerCompactionWriter.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/writer/AbstractInnerCompactionWriter.java
index f31de93e6f..f49b7acb40 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/writer/AbstractInnerCompactionWriter.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/execute/utils/writer/AbstractInnerCompactionWriter.java
@@ -47,9 +47,9 @@ public abstract class AbstractInnerCompactionWriter extends AbstractCompactionWr
long sizeForFileWriter =
(long)
(SystemInfo.getInstance().getMemorySizeForCompaction()
- / IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount()
- * CommonDescriptor.getInstance().getConfig().getChunkMetadataSizeProportion());
- boolean enableMemoryControl = CommonDescriptor.getInstance().getConfig().isEnableMemControl();
+ / IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount()
+ * CommonDescriptor.getInstance().getConf().getChunkMetadataSizeProportion());
+ boolean enableMemoryControl = CommonDescriptor.getInstance().getConf().isEnableMemControl();
this.fileWriter =
new TsFileIOWriter(targetFileResource.getTsFile(), enableMemoryControl, sizeForFileWriter);
this.targetResource = targetFileResource;
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/schedule/CompactionScheduler.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/schedule/CompactionScheduler.java
index dec7eefa28..f2e30faf8a 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/schedule/CompactionScheduler.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/schedule/CompactionScheduler.java
@@ -49,7 +49,7 @@ import java.util.List;
public class CompactionScheduler {
private static final Logger LOGGER =
LoggerFactory.getLogger(IoTDBConstant.COMPACTION_LOGGER_NAME);
- private static IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
public static void scheduleCompaction(TsFileManager tsFileManager, long timePartition) {
if (!tsFileManager.isAllowCompaction()) {
@@ -112,11 +112,11 @@ public class CompactionScheduler {
ICompactionPerformer performer =
sequence
? IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.getInnerSeqCompactionPerformer()
.createInstance()
: IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.getInnerUnseqCompactionPerformer()
.createInstance();
CompactionTaskManager.getInstance()
@@ -159,7 +159,7 @@ public class CompactionScheduler {
taskList.get(i).getSeqFiles(),
taskList.get(i).getUnseqFiles(),
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.getCrossCompactionPerformer()
.createInstance(),
CompactionTaskManager.currentTaskNum,
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/schedule/CompactionTaskManager.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/schedule/CompactionTaskManager.java
index 0e51e046a1..7ecd328c2b 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/schedule/CompactionTaskManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/schedule/CompactionTaskManager.java
@@ -77,7 +77,7 @@ public class CompactionTaskManager implements IService {
private final RateLimiter mergeWriteRateLimiter = RateLimiter.create(Double.MAX_VALUE);
- private final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private volatile boolean init = false;
public static CompactionTaskManager getInstance() {
@@ -87,7 +87,7 @@ public class CompactionTaskManager implements IService {
@Override
public synchronized void start() {
if (taskExecutionPool == null
- && IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount() > 0
+ && IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount() > 0
&& (config.isEnableSeqSpaceCompaction()
|| config.isEnableUnseqSpaceCompaction()
|| config.isEnableCrossSpaceCompaction())) {
@@ -105,7 +105,7 @@ public class CompactionTaskManager implements IService {
}
private void initThreadPool() {
- int compactionThreadNum = IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
+ int compactionThreadNum = IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
this.taskExecutionPool =
(WrappedThreadPoolExecutor)
IoTDBThreadPoolFactory.newFixedThreadPool(
@@ -114,7 +114,7 @@ public class CompactionTaskManager implements IService {
(WrappedThreadPoolExecutor)
IoTDBThreadPoolFactory.newFixedThreadPool(
compactionThreadNum
- * IoTDBDescriptor.getInstance().getConfig().getSubCompactionTaskNum(),
+ * IoTDBDescriptor.getInstance().getConf().getSubCompactionTaskNum(),
ThreadName.COMPACTION_SUB_SERVICE.getName());
for (int i = 0; i < compactionThreadNum; ++i) {
taskExecutionPool.submit(new CompactionWorker(i, candidateCompactionTaskQueue));
@@ -242,7 +242,7 @@ public class CompactionTaskManager implements IService {
public RateLimiter getMergeWriteRateLimiter() {
setWriteMergeRate(
- IoTDBDescriptor.getInstance().getConfig().getCompactionWriteThroughputMbPerSec());
+ IoTDBDescriptor.getInstance().getConf().getCompactionWriteThroughputMbPerSec());
return mergeWriteRateLimiter;
}
@@ -354,7 +354,7 @@ public class CompactionTaskManager implements IService {
@TestOnly
public void restart() throws InterruptedException {
- if (IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount() > 0) {
+ if (IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount() > 0) {
if (subCompactionTaskExecutionPool != null) {
this.subCompactionTaskExecutionPool.shutdownNow();
if (!this.subCompactionTaskExecutionPool.awaitTermination(
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/schedule/comparator/DefaultCompactionTaskComparatorImpl.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/schedule/comparator/DefaultCompactionTaskComparatorImpl.java
index 334acae481..2d2e8a0bf2 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/schedule/comparator/DefaultCompactionTaskComparatorImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/schedule/comparator/DefaultCompactionTaskComparatorImpl.java
@@ -30,7 +30,7 @@ import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
import java.util.List;
public class DefaultCompactionTaskComparatorImpl implements ICompactionTaskComparator {
- private IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
@Override
public int compare(AbstractCompactionTask o1, AbstractCompactionTask o2) {
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/estimator/InplaceCompactionEstimator.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/estimator/InplaceCompactionEstimator.java
index d8c8e99942..271ef9d58c 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/estimator/InplaceCompactionEstimator.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/estimator/InplaceCompactionEstimator.java
@@ -41,7 +41,7 @@ public class InplaceCompactionEstimator extends AbstractCrossSpaceEstimator {
// the number of timeseries being compacted at the same time
private final int concurrentSeriesNum =
- IoTDBDescriptor.getInstance().getConfig().getSubCompactionTaskNum();
+ IoTDBDescriptor.getInstance().getConf().getSubCompactionTaskNum();
/** Total metadata size of each file. */
private final Map<TsFileResource, Long> fileMetaSizeMap = new HashMap<>();
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/estimator/ReadPointCrossCompactionEstimator.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/estimator/ReadPointCrossCompactionEstimator.java
index d50e5a3af2..b2df2a0e0e 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/estimator/ReadPointCrossCompactionEstimator.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/estimator/ReadPointCrossCompactionEstimator.java
@@ -51,7 +51,7 @@ public class ReadPointCrossCompactionEstimator extends AbstractCrossSpaceEstimat
// the number of timeseries being compacted at the same time
private final int subCompactionTaskNum =
- IoTDBDescriptor.getInstance().getConfig().getSubCompactionTaskNum();
+ IoTDBDescriptor.getInstance().getConf().getSubCompactionTaskNum();
public ReadPointCrossCompactionEstimator() {
this.maxCostOfReadingSeqFile = 0;
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 1a3bb4480d..a054c13781 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
@@ -45,7 +45,7 @@ import java.util.stream.Collectors;
public class RewriteCrossSpaceCompactionSelector implements ICrossSpaceSelector {
private static final Logger LOGGER =
LoggerFactory.getLogger(IoTDBConstant.COMPACTION_LOGGER_NAME);
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private final int SELECT_WARN_THRESHOLD = 10;
protected String logicalStorageGroupName;
@@ -73,16 +73,16 @@ public class RewriteCrossSpaceCompactionSelector implements ICrossSpaceSelector
this.memoryBudget =
(long)
((double) SystemInfo.getInstance().getMemorySizeForCompaction()
- / IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount()
+ / IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount()
* config.getUsableCompactionMemoryProportion());
this.maxCrossCompactionFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxCrossCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().getMaxCrossCompactionCandidateFileNum();
this.maxCrossCompactionFileSize =
- IoTDBDescriptor.getInstance().getConfig().getMaxCrossCompactionCandidateFileSize();
+ IoTDBDescriptor.getInstance().getConf().getMaxCrossCompactionCandidateFileSize();
this.compactionEstimator =
ICompactionSelector.getCompactionEstimator(
- IoTDBDescriptor.getInstance().getConfig().getCrossCompactionPerformer(), false);
+ IoTDBDescriptor.getInstance().getConf().getCrossCompactionPerformer(), false);
}
/**
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/impl/SizeTieredCompactionSelector.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/impl/SizeTieredCompactionSelector.java
index e4b7111505..388489f4fa 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/impl/SizeTieredCompactionSelector.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/impl/SizeTieredCompactionSelector.java
@@ -56,7 +56,7 @@ public class SizeTieredCompactionSelector
implements IInnerSeqSpaceSelector, IInnerUnseqSpaceSelector {
private static final Logger LOGGER =
LoggerFactory.getLogger(IoTDBConstant.COMPACTION_LOGGER_NAME);
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
protected String storageGroupName;
protected String dataRegionId;
protected long timePartition;
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/flush/FlushManager.java b/server/src/main/java/org/apache/iotdb/db/engine/flush/FlushManager.java
index 5f2a304eab..61329aecf1 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/flush/FlushManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/flush/FlushManager.java
@@ -39,7 +39,7 @@ import java.util.concurrent.ConcurrentLinkedDeque;
public class FlushManager implements FlushManagerMBean, IService {
private static final Logger LOGGER = LoggerFactory.getLogger(FlushManager.class);
- private final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private ConcurrentLinkedDeque<TsFileProcessor> tsFileProcessorQueue =
new ConcurrentLinkedDeque<>();
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java b/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java
index 9206e679e3..57d077df26 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/flush/MemTableFlushTask.java
@@ -58,7 +58,7 @@ public class MemTableFlushTask {
private static final Logger LOGGER = LoggerFactory.getLogger(MemTableFlushTask.class);
private static final FlushSubTaskPoolManager SUB_TASK_POOL_MANAGER =
FlushSubTaskPoolManager.getInstance();
- private static CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
+ private static CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private final Future<?> encodingTaskFuture;
private final Future<?> ioTaskFuture;
private RestorableTsFileIOWriter writer;
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/flush/pool/FlushTaskPoolManager.java b/server/src/main/java/org/apache/iotdb/db/engine/flush/pool/FlushTaskPoolManager.java
index dd63d1bfa0..74b646d333 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/flush/pool/FlushTaskPoolManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/flush/pool/FlushTaskPoolManager.java
@@ -31,7 +31,7 @@ public class FlushTaskPoolManager extends AbstractPoolManager {
private static final Logger LOGGER = LoggerFactory.getLogger(FlushTaskPoolManager.class);
private FlushTaskPoolManager() {
- int threadCnt = CommonDescriptor.getInstance().getConfig().getFlushThreadCount();
+ int threadCnt = CommonDescriptor.getInstance().getConf().getFlushThreadCount();
pool = IoTDBThreadPoolFactory.newFixedThreadPool(threadCnt, ThreadName.FLUSH_SERVICE.getName());
}
@@ -52,7 +52,7 @@ public class FlushTaskPoolManager extends AbstractPoolManager {
@Override
public void start() {
if (pool == null) {
- int threadCnt = CommonDescriptor.getInstance().getConfig().getFlushThreadCount();
+ int threadCnt = CommonDescriptor.getInstance().getConf().getFlushThreadCount();
pool =
IoTDBThreadPoolFactory.newFixedThreadPool(threadCnt, ThreadName.FLUSH_SERVICE.getName());
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/load/LoadTsFileManager.java b/server/src/main/java/org/apache/iotdb/db/engine/load/LoadTsFileManager.java
index 20b9cd75220..60eefc808f 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/load/LoadTsFileManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/load/LoadTsFileManager.java
@@ -58,7 +58,7 @@ import java.util.concurrent.TimeUnit;
*/
public class LoadTsFileManager {
private static final Logger logger = LoggerFactory.getLogger(LoadTsFileManager.class);
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private final File loadDir;
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 a7790b7764..eb4a199596 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
@@ -18,6 +18,7 @@
*/
package org.apache.iotdb.db.engine.memtable;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.service.metric.MetricService;
@@ -78,7 +79,7 @@ public abstract class AbstractMemTable implements IMemTable {
private boolean shouldFlush = false;
private volatile FlushStatus flushStatus = FlushStatus.WORKING;
private final int avgSeriesPointNumThreshold =
- IoTDBDescriptor.getInstance().getConfig().getAvgSeriesPointNumberThreshold();
+ CommonDescriptor.getInstance().getConf().getAvgSeriesPointNumberThreshold();
/** memory size of data points, including TEXT values */
private long memSize = 0;
/**
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/settle/SettleLog.java b/server/src/main/java/org/apache/iotdb/db/engine/settle/SettleLog.java
index be29a3a0b7..f9cc4e5a4c 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/settle/SettleLog.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/settle/SettleLog.java
@@ -36,7 +36,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
public class SettleLog {
private static final Logger logger = LoggerFactory.getLogger(SettleLog.class);
public static final String COMMA_SEPERATOR = ",";
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private static final String SETTLE_DIR = "settle";
private static final String SETTLE_LOG_NAME = "settle.txt";
private static BufferedWriter settleLogWriter;
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/settle/SettleRequestHandler.java b/server/src/main/java/org/apache/iotdb/db/engine/settle/SettleRequestHandler.java
index 7b32559532..2bf84e333d 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/settle/SettleRequestHandler.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/settle/SettleRequestHandler.java
@@ -98,7 +98,7 @@ public class SettleRequestHandler {
private SettleRequestContext(List<String> paths) {
this.paths = paths;
this.tsFileNames = new HashSet<>();
- this.config = IoTDBDescriptor.getInstance().getConfig();
+ this.config = IoTDBDescriptor.getInstance().getConf();
}
private TSStatus validate() {
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/snapshot/SnapshotLoader.java b/server/src/main/java/org/apache/iotdb/db/engine/snapshot/SnapshotLoader.java
index b95d92c4fb..026f8d80b6 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/snapshot/SnapshotLoader.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/snapshot/SnapshotLoader.java
@@ -60,7 +60,7 @@ public class SnapshotLoader {
private DataRegion loadSnapshot() {
try {
return new DataRegion(
- IoTDBDescriptor.getInstance().getConfig().getDnSystemDir()
+ IoTDBDescriptor.getInstance().getConf().getDnSystemDir()
+ File.separator
+ "databases"
+ File.separator
@@ -171,7 +171,7 @@ public class SnapshotLoader {
}
private void deleteAllFilesInDataDirs() throws IOException {
- String[] dataDirPaths = IoTDBDescriptor.getInstance().getConfig().getDnDataDirs();
+ String[] dataDirPaths = IoTDBDescriptor.getInstance().getConf().getDnDataDirs();
// delete
List<File> timePartitions = new ArrayList<>();
@@ -250,7 +250,7 @@ public class SnapshotLoader {
}
FolderManager folderManager =
new FolderManager(
- Arrays.asList(IoTDBDescriptor.getInstance().getConfig().getDnDataDirs()),
+ Arrays.asList(IoTDBDescriptor.getInstance().getConf().getDnDataDirs()),
DirectoryStrategyType.SEQUENCE_STRATEGY);
File[] timePartitionFolders = seqFileDir.listFiles();
if (timePartitionFolders != null) {
@@ -318,7 +318,7 @@ public class SnapshotLoader {
String snapshotId = logAnalyzer.getSnapshotId();
int loggedFileNum = logAnalyzer.getTotalFileCountInSnapshot();
Set<String> fileInfoSet = logAnalyzer.getFileInfoSet();
- String[] dataDirs = IoTDBDescriptor.getInstance().getConfig().getDnDataDirs();
+ String[] dataDirs = IoTDBDescriptor.getInstance().getConf().getDnDataDirs();
int fileCnt = 0;
for (String dataDir : dataDirs) {
String snapshotDir =
@@ -454,7 +454,7 @@ public class SnapshotLoader {
SnapshotLogAnalyzer analyzer = new SnapshotLogAnalyzer(logFile);
try {
String snapshotId = analyzer.getSnapshotId();
- String[] dataDirs = IoTDBDescriptor.getInstance().getConfig().getDnDataDirs();
+ String[] dataDirs = IoTDBDescriptor.getInstance().getConf().getDnDataDirs();
List<File> fileList = new LinkedList<>();
for (String dataDir : dataDirs) {
String snapshotDir =
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/snapshot/SnapshotTaker.java b/server/src/main/java/org/apache/iotdb/db/engine/snapshot/SnapshotTaker.java
index 78a81803a1..3a0095599b 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/snapshot/SnapshotTaker.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/snapshot/SnapshotTaker.java
@@ -249,7 +249,7 @@ public class SnapshotTaker {
private void cleanUpWhenFail(String snapshotId) {
LOGGER.info("Cleaning up snapshot dir for {}", snapshotId);
- for (String dataDir : IoTDBDescriptor.getInstance().getConfig().getDnDataDirs()) {
+ for (String dataDir : IoTDBDescriptor.getInstance().getConf().getDnDataDirs()) {
File dataDirForThisSnapshot =
new File(
dataDir
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java
index aef98c79e0..574de6546f 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegion.java
@@ -162,8 +162,8 @@ import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.TSFILE_SUFF
*/
public class DataRegion implements IDataRegionForQuery {
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private static final Logger DEBUG_LOGGER = LoggerFactory.getLogger("QUERY_DEBUG");
/**
@@ -603,7 +603,7 @@ public class DataRegion implements IDataRegionForQuery {
timedCompactionScheduleTask,
this::executeCompaction,
COMPACTION_TASK_SUBMIT_DELAY,
- IoTDBDescriptor.getInstance().getConfig().getCompactionScheduleIntervalInMs(),
+ IoTDBDescriptor.getInstance().getConf().getCompactionScheduleIntervalInMs(),
TimeUnit.MILLISECONDS);
}
@@ -1236,7 +1236,7 @@ public class DataRegion implements IDataRegionForQuery {
logger.error(
"disk space is insufficient when creating TsFile processor, change system mode to read-only",
e);
- CommonDescriptor.getInstance().getConfig().setNodeStatus(NodeStatus.ReadOnly);
+ CommonDescriptor.getInstance().getConf().setNodeStatus(NodeStatus.ReadOnly);
break;
} catch (IOException e) {
if (retryCnt < 3) {
@@ -1245,7 +1245,7 @@ public class DataRegion implements IDataRegionForQuery {
} else {
logger.error(
"meet IOException when creating TsFileProcessor, change system mode to error", e);
- CommonDescriptor.getInstance().getConfig().handleUnrecoverableError();
+ CommonDescriptor.getInstance().getConf().handleUnrecoverableError();
break;
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegionInfo.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegionInfo.java
index 0e60feae04..17731d4ab2 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegionInfo.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/DataRegionInfo.java
@@ -39,9 +39,9 @@ public class DataRegionInfo {
/** The threshold of reporting it's size to SystemInfo */
private final long storageGroupSizeReportThreshold =
(long)
- (CommonDescriptor.getInstance().getConfig().getWriteMemoryVariationReportProportion()
- * CommonDescriptor.getInstance().getConfig().getAllocateMemoryForStorageEngine()
- * CommonDescriptor.getInstance().getConfig().getWriteProportionForMemtable());
+ (CommonDescriptor.getInstance().getConf().getWriteMemoryVariationReportProportion()
+ * CommonDescriptor.getInstance().getConf().getAllocateMemoryForStorageEngine()
+ * CommonDescriptor.getInstance().getConf().getWriteProportionForMemtable());
private final AtomicLong lastReportedSize = new AtomicLong();
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TimePartitionManager.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TimePartitionManager.java
index ff507ed552..16d5a8f7cf 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TimePartitionManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TimePartitionManager.java
@@ -22,7 +22,6 @@ package org.apache.iotdb.db.engine.storagegroup;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.consensus.DataRegionId;
import org.apache.iotdb.commons.utils.TestOnly;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.StorageEngine;
import java.util.HashMap;
@@ -36,7 +35,7 @@ public class TimePartitionManager {
long memCost = 0;
long timePartitionInfoMemoryThreshold =
- CommonDescriptor.getInstance().getConfig().getAllocateMemoryForTimePartitionInfo();
+ CommonDescriptor.getInstance().getConf().getAllocateMemoryForTimePartitionInfo();
private TimePartitionManager() {
timePartitionInfoMap = new HashMap<>();
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
index a3678b1459..c807eaddc8 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java
@@ -99,8 +99,8 @@ public class TsFileProcessor {
/** logger fot this class */
private static final Logger logger = LoggerFactory.getLogger(TsFileProcessor.class);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
/** storgae group name of this tsfile */
private final String storageGroupName;
@@ -1073,7 +1073,7 @@ public class TsFileProcessor {
storageGroupName,
tsFileResource.getTsFile().getAbsolutePath(),
e);
- CommonDescriptor.getInstance().getConfig().handleUnrecoverableError();
+ CommonDescriptor.getInstance().getConf().handleUnrecoverableError();
try {
logger.error(
"{}: {} IOTask meets error, truncate the corrupted data",
@@ -1208,7 +1208,7 @@ public class TsFileProcessor {
storageGroupName,
tsFileResource.getTsFile().getAbsolutePath(),
e);
- CommonDescriptor.getInstance().getConfig().handleUnrecoverableError();
+ CommonDescriptor.getInstance().getConf().handleUnrecoverableError();
break;
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
index c151524ab4..e0b99fb264 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileResource.java
@@ -77,7 +77,7 @@ public class TsFileResource {
private static final Logger DEBUG_LOGGER = LoggerFactory.getLogger("QUERY_DEBUG");
- private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConf();
/** this tsfile */
private File file;
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 c7b3b022a4..52e56ab01e 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
@@ -19,6 +19,7 @@
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;
@@ -53,13 +54,13 @@ public class BatchHandlerQueue<T extends Event> {
this.queueNumber =
Math.min(
queueNumber,
- IoTDBDescriptor.getInstance().getConfig().getTriggerForwardMaxQueueNumber());
+ CommonDescriptor.getInstance().getConf().getTriggerForwardMaxQueueNumber());
this.queueSize =
Math.min(
queueSize,
- IoTDBDescriptor.getInstance().getConfig().getTriggerForwardMaxSizePerQueue());
+ CommonDescriptor.getInstance().getConf().getTriggerForwardMaxSizePerQueue());
this.batchSize =
- Math.min(batchSize, IoTDBDescriptor.getInstance().getConfig().getTriggerForwardBatchSize());
+ Math.min(batchSize, CommonDescriptor.getInstance().getConf().getTriggerForwardBatchSize());
this.handler = handler;
queues = new ArrayBlockingQueue[this.queueNumber];
for (int i = 0; i < queueNumber; i++) {
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 0a6503287d..cbb456fdb9 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
@@ -19,6 +19,7 @@
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;
@@ -36,11 +37,11 @@ public class HTTPConnectionPool {
clientConnectionManager = new PoolingHttpClientConnectionManager();
// Set the max number of connections
clientConnectionManager.setMaxTotal(
- IoTDBDescriptor.getInstance().getConfig().getTriggerForwardHTTPPoolSize());
+ CommonDescriptor.getInstance().getConf().getTriggerForwardHTTPPoolSize());
// Set the maximum number of connections per host and the specified number of connections
// per website, which will not affect the access of other websites
clientConnectionManager.setDefaultMaxPerRoute(
- IoTDBDescriptor.getInstance().getConfig().getTriggerForwardHTTPPOOLMaxPerRoute());
+ CommonDescriptor.getInstance().getConf().getTriggerForwardHTTPPOOLMaxPerRoute());
}
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/trigger/utils/MQTTConnectionPool.java b/server/src/main/java/org/apache/iotdb/db/engine/trigger/utils/MQTTConnectionPool.java
index b5877d07b6..0f9979d0cf 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/trigger/utils/MQTTConnectionPool.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/trigger/utils/MQTTConnectionPool.java
@@ -51,7 +51,7 @@ public class MQTTConnectionPool extends GenericObjectPool<BlockingConnection> {
private MQTTConnectionPool(MQTTConnectionFactory factory, int size) {
super(factory);
setMaxTotal(
- Math.min(size, CommonDescriptor.getInstance().getConfig().getTriggerForwardMQTTPoolSize()));
+ Math.min(size, CommonDescriptor.getInstance().getConf().getTriggerForwardMQTTPoolSize()));
setMinIdle(1);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/upgrade/UpgradeLog.java b/server/src/main/java/org/apache/iotdb/db/engine/upgrade/UpgradeLog.java
index 1c4159a239..fd0e4c1967 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/upgrade/UpgradeLog.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/upgrade/UpgradeLog.java
@@ -35,7 +35,7 @@ public class UpgradeLog {
private static final Logger logger = LoggerFactory.getLogger(UpgradeLog.class);
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private static final String UPGRADE_DIR = "upgrade";
private static final String UPGRADE_LOG_NAME = "upgrade.txt";
private static BufferedWriter upgradeLogWriter;
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/sql/PathNumOverLimitException.java b/server/src/main/java/org/apache/iotdb/db/exception/sql/PathNumOverLimitException.java
index 4160f06e95..e0a4272ecd 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/sql/PathNumOverLimitException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/sql/PathNumOverLimitException.java
@@ -28,6 +28,6 @@ public class PathNumOverLimitException extends SemanticException {
String.format(
"Too many paths in one query! Currently allowed max deduplicated path number is %d. "
+ "Please use slimit or adjust max_deduplicated_path_num in iotdb-common.properties.",
- IoTDBDescriptor.getInstance().getConfig().getMaxQueryDeduplicatedPathNum()));
+ IoTDBDescriptor.getInstance().getConf().getMaxQueryDeduplicatedPathNum()));
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeLastCacheManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeLastCacheManager.java
index 7417160f47..4a3db43783 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeLastCacheManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeLastCacheManager.java
@@ -30,7 +30,7 @@ public class DataNodeLastCacheManager {
private static final Logger logger = LoggerFactory.getLogger(DataNodeLastCacheManager.class);
private static final boolean CACHE_ENABLED =
- IoTDBDescriptor.getInstance().getConfig().isLastCacheEnabled();
+ IoTDBDescriptor.getInstance().getConf().isLastCacheEnabled();
/**
* get the last cache value from time series
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeSchemaCache.java b/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeSchemaCache.java
index bfde2437d0..3bbd12e094 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeSchemaCache.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeSchemaCache.java
@@ -45,7 +45,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
public class DataNodeSchemaCache {
private static final Logger logger = LoggerFactory.getLogger(DataNodeSchemaCache.class);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private final Cache<PartialPath, SchemaCacheEntry> cache;
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/idtable/IDTable.java b/server/src/main/java/org/apache/iotdb/db/metadata/idtable/IDTable.java
index 3862f94ed5..219254dc9d 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/idtable/IDTable.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/idtable/IDTable.java
@@ -50,7 +50,7 @@ public interface IDTable {
Logger logger = LoggerFactory.getLogger(IDTable.class);
/** iotdb config */
- IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
/**
* create aligned timeseries
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/idtable/IDTableHashmapImpl.java b/server/src/main/java/org/apache/iotdb/db/metadata/idtable/IDTableHashmapImpl.java
index fc466920f4..22f89643aa 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/idtable/IDTableHashmapImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/idtable/IDTableHashmapImpl.java
@@ -66,7 +66,7 @@ public class IDTableHashmapImpl implements IDTable {
/** disk schema manager to manage disk schema entry */
private IDiskSchemaManager IDiskSchemaManager;
/** iotdb config */
- protected static IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ protected static IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
public IDTableHashmapImpl(File storageGroupDir) {
idTables = new Map[NUM_OF_SLOTS];
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/idtable/IDTableManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/idtable/IDTableManager.java
index f904bd4e3a..f1638399bd 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/idtable/IDTableManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/idtable/IDTableManager.java
@@ -44,7 +44,7 @@ public class IDTableManager {
/** system dir */
private final String systemDir =
- FilePathUtils.regularizePath(IoTDBDescriptor.getInstance().getConfig().getDnSystemDir())
+ FilePathUtils.regularizePath(IoTDBDescriptor.getInstance().getConf().getDnSystemDir())
+ "databases";
// region IDManager Singleton
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/idtable/entry/DeviceIDFactory.java b/server/src/main/java/org/apache/iotdb/db/metadata/idtable/entry/DeviceIDFactory.java
index 332183cb3b..141afe627e 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/idtable/entry/DeviceIDFactory.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/idtable/entry/DeviceIDFactory.java
@@ -49,9 +49,9 @@ public class DeviceIDFactory {
}
private DeviceIDFactory() {
- if (IoTDBDescriptor.getInstance().getConfig().isEnableIDTable()
+ if (IoTDBDescriptor.getInstance().getConf().isEnableIDTable()
&& IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.getDeviceIDTransformationMethod()
.equals("SHA256")) {
getDeviceIDFunction = SHA256DeviceID::new;
@@ -84,9 +84,9 @@ public class DeviceIDFactory {
/** reset id method */
@TestOnly
public void reset() {
- if (IoTDBDescriptor.getInstance().getConfig().isEnableIDTable()
+ if (IoTDBDescriptor.getInstance().getConf().isEnableIDTable()
&& IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.getDeviceIDTransformationMethod()
.equals("SHA256")) {
getDeviceIDFunction = SHA256DeviceID::new;
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/idtable/entry/SchemaEntry.java b/server/src/main/java/org/apache/iotdb/db/metadata/idtable/entry/SchemaEntry.java
index d9e8339c9c..4c8b280c9f 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/idtable/entry/SchemaEntry.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/idtable/entry/SchemaEntry.java
@@ -46,7 +46,7 @@ public class SchemaEntry {
private long schema;
/** This static field will not occupy memory */
- private static IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
@TestOnly
public SchemaEntry(TSDataType dataType) {
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mnode/container/MNodeContainers.java b/server/src/main/java/org/apache/iotdb/db/metadata/mnode/container/MNodeContainers.java
index ad473edac0..4a4a0b8581 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mnode/container/MNodeContainers.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mnode/container/MNodeContainers.java
@@ -48,7 +48,7 @@ public class MNodeContainers {
public static IMNodeContainer getNewMNodeContainer() {
if (IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.getSchemaEngineMode()
.equals(SchemaEngineMode.Schema_File.toString())) {
return new CachedMNodeContainer();
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/ConfigMTree.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/ConfigMTree.java
index a042c2fd78..1b612e52e8 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/ConfigMTree.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/ConfigMTree.java
@@ -131,7 +131,7 @@ public class ConfigMTree {
} else {
IStorageGroupMNode storageGroupMNode =
new StorageGroupMNode(
- cur, nodeNames[i], CommonDescriptor.getInstance().getConfig().getDefaultTtlInMs());
+ cur, nodeNames[i], CommonDescriptor.getInstance().getConf().getDefaultTtlInMs());
IMNode result = cur.addChild(nodeNames[i], storageGroupMNode);
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/MemMTreeStore.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/MemMTreeStore.java
index cca5d93868..248eea253b 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/MemMTreeStore.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/MemMTreeStore.java
@@ -59,7 +59,7 @@ public class MemMTreeStore implements IMTreeStore {
new StorageGroupMNode(
null,
rootPath.getTailNode(),
- CommonDescriptor.getInstance().getConfig().getDefaultTtlInMs());
+ CommonDescriptor.getInstance().getConf().getDefaultTtlInMs());
} else {
this.root = new InternalMNode(null, IoTDBConstant.PATH_ROOT);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/memcontrol/MemManagerHolder.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/memcontrol/MemManagerHolder.java
index f462009588..42cda1f902 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/memcontrol/MemManagerHolder.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/memcontrol/MemManagerHolder.java
@@ -26,7 +26,7 @@ public class MemManagerHolder {
private static IMemManager memManagerInstance;
public static void initMemManagerInstance() {
- if (IoTDBDescriptor.getInstance().getConfig().getCachedMNodeSizeInSchemaFileMode() >= 0) {
+ if (IoTDBDescriptor.getInstance().getConf().getCachedMNodeSizeInSchemaFileMode() >= 0) {
memManagerInstance = new MemManagerNodeNumBasedImpl();
} else {
memManagerInstance = new MemManagerNodeEstimatedSizeBasedImpl();
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/memcontrol/MemManagerNodeNumBasedImpl.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/memcontrol/MemManagerNodeNumBasedImpl.java
index 993fcfee4f..e9565c6675 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/memcontrol/MemManagerNodeNumBasedImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/memcontrol/MemManagerNodeNumBasedImpl.java
@@ -37,7 +37,7 @@ public class MemManagerNodeNumBasedImpl implements IMemManager {
@Override
public void init() {
- capacity = IoTDBDescriptor.getInstance().getConfig().getCachedMNodeSizeInSchemaFileMode();
+ capacity = IoTDBDescriptor.getInstance().getConf().getCachedMNodeSizeInSchemaFileMode();
}
@Override
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/MockSchemaFile.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/MockSchemaFile.java
index bb2c331c02..ed74235b36 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/MockSchemaFile.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/MockSchemaFile.java
@@ -60,7 +60,7 @@ public class MockSchemaFile implements ISchemaFile {
new StorageGroupMNode(
null,
storageGroupPath.getTailNode(),
- CommonDescriptor.getInstance().getConfig().getDefaultTtlInMs());
+ CommonDescriptor.getInstance().getConf().getDefaultTtlInMs());
writeMNode(storageGroupMNode);
return cloneMNode(storageGroupMNode);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFile.java b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFile.java
index e4c819130e..42ec6085b8 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFile.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/mtree/store/disk/schemafile/SchemaFile.java
@@ -136,7 +136,7 @@ public class SchemaFile implements ISchemaFile {
sgName,
schemaRegionId,
true,
- CommonDescriptor.getInstance().getConfig().getDefaultTtlInMs(),
+ CommonDescriptor.getInstance().getConf().getDefaultTtlInMs(),
false);
}
@@ -467,7 +467,7 @@ public class SchemaFile implements ISchemaFile {
sgName,
schemaRegionId,
false,
- CommonDescriptor.getInstance().getConfig().getDefaultTtlInMs(),
+ CommonDescriptor.getInstance().getConf().getDefaultTtlInMs(),
false);
}
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 2a21891c41..01fed09c3f 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
@@ -29,18 +29,18 @@ public class SchemaFileConfig {
public static final int SCHEMA_FILE_VERSION = 1;
// folder to store .pst files
- public static String SCHEMA_FOLDER = IoTDBDescriptor.getInstance().getConfig().getSchemaDir();
+ public static String SCHEMA_FOLDER = IoTDBDescriptor.getInstance().getConf().getSchemaDir();
public static int FILE_HEADER_SIZE = 256; // size of file header in bytes
public static final int PAGE_CACHE_SIZE =
IoTDBDescriptor.getInstance()
- .getConfig()
+ .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 =
- IoTDBDescriptor.getInstance().getConfig().getSchemaFileLogSize();
+ IoTDBDescriptor.getInstance().getConf().getSchemaFileLogSize();
// marks to note the state of schema file log
public static final byte SF_PREPARE_MARK = (byte) 0xfe;
@@ -73,9 +73,9 @@ public class SchemaFileConfig {
2; // length of short, which is the type of segment offset and index
public static final short SEG_MAX_SIZ = (short) (PAGE_LENGTH - PAGE_HEADER_SIZE - SEG_OFF_DIG);
public static final short SEG_MIN_SIZ =
- IoTDBDescriptor.getInstance().getConfig().getMinimumSegmentInSchemaFile() > SEG_MAX_SIZ
+ IoTDBDescriptor.getInstance().getConf().getMinimumSegmentInSchemaFile() > SEG_MAX_SIZ
? SEG_MAX_SIZ
- : IoTDBDescriptor.getInstance().getConfig().getMinimumSegmentInSchemaFile();
+ : IoTDBDescriptor.getInstance().getConf().getMinimumSegmentInSchemaFile();
public static final int SEG_INDEX_DIGIT = 16; // for type short in bits
public static final long SEG_INDEX_MASK = 0xffffL; // help to translate address
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/MemoryStatistics.java b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/MemoryStatistics.java
index 4e6cc501ae..540fd67abe 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/MemoryStatistics.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/MemoryStatistics.java
@@ -20,7 +20,6 @@
package org.apache.iotdb.db.metadata.rescon;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -54,7 +53,7 @@ public class MemoryStatistics {
private MemoryStatistics() {}
public void init() {
- memoryCapacity = CommonDescriptor.getInstance().getConfig().getAllocateMemoryForSchemaRegion();
+ memoryCapacity = CommonDescriptor.getInstance().getConf().getAllocateMemoryForSchemaRegion();
memoryUsage.getAndSet(0);
allowToCreateNewSeries = true;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/SchemaResourceManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/SchemaResourceManager.java
index d46cb7addf..2551b4498e 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/rescon/SchemaResourceManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/rescon/SchemaResourceManager.java
@@ -37,7 +37,7 @@ public class SchemaResourceManager {
SchemaStatisticsManager.getInstance(), MemoryStatistics.getInstance()));
MemoryStatistics.getInstance().init();
if (IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.getSchemaEngineMode()
.equals(SchemaEngineMode.Schema_File.toString())) {
initSchemaFileModeResource();
@@ -48,7 +48,7 @@ public class SchemaResourceManager {
SchemaStatisticsManager.getInstance().clear();
MemoryStatistics.getInstance().clear();
if (IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.getSchemaEngineMode()
.equals(SchemaEngineMode.Schema_File.toString())) {
clearSchemaFileModeResource();
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngine.java b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngine.java
index adcf9066de..30462265de 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngine.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/schemaregion/SchemaEngine.java
@@ -60,8 +60,8 @@ public class SchemaEngine {
private static final Logger logger = LoggerFactory.getLogger(SchemaEngine.class);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private volatile Map<SchemaRegionId, ISchemaRegion> schemaRegionMap;
private SchemaEngineMode schemaRegionStoredMode;
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 2696455c84..562c3d3fd2 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
@@ -18,6 +18,8 @@
*/
package org.apache.iotdb.db.metadata.schemaregion;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.consensus.SchemaRegionId;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.exception.MetadataException;
@@ -126,7 +128,8 @@ public class SchemaRegionMemoryImpl implements ISchemaRegion {
private static final Logger logger = LoggerFactory.getLogger(SchemaRegionMemoryImpl.class);
- protected static IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
+ private static final IoTDBConfig IOTDB_CONFIG = IoTDBDescriptor.getInstance().getConf();
private boolean isRecovering = true;
private volatile boolean initialized = false;
@@ -159,14 +162,14 @@ public class SchemaRegionMemoryImpl implements ISchemaRegion {
storageGroupFullPath = storageGroup.getFullPath();
this.schemaRegionId = schemaRegionId;
- storageGroupDirPath = config.getSchemaDir() + File.separator + storageGroupFullPath;
+ storageGroupDirPath = IOTDB_CONFIG.getSchemaDir() + File.separator + storageGroupFullPath;
schemaRegionDirPath = storageGroupDirPath + File.separator + schemaRegionId.getId();
// In ratis mode, no matter create schemaRegion or recover schemaRegion, the working dir should
// be clear first
- if (config.isClusterMode()
- && config
- .getSchemaRegionConsensusProtocolClass()
+ if (IOTDB_CONFIG.isClusterMode()
+ && COMMON_CONFIG
+ .getSchemaRegionConsensusProtocolClass().getProtocol()
.equals(ConsensusFactory.RATIS_CONSENSUS)) {
File schemaRegionDir = new File(schemaRegionDirPath);
if (schemaRegionDir.exists()) {
@@ -197,9 +200,9 @@ public class SchemaRegionMemoryImpl implements ISchemaRegion {
new MTreeBelowSGMemoryImpl(
new PartialPath(storageGroupFullPath), tagManager::readTags, schemaRegionId.getId());
- if (!(config.isClusterMode()
- && config
- .getSchemaRegionConsensusProtocolClass()
+ if (!(IOTDB_CONFIG.isClusterMode()
+ && COMMON_CONFIG
+ .getSchemaRegionConsensusProtocolClass().getProtocol()
.equals(ConsensusFactory.RATIS_CONSENSUS))) {
usingMLog = true;
initMLog();
@@ -251,7 +254,7 @@ public class SchemaRegionMemoryImpl implements ISchemaRegion {
schemaRegionDirPath,
MetadataConstant.METADATA_LOG,
new FakeCRC32Serializer<>(new SchemaRegionPlanSerializer()),
- config.getSyncMlogPeriodInMs() == 0);
+ COMMON_CONFIG.getSyncMlogPeriodInMs() == 0);
}
public void writeToMLog(ISchemaRegionPlan schemaRegionPlan) throws IOException {
@@ -583,7 +586,7 @@ public class SchemaRegionMemoryImpl implements ISchemaRegion {
}
// update id table if not in recovering or disable id table log file
- if (config.isEnableIDTable() && (!isRecovering || !config.isEnableIDTableLogFile())) {
+ if (IOTDB_CONFIG.isEnableIDTable() && (!isRecovering || !IOTDB_CONFIG.isEnableIDTableLogFile())) {
IDTable idTable = IDTableManager.getInstance().getIDTable(plan.getPath().getDevicePath());
idTable.createTimeseries(plan);
}
@@ -688,7 +691,7 @@ public class SchemaRegionMemoryImpl implements ISchemaRegion {
}
// update id table if not in recovering or disable id table log file
- if (config.isEnableIDTable() && (!isRecovering || !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 8ae626eae2..6cfdf2c627 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
@@ -18,6 +18,8 @@
*/
package org.apache.iotdb.db.metadata.schemaregion;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.consensus.SchemaRegionId;
import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.file.SystemFileFactory;
@@ -122,7 +124,8 @@ public class SchemaRegionSchemaFileImpl implements ISchemaRegion {
private static final Logger logger = LoggerFactory.getLogger(SchemaRegionSchemaFileImpl.class);
- protected static IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
+ protected static final IoTDBConfig IOTDB_CONFIG = IoTDBDescriptor.getInstance().getConf();
private boolean isRecovering = true;
private volatile boolean initialized = false;
@@ -160,7 +163,7 @@ public class SchemaRegionSchemaFileImpl implements ISchemaRegion {
storageGroupFullPath = storageGroup.getFullPath();
this.schemaRegionId = schemaRegionId;
- storageGroupDirPath = config.getSchemaDir() + File.separator + storageGroupFullPath;
+ storageGroupDirPath = IOTDB_CONFIG.getSchemaDir() + File.separator + storageGroupFullPath;
schemaRegionDirPath = storageGroupDirPath + File.separator + schemaRegionId.getId();
this.seriesNumerMonitor = seriesNumerMonitor;
@@ -185,9 +188,9 @@ public class SchemaRegionSchemaFileImpl implements ISchemaRegion {
new MTreeBelowSGCachedImpl(
new PartialPath(storageGroupFullPath), tagManager::readTags, schemaRegionId.getId());
- if (!(config.isClusterMode()
- && config
- .getSchemaRegionConsensusProtocolClass()
+ if (!(IOTDB_CONFIG.isClusterMode()
+ && COMMON_CONFIG
+ .getSchemaRegionConsensusProtocolClass().getProtocol()
.equals(ConsensusFactory.RATIS_CONSENSUS))) {
usingMLog = true;
initMLog();
@@ -239,7 +242,7 @@ public class SchemaRegionSchemaFileImpl implements ISchemaRegion {
schemaRegionDirPath,
MetadataConstant.METADATA_LOG,
new FakeCRC32Serializer<>(new SchemaRegionPlanSerializer()),
- config.getSyncMlogPeriodInMs() == 0);
+ COMMON_CONFIG.getSyncMlogPeriodInMs() == 0);
}
public void writeToMLog(ISchemaRegionPlan schemaRegionPlan) throws IOException {
@@ -600,7 +603,7 @@ public class SchemaRegionSchemaFileImpl implements ISchemaRegion {
}
// update id table if not in recovering or disable id table log file
- if (config.isEnableIDTable() && (!isRecovering || !config.isEnableIDTableLogFile())) {
+ if (IOTDB_CONFIG.isEnableIDTable() && (!isRecovering || !IOTDB_CONFIG.isEnableIDTableLogFile())) {
IDTable idTable = IDTableManager.getInstance().getIDTable(plan.getPath().getDevicePath());
idTable.createTimeseries(plan);
}
@@ -745,7 +748,7 @@ public class SchemaRegionSchemaFileImpl implements ISchemaRegion {
}
// update id table if not in recovering or disable id table log file
- if (config.isEnableIDTable() && (!isRecovering || !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 07d47d8400..edaf9637bc 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
@@ -18,6 +18,7 @@
*/
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;
@@ -48,10 +49,10 @@ public class TagLogFile implements AutoCloseable {
+ "Please enlarge tag_attribute_total_size in iotdb-common.properties";
private static final int MAX_LENGTH =
- IoTDBDescriptor.getInstance().getConfig().getTagAttributeTotalSize();
+ CommonDescriptor.getInstance().getConf().getTagAttributeTotalSize();
private static final int RECORD_FLUSH_INTERVAL =
- IoTDBDescriptor.getInstance().getConfig().getTagAttributeFlushInterval();
+ CommonDescriptor.getInstance().getConf().getTagAttributeFlushInterval();
private int unFlushedRecordNum = 0;
public TagLogFile(String schemaDir, String logFileName) throws IOException {
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/tag/TagManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/tag/TagManager.java
index 89a2c2cc80..7a9c59f465 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/tag/TagManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/tag/TagManager.java
@@ -18,11 +18,11 @@
*/
package org.apache.iotdb.db.metadata.tag;
+import org.apache.iotdb.commons.conf.CommonConfig;
+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.commons.path.PartialPath;
-import org.apache.iotdb.db.conf.IoTDBConfig;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.metadata.MetadataConstant;
import org.apache.iotdb.db.metadata.mnode.IMNode;
import org.apache.iotdb.db.metadata.mnode.IMeasurementMNode;
@@ -57,7 +57,7 @@ public class TagManager {
"before deleting it, tag key is %s, tag value is %s, tlog offset is %d, contains key %b";
private static final Logger logger = LoggerFactory.getLogger(TagManager.class);
- private static IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private String sgSchemaDirPath;
private TagLogFile tagLogFile;
@@ -120,7 +120,7 @@ public class TagManager {
}
public boolean recoverIndex(long offset, IMeasurementMNode measurementMNode) throws IOException {
- Map<String, String> tags = tagLogFile.readTag(config.getTagAttributeTotalSize(), offset);
+ Map<String, String> tags = tagLogFile.readTag(COMMON_CONFIG.getTagAttributeTotalSize(), offset);
if (tags == null || tags.isEmpty()) {
return false;
} else {
@@ -239,7 +239,7 @@ public class TagManager {
return;
}
Map<String, String> tagMap =
- tagLogFile.readTag(config.getTagAttributeTotalSize(), node.getOffset());
+ tagLogFile.readTag(COMMON_CONFIG.getTagAttributeTotalSize(), node.getOffset());
if (tagMap != null) {
for (Map.Entry<String, String> entry : tagMap.entrySet()) {
if (tagIndex.containsKey(entry.getKey())
@@ -283,7 +283,7 @@ public class TagManager {
throws MetadataException, IOException {
Pair<Map<String, String>, Map<String, String>> pair =
- tagLogFile.read(config.getTagAttributeTotalSize(), leafMNode.getOffset());
+ tagLogFile.read(COMMON_CONFIG.getTagAttributeTotalSize(), leafMNode.getOffset());
if (tagsMap != null) {
for (Map.Entry<String, String> entry : tagsMap.entrySet()) {
@@ -347,7 +347,7 @@ public class TagManager {
throws MetadataException, IOException {
Pair<Map<String, String>, Map<String, String>> pair =
- tagLogFile.read(config.getTagAttributeTotalSize(), leafMNode.getOffset());
+ tagLogFile.read(COMMON_CONFIG.getTagAttributeTotalSize(), leafMNode.getOffset());
for (Map.Entry<String, String> entry : attributesMap.entrySet()) {
String key = entry.getKey();
@@ -375,7 +375,7 @@ public class TagManager {
throws MetadataException, IOException {
Pair<Map<String, String>, Map<String, String>> pair =
- tagLogFile.read(config.getTagAttributeTotalSize(), leafMNode.getOffset());
+ tagLogFile.read(COMMON_CONFIG.getTagAttributeTotalSize(), leafMNode.getOffset());
for (Map.Entry<String, String> entry : tagsMap.entrySet()) {
String key = entry.getKey();
@@ -404,7 +404,7 @@ public class TagManager {
Set<String> keySet, PartialPath fullPath, IMeasurementMNode leafMNode)
throws MetadataException, IOException {
Pair<Map<String, String>, Map<String, String>> pair =
- tagLogFile.read(config.getTagAttributeTotalSize(), leafMNode.getOffset());
+ tagLogFile.read(COMMON_CONFIG.getTagAttributeTotalSize(), leafMNode.getOffset());
Map<String, String> deleteTag = new HashMap<>();
for (String key : keySet) {
@@ -476,7 +476,7 @@ public class TagManager {
throws MetadataException, IOException {
// tags, attributes
Pair<Map<String, String>, Map<String, String>> pair =
- tagLogFile.read(config.getTagAttributeTotalSize(), leafMNode.getOffset());
+ tagLogFile.read(COMMON_CONFIG.getTagAttributeTotalSize(), leafMNode.getOffset());
Map<String, String> oldTagValue = new HashMap<>();
Map<String, String> newTagValue = new HashMap<>();
@@ -546,7 +546,7 @@ public class TagManager {
throws MetadataException, IOException {
// tags, attributes
Pair<Map<String, String>, Map<String, String>> pair =
- tagLogFile.read(config.getTagAttributeTotalSize(), leafMNode.getOffset());
+ tagLogFile.read(COMMON_CONFIG.getTagAttributeTotalSize(), leafMNode.getOffset());
// current name has existed
if (pair.left.containsKey(newKey) || pair.right.containsKey(newKey)) {
@@ -608,7 +608,7 @@ public class TagManager {
public Pair<Map<String, String>, Map<String, String>> readTagFile(long tagFileOffset)
throws IOException {
- return tagLogFile.read(config.getTagAttributeTotalSize(), tagFileOffset);
+ return tagLogFile.read(COMMON_CONFIG.getTagAttributeTotalSize(), tagFileOffset);
}
/**
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/common/DataNodeEndPoints.java b/server/src/main/java/org/apache/iotdb/db/mpp/common/DataNodeEndPoints.java
index 8cf8055ce9..6a57fd5191 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/common/DataNodeEndPoints.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/common/DataNodeEndPoints.java
@@ -30,13 +30,13 @@ public class DataNodeEndPoints {
public static final TEndPoint LOCAL_HOST_DATA_BLOCK_ENDPOINT =
new TEndPoint(
- IoTDBDescriptor.getInstance().getConfig().getDnInternalAddress(),
- IoTDBDescriptor.getInstance().getConfig().getDnMppDataExchangePort());
+ IoTDBDescriptor.getInstance().getConf().getDnInternalAddress(),
+ IoTDBDescriptor.getInstance().getConf().getDnMppDataExchangePort());
public static final TEndPoint LOCAL_HOST_INTERNAL_ENDPOINT =
new TEndPoint(
- IoTDBDescriptor.getInstance().getConfig().getDnInternalAddress(),
- IoTDBDescriptor.getInstance().getConfig().getDnInternalPort());
+ IoTDBDescriptor.getInstance().getConf().getDnInternalAddress(),
+ IoTDBDescriptor.getInstance().getConf().getDnInternalPort());
public static boolean isSameNode(TEndPoint endPoint) {
return endPoint.equals(LOCAL_HOST_DATA_BLOCK_ENDPOINT);
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java b/server/src/main/java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java
index ebddd19f06..d43bbd7d52 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/common/header/ColumnHeaderConstant.java
@@ -28,7 +28,7 @@ import com.google.common.collect.ImmutableList;
import java.util.List;
public class ColumnHeaderConstant {
- private static final CommonConfig commonConfig = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig commonConfig = CommonDescriptor.getInstance().getConf();
// column names for query statement
public static final String TIME = "Time";
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/ClusterSchemaTree.java b/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/ClusterSchemaTree.java
index ead88e81ec..8cf1d54608 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/ClusterSchemaTree.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/ClusterSchemaTree.java
@@ -87,7 +87,7 @@ public class ClusterSchemaTree implements ISchemaTree {
root,
pathPattern,
false,
- CommonDescriptor.getInstance().getConfig().getMaxDeduplicatedPathNum() + 1,
+ CommonDescriptor.getInstance().getConf().getMaxDeduplicatedPathNum() + 1,
0);
return new Pair<>(visitor.getAllResult(), visitor.getNextOffset());
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/QueryIdGenerator.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/QueryIdGenerator.java
index 49ad488d08..60a4d96225 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/QueryIdGenerator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/QueryIdGenerator.java
@@ -56,7 +56,7 @@ public class QueryIdGenerator {
private int counter;
public QueryIdGenerator() {
- int dataNodeId = IoTDBDescriptor.getInstance().getConfig().getDataNodeId();
+ int dataNodeId = IoTDBDescriptor.getInstance().getConf().getDataNodeId();
checkArgument(dataNodeId != -1, "DataNodeId should be init first!");
this.dataNodeId = String.valueOf(dataNodeId);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/MPPDataExchangeService.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/MPPDataExchangeService.java
index 4efa08e78c..bc94d75a98 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/MPPDataExchangeService.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/MPPDataExchangeService.java
@@ -49,13 +49,13 @@ public class MPPDataExchangeService extends ThriftService implements MPPDataExch
private static final Logger LOGGER = LoggerFactory.getLogger(MPPDataExchangeService.class);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private final MPPDataExchangeManager mppDataExchangeManager;
private final ExecutorService executorService;
private MPPDataExchangeService() {
- IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
executorService =
IoTDBThreadPoolFactory.newThreadPool(
COMMON_CONFIG.getMppDataExchangeCorePoolSize(),
@@ -90,7 +90,7 @@ public class MPPDataExchangeService extends ThriftService implements MPPDataExch
@Override
public void initThriftServiceThread() throws IllegalAccessException {
try {
- IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
thriftServiceThread =
new ThriftServiceThread(
processor,
@@ -113,12 +113,12 @@ public class MPPDataExchangeService extends ThriftService implements MPPDataExch
@Override
public String getBindIP() {
- return IoTDBDescriptor.getInstance().getConfig().getDnInternalAddress();
+ return IoTDBDescriptor.getInstance().getConf().getDnInternalAddress();
}
@Override
public int getBindPort() {
- return IoTDBDescriptor.getInstance().getConfig().getDnMppDataExchangePort();
+ return IoTDBDescriptor.getInstance().getConf().getDnMppDataExchangePort();
}
@Override
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SharedTsBlockQueue.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SharedTsBlockQueue.java
index ef7299a67d..62d6096169 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SharedTsBlockQueue.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/exchange/SharedTsBlockQueue.java
@@ -73,7 +73,7 @@ public class SharedTsBlockQueue {
private LocalSinkHandle sinkHandle;
private long maxBytesCanReserve =
- CommonDescriptor.getInstance().getConfig().getMaxBytesPerFragmentInstance();
+ CommonDescriptor.getInstance().getConf().getMaxBytesPerFragmentInstance();
public SharedTsBlockQueue(
TFragmentInstanceId fragmentInstanceId,
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 ae913b5481..b326c4872c 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
@@ -24,7 +24,6 @@ import org.apache.iotdb.commons.client.IClientManager;
import org.apache.iotdb.commons.client.sync.SyncDataNodeMPPDataExchangeServiceClient;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.utils.TestOnly;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.mpp.execution.exchange.MPPDataExchangeManager.SinkHandleListener;
import org.apache.iotdb.db.mpp.execution.memory.LocalMemoryManager;
import org.apache.iotdb.db.mpp.metric.QueryMetricsManager;
@@ -101,7 +100,7 @@ public class SinkHandle implements ISinkHandle {
/** max bytes this SourceHandle can reserve. */
private long maxBytesCanReserve =
- CommonDescriptor.getInstance().getConfig().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 a20b4dabe4..8a798e512e 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
@@ -24,7 +24,6 @@ import org.apache.iotdb.commons.client.IClientManager;
import org.apache.iotdb.commons.client.sync.SyncDataNodeMPPDataExchangeServiceClient;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.utils.TestOnly;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.mpp.execution.exchange.MPPDataExchangeManager.SourceHandleListener;
import org.apache.iotdb.db.mpp.execution.memory.LocalMemoryManager;
import org.apache.iotdb.db.mpp.metric.QueryMetricsManager;
@@ -98,7 +97,7 @@ public class SourceHandle implements ISourceHandle {
/** max bytes this SourceHandle can reserve. */
private long maxBytesCanReserve =
- CommonDescriptor.getInstance().getConfig().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/executor/RegionWriteExecutor.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/executor/RegionWriteExecutor.java
index cd1b5a305a..e8c999cb47 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/executor/RegionWriteExecutor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/executor/RegionWriteExecutor.java
@@ -76,7 +76,7 @@ public class RegionWriteExecutor {
private static final Logger LOGGER = LoggerFactory.getLogger(RegionWriteExecutor.class);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private static final DataNodeRegionManager REGION_MANAGER = DataNodeRegionManager.getInstance();
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 efa8db0bf1..6f360ead5c 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
@@ -20,6 +20,7 @@ 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;
@@ -73,7 +74,7 @@ public class FragmentInstanceManager {
private final CounterStat failedInstances = new CounterStat();
private static final long QUERY_TIMEOUT_MS =
- IoTDBDescriptor.getInstance().getConfig().getQueryTimeoutThreshold();
+ CommonDescriptor.getInstance().getConf().getQueryTimeoutThreshold();
private final ExecutorService intoOperationExecutor;
@@ -104,7 +105,7 @@ public class FragmentInstanceManager {
this.intoOperationExecutor =
IoTDBThreadPoolFactory.newFixedThreadPool(
- IoTDBDescriptor.getInstance().getConfig().getIntoOperationExecutionThreadCount(),
+ CommonDescriptor.getInstance().getConf().getIntoOperationExecutionThreadCount(),
"into-operation-executor");
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/memory/LocalMemoryManager.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/memory/LocalMemoryManager.java
index ae9f0c4a32..57c4b0706a 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/memory/LocalMemoryManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/memory/LocalMemoryManager.java
@@ -33,8 +33,8 @@ public class LocalMemoryManager {
queryPool =
new MemoryPool(
"query",
- CommonDescriptor.getInstance().getConfig().getAllocateMemoryForDataExchange(),
- CommonDescriptor.getInstance().getConfig().getMaxBytesPerFragmentInstance());
+ CommonDescriptor.getInstance().getConf().getAllocateMemoryForDataExchange(),
+ CommonDescriptor.getInstance().getConf().getMaxBytesPerFragmentInstance());
}
public MemoryPool getQueryPool() {
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 0d08a5467b..f095c898e6 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
@@ -20,6 +20,7 @@
package org.apache.iotdb.db.mpp.execution.operator.process;
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;
@@ -317,7 +318,7 @@ public abstract class AbstractIntoOperator implements ProcessOperator {
public static class InsertTabletStatementGenerator {
private final int TABLET_ROW_LIMIT =
- IoTDBDescriptor.getInstance().getConfig().getSelectIntoInsertTabletPlanRowLimit();
+ CommonDescriptor.getInstance().getConf().getSelectIntoInsertTabletPlanRowLimit();
private final PartialPath devicePath;
private final boolean isAligned;
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 f8384e090e..ba9570edf8 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
@@ -22,7 +22,6 @@ package org.apache.iotdb.db.mpp.execution.operator.process;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.udf.service.UDFClassLoaderManager;
import org.apache.iotdb.commons.udf.service.UDFManagementService;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.query.QueryProcessException;
import org.apache.iotdb.db.mpp.common.NodeRef;
import org.apache.iotdb.db.mpp.execution.operator.Operator;
@@ -60,11 +59,11 @@ public class TransformOperator implements ProcessOperator {
private static final Logger LOGGER = LoggerFactory.getLogger(TransformOperator.class);
protected final float udfReaderMemoryBudgetInMB =
- CommonDescriptor.getInstance().getConfig().getUdfReaderMemoryBudgetInMB();
+ CommonDescriptor.getInstance().getConf().getUdfReaderMemoryBudgetInMB();
protected final float udfTransformerMemoryBudgetInMB =
- CommonDescriptor.getInstance().getConfig().getUdfTransformerMemoryBudgetInMB();
+ CommonDescriptor.getInstance().getConf().getUdfTransformerMemoryBudgetInMB();
protected final float udfCollectorMemoryBudgetInMB =
- CommonDescriptor.getInstance().getConfig().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/operator/process/last/LastQueryUtil.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/last/LastQueryUtil.java
index f8bb75f088..f685c29388 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/last/LastQueryUtil.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/last/LastQueryUtil.java
@@ -43,7 +43,7 @@ import java.util.List;
public class LastQueryUtil {
private static final boolean CACHE_ENABLED =
- IoTDBDescriptor.getInstance().getConfig().isLastCacheEnabled();
+ IoTDBDescriptor.getInstance().getConf().isLastCacheEnabled();
public static TsBlockBuilder createTsBlockBuilder() {
return new TsBlockBuilder(ImmutableList.of(TSDataType.TEXT, TSDataType.TEXT, TSDataType.TEXT));
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/DriverScheduler.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/schedule/DriverScheduler.java
index e9f097f7bf..3be447c99c 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
@@ -18,6 +18,7 @@
*/
package org.apache.iotdb.db.mpp.execution.schedule;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.exception.StartupException;
import org.apache.iotdb.commons.service.IService;
import org.apache.iotdb.commons.service.ServiceType;
@@ -80,11 +81,11 @@ public class DriverScheduler implements IDriverScheduler, IService {
private IMPPDataExchangeManager blockManager;
private static final int MAX_CAPACITY =
- IoTDBDescriptor.getInstance().getConfig().getMaxAllowedConcurrentQueries();
+ CommonDescriptor.getInstance().getConf().getMaxAllowedConcurrentQueries();
private static final int WORKER_THREAD_NUM =
- IoTDBDescriptor.getInstance().getConfig().getQueryThreadCount();
+ CommonDescriptor.getInstance().getConf().getQueryThreadCount();
private static final long QUERY_TIMEOUT_MS =
- IoTDBDescriptor.getInstance().getConfig().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 33028af21b..6649cf2890 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
@@ -19,6 +19,7 @@
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;
@@ -38,7 +39,7 @@ public class DriverTaskThread extends AbstractDriverThread {
public static final Duration EXECUTION_TIME_SLICE =
new Duration(
- IoTDBDescriptor.getInstance().getConfig().getDriverTaskExecutionTimeSliceInMs(),
+ CommonDescriptor.getInstance().getConf().getDriverTaskExecutionTimeSliceInMs(),
TimeUnit.MILLISECONDS);
// we manage thread pool size directly, so create an unlimited pool
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/Coordinator.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/Coordinator.java
index ab66646a4f..21330f8e0a 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/Coordinator.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/Coordinator.java
@@ -61,8 +61,8 @@ public class Coordinator {
private static final Logger LOGGER = LoggerFactory.getLogger(Coordinator.class);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
- private static final IoTDBConfig IOTDB_CONFIG = IoTDBDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
+ private static final IoTDBConfig IOTDB_CONFIG = IoTDBDescriptor.getInstance().getConf();
private static final String COORDINATOR_EXECUTOR_NAME = "MPPCoordinator";
private static final String COORDINATOR_WRITE_EXECUTOR_NAME = "MPPCoordinatorWrite";
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
index 36324cac78..53db286673 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
@@ -176,7 +176,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
private static final Logger logger = LoggerFactory.getLogger(AnalyzeVisitor.class);
- private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConf();
private final IPartitionFetcher partitionFetcher;
private final ISchemaFetcher schemaFetcher;
@@ -1815,7 +1815,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
try (TsFileSequenceReader reader = new TsFileSequenceReader(tsFile.getAbsolutePath())) {
Map<String, List<TimeseriesMetadata>> device2Metadata = reader.getAllTimeseriesMetadata(true);
- if (IoTDBDescriptor.getInstance().getConfig().isAutoCreateSchemaEnabled()
+ if (IoTDBDescriptor.getInstance().getConf().isAutoCreateSchemaEnabled()
|| statement.isVerifySchema()) {
// construct schema
for (Map.Entry<String, List<TimeseriesMetadata>> entry : device2Metadata.entrySet()) {
@@ -1918,7 +1918,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
"",
partitionFetcher,
schemaFetcher,
- IoTDBDescriptor.getInstance().getConfig().getQueryTimeoutThreshold());
+ IoTDBDescriptor.getInstance().getConf().getQueryTimeoutThreshold());
if (result.status.code != TSStatusCode.SUCCESS_STATUS.getStatusCode()
&& result.status.code != TSStatusCode.DATABASE_ALREADY_EXISTS.getStatusCode()) {
logger.warn(
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterPartitionFetcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterPartitionFetcher.java
index 029c878114..943e5dbc2d 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterPartitionFetcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterPartitionFetcher.java
@@ -65,7 +65,7 @@ import java.util.Map;
public class ClusterPartitionFetcher implements IPartitionFetcher {
private static final Logger logger = LoggerFactory.getLogger(ClusterPartitionFetcher.class);
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private final SeriesPartitionExecutor partitionExecutor;
@@ -385,16 +385,16 @@ public class ClusterPartitionFetcher implements IPartitionFetcher {
return new SchemaPartition(
regionReplicaMap,
- IoTDBDescriptor.getInstance().getConfig().getSeriesPartitionExecutorClass(),
- IoTDBDescriptor.getInstance().getConfig().getSeriesPartitionSlotNum());
+ IoTDBDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
+ IoTDBDescriptor.getInstance().getConf().getSeriesPartitionSlotNum());
}
private SchemaNodeManagementPartition parseSchemaNodeManagementPartitionResp(
TSchemaNodeManagementResp schemaNodeManagementResp) {
return new SchemaNodeManagementPartition(
schemaNodeManagementResp.getSchemaRegionMap(),
- IoTDBDescriptor.getInstance().getConfig().getSeriesPartitionExecutorClass(),
- IoTDBDescriptor.getInstance().getConfig().getSeriesPartitionSlotNum(),
+ IoTDBDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
+ IoTDBDescriptor.getInstance().getConf().getSeriesPartitionSlotNum(),
schemaNodeManagementResp.getMatchedNode());
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ColumnPaginationController.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ColumnPaginationController.java
index 082428664d..f8405391d1 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ColumnPaginationController.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ColumnPaginationController.java
@@ -26,7 +26,7 @@ import org.apache.iotdb.db.exception.sql.PathNumOverLimitException;
public class ColumnPaginationController {
private int curLimit =
- IoTDBDescriptor.getInstance().getConfig().getMaxQueryDeduplicatedPathNum() + 1;
+ IoTDBDescriptor.getInstance().getConf().getMaxQueryDeduplicatedPathNum() + 1;
private int curOffset;
// records the path number that the SchemaProcessor totally returned
@@ -69,7 +69,7 @@ public class ColumnPaginationController {
public void consumeLimit() {
consumed++;
- if (consumed > IoTDBDescriptor.getInstance().getConfig().getMaxQueryDeduplicatedPathNum()) {
+ if (consumed > IoTDBDescriptor.getInstance().getConf().getMaxQueryDeduplicatedPathNum()) {
throw new PathNumOverLimitException();
}
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 ea23bc4fca..b4a95a4f3c 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
@@ -25,6 +25,8 @@ import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot;
import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot;
import org.apache.iotdb.commons.client.IClientManager;
import org.apache.iotdb.commons.client.exception.ClientManagerException;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.consensus.ConfigNodeRegionId;
import org.apache.iotdb.commons.exception.IoTDBException;
import org.apache.iotdb.commons.exception.MetadataException;
@@ -71,7 +73,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
public class PartitionCache {
private static final Logger logger = LoggerFactory.getLogger(PartitionCache.class);
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final CommonConfig config = CommonDescriptor.getInstance().getConf();
private static final List<String> ROOT_PATH = Arrays.asList("root", "**");
private static final String STORAGE_GROUP_CACHE_NAME = "Database";
private static final String SCHEMA_PARTITION_CACHE_NAME = "SchemaPartition";
@@ -80,7 +82,7 @@ public class PartitionCache {
/** calculate slotId by device */
private final String seriesSlotExecutorName = config.getSeriesPartitionExecutorClass();
- private final int seriesPartitionSlotNum = config.getSeriesPartitionSlotNum();
+ private final int seriesPartitionSlotNum = config.getSeriesSlotNum();
private final SeriesPartitionExecutor partitionExecutor;
/** the size of partitionCache */
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/ClusterSchemaFetcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/ClusterSchemaFetcher.java
index fb835ff76f..0939b6e1c6 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/ClusterSchemaFetcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/ClusterSchemaFetcher.java
@@ -50,7 +50,7 @@ import java.util.stream.IntStream;
public class ClusterSchemaFetcher implements ISchemaFetcher {
- private final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private final Coordinator coordinator = Coordinator.getInstance();
private final DataNodeSchemaCache schemaCache = DataNodeSchemaCache.getInstance();
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
index 9cf25c433c..ac83ed4e9e 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/QueryExecution.java
@@ -94,7 +94,7 @@ import static org.apache.iotdb.db.mpp.metric.QueryPlanCostMetricSet.DISTRIBUTION
public class QueryExecution implements IQueryExecution {
private static final Logger logger = LoggerFactory.getLogger(QueryExecution.class);
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private static final int MAX_RETRY_COUNT = 3;
private static final long RETRY_INTERVAL_IN_MS = 2000;
private int retryCount = 0;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ConfigExecution.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ConfigExecution.java
index 6aca2d96fc..d939315145 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ConfigExecution.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/ConfigExecution.java
@@ -56,7 +56,7 @@ public class ConfigExecution implements IQueryExecution {
private static final Logger LOGGER = LoggerFactory.getLogger(ConfigExecution.class);
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private final MPPQueryContext context;
private final ExecutorService executor;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/GetTimeSlotListTask.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/GetTimeSlotListTask.java
index e7f5f63223..ee538914d6 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/GetTimeSlotListTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/GetTimeSlotListTask.java
@@ -61,7 +61,7 @@ public class GetTimeSlotListTask implements IConfigTask {
.getColumnBuilder(0)
.writeLong(
timePartitionSlot.getStartTime()
- / IoTDBDescriptor.getInstance().getConfig().getDnTimePartitionInterval());
+ / IoTDBDescriptor.getInstance().getConf().getDnTimePartitionInterval());
builder.declarePosition();
}
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 507476f8a4..d01c8adbf8 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
@@ -24,6 +24,7 @@ import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot;
import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot;
import org.apache.iotdb.commons.auth.entity.PrivilegeType;
import org.apache.iotdb.commons.cluster.NodeStatus;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.cq.TimeoutPolicy;
import org.apache.iotdb.commons.exception.IllegalPathException;
@@ -200,7 +201,7 @@ import static org.apache.iotdb.db.metadata.MetadataConstant.ALL_RESULT_NODES;
/** Parse AST to Statement. */
public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
- private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConf();
private static final String DELETE_RANGE_ERROR_MSG =
"For delete statement, where clause can only contain atomic expressions like : "
@@ -310,9 +311,8 @@ public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
throw new SemanticException("datatype must be declared");
}
- final IoTDBDescriptor ioTDBDescriptor = IoTDBDescriptor.getInstance();
createTimeSeriesStatement.setEncoding(
- ioTDBDescriptor.getDefaultEncodingByType(createTimeSeriesStatement.getDataType()));
+ CommonDescriptor.getInstance().getDefaultEncodingByType(createTimeSeriesStatement.getDataType()));
if (props != null
&& props.containsKey(IoTDBConstant.COLUMN_TIMESERIES_ENCODING.toLowerCase())) {
String encodingString =
@@ -373,7 +373,7 @@ public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
}
}
- TSEncoding encoding = IoTDBDescriptor.getInstance().getDefaultEncodingByType(dataType);
+ TSEncoding encoding = CommonDescriptor.getInstance().getDefaultEncodingByType(dataType);
if (props.containsKey(IoTDBConstant.COLUMN_TIMESERIES_ENCODING.toLowerCase())) {
String encodingString =
props.get(IoTDBConstant.COLUMN_TIMESERIES_ENCODING.toLowerCase()).toUpperCase();
@@ -2316,7 +2316,7 @@ public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
private Expression parseRealLiteral(String value) {
// 3.33 is float by default
return new ConstantOperand(
- CONFIG.getFloatingStringInferType().equals(TSDataType.DOUBLE)
+ CommonDescriptor.getInstance().getConf().getFloatingStringInferType().equals(TSDataType.DOUBLE)
? TSDataType.DOUBLE
: TSDataType.FLOAT,
value);
@@ -2416,7 +2416,7 @@ public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
@Override
public Statement visitMerge(IoTDBSqlParser.MergeContext ctx) {
MergeStatement mergeStatement = new MergeStatement(StatementType.MERGE);
- if (ctx.CLUSTER() != null && !IoTDBDescriptor.getInstance().getConfig().isClusterMode()) {
+ if (ctx.CLUSTER() != null && !IoTDBDescriptor.getInstance().getConf().isClusterMode()) {
throw new SemanticException("MERGE ON CLUSTER is not supported in standalone mode");
}
mergeStatement.setOnCluster(ctx.LOCAL() == null);
@@ -2426,7 +2426,7 @@ public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
@Override
public Statement visitFullMerge(IoTDBSqlParser.FullMergeContext ctx) {
MergeStatement mergeStatement = new MergeStatement(StatementType.FULL_MERGE);
- if (ctx.CLUSTER() != null && !IoTDBDescriptor.getInstance().getConfig().isClusterMode()) {
+ if (ctx.CLUSTER() != null && !IoTDBDescriptor.getInstance().getConf().isClusterMode()) {
throw new SemanticException("FULL MERGE ON CLUSTER is not supported in standalone mode");
}
mergeStatement.setOnCluster(ctx.LOCAL() == null);
@@ -2442,7 +2442,7 @@ public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
if (ctx.BOOLEAN_LITERAL() != null) {
flushStatement.setSeq(Boolean.parseBoolean(ctx.BOOLEAN_LITERAL().getText()));
}
- if (ctx.CLUSTER() != null && !IoTDBDescriptor.getInstance().getConfig().isClusterMode()) {
+ if (ctx.CLUSTER() != null && !IoTDBDescriptor.getInstance().getConf().isClusterMode()) {
throw new SemanticException("FLUSH ON CLUSTER is not supported in standalone mode");
}
flushStatement.setOnCluster(ctx.LOCAL() == null);
@@ -2461,7 +2461,7 @@ public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
@Override
public Statement visitClearCache(IoTDBSqlParser.ClearCacheContext ctx) {
ClearCacheStatement clearCacheStatement = new ClearCacheStatement(StatementType.CLEAR_CACHE);
- if (ctx.CLUSTER() != null && !IoTDBDescriptor.getInstance().getConfig().isClusterMode()) {
+ if (ctx.CLUSTER() != null && !IoTDBDescriptor.getInstance().getConf().isClusterMode()) {
throw new SemanticException("CLEAR CACHE ON CLUSTER is not supported in standalone mode");
}
clearCacheStatement.setOnCluster(ctx.LOCAL() == null);
@@ -2474,7 +2474,7 @@ public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
public Statement visitLoadConfiguration(IoTDBSqlParser.LoadConfigurationContext ctx) {
LoadConfigurationStatement loadConfigurationStatement =
new LoadConfigurationStatement(StatementType.LOAD_CONFIGURATION);
- if (ctx.CLUSTER() != null && !IoTDBDescriptor.getInstance().getConfig().isClusterMode()) {
+ if (ctx.CLUSTER() != null && !IoTDBDescriptor.getInstance().getConf().isClusterMode()) {
throw new SemanticException(
"LOAD CONFIGURATION ON CLUSTER is not supported in standalone mode");
}
@@ -2487,7 +2487,7 @@ public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
@Override
public Statement visitSetSystemStatus(IoTDBSqlParser.SetSystemStatusContext ctx) {
SetSystemStatusStatement setSystemStatusStatement = new SetSystemStatusStatement();
- if (ctx.CLUSTER() != null && !IoTDBDescriptor.getInstance().getConfig().isClusterMode()) {
+ if (ctx.CLUSTER() != null && !IoTDBDescriptor.getInstance().getConf().isClusterMode()) {
throw new SemanticException(
"SET SYSTEM STATUS ON CLUSTER is not supported in standalone mode");
}
@@ -2673,7 +2673,7 @@ public class ASTVisitor extends IoTDBSqlParserBaseVisitor<Statement> {
}
}
- TSEncoding encoding = IoTDBDescriptor.getInstance().getDefaultEncodingByType(dataType);
+ TSEncoding encoding = CommonDescriptor.getInstance().getDefaultEncodingByType(dataType);
if (props.containsKey(IoTDBConstant.COLUMN_TIMESERIES_ENCODING.toLowerCase())) {
String encodingString =
props.get(IoTDBConstant.COLUMN_TIMESERIES_ENCODING.toLowerCase()).toUpperCase();
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LocalExecutionPlanContext.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LocalExecutionPlanContext.java
index 0deed615db..fe97e636cd 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LocalExecutionPlanContext.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LocalExecutionPlanContext.java
@@ -19,7 +19,6 @@
package org.apache.iotdb.db.mpp.plan.planner;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.metadata.schemaregion.ISchemaRegion;
import org.apache.iotdb.db.mpp.common.FragmentInstanceId;
import org.apache.iotdb.db.mpp.execution.driver.DataDriverContext;
@@ -164,7 +163,7 @@ public class LocalExecutionPlanContext {
}
public long getMaxBytesOneHandleCanReserve() {
- long maxBytesPerFI = CommonDescriptor.getInstance().getConfig().getMaxBytesPerFragmentInstance();
+ long maxBytesPerFI = CommonDescriptor.getInstance().getConf().getMaxBytesPerFragmentInstance();
return exchangeSumNum == 0 ? maxBytesPerFI : maxBytesPerFI / exchangeSumNum;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LocalExecutionPlanner.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LocalExecutionPlanner.java
index dd27a6f1dc..b8662a7f14 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LocalExecutionPlanner.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LocalExecutionPlanner.java
@@ -20,7 +20,6 @@ package org.apache.iotdb.db.mpp.plan.planner;
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.exception.query.QueryProcessException;
import org.apache.iotdb.db.metadata.schemaregion.ISchemaRegion;
import org.apache.iotdb.db.mpp.exception.MemoryNotEnoughException;
@@ -53,7 +52,7 @@ public class LocalExecutionPlanner {
/** allocated memory for operator execution */
private long freeMemoryForOperators =
- CommonDescriptor.getInstance().getConfig().getAllocateMemoryForOperators();
+ CommonDescriptor.getInstance().getConf().getAllocateMemoryForOperators();
public static LocalExecutionPlanner getInstance() {
return InstanceHolder.INSTANCE;
@@ -111,7 +110,7 @@ public class LocalExecutionPlanner {
throws MemoryNotEnoughException {
// if it is disabled, just return
- if (!CommonDescriptor.getInstance().getConfig().isEnableQueryMemoryEstimation()) {
+ if (!CommonDescriptor.getInstance().getConf().isEnableQueryMemoryEstimation()) {
return;
}
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 a083eb15d4..8bcbed5ad1 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
@@ -19,6 +19,7 @@
package org.apache.iotdb.db.mpp.plan.planner;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
+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;
@@ -1500,7 +1501,7 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
context.getTypeProvider());
int rowLimit =
- IoTDBDescriptor.getInstance().getConfig().getSelectIntoInsertTabletPlanRowLimit();
+ CommonDescriptor.getInstance().getConf().getSelectIntoInsertTabletPlanRowLimit();
long maxStatementSize = calculateStatementSizePerLine(targetPathToDataTypeMap) * rowLimit;
context.getTimeSliceAllocator().recordExecutionWeight(operatorContext, 1);
@@ -1559,7 +1560,7 @@ public class OperatorTreeGenerator extends PlanVisitor<Operator, LocalExecutionP
}
int rowLimit =
- IoTDBDescriptor.getInstance().getConfig().getSelectIntoInsertTabletPlanRowLimit();
+ 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 13c2e84d4f..904f778071 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
@@ -21,6 +21,7 @@ package org.apache.iotdb.db.mpp.plan.planner.distribution;
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
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;
@@ -150,7 +151,7 @@ public class SimpleFragmentParallelPlanner implements IFragmentParallelPlaner {
String.format("regionReplicaSet is invalid: %s", regionReplicaSet));
}
String readConsistencyLevel =
- IoTDBDescriptor.getInstance().getConfig().getReadConsistencyLevel();
+ CommonDescriptor.getInstance().getConf().getReadConsistencyLevel();
// TODO: (Chen Rongzhao) need to make the values of ReadConsistencyLevel as static variable or
// enums
boolean selectRandomDataNode = "weak".equals(readConsistencyLevel);
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/FragmentInstance.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/FragmentInstance.java
index 8775865ee8..9590f154a6 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/FragmentInstance.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/FragmentInstance.java
@@ -50,7 +50,7 @@ public class FragmentInstance implements IConsensusRequest {
private final Logger logger = LoggerFactory.getLogger(FragmentInstance.class);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private final FragmentInstanceId id;
private final QueryType type;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/load/LoadSingleTsFileNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/load/LoadSingleTsFileNode.java
index 974b1d63b4..74e28ba286 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/load/LoadSingleTsFileNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/load/LoadSingleTsFileNode.java
@@ -114,8 +114,8 @@ public class LoadSingleTsFileNode extends WritePlanNode {
}
private boolean isDispatchedToLocal(TEndPoint endPoint) {
- return IoTDBDescriptor.getInstance().getConfig().getDnInternalAddress().equals(endPoint.getIp())
- && IoTDBDescriptor.getInstance().getConfig().getDnInternalPort() == endPoint.port;
+ return IoTDBDescriptor.getInstance().getConf().getDnInternalAddress().equals(endPoint.getIp())
+ && IoTDBDescriptor.getInstance().getConf().getDnInternalPort() == endPoint.port;
}
public boolean needDecodeTsFile() {
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 a739020e30..eba225c22a 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
@@ -20,6 +20,7 @@
package org.apache.iotdb.db.mpp.plan.planner.plan.node.metedata.write;
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;
@@ -47,7 +48,7 @@ import java.util.Objects;
public class CreateMultiTimeSeriesNode extends WritePlanNode {
private static final int SPLIT_SIZE =
- IoTDBDescriptor.getInstance().getConfig().getMaxMeasurementNumOfInternalRequest();
+ CommonDescriptor.getInstance().getConf().getMaxMeasurementNumOfInternalRequest();
private final Map<PartialPath, MeasurementGroup> measurementGroupMap;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertNode.java
index 377070f3b4..92f1f9a612 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertNode.java
@@ -186,7 +186,7 @@ public abstract class InsertNode extends WritePlanNode {
if (measurements[i] == null) {
continue;
}
- if (IoTDBDescriptor.getInstance().getConfig().isClusterMode()) {
+ if (IoTDBDescriptor.getInstance().getConf().isClusterMode()) {
byteLen += WALWriteUtils.sizeToWrite(measurementSchemas[i]);
} else {
byteLen += ReadWriteIOUtils.sizeToWrite(measurements[i]);
@@ -206,7 +206,7 @@ public abstract class InsertNode extends WritePlanNode {
}
// serialize measurementId only for standalone version for better write performance
- if (IoTDBDescriptor.getInstance().getConfig().isClusterMode()) {
+ if (IoTDBDescriptor.getInstance().getConf().isClusterMode()) {
WALWriteUtils.write(measurementSchemas[i], buffer);
} else {
WALWriteUtils.write(measurements[i], buffer);
@@ -221,7 +221,7 @@ public abstract class InsertNode extends WritePlanNode {
*/
protected void deserializeMeasurementSchemas(DataInputStream stream) throws IOException {
for (int i = 0; i < measurements.length; i++) {
- if (IoTDBDescriptor.getInstance().getConfig().isClusterMode()) {
+ if (IoTDBDescriptor.getInstance().getConf().isClusterMode()) {
measurementSchemas[i] = MeasurementSchema.deserializeFrom(stream);
measurements[i] = measurementSchemas[i].getMeasurementId();
dataTypes[i] = measurementSchemas[i].getType();
@@ -250,7 +250,7 @@ public abstract class InsertNode extends WritePlanNode {
/** Check whether data types are matched with measurement schemas */
protected void selfCheckDataTypes() throws DataTypeMismatchException, PathNotExistException {
for (int i = 0; i < measurementSchemas.length; i++) {
- if (CommonDescriptor.getInstance().getConfig().isEnablePartialInsert()) {
+ if (CommonDescriptor.getInstance().getConf().isEnablePartialInsert()) {
// if enable partial insert, mark failed measurements with exception
if (measurementSchemas[i] == null) {
markFailedMeasurement(
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowNode.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowNode.java
index 173ea3390d..cc4ad06ece 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/plan/node/write/InsertRowNode.java
@@ -240,7 +240,7 @@ public class InsertRowNode extends InsertNode implements WALEntryValue {
for (int i = 0; i < measurementSchemas.length; i++) {
// null when time series doesn't exist
if (measurementSchemas[i] == null) {
- if (!CommonDescriptor.getInstance().getConfig().isEnablePartialInsert()) {
+ if (!CommonDescriptor.getInstance().getConf().isEnablePartialInsert()) {
throw new QueryProcessException(
new PathNotExistException(
devicePath.getFullPath() + IoTDBConstant.PATH_SEPARATOR + measurements[i]));
@@ -265,7 +265,7 @@ public class InsertRowNode extends InsertNode implements WALEntryValue {
dataTypes[i],
time,
values[i]);
- if (!CommonDescriptor.getInstance().getConfig().isEnablePartialInsert()) {
+ if (!CommonDescriptor.getInstance().getConf().isEnablePartialInsert()) {
throw e;
} else {
markFailedMeasurement(i, e);
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/AbstractFragInsStateTracker.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/AbstractFragInsStateTracker.java
index 5763b96942..519cb2ac01 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/AbstractFragInsStateTracker.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/AbstractFragInsStateTracker.java
@@ -61,8 +61,8 @@ public abstract class AbstractFragInsStateTracker implements IFragInstanceStateT
this.scheduledExecutor = scheduledExecutor;
this.instances = instances;
this.internalServiceClientManager = internalServiceClientManager;
- this.localhostIpAddr = IoTDBDescriptor.getInstance().getConfig().getDnInternalAddress();
- this.localhostInternalPort = IoTDBDescriptor.getInstance().getConfig().getDnInternalPort();
+ this.localhostIpAddr = IoTDBDescriptor.getInstance().getConf().getDnInternalAddress();
+ this.localhostInternalPort = IoTDBDescriptor.getInstance().getConf().getDnInternalPort();
}
public abstract void start();
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java
index f896427090..8a3feb80e5 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/FragmentInstanceDispatcherImpl.java
@@ -82,8 +82,8 @@ public class FragmentInstanceDispatcherImpl implements IFragInstanceDispatcher {
this.executor = executor;
this.writeOperationExecutor = writeOperationExecutor;
this.internalServiceClientManager = internalServiceClientManager;
- this.localhostIpAddr = IoTDBDescriptor.getInstance().getConfig().getDnInternalAddress();
- this.localhostInternalPort = IoTDBDescriptor.getInstance().getConfig().getDnInternalPort();
+ this.localhostIpAddr = IoTDBDescriptor.getInstance().getConf().getDnInternalAddress();
+ this.localhostInternalPort = IoTDBDescriptor.getInstance().getConf().getDnInternalPort();
}
@Override
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileDispatcherImpl.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileDispatcherImpl.java
index c7a47d71c7..ab14d54abd 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileDispatcherImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileDispatcherImpl.java
@@ -72,8 +72,8 @@ public class LoadTsFileDispatcherImpl implements IFragInstanceDispatcher {
public LoadTsFileDispatcherImpl(
IClientManager<TEndPoint, SyncDataNodeInternalServiceClient> internalServiceClientManager) {
this.internalServiceClientManager = internalServiceClientManager;
- this.localhostIpAddr = IoTDBDescriptor.getInstance().getConfig().getDnInternalAddress();
- this.localhostInternalPort = IoTDBDescriptor.getInstance().getConfig().getDnInternalPort();
+ this.localhostIpAddr = IoTDBDescriptor.getInstance().getConf().getDnInternalAddress();
+ this.localhostInternalPort = IoTDBDescriptor.getInstance().getConf().getDnInternalPort();
this.executor =
IoTDBThreadPoolFactory.newCachedThreadPool(LoadTsFileDispatcherImpl.class.getName());
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileScheduler.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileScheduler.java
index ae76e3f43f..ae5a271c6a 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileScheduler.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/scheduler/load/LoadTsFileScheduler.java
@@ -78,8 +78,8 @@ import java.util.stream.Collectors;
*/
public class LoadTsFileScheduler implements IScheduler {
private static final Logger logger = LoggerFactory.getLogger(LoadTsFileScheduler.class);
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
public static final long LOAD_TASK_MAX_TIME_IN_SECOND = 5184000L; // one day
private static final long MAX_MEMORY_SIZE =
Math.min(
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 9c4162195f..79aac15dd9 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
@@ -19,6 +19,7 @@
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;
@@ -46,10 +47,10 @@ public class LoadTsFileStatement extends Statement {
public LoadTsFileStatement(String filePath) throws FileNotFoundException {
this.file = new File(filePath);
- this.sgLevel = IoTDBDescriptor.getInstance().getConfig().getDefaultStorageGroupLevel();
+ this.sgLevel = CommonDescriptor.getInstance().getConf().getDefaultStorageGroupLevel();
this.verifySchema = true;
this.deleteAfterLoad = true;
- this.autoCreateDatabase = IoTDBDescriptor.getInstance().getConfig().isAutoCreateSchemaEnabled();
+ this.autoCreateDatabase = CommonDescriptor.getInstance().getConf().isEnableAutoCreateSchema();
this.tsFiles = new ArrayList<>();
this.resources = new ArrayList<>();
this.statementType = StatementType.MULTI_BATCH_INSERT;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/CreateContinuousQueryStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/CreateContinuousQueryStatement.java
index 97d40e9fd2..969ef478b8 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/CreateContinuousQueryStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/CreateContinuousQueryStatement.java
@@ -175,12 +175,12 @@ public class CreateContinuousQueryStatement extends Statement implements IConfig
public void semanticCheck() {
if (everyInterval
- < IoTDBDescriptor.getInstance().getConfig().getContinuousQueryMinimumEveryInterval()) {
+ < IoTDBDescriptor.getInstance().getConf().getContinuousQueryMinimumEveryInterval()) {
throw new SemanticException(
String.format(
"CQ: Every interval [%d] should not be lower than the `continuous_query_minimum_every_interval` [%d] configured.",
everyInterval,
- IoTDBDescriptor.getInstance().getConfig().getContinuousQueryMinimumEveryInterval()));
+ IoTDBDescriptor.getInstance().getConf().getContinuousQueryMinimumEveryInterval()));
}
if (startTimeOffset <= 0) {
throw new SemanticException("CQ: The start time offset should be greater than 0.");
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/datastructure/SerializableList.java b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/datastructure/SerializableList.java
index 9ebe306d58..e690e99a3d 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/transformation/datastructure/SerializableList.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/transformation/datastructure/SerializableList.java
@@ -21,7 +21,6 @@ package org.apache.iotdb.db.mpp.transformation.datastructure;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.file.SystemFileFactory;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.service.TemporaryQueryDataFileService;
import org.apache.iotdb.tsfile.utils.PublicBAOS;
@@ -33,7 +32,7 @@ import java.nio.channels.FileChannel;
public interface SerializableList {
int INITIAL_BYTE_ARRAY_LENGTH_FOR_MEMORY_CONTROL =
- CommonDescriptor.getInstance().getConfig().getUdfInitialByteArrayLengthForMemoryControl();
+ CommonDescriptor.getInstance().getConf().getUdfInitialByteArrayLengthForMemoryControl();
void serialize(PublicBAOS outputStream) throws IOException;
diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/handler/QueryHandlerFactory.java b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/handler/QueryHandlerFactory.java
index b944faf14c..be135f82a2 100644
--- a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/handler/QueryHandlerFactory.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/handler/QueryHandlerFactory.java
@@ -31,10 +31,10 @@ public class QueryHandlerFactory {
*/
public static AbstractQueryHandler getInstance() {
if (IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.getRpcImplClassName()
.equals(ClientRPCServiceImpl.class.getName())) {
- if ("Tag".equals(IoTDBDescriptor.getInstance().getConfig().getSchemaEngineMode())) {
+ if ("Tag".equals(IoTDBDescriptor.getInstance().getConf().getSchemaEngineMode())) {
return new TagQueryHandler();
}
return new NewQueryHandler();
diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/meta/InfluxDBMetaManagerFactory.java b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/meta/InfluxDBMetaManagerFactory.java
index 5efa5728ed..8c431a855a 100644
--- a/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/meta/InfluxDBMetaManagerFactory.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/influxdb/meta/InfluxDBMetaManagerFactory.java
@@ -31,10 +31,10 @@ public class InfluxDBMetaManagerFactory {
*/
public static IInfluxDBMetaManager getInstance() {
if (IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.getRpcImplClassName()
.equals(ClientRPCServiceImpl.class.getName())) {
- if ("Tag".equals(IoTDBDescriptor.getInstance().getConfig().getSchemaEngineMode())) {
+ if ("Tag".equals(IoTDBDescriptor.getInstance().getConf().getSchemaEngineMode())) {
return TagInfluxDBMetaManager.getInstance();
}
return NewInfluxDBMetaManager.getInstance();
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 d7013ab8a4..2c45fbfffa 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
@@ -18,6 +18,8 @@
*/
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;
@@ -56,7 +58,7 @@ import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
public class InfluxDBAstVisitor extends InfluxDBSqlParserBaseVisitor<Statement> {
- private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConfig();
+ private static final CommonConfig CONFIG = CommonDescriptor.getInstance().getConf();
@Override
public Statement visitSingleStatement(InfluxDBSqlParser.SingleStatementContext ctx) {
diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/mqtt/MPPPublishHandler.java b/server/src/main/java/org/apache/iotdb/db/protocol/mqtt/MPPPublishHandler.java
index e688405bad..f84e359240 100644
--- a/server/src/main/java/org/apache/iotdb/db/protocol/mqtt/MPPPublishHandler.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/mqtt/MPPPublishHandler.java
@@ -23,8 +23,6 @@ import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.auth.AuthorityChecker;
-import org.apache.iotdb.db.conf.IoTDBConfig;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.mpp.plan.Coordinator;
import org.apache.iotdb.db.mpp.plan.analyze.ClusterPartitionFetcher;
import org.apache.iotdb.db.mpp.plan.analyze.IPartitionFetcher;
@@ -170,7 +168,7 @@ public class MPPPublishHandler extends AbstractInterceptHandler {
"",
partitionFetcher,
schemaFetcher,
- CommonDescriptor.getInstance().getConfig().getQueryTimeoutThreshold());
+ CommonDescriptor.getInstance().getConf().getQueryTimeoutThreshold());
tsStatus = result.status;
}
} catch (Exception e) {
diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/mqtt/PayloadFormatManager.java b/server/src/main/java/org/apache/iotdb/db/protocol/mqtt/PayloadFormatManager.java
index ee9fd6aea3..acbe7e5d10 100644
--- a/server/src/main/java/org/apache/iotdb/db/protocol/mqtt/PayloadFormatManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/mqtt/PayloadFormatManager.java
@@ -48,7 +48,7 @@ public class PayloadFormatManager {
}
private static void init() {
- mqttDir = IoTDBDescriptor.getInstance().getConfig().getMqttDir();
+ mqttDir = IoTDBDescriptor.getInstance().getConf().getMqttDir();
logger.info("mqttDir: {}", mqttDir);
try {
diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java
index 96a85f9741..a0f3808fdf 100644
--- a/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java
@@ -55,7 +55,7 @@ import java.util.List;
public class GrafanaApiServiceImpl extends GrafanaApiService {
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private static final Coordinator COORDINATOR = Coordinator.getInstance();
@@ -73,7 +73,7 @@ public class GrafanaApiServiceImpl extends GrafanaApiService {
SCHEMA_FETCHER = ClusterSchemaFetcher.getInstance();
authorizationHandler = new AuthorizationHandler();
- switch (IoTDBDescriptor.getInstance().getConfig().getTimestampPrecision()) {
+ switch (IoTDBDescriptor.getInstance().getConf().getTimestampPrecision()) {
case "ns":
timePrecision = 1000000;
break;
diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java
index 2f00f2e5dd..51f727444d 100644
--- a/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java
@@ -51,7 +51,7 @@ import java.time.ZoneId;
public class RestApiServiceImpl extends RestApiService {
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private static final Coordinator COORDINATOR = Coordinator.getInstance();
diff --git a/server/src/main/java/org/apache/iotdb/db/query/control/SessionManager.java b/server/src/main/java/org/apache/iotdb/db/query/control/SessionManager.java
index 4fd13c04d5..65fc03205d 100644
--- a/server/src/main/java/org/apache/iotdb/db/query/control/SessionManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/query/control/SessionManager.java
@@ -76,7 +76,7 @@ public class SessionManager implements SessionManagerMBean {
TSProtocolVersion.IOTDB_SERVICE_PROTOCOL_V3;
private static final boolean enableAuditLog =
- IoTDBDescriptor.getInstance().getConfig().isEnableAuditLog();
+ IoTDBDescriptor.getInstance().getConf().isEnableAuditLog();
protected SessionManager() {
// singleton
diff --git a/server/src/main/java/org/apache/iotdb/db/rescon/MemTableManager.java b/server/src/main/java/org/apache/iotdb/db/rescon/MemTableManager.java
index c2d862470c..465d3ec387 100644
--- a/server/src/main/java/org/apache/iotdb/db/rescon/MemTableManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/rescon/MemTableManager.java
@@ -31,8 +31,8 @@ import org.slf4j.LoggerFactory;
public class MemTableManager {
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
- private static final IoTDBConfig IOTDB_CONFIG = IoTDBDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
+ private static final IoTDBConfig IOTDB_CONFIG = IoTDBDescriptor.getInstance().getConf();
private static final Logger logger = LoggerFactory.getLogger(MemTableManager.class);
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 cc9f4d7e43..9340335a29 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
@@ -39,8 +39,8 @@ public class PrimitiveArrayManager {
private static final Logger LOGGER = LoggerFactory.getLogger(PrimitiveArrayManager.class);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
- private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
+ private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConf();
public static final int ARRAY_SIZE = COMMON_CONFIG.getPrimitiveArraySize();
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 f123c9a089..cd4f02a766 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
@@ -24,8 +24,6 @@ import org.apache.iotdb.commons.concurrent.ThreadName;
import org.apache.iotdb.commons.conf.CommonConfig;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.utils.TestOnly;
-import org.apache.iotdb.db.conf.IoTDBConfig;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.flush.FlushManager;
import org.apache.iotdb.db.engine.storagegroup.DataRegionInfo;
import org.apache.iotdb.db.engine.storagegroup.TsFileProcessor;
@@ -42,7 +40,7 @@ import java.util.concurrent.atomic.AtomicLong;
public class SystemInfo {
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
private static final Logger logger = LoggerFactory.getLogger(SystemInfo.class);
private long totalStorageGroupMemCost = 0L;
diff --git a/server/src/main/java/org/apache/iotdb/db/rescon/TsFileResourceManager.java b/server/src/main/java/org/apache/iotdb/db/rescon/TsFileResourceManager.java
index a83d50dd62..4bd313f793 100644
--- a/server/src/main/java/org/apache/iotdb/db/rescon/TsFileResourceManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/rescon/TsFileResourceManager.java
@@ -32,7 +32,7 @@ import java.util.TreeSet;
public class TsFileResourceManager {
private static final Logger logger = LoggerFactory.getLogger(TsFileResourceManager.class);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
/** threshold total memory for all TimeIndex */
private double TIME_INDEX_MEMORY_THRESHOLD = COMMON_CONFIG.getAllocateMemoryForTimeIndex();
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 0864f28ee3..a8ed07deae 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
@@ -25,8 +25,10 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.common.rpc.thrift.TNodeResource;
import org.apache.iotdb.commons.concurrent.IoTDBDefaultThreadExceptionHandler;
+import org.apache.iotdb.commons.conf.CommonConfig;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.conf.IoTDBConstant;
+import org.apache.iotdb.commons.consensus.ConsensusProtocolClass;
import org.apache.iotdb.commons.exception.ConfigurationException;
import org.apache.iotdb.commons.exception.StartupException;
import org.apache.iotdb.commons.file.SystemFileFactory;
@@ -100,7 +102,9 @@ import static org.apache.iotdb.commons.conf.IoTDBConstant.DEFAULT_CLUSTER_NAME;
public class DataNode implements DataNodeMBean {
private static final Logger logger = LoggerFactory.getLogger(DataNode.class);
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
+ private static final IoTDBConfig IOTDB_CONFIG = IoTDBDescriptor.getInstance().getConf();
private final String mbeanName =
String.format(
@@ -108,7 +112,7 @@ public class DataNode implements DataNodeMBean {
private static final File SYSTEM_PROPERTIES =
SystemFileFactory.INSTANCE.getFile(
- config.getSchemaDir() + File.separator + IoTDBStartCheck.PROPERTIES_FILE_NAME);
+ IOTDB_CONFIG.getSchemaDir() + File.separator + IoTDBStartCheck.PROPERTIES_FILE_NAME);
/**
* when joining a cluster or getting configuration this node will retry at most "DEFAULT_RETRY"
@@ -116,7 +120,7 @@ public class DataNode implements DataNodeMBean {
*/
private static final int DEFAULT_RETRY = 10;
- private static final long DEFAULT_RETRY_INTERVAL_IN_MS = config.getDnJoinClusterRetryIntervalMs();
+ private static final long DEFAULT_RETRY_INTERVAL_IN_MS = IOTDB_CONFIG.getDnJoinClusterRetryIntervalMs();
private final TEndPoint thisNode = new TEndPoint();
@@ -149,7 +153,7 @@ public class DataNode implements DataNodeMBean {
isFirstStart = prepareDataNode();
// Set target ConfigNodeList from iotdb-datanode.properties file
- ConfigNodeInfo.getInstance().updateConfigNodeList(config.getDnTargetConfigNodeList());
+ ConfigNodeInfo.getInstance().updateConfigNodeList(IOTDB_CONFIG.getDnTargetConfigNodeList());
// Pull and check system configurations from ConfigNode-leader
pullAndCheckSystemConfigurations();
@@ -171,7 +175,7 @@ public class DataNode implements DataNodeMBean {
// Setup metric service
setUpMetricService();
- logger.info("IoTDB configuration: " + config.getConfigMessage());
+ logger.info("IoTDB configuration: " + IOTDB_CONFIG.getConfigMessage());
logger.info("Congratulation, IoTDB DataNode is set up successfully. Now, enjoy yourself!");
} catch (StartupException | ConfigurationException | IOException e) {
@@ -188,13 +192,13 @@ public class DataNode implements DataNodeMBean {
/** Prepare cluster IoTDB-DataNode */
private boolean prepareDataNode() throws StartupException, ConfigurationException, IOException {
// Set cluster mode
- config.setClusterMode(true);
+ IOTDB_CONFIG.setClusterMode(true);
// Notice: Consider this DataNode as first start if the system.properties file doesn't exist
boolean isFirstStart = IoTDBStartCheck.getInstance().checkIsFirstStart();
// Check target ConfigNodes
- for (TEndPoint endPoint : config.getDnTargetConfigNodeList()) {
+ for (TEndPoint endPoint : IOTDB_CONFIG.getDnTargetConfigNodeList()) {
if (endPoint.getIp().equals("0.0.0.0")) {
throw new StartupException(
"The ip address of any target_config_node_list couldn't be 0.0.0.0");
@@ -202,8 +206,8 @@ public class DataNode implements DataNodeMBean {
}
// Set this node
- thisNode.setIp(config.getDnInternalAddress());
- thisNode.setPort(config.getDnInternalPort());
+ thisNode.setIp(IOTDB_CONFIG.getDnInternalAddress());
+ thisNode.setPort(IOTDB_CONFIG.getDnInternalPort());
// Startup checks
StartupChecks checks = new StartupChecks(IoTDBConstant.DN_ROLE).withDefaultTest();
@@ -261,21 +265,25 @@ public class DataNode implements DataNodeMBean {
/* Load system configurations */
IoTDBDescriptor.getInstance().loadGlobalConfig(configurationResp.globalConfig);
- IoTDBDescriptor.getInstance().loadRatisConfig(configurationResp.ratisConfig);
+ CommonDescriptor.getInstance().loadRatisConfig(configurationResp.ratisConfig);
IoTDBDescriptor.getInstance().loadCQConfig(configurationResp.cqConfig);
CommonDescriptor.getInstance().loadGlobalConfig(configurationResp.globalConfig);
/* Set cluster consensus protocol class */
- if (!IoTDBStartCheck.getInstance()
+ try {
+ if (!IoTDBStartCheck.getInstance()
.checkConsensusProtocolExists(TConsensusGroupType.DataRegion)) {
- config.setDataRegionConsensusProtocolClass(
- configurationResp.globalConfig.getDataRegionConsensusProtocolClass());
- }
+ COMMON_CONFIG.setDataRegionConsensusProtocolClass(ConsensusProtocolClass.parse(
+ configurationResp.globalConfig.getDataRegionConsensusProtocolClass()));
+ }
- if (!IoTDBStartCheck.getInstance()
+ if (!IoTDBStartCheck.getInstance()
.checkConsensusProtocolExists(TConsensusGroupType.SchemaRegion)) {
- config.setSchemaRegionConsensusProtocolClass(
- configurationResp.globalConfig.getSchemaRegionConsensusProtocolClass());
+ COMMON_CONFIG.setSchemaRegionConsensusProtocolClass(ConsensusProtocolClass.parse(
+ configurationResp.globalConfig.getSchemaRegionConsensusProtocolClass()));
+ }
+ } catch (IOException e) {
+ throw new StartupException(e);
}
/* Check system configurations */
@@ -283,10 +291,10 @@ public class DataNode implements DataNodeMBean {
IoTDBStartCheck.getInstance().checkSystemConfig();
IoTDBStartCheck.getInstance().checkDirectory();
IoTDBStartCheck.getInstance().serializeGlobalConfig(configurationResp.globalConfig);
- IoTDBDescriptor.getInstance().initClusterSchemaMemoryAllocate();
- if (!config.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.IOT_CONSENSUS)) {
+ CommonDescriptor.getInstance().initClusterSchemaMemoryAllocate();
+ if (!COMMON_CONFIG.getDataRegionConsensusProtocolClass().getProtocol().equals(ConsensusFactory.IOT_CONSENSUS)) {
// In current implementation, only IoTConsensus need separated memory from Consensus
- IoTDBDescriptor.getInstance().reclaimConsensusMemory();
+ CommonDescriptor.getInstance().reclaimConsensusMemory();
SystemInfo.getInstance().allocateWriteMemory();
}
} catch (Exception e) {
@@ -340,7 +348,7 @@ public class DataNode implements DataNodeMBean {
int retry = DEFAULT_RETRY;
TDataNodeRegisterReq req = new TDataNodeRegisterReq();
req.setDataNodeConfiguration(generateDataNodeConfiguration());
- req.setClusterName(config.getClusterName());
+ req.setClusterName(IOTDB_CONFIG.getClusterName());
TDataNodeRegisterResp dataNodeRegisterResp = null;
while (retry > 0) {
try (ConfigNodeClient configNodeClient = new ConfigNodeClient()) {
@@ -374,14 +382,14 @@ public class DataNode implements DataNodeMBean {
/* Store runtime configurations when register success */
int dataNodeID = dataNodeRegisterResp.getDataNodeId();
- config.setDataNodeId(dataNodeID);
+ IOTDB_CONFIG.setDataNodeId(dataNodeID);
IoTDBStartCheck.getInstance()
- .serializeClusterNameAndDataNodeId(config.getClusterName(), dataNodeID);
+ .serializeClusterNameAndDataNodeId(IOTDB_CONFIG.getClusterName(), dataNodeID);
storeRuntimeConfigurations(
dataNodeRegisterResp.getConfigNodeList(), dataNodeRegisterResp.getRuntimeConfiguration());
- logger.info("Successfully register to the cluster: {}", config.getClusterName());
+ logger.info("Successfully register to the cluster: {}", IOTDB_CONFIG.getClusterName());
} else {
/* Throw exception when register failed */
logger.error(dataNodeRegisterResp.getStatus().getMessage());
@@ -396,7 +404,7 @@ public class DataNode implements DataNodeMBean {
int retry = DEFAULT_RETRY;
TDataNodeRestartReq req = new TDataNodeRestartReq();
req.setClusterName(
- config.getClusterName() == null ? DEFAULT_CLUSTER_NAME : config.getClusterName());
+ IOTDB_CONFIG.getClusterName() == null ? DEFAULT_CLUSTER_NAME : IOTDB_CONFIG.getClusterName());
req.setDataNodeConfiguration(generateDataNodeConfiguration());
TDataNodeRestartResp dataNodeRestartResp = null;
while (retry > 0) {
@@ -432,7 +440,7 @@ public class DataNode implements DataNodeMBean {
/* Store runtime configurations when restart request is accepted */
storeRuntimeConfigurations(
dataNodeRestartResp.getConfigNodeList(), dataNodeRestartResp.getRuntimeConfiguration());
- logger.info("Restart request to cluster: {} is accepted.", config.getClusterName());
+ logger.info("Restart request to cluster: {} is accepted.", IOTDB_CONFIG.getClusterName());
} else {
/* Throw exception when restart is rejected */
throw new StartupException(dataNodeRestartResp.getStatus().getMessage());
@@ -487,9 +495,9 @@ public class DataNode implements DataNodeMBean {
registerManager.register(CacheHitRatioMonitor.getInstance());
// close wal when using ratis consensus
- if (config.isClusterMode()
- && config.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.RATIS_CONSENSUS)) {
- config.setWalMode(WALMode.DISABLE);
+ if (IOTDB_CONFIG.isClusterMode()
+ && COMMON_CONFIG.getDataRegionConsensusProtocolClass().getProtocol().equals(ConsensusFactory.RATIS_CONSENSUS)) {
+ COMMON_CONFIG.setWalMode(WALMode.DISABLE);
}
registerManager.register(WALManager.getInstance());
@@ -536,9 +544,9 @@ public class DataNode implements DataNodeMBean {
// Start client RPCService to indicate that the current DataNode provide external services
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setRpcImplClassName(ClientRPCServiceImpl.class.getName());
- if (config.isEnableRpcService()) {
+ if (IOTDB_CONFIG.isEnableRpcService()) {
registerManager.register(RPCService.getInstance());
}
// init service protocols
@@ -562,16 +570,16 @@ public class DataNode implements DataNodeMBean {
private TDataNodeLocation generateDataNodeLocation() {
TDataNodeLocation location = new TDataNodeLocation();
- location.setDataNodeId(config.getDataNodeId());
- location.setClientRpcEndPoint(new TEndPoint(config.getDnRpcAddress(), config.getDnRpcPort()));
+ location.setDataNodeId(IOTDB_CONFIG.getDataNodeId());
+ location.setClientRpcEndPoint(new TEndPoint(IOTDB_CONFIG.getDnRpcAddress(), IOTDB_CONFIG.getDnRpcPort()));
location.setInternalEndPoint(
- new TEndPoint(config.getDnInternalAddress(), config.getDnInternalPort()));
+ new TEndPoint(IOTDB_CONFIG.getDnInternalAddress(), IOTDB_CONFIG.getDnInternalPort()));
location.setMPPDataExchangeEndPoint(
- new TEndPoint(config.getDnInternalAddress(), config.getDnMppDataExchangePort()));
+ new TEndPoint(IOTDB_CONFIG.getDnInternalAddress(), IOTDB_CONFIG.getDnMppDataExchangePort()));
location.setDataRegionConsensusEndPoint(
- new TEndPoint(config.getDnInternalAddress(), config.getDnDataRegionConsensusPort()));
+ new TEndPoint(IOTDB_CONFIG.getDnInternalAddress(), IOTDB_CONFIG.getDnDataRegionConsensusPort()));
location.setSchemaRegionConsensusEndPoint(
- new TEndPoint(config.getDnInternalAddress(), config.getDnSchemaRegionConsensusPort()));
+ new TEndPoint(IOTDB_CONFIG.getDnInternalAddress(), IOTDB_CONFIG.getDnSchemaRegionConsensusPort()));
return location;
}
@@ -594,13 +602,13 @@ public class DataNode implements DataNodeMBean {
private void registerUdfServices() throws StartupException {
registerManager.register(TemporaryQueryDataFileService.getInstance());
- registerManager.register(UDFClassLoaderManager.setupAndGetInstance(config.getUdfDir()));
+ registerManager.register(UDFClassLoaderManager.setupAndGetInstance(COMMON_CONFIG.getUdfDir()));
}
private void initUDFRelatedInstance() throws StartupException {
try {
- UDFExecutableManager.setupAndGetInstance(config.getUdfTemporaryLibDir(), config.getUdfDir());
- UDFClassLoaderManager.setupAndGetInstance(config.getUdfDir());
+ UDFExecutableManager.setupAndGetInstance(COMMON_CONFIG.getUdfTemporaryLibDir(), COMMON_CONFIG.getUdfDir());
+ UDFClassLoaderManager.setupAndGetInstance(COMMON_CONFIG.getUdfDir());
} catch (IOException e) {
throw new StartupException(e);
}
@@ -700,7 +708,7 @@ public class DataNode implements DataNodeMBean {
private void initTriggerRelatedInstance() throws StartupException {
try {
TriggerExecutableManager.setupAndGetInstance(
- config.getTriggerTemporaryLibDir(), config.getTriggerDir());
+ COMMON_CONFIG.getTriggerTemporaryLibDir(), COMMON_CONFIG.getTriggerDir());
} catch (IOException e) {
throw new StartupException(e);
}
@@ -833,10 +841,10 @@ public class DataNode implements DataNodeMBean {
}
private void initProtocols() throws StartupException {
- if (config.isEnableInfluxDBRpcService()) {
+ if (COMMON_CONFIG.isEnableInfluxDBRpcService()) {
registerManager.register(InfluxDBRPCService.getInstance());
}
- if (config.isEnableMQTTService()) {
+ if (COMMON_CONFIG.isEnableMqttService()) {
registerManager.register(MQTTService.getInstance());
}
if (IoTDBRestServiceDescriptor.getInstance().getConfig().isEnableRestService()) {
diff --git a/server/src/main/java/org/apache/iotdb/db/service/DataNodeInternalRPCService.java b/server/src/main/java/org/apache/iotdb/db/service/DataNodeInternalRPCService.java
index 4f722becea..9b6c9f3972 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/DataNodeInternalRPCService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/DataNodeInternalRPCService.java
@@ -55,7 +55,7 @@ public class DataNodeInternalRPCService extends ThriftService
public void initThriftServiceThread()
throws IllegalAccessException, InstantiationException, ClassNotFoundException {
try {
- IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
thriftServiceThread =
new ThriftServiceThread(
processor,
@@ -78,12 +78,12 @@ public class DataNodeInternalRPCService extends ThriftService
@Override
public String getBindIP() {
- return IoTDBDescriptor.getInstance().getConfig().getDnInternalAddress();
+ return IoTDBDescriptor.getInstance().getConf().getDnInternalAddress();
}
@Override
public int getBindPort() {
- return IoTDBDescriptor.getInstance().getConfig().getDnInternalPort();
+ return IoTDBDescriptor.getInstance().getConf().getDnInternalPort();
}
private static class DataNodeInternalRPCServiceHolder {
diff --git a/server/src/main/java/org/apache/iotdb/db/service/GetVersion.java b/server/src/main/java/org/apache/iotdb/db/service/GetVersion.java
index 8b49874460..664f7d1c77 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/GetVersion.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/GetVersion.java
@@ -22,6 +22,6 @@ import org.apache.iotdb.db.conf.IoTDBDescriptor;
public class GetVersion {
public static void main(String[] args) {
- System.out.println(IoTDBDescriptor.getInstance().getConfig().getIoTDBVersion());
+ System.out.println(IoTDBDescriptor.getInstance().getConf().getIoTDBVersion());
}
}
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 dd0e4d513b..c4b7be836a 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
@@ -20,6 +20,8 @@
package org.apache.iotdb.db.service;
import org.apache.iotdb.commons.concurrent.ThreadName;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.exception.runtime.RPCServiceException;
import org.apache.iotdb.commons.service.ServiceType;
import org.apache.iotdb.commons.service.ThriftService;
@@ -43,7 +45,7 @@ public class InfluxDBRPCService extends ThriftService implements InfluxDBRPCServ
public void initTProcessor()
throws ClassNotFoundException, IllegalAccessException, InstantiationException {
if (IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.getRpcImplClassName()
.equals(ClientRPCServiceImpl.class.getName())) {
impl =
@@ -52,7 +54,7 @@ public class InfluxDBRPCService extends ThriftService implements InfluxDBRPCServ
} else {
impl =
(IInfluxDBServiceWithHandler)
- Class.forName(IoTDBDescriptor.getInstance().getConfig().getInfluxDBImplClassName())
+ Class.forName(IoTDBDescriptor.getInstance().getConf().getInfluxDBImplClassName())
.newInstance();
}
initSyncedServiceImpl(null);
@@ -61,7 +63,8 @@ public class InfluxDBRPCService extends ThriftService implements InfluxDBRPCServ
@Override
public void initThriftServiceThread() throws IllegalAccessException {
- IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ CommonConfig commonConfig = CommonDescriptor.getInstance().getConf();
+ IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
try {
thriftServiceThread =
new ThriftServiceThread(
@@ -69,11 +72,11 @@ public class InfluxDBRPCService extends ThriftService implements InfluxDBRPCServ
getID().getName(),
ThreadName.INFLUXDB_RPC_PROCESSOR.getName(),
config.getDnRpcAddress(),
- config.getInfluxDBRpcPort(),
+ commonConfig.getInfluxDBRpcPort(),
config.getDnRpcMaxConcurrentClientNum(),
config.getThriftServerAwaitTimeForStopService(),
new InfluxDBServiceThriftHandler(impl),
- IoTDBDescriptor.getInstance().getConfig().isDnRpcThriftCompressionEnable());
+ IoTDBDescriptor.getInstance().getConf().isDnRpcThriftCompressionEnable());
} catch (RPCServiceException e) {
throw new IllegalAccessException(e.getMessage());
}
@@ -82,12 +85,12 @@ public class InfluxDBRPCService extends ThriftService implements InfluxDBRPCServ
@Override
public String getBindIP() {
- return IoTDBDescriptor.getInstance().getConfig().getDnRpcAddress();
+ return IoTDBDescriptor.getInstance().getConf().getDnRpcAddress();
}
@Override
public int getBindPort() {
- return IoTDBDescriptor.getInstance().getConfig().getInfluxDBRpcPort();
+ return CommonDescriptor.getInstance().getConf().getInfluxDBRpcPort();
}
@Override
diff --git a/server/src/main/java/org/apache/iotdb/db/service/IoTDBShutdownHook.java b/server/src/main/java/org/apache/iotdb/db/service/IoTDBShutdownHook.java
index f15e4406a8..940631f157 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/IoTDBShutdownHook.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/IoTDBShutdownHook.java
@@ -39,18 +39,18 @@ public class IoTDBShutdownHook extends Thread {
@Override
public void run() {
// close rocksdb if possible to avoid lose data
- if (SchemaEngineMode.valueOf(IoTDBDescriptor.getInstance().getConfig().getSchemaEngineMode())
+ if (SchemaEngineMode.valueOf(IoTDBDescriptor.getInstance().getConf().getSchemaEngineMode())
.equals(SchemaEngineMode.Rocksdb_based)) {
SchemaEngine.getInstance().clear();
}
// reject write operations to make sure all tsfiles will be sealed
- CommonDescriptor.getInstance().getConfig().setNodeStatusToShutdown();
+ CommonDescriptor.getInstance().getConf().setNodeStatusToShutdown();
// wait all wal are flushed
WALManager.getInstance().waitAllWALFlushed();
// flush data to Tsfile and remove WAL log files
- if (!IoTDBDescriptor.getInstance().getConfig().isClusterMode()) {
+ if (!IoTDBDescriptor.getInstance().getConf().isClusterMode()) {
StorageEngine.getInstance().syncCloseAllProcessor();
}
WALManager.getInstance().deleteOutdatedWALFiles();
@@ -59,9 +59,9 @@ public class IoTDBShutdownHook extends Thread {
// consensus algorithms, which will replace the underlying storage engine based on its own
// latest snapshot, while other consensus algorithms will not. This judgement ensures that
// compaction work is not discarded even if there are frequent restarts
- if (IoTDBDescriptor.getInstance().getConfig().isClusterMode()
+ if (IoTDBDescriptor.getInstance().getConf().isClusterMode()
&& CommonDescriptor.getInstance()
- .getConfig()
+ .getConf()
.getDataRegionConsensusProtocolClass()
.getProtocol()
.equals(ConsensusFactory.RATIS_CONSENSUS)) {
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 e4e03ea5c0..146edd3d47 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
@@ -22,8 +22,6 @@ import org.apache.iotdb.commons.conf.CommonConfig;
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.IoTDBConfig;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.protocol.mqtt.BrokerAuthenticator;
import org.apache.iotdb.db.protocol.mqtt.MPPPublishHandler;
@@ -58,7 +56,7 @@ public class MQTTService implements IService {
}
public void startup() {
- CommonConfig commonConfig = CommonDescriptor.getInstance().getConfig();
+ CommonConfig commonConfig = CommonDescriptor.getInstance().getConf();
IConfig config = createBrokerConfig(commonConfig);
List<InterceptHandler> handlers = new ArrayList<>(1);
handlers.add(new MPPPublishHandler(commonConfig));
diff --git a/server/src/main/java/org/apache/iotdb/db/service/RPCService.java b/server/src/main/java/org/apache/iotdb/db/service/RPCService.java
index 5fcf98801a..5f3f69f89e 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/RPCService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/RPCService.java
@@ -47,7 +47,7 @@ public class RPCService extends ThriftService implements RPCServiceMBean {
NoSuchMethodException, InvocationTargetException {
impl =
(IClientRPCServiceWithHandler)
- Class.forName(IoTDBDescriptor.getInstance().getConfig().getRpcImplClassName())
+ Class.forName(IoTDBDescriptor.getInstance().getConf().getRpcImplClassName())
.getDeclaredConstructor()
.newInstance();
initSyncedServiceImpl(null);
@@ -56,7 +56,7 @@ public class RPCService extends ThriftService implements RPCServiceMBean {
@Override
public void initThriftServiceThread() throws IllegalAccessException {
- IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
try {
thriftServiceThread =
new ThriftServiceThread(
@@ -68,7 +68,7 @@ public class RPCService extends ThriftService implements RPCServiceMBean {
config.getDnRpcMaxConcurrentClientNum(),
config.getThriftServerAwaitTimeForStopService(),
new RPCServiceThriftHandler(impl),
- IoTDBDescriptor.getInstance().getConfig().isDnRpcThriftCompressionEnable());
+ IoTDBDescriptor.getInstance().getConf().isDnRpcThriftCompressionEnable());
} catch (RPCServiceException e) {
throw new IllegalAccessException(e.getMessage());
}
@@ -78,12 +78,12 @@ public class RPCService extends ThriftService implements RPCServiceMBean {
@Override
public String getBindIP() {
- return IoTDBDescriptor.getInstance().getConfig().getDnRpcAddress();
+ return IoTDBDescriptor.getInstance().getConf().getDnRpcAddress();
}
@Override
public int getBindPort() {
- return IoTDBDescriptor.getInstance().getConfig().getDnRpcPort();
+ return IoTDBDescriptor.getInstance().getConf().getDnRpcPort();
}
@Override
diff --git a/server/src/main/java/org/apache/iotdb/db/service/SettleService.java b/server/src/main/java/org/apache/iotdb/db/service/SettleService.java
index 2cd05464b8..e89a512eab 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/SettleService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/SettleService.java
@@ -64,7 +64,7 @@ public class SettleService implements IService {
@Override
public void start() {
if (settleThreadPool == null) {
- int settleThreadNum = IoTDBDescriptor.getInstance().getConfig().getSettleThreadNum();
+ int settleThreadNum = IoTDBDescriptor.getInstance().getConf().getSettleThreadNum();
settleThreadPool =
IoTDBThreadPoolFactory.newFixedThreadPool(
settleThreadNum, ThreadName.SETTLE_SERVICE.getName());
diff --git a/server/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java b/server/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java
index 0f42a0720f..a21c65a309 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/TemporaryQueryDataFileService.java
@@ -43,7 +43,7 @@ public class TemporaryQueryDataFileService implements IService {
private static final Logger logger = LoggerFactory.getLogger(TemporaryQueryDataFileService.class);
private static final String TEMPORARY_FILE_DIR =
- IoTDBDescriptor.getInstance().getConfig().getDnSystemDir()
+ IoTDBDescriptor.getInstance().getConf().getDnSystemDir()
+ File.separator
+ "udf"
+ File.separator
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 4838baba34..a139b5474d 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
@@ -19,6 +19,7 @@
package org.apache.iotdb.db.service;
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;
@@ -53,7 +54,7 @@ public class UpgradeSevice implements IService {
@Override
public void start() {
- int updateThreadNum = IoTDBDescriptor.getInstance().getConfig().getUpgradeThreadCount();
+ int updateThreadNum = CommonDescriptor.getInstance().getConf().getUpgradeThreadCount();
if (updateThreadNum <= 0) {
updateThreadNum = 1;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/service/metrics/SystemMetrics.java b/server/src/main/java/org/apache/iotdb/db/service/metrics/SystemMetrics.java
index 1d77059475..6adc7b5477 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/metrics/SystemMetrics.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/metrics/SystemMetrics.java
@@ -186,7 +186,7 @@ public class SystemMetrics implements IMetricSet {
}
private void collectSystemDiskInfo(AbstractMetricService metricService) {
- String[] dataDirs = IoTDBDescriptor.getInstance().getConfig().getDnDataDirs();
+ String[] dataDirs = IoTDBDescriptor.getInstance().getConf().getDnDataDirs();
for (String dataDir : dataDirs) {
Path path = Paths.get(dataDir);
FileStore fileStore = null;
diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java
index 4a4600929e..e9ee7549cc 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/ClientRPCServiceImpl.java
@@ -138,8 +138,8 @@ public class ClientRPCServiceImpl implements IClientRPCServiceWithHandler {
private static final Logger LOGGER = LoggerFactory.getLogger(ClientRPCServiceImpl.class);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
- private static final IoTDBConfig IOTDB_CONFIG = IoTDBDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
+ private static final IoTDBConfig IOTDB_CONFIG = IoTDBDescriptor.getInstance().getConf();
private static final Coordinator COORDINATOR = Coordinator.getInstance();
@@ -563,9 +563,9 @@ public class ClientRPCServiceImpl implements IClientRPCServiceWithHandler {
properties.setWatermarkBitString(COMMON_CONFIG.getWatermarkBitString());
properties.setWatermarkParamMarkRate(COMMON_CONFIG.getWatermarkParamMarkRate());
properties.setWatermarkParamMaxRightBit(COMMON_CONFIG.getWatermarkParamMaxRightBit());
- properties.setIsReadOnly(CommonDescriptor.getInstance().getConfig().isReadOnly());
+ properties.setIsReadOnly(CommonDescriptor.getInstance().getConf().isReadOnly());
properties.setThriftMaxFrameSize(
- IoTDBDescriptor.getInstance().getConfig().getDnThriftMaxFrameSize());
+ IoTDBDescriptor.getInstance().getConf().getDnThriftMaxFrameSize());
return properties;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
index 5740a12226..6101fc7b34 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
@@ -982,9 +982,9 @@ public class DataNodeInternalRPCServiceImpl implements IDataNodeRPCService.Iface
}
resp.setHeartbeatTimestamp(req.getHeartbeatTimestamp());
- resp.setStatus(CommonDescriptor.getInstance().getConfig().getNodeStatus().getStatus());
- if (CommonDescriptor.getInstance().getConfig().getStatusReason() != null) {
- resp.setStatusReason(CommonDescriptor.getInstance().getConfig().getStatusReason());
+ resp.setStatus(CommonDescriptor.getInstance().getConf().getNodeStatus().getStatus());
+ if (CommonDescriptor.getInstance().getConf().getStatusReason() != null) {
+ resp.setStatusReason(CommonDescriptor.getInstance().getConf().getStatusReason());
}
return resp;
}
@@ -1052,7 +1052,7 @@ public class DataNodeInternalRPCServiceImpl implements IDataNodeRPCService.Iface
}
private void sampleDiskLoad(TLoadSample loadSample) {
- final CommonConfig commonConfig = CommonDescriptor.getInstance().getConfig();
+ final CommonConfig commonConfig = CommonDescriptor.getInstance().getConf();
long freeDisk =
MetricService.getInstance()
@@ -1123,11 +1123,11 @@ public class DataNodeInternalRPCServiceImpl implements IDataNodeRPCService.Iface
public TSStatus loadConfiguration() throws TException {
try {
long prevDeleteWalFilesPeriodInMs =
- CommonDescriptor.getInstance().getConfig().getDeleteWalFilesPeriodInMs();
+ CommonDescriptor.getInstance().getConf().getDeleteWalFilesPeriodInMs();
CommonDescriptor.getInstance().loadHotModifiedProps();
IoTDBDescriptor.getInstance().loadHotModifiedProps();
if (prevDeleteWalFilesPeriodInMs
- != CommonDescriptor.getInstance().getConfig().getDeleteWalFilesPeriodInMs()) {
+ != CommonDescriptor.getInstance().getConf().getDeleteWalFilesPeriodInMs()) {
WALManager.getInstance().rebootWALDeleteThread();
}
} catch (Exception e) {
@@ -1140,7 +1140,7 @@ public class DataNodeInternalRPCServiceImpl implements IDataNodeRPCService.Iface
@Override
public TSStatus setSystemStatus(String status) throws TException {
try {
- CommonDescriptor.getInstance().getConfig().setNodeStatus(NodeStatus.parse(status));
+ CommonDescriptor.getInstance().getConf().setNodeStatus(NodeStatus.parse(status));
} catch (Exception e) {
return RpcUtils.getStatus(TSStatusCode.EXECUTE_STATEMENT_ERROR, e.getMessage());
}
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/SyncService.java b/server/src/main/java/org/apache/iotdb/db/sync/SyncService.java
index 849c7abd10..7196a9be2f 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/SyncService.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/SyncService.java
@@ -73,7 +73,7 @@ import java.util.concurrent.ConcurrentHashMap;
public class SyncService implements IService {
private static final Logger logger = LoggerFactory.getLogger(SyncService.class);
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private final Map<String, Pipe> pipes;
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePlugin.java b/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePlugin.java
index e727ab57ca..9928e1ff87 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePlugin.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePlugin.java
@@ -93,7 +93,7 @@ public class ExtPipePlugin {
this.pipeOpManager = pipeOpManager;
this.extPipePluginManager = extPipePluginManager;
- String timePrecision = IoTDBDescriptor.getInstance().getConfig().getTimestampPrecision();
+ String timePrecision = IoTDBDescriptor.getInstance().getConf().getTimestampPrecision();
switch (timePrecision) {
case "ms":
timestampDivisor = 1;
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePluginRegister.java b/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePluginRegister.java
index 19c6328baa..659bedc0f8 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePluginRegister.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePluginRegister.java
@@ -52,7 +52,7 @@ public class ExtPipePluginRegister {
new ConcurrentHashMap<>();
private ExtPipePluginRegister() throws IOException {
- extPipeDir = IoTDBDescriptor.getInstance().getConfig().getExtPipeDir();
+ extPipeDir = IoTDBDescriptor.getInstance().getConf().getExtPipeDir();
logger.info("extPipeDir: {}", extPipeDir);
makeExtPipeDir();
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/DeletionLoader.java b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/DeletionLoader.java
index a976d9ef2b..048a296f3d 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/DeletionLoader.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/DeletionLoader.java
@@ -48,7 +48,7 @@ public class DeletionLoader implements ILoader {
@Override
public void load() throws PipeDataLoadException {
- if (CommonDescriptor.getInstance().getConfig().isReadOnly()) {
+ if (CommonDescriptor.getInstance().getConf().isReadOnly()) {
throw new PipeDataLoadException("storage engine readonly");
}
try {
@@ -63,7 +63,7 @@ public class DeletionLoader implements ILoader {
"",
PARTITION_FETCHER,
SCHEMA_FETCHER,
- IoTDBDescriptor.getInstance().getConfig().getQueryTimeoutThreshold());
+ IoTDBDescriptor.getInstance().getConf().getQueryTimeoutThreshold());
if (result.status.code != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
logger.error("Delete {} error, statement: {}.", deletion, statement);
logger.error("Delete result status : {}.", result.status);
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/TsFileLoader.java b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/TsFileLoader.java
index ec2eefd639..d17c4531e9 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/TsFileLoader.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/TsFileLoader.java
@@ -66,7 +66,7 @@ public class TsFileLoader implements ILoader {
"",
PARTITION_FETCHER,
SCHEMA_FETCHER,
- IoTDBDescriptor.getInstance().getConfig().getQueryTimeoutThreshold());
+ IoTDBDescriptor.getInstance().getConf().getQueryTimeoutThreshold());
if (result.status.code != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
logger.error("Load TsFile {} error, statement: {}.", tsFile.getPath(), statement);
logger.error("Load TsFile result status : {}.", result.status);
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/transport/client/IoTDBSyncClient.java b/server/src/main/java/org/apache/iotdb/db/sync/transport/client/IoTDBSyncClient.java
index 2e31211f88..b9b55ff849 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/transport/client/IoTDBSyncClient.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/transport/client/IoTDBSyncClient.java
@@ -57,7 +57,7 @@ public class IoTDBSyncClient implements ISyncClient {
private static final Logger logger = LoggerFactory.getLogger(IoTDBSyncClient.class);
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private static final int TRANSFER_BUFFER_SIZE_IN_BYTES = 1 * 1024 * 1024;
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 8ae5dba86d..b336f1f1ae 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
@@ -20,6 +20,8 @@
package org.apache.iotdb.db.sync.transport.server;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.exception.sync.PipeDataLoadException;
import org.apache.iotdb.commons.path.PartialPath;
@@ -64,7 +66,8 @@ import java.util.concurrent.atomic.AtomicLong;
public class ReceiverManager {
private static final Logger logger = LoggerFactory.getLogger(ReceiverManager.class);
- private final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
+ private static final IoTDBConfig IOTDB_CONFIG = IoTDBDescriptor.getInstance().getConf();
// When the client abnormally exits, we can still know who to disconnect
private final ThreadLocal<Long> currentConnectionId;
@@ -158,20 +161,20 @@ public class ReceiverManager {
SyncIdentityInfo identityInfo = new SyncIdentityInfo(tIdentityInfo, remoteAddress);
logger.info("Invoke handshake method from client ip = {}", identityInfo.getRemoteAddress());
// check ip address
- if (!verifyIPSegment(config.getIpWhiteList(), identityInfo.getRemoteAddress())) {
+ if (!verifyIPSegment(COMMON_CONFIG.getIpWhiteList(), identityInfo.getRemoteAddress())) {
return RpcUtils.getStatus(
TSStatusCode.PIPESERVER_ERROR,
String.format(
"permission is not allowed: the sender IP <%s>, the white list of receiver <%s>",
- identityInfo.getRemoteAddress(), config.getIpWhiteList()));
+ identityInfo.getRemoteAddress(), COMMON_CONFIG.getIpWhiteList()));
}
// Version check
- if (!config.getIoTDBMajorVersion(identityInfo.version).equals(config.getIoTDBMajorVersion())) {
+ if (!IOTDB_CONFIG.getIoTDBMajorVersion(identityInfo.version).equals(IOTDB_CONFIG.getIoTDBMajorVersion())) {
return RpcUtils.getStatus(
TSStatusCode.PIPESERVER_ERROR,
String.format(
"version mismatch: the sender <%s>, the receiver <%s>",
- identityInfo.version, config.getIoTDBVersion()));
+ identityInfo.version, IOTDB_CONFIG.getIoTDBVersion()));
}
if (!new File(SyncPathUtil.getFileDataDirPath(identityInfo)).exists()) {
@@ -434,7 +437,7 @@ public class ReceiverManager {
"",
partitionFetcher,
schemaFetcher,
- IoTDBDescriptor.getInstance().getConfig().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/tools/TsFileSplitTool.java b/server/src/main/java/org/apache/iotdb/db/tools/TsFileSplitTool.java
index 336a5681c6..489f21eb97 100644
--- a/server/src/main/java/org/apache/iotdb/db/tools/TsFileSplitTool.java
+++ b/server/src/main/java/org/apache/iotdb/db/tools/TsFileSplitTool.java
@@ -71,10 +71,10 @@ public class TsFileSplitTool {
* default is 100
*/
private final long chunkPointNumLowerBoundInCompaction =
- IoTDBDescriptor.getInstance().getConfig().getChunkPointNumLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkPointNumLowerBoundInCompaction();
private static long targetSplitFileSize =
- IoTDBDescriptor.getInstance().getConfig().getTargetCompactionFileSize();
+ IoTDBDescriptor.getInstance().getConf().getTargetCompactionFileSize();
private static String levelNum = "10";
diff --git a/server/src/main/java/org/apache/iotdb/db/tools/watermark/GroupedLSBWatermarkEncoder.java b/server/src/main/java/org/apache/iotdb/db/tools/watermark/GroupedLSBWatermarkEncoder.java
index 5c86e4abb6..7042ff50c1 100644
--- a/server/src/main/java/org/apache/iotdb/db/tools/watermark/GroupedLSBWatermarkEncoder.java
+++ b/server/src/main/java/org/apache/iotdb/db/tools/watermark/GroupedLSBWatermarkEncoder.java
@@ -47,10 +47,10 @@ public class GroupedLSBWatermarkEncoder implements WatermarkEncoder {
public GroupedLSBWatermarkEncoder() {
this(
- CommonDescriptor.getInstance().getConfig().getWatermarkSecretKey(),
- CommonDescriptor.getInstance().getConfig().getWatermarkBitString());
- this.markRate = CommonDescriptor.getInstance().getConfig().getWatermarkParamMarkRate();
- this.maxBitPosition = CommonDescriptor.getInstance().getConfig().getWatermarkParamMaxRightBit();
+ CommonDescriptor.getInstance().getConf().getWatermarkSecretKey(),
+ CommonDescriptor.getInstance().getConf().getWatermarkBitString());
+ this.markRate = CommonDescriptor.getInstance().getConf().getWatermarkParamMarkRate();
+ this.maxBitPosition = CommonDescriptor.getInstance().getConf().getWatermarkParamMaxRightBit();
}
public static int hashMod(String val, Integer base) {
diff --git a/server/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java b/server/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java
index 7feb796061..4c1a3f6070 100644
--- a/server/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java
@@ -75,7 +75,7 @@ public class TriggerFireVisitor extends PlanVisitor<TriggerFireResult, TriggerEv
* How many times should we retry when error occurred during firing a trigger on another datanode
*/
private static final int FIRE_RETRY_NUM =
- IoTDBDescriptor.getInstance().getConfig().getRetryNumToFindStatefulTrigger();
+ IoTDBDescriptor.getInstance().getConf().getRetryNumToFindStatefulTrigger();
@Override
public TriggerFireResult process(PlanNode node, TriggerEvent context) {
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 e82c82e558..dfb1a3d404 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
@@ -19,6 +19,8 @@
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;
@@ -31,7 +33,7 @@ import java.io.IOException;
public class TriggerClassLoaderManager {
private static final Logger LOGGER = LoggerFactory.getLogger(TriggerClassLoaderManager.class);
- private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
/** The dir that stores jar files. */
private final String libRoot;
@@ -70,8 +72,8 @@ public class TriggerClassLoaderManager {
static {
try {
- SystemFileFactory.INSTANCE.makeDirIfNecessary(CONFIG.getTriggerDir());
- INSTANCE = new TriggerClassLoaderManager(CONFIG.getTriggerDir());
+ SystemFileFactory.INSTANCE.makeDirIfNecessary(COMMON_CONFIG.getTriggerDir());
+ INSTANCE = new TriggerClassLoaderManager(COMMON_CONFIG.getTriggerDir());
} catch (IOException e) {
throw new RuntimeException(e);
}
diff --git a/server/src/main/java/org/apache/iotdb/db/trigger/service/TriggerManagementService.java b/server/src/main/java/org/apache/iotdb/db/trigger/service/TriggerManagementService.java
index 8ba713b9e9..ec2e85c36c 100644
--- a/server/src/main/java/org/apache/iotdb/db/trigger/service/TriggerManagementService.java
+++ b/server/src/main/java/org/apache/iotdb/db/trigger/service/TriggerManagementService.java
@@ -66,7 +66,7 @@ public class TriggerManagementService {
*/
private final PatternTreeMap<String, PatternTreeMapFactory.StringSerializer> patternTreeMap;
- private static final int DATA_NODE_ID = IoTDBDescriptor.getInstance().getConfig().getDataNodeId();
+ private static final int DATA_NODE_ID = IoTDBDescriptor.getInstance().getConf().getDataNodeId();
private TriggerManagementService() {
this.lock = new ReentrantLock();
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/DateTimeUtils.java b/server/src/main/java/org/apache/iotdb/db/utils/DateTimeUtils.java
index 914058af81..fb0c03edb2 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/DateTimeUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/DateTimeUtils.java
@@ -455,7 +455,7 @@ public class DateTimeUtils {
str,
toZoneOffset(zoneId),
0,
- CommonDescriptor.getInstance().getConfig().getTimestampPrecision());
+ CommonDescriptor.getInstance().getConf().getTimestampPrecision());
}
public static long convertDatetimeStrToLong(
@@ -533,7 +533,7 @@ public class DateTimeUtils {
public static long convertDurationStrToLong(long currentTime, String duration) {
return convertDurationStrToLong(
- currentTime, duration, CommonDescriptor.getInstance().getConfig().getTimestampPrecision());
+ currentTime, duration, CommonDescriptor.getInstance().getConf().getTimestampPrecision());
}
/**
@@ -653,8 +653,8 @@ public class DateTimeUtils {
}
public static long currentTime() {
- long startupNano = IoTDBDescriptor.getInstance().getConfig().getStartUpNanosecond();
- String timePrecision = CommonDescriptor.getInstance().getConfig().getTimestampPrecision();
+ long startupNano = IoTDBDescriptor.getInstance().getConf().getStartUpNanosecond();
+ String timePrecision = CommonDescriptor.getInstance().getConf().getTimestampPrecision();
switch (timePrecision) {
case "ns":
return System.currentTimeMillis() * 1000_000 + (System.nanoTime() - startupNano) % 1000_000;
@@ -666,7 +666,7 @@ public class DateTimeUtils {
}
public static String convertLongToDate(long timestamp) {
- String timePrecision = CommonDescriptor.getInstance().getConfig().getTimestampPrecision();
+ String timePrecision = CommonDescriptor.getInstance().getConf().getTimestampPrecision();
switch (timePrecision) {
case "ns":
timestamp /= 1000_000_000;
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/EncodingInferenceUtils.java b/server/src/main/java/org/apache/iotdb/db/utils/EncodingInferenceUtils.java
index 1688a09dbc..0d9df9145e 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/EncodingInferenceUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/EncodingInferenceUtils.java
@@ -32,7 +32,7 @@ public class EncodingInferenceUtils {
/** Get default encoding by dataType */
public static TSEncoding getDefaultEncoding(TSDataType dataType) {
- CommonConfig conf = CommonDescriptor.getInstance().getConfig();
+ CommonConfig conf = CommonDescriptor.getInstance().getConf();
switch (dataType) {
case BOOLEAN:
return conf.getDefaultBooleanEncoding();
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java b/server/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java
index 0f3e89d607..2d70e7cf1d 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java
@@ -52,8 +52,8 @@ public class OpenFileNumUtil {
// command 'lsof -p' is available on most Linux distro except CentOS.
private static final String SEARCH_OPEN_DATA_FILE_BY_PID = "lsof -p %d";
- private static IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
- private static CommonConfig commonConfig = CommonDescriptor.getInstance().getConfig();
+ private static IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
+ private static CommonConfig commonConfig = CommonDescriptor.getInstance().getConf();
private static DirectoryManager directoryManager = DirectoryManager.getInstance();
private static final String[] COMMAND_TEMPLATE = {"/bin/bash", "-c", ""};
private static boolean isOutputValid = false;
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/TimePartitionUtils.java b/server/src/main/java/org/apache/iotdb/db/utils/TimePartitionUtils.java
index 737372f789..1ae7b8dab2 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/TimePartitionUtils.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/TimePartitionUtils.java
@@ -26,7 +26,7 @@ import org.apache.iotdb.db.conf.ServerConfigConsistent;
public class TimePartitionUtils {
@ServerConfigConsistent
public static long timePartitionInterval =
- IoTDBDescriptor.getInstance().getConfig().getDnTimePartitionInterval();
+ IoTDBDescriptor.getInstance().getConf().getDnTimePartitionInterval();
public static TTimePartitionSlot getTimePartition(long time) {
TTimePartitionSlot timePartitionSlot = new TTimePartitionSlot();
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 96c2b8292b..f83e44041c 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
@@ -19,6 +19,7 @@
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;
@@ -30,19 +31,19 @@ import org.apache.commons.lang3.StringUtils;
public class TypeInferenceUtils {
private static TSDataType booleanStringInferType =
- IoTDBDescriptor.getInstance().getConfig().getBooleanStringInferType();
+ CommonDescriptor.getInstance().getConf().getBooleanStringInferType();
private static TSDataType integerStringInferType =
- IoTDBDescriptor.getInstance().getConfig().getIntegerStringInferType();
+ CommonDescriptor.getInstance().getConf().getIntegerStringInferType();
private static TSDataType longStringInferType =
- IoTDBDescriptor.getInstance().getConfig().getLongStringInferType();
+ CommonDescriptor.getInstance().getConf().getLongStringInferType();
private static TSDataType floatingStringInferType =
- IoTDBDescriptor.getInstance().getConfig().getFloatingStringInferType();
+ CommonDescriptor.getInstance().getConf().getFloatingStringInferType();
private static TSDataType nanStringInferType =
- IoTDBDescriptor.getInstance().getConfig().getNanStringInferType();
+ CommonDescriptor.getInstance().getConf().getNanStringInferType();
private TypeInferenceUtils() {}
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java
index 01d68e445a..157544e072 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/datastructure/TVList.java
@@ -50,7 +50,7 @@ public abstract class TVList implements WALEntryValue {
protected static final int SMALL_ARRAY_LENGTH = 32;
protected static final String ERR_DATATYPE_NOT_CONSISTENT = "DataType not consistent";
protected static final long targetChunkSize =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkSize();
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
// list of timestamp array, add 1 when expanded -> data point timestamp array
// index relation: arrayIndex -> elementIndex
protected List<long[]> timestamps;
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/windowing/runtime/WindowEvaluationTaskPoolManager.java b/server/src/main/java/org/apache/iotdb/db/utils/windowing/runtime/WindowEvaluationTaskPoolManager.java
index 9fba7a2a73..d088356036 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/windowing/runtime/WindowEvaluationTaskPoolManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/windowing/runtime/WindowEvaluationTaskPoolManager.java
@@ -39,7 +39,7 @@ public class WindowEvaluationTaskPoolManager extends AbstractPoolManager {
LoggerFactory.getLogger(WindowEvaluationTaskPoolManager.class);
private WindowEvaluationTaskPoolManager() {
- final int nThreads = IoTDBDescriptor.getInstance().getConfig().getWindowEvaluationThreadCount();
+ final int nThreads = IoTDBDescriptor.getInstance().getConf().getWindowEvaluationThreadCount();
LOGGER.info("WindowEvaluationTaskPoolManager is initializing, thread number: {}", nThreads);
pool =
new ThreadPoolExecutor(
@@ -48,7 +48,7 @@ public class WindowEvaluationTaskPoolManager extends AbstractPoolManager {
0L,
TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<>(
- IoTDBDescriptor.getInstance().getConfig().getMaxPendingWindowEvaluationTasks()),
+ IoTDBDescriptor.getInstance().getConf().getMaxPendingWindowEvaluationTasks()),
new IoTThreadFactory(ThreadName.WINDOW_EVALUATION_SERVICE.getName()));
}
@@ -78,7 +78,7 @@ public class WindowEvaluationTaskPoolManager extends AbstractPoolManager {
pool =
IoTDBThreadPoolFactory.newFixedThreadPool(
- IoTDBDescriptor.getInstance().getConfig().getWindowEvaluationThreadCount(),
+ IoTDBDescriptor.getInstance().getConf().getWindowEvaluationThreadCount(),
ThreadName.WINDOW_EVALUATION_SERVICE.getName());
}
diff --git a/server/src/main/java/org/apache/iotdb/db/wal/WALManager.java b/server/src/main/java/org/apache/iotdb/db/wal/WALManager.java
index b8b7b5317b..c71f39825f 100644
--- a/server/src/main/java/org/apache/iotdb/db/wal/WALManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/wal/WALManager.java
@@ -54,8 +54,8 @@ import java.util.concurrent.atomic.AtomicLong;
public class WALManager implements IService {
private static final Logger logger = LoggerFactory.getLogger(WALManager.class);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
/** manage all wal nodes and decide how to allocate them */
private final NodeAllocationStrategy walNodesManager;
diff --git a/server/src/main/java/org/apache/iotdb/db/wal/allocation/AbstractNodeAllocationStrategy.java b/server/src/main/java/org/apache/iotdb/db/wal/allocation/AbstractNodeAllocationStrategy.java
index 857b9a6d1e..f63da81a0a 100644
--- a/server/src/main/java/org/apache/iotdb/db/wal/allocation/AbstractNodeAllocationStrategy.java
+++ b/server/src/main/java/org/apache/iotdb/db/wal/allocation/AbstractNodeAllocationStrategy.java
@@ -37,7 +37,7 @@ import java.util.Arrays;
public abstract class AbstractNodeAllocationStrategy implements NodeAllocationStrategy {
private static final Logger logger =
LoggerFactory.getLogger(AbstractNodeAllocationStrategy.class);
- private static final CommonConfig commonConfig = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig commonConfig = CommonDescriptor.getInstance().getConf();
/** manage wal folders */
protected FolderManager folderManager;
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 c1ef5932e4..e8e35d1f29 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
@@ -20,6 +20,7 @@ package org.apache.iotdb.db.wal.buffer;
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;
@@ -56,8 +57,9 @@ import static org.apache.iotdb.db.wal.node.WALNode.DEFAULT_SEARCH_INDEX;
*/
public class WALBuffer extends AbstractWALBuffer {
private static final Logger logger = LoggerFactory.getLogger(WALBuffer.class);
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
- private static final int HALF_WAL_BUFFER_SIZE = config.getWalBufferSize() / 2;
+
+ private static final CommonConfig config = CommonDescriptor.getInstance().getConf();
+ private static final int HALF_WAL_BUFFER_SIZE = config.getWalBufferSizeInByte() / 2;
private static final int QUEUE_CAPACITY = config.getWalBufferQueueCapacity();
/** whether close method is called */
@@ -426,7 +428,7 @@ public class WALBuffer extends AbstractWALBuffer {
} catch (Throwable e) {
logger.error(
"Fail to sync wal node-{}'s buffer, change system mode to error.", identifier, e);
- CommonDescriptor.getInstance().getConfig().handleUnrecoverableError();
+ CommonDescriptor.getInstance().getConf().handleUnrecoverableError();
} finally {
switchSyncingBufferToIdle();
}
@@ -447,7 +449,7 @@ public class WALBuffer extends AbstractWALBuffer {
if (info.rollWALFileWriterListener != null) {
info.rollWALFileWriterListener.fail(e);
}
- CommonDescriptor.getInstance().getConfig().handleUnrecoverableError();
+ CommonDescriptor.getInstance().getConf().handleUnrecoverableError();
}
} else if (forceFlag) { // force os cache to the storage device, avoid force twice by judging
// after rolling file
@@ -462,7 +464,7 @@ public class WALBuffer extends AbstractWALBuffer {
for (WALFlushListener fsyncListener : info.fsyncListeners) {
fsyncListener.fail(e);
}
- CommonDescriptor.getInstance().getConfig().handleUnrecoverableError();
+ CommonDescriptor.getInstance().getConf().handleUnrecoverableError();
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/wal/buffer/WALInfoEntry.java b/server/src/main/java/org/apache/iotdb/db/wal/buffer/WALInfoEntry.java
index d7cb58e5df..4036a9aed3 100644
--- a/server/src/main/java/org/apache/iotdb/db/wal/buffer/WALInfoEntry.java
+++ b/server/src/main/java/org/apache/iotdb/db/wal/buffer/WALInfoEntry.java
@@ -25,7 +25,7 @@ import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertTabletNode;
/** This entry class stores info for persistence */
public class WALInfoEntry extends WALEntry {
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
/** wal entry type 1 byte, memTable id 8 bytes */
public static final int FIXED_SERIALIZED_SIZE = Byte.BYTES + Long.BYTES;
diff --git a/server/src/main/java/org/apache/iotdb/db/wal/checkpoint/CheckpointManager.java b/server/src/main/java/org/apache/iotdb/db/wal/checkpoint/CheckpointManager.java
index 8e6d4a83bb..202feb1c54 100644
--- a/server/src/main/java/org/apache/iotdb/db/wal/checkpoint/CheckpointManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/wal/checkpoint/CheckpointManager.java
@@ -45,8 +45,8 @@ import java.util.concurrent.locks.ReentrantLock;
/** This class is used to manage checkpoints of one wal node */
public class CheckpointManager implements AutoCloseable {
private static final Logger logger = LoggerFactory.getLogger(CheckpointManager.class);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
/** WALNode identifier of this checkpoint manager */
protected final String identifier;
@@ -176,7 +176,7 @@ public class CheckpointManager implements AutoCloseable {
"Fail to fsync wal node-{}'s checkpoint writer, change system mode to error.",
identifier,
e);
- CommonDescriptor.getInstance().getConfig().handleUnrecoverableError();
+ CommonDescriptor.getInstance().getConf().handleUnrecoverableError();
}
try {
@@ -195,7 +195,7 @@ public class CheckpointManager implements AutoCloseable {
"Fail to roll wal node-{}'s checkpoint writer, change system mode to error.",
identifier,
e);
- CommonDescriptor.getInstance().getConfig().handleUnrecoverableError();
+ CommonDescriptor.getInstance().getConf().handleUnrecoverableError();
}
} finally {
infoLock.unlock();
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 18e1b89b1f..01c5e43405 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
@@ -18,6 +18,7 @@
*/
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;
@@ -42,7 +43,7 @@ public class WALReader implements Closeable {
private static final Logger logger = LoggerFactory.getLogger(WALReader.class);
/** 1/10 of .wal file size as buffer size */
private static final int STREAM_BUFFER_SIZE =
- (int) IoTDBDescriptor.getInstance().getConfig().getWalFileSizeThresholdInByte() / 10;
+ (int) CommonDescriptor.getInstance().getConf().getWalFileSizeThresholdInByte() / 10;
private final File logFile;
private final boolean fileMayCorrupt;
diff --git a/server/src/main/java/org/apache/iotdb/db/wal/node/WALNode.java b/server/src/main/java/org/apache/iotdb/db/wal/node/WALNode.java
index 8e48dc160d..7041e00447 100644
--- a/server/src/main/java/org/apache/iotdb/db/wal/node/WALNode.java
+++ b/server/src/main/java/org/apache/iotdb/db/wal/node/WALNode.java
@@ -80,8 +80,8 @@ import java.util.regex.Pattern;
*/
public class WALNode implements IWALNode {
private static final Logger logger = LoggerFactory.getLogger(WALNode.class);
- private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConfig();
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
/** no iot consensus, all insert nodes can be safely deleted */
public static final long DEFAULT_SAFELY_DELETED_SEARCH_INDEX = Long.MAX_VALUE;
diff --git a/server/src/main/java/org/apache/iotdb/db/wal/recover/WALNodeRecoverTask.java b/server/src/main/java/org/apache/iotdb/db/wal/recover/WALNodeRecoverTask.java
index 03bd66e32f..bd02dea8c2 100644
--- a/server/src/main/java/org/apache/iotdb/db/wal/recover/WALNodeRecoverTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/wal/recover/WALNodeRecoverTask.java
@@ -53,7 +53,7 @@ import static org.apache.iotdb.consensus.iot.wal.ConsensusReqReader.DEFAULT_SEAR
/** This task is responsible for the recovery of one wal node. */
public class WALNodeRecoverTask implements Runnable {
private static final Logger logger = LoggerFactory.getLogger(WALNodeRecoverTask.class);
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private static final WALRecoverManager walRecoverManger = WALRecoverManager.getInstance();
/** this directory store one wal node's .wal and .checkpoint files */
diff --git a/server/src/main/java/org/apache/iotdb/db/wal/recover/WALRecoverManager.java b/server/src/main/java/org/apache/iotdb/db/wal/recover/WALRecoverManager.java
index 3f545487d6..860a1cdab0 100644
--- a/server/src/main/java/org/apache/iotdb/db/wal/recover/WALRecoverManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/wal/recover/WALRecoverManager.java
@@ -48,7 +48,7 @@ import java.util.concurrent.Future;
/** First set allVsgScannedLatch, then call recover method. */
public class WALRecoverManager {
private static final Logger logger = LoggerFactory.getLogger(WALRecoverManager.class);
- private static final CommonConfig commonConfig = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig commonConfig = CommonDescriptor.getInstance().getConf();
/** true when the recover procedure has started */
private volatile boolean hasStarted = false;
diff --git a/server/src/main/java/org/apache/iotdb/db/wal/recover/file/TsFilePlanRedoer.java b/server/src/main/java/org/apache/iotdb/db/wal/recover/file/TsFilePlanRedoer.java
index 89430bc91f..16679ef92c 100644
--- a/server/src/main/java/org/apache/iotdb/db/wal/recover/file/TsFilePlanRedoer.java
+++ b/server/src/main/java/org/apache/iotdb/db/wal/recover/file/TsFilePlanRedoer.java
@@ -105,11 +105,11 @@ public class TsFilePlanRedoer {
}
}
- if (IoTDBDescriptor.getInstance().getConfig().isEnableIDTable()) {
+ if (IoTDBDescriptor.getInstance().getConf().isEnableIDTable()) {
// TODO get device id by idTable
// idTable.getSeriesSchemas(node);
} else {
- if (!IoTDBDescriptor.getInstance().getConfig().isClusterMode()) {
+ if (!IoTDBDescriptor.getInstance().getConf().isClusterMode()) {
SchemaValidator.validate(node);
}
node.setDeviceID(DeviceIDFactory.getInstance().getDeviceID(node.getDevicePath()));
diff --git a/server/src/test/java/org/apache/iotdb/db/auth/authorizer/LocalFileAuthorizerTest.java b/server/src/test/java/org/apache/iotdb/db/auth/authorizer/LocalFileAuthorizerTest.java
index cd951ccdc7..e8181b5b1f 100644
--- a/server/src/test/java/org/apache/iotdb/db/auth/authorizer/LocalFileAuthorizerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/auth/authorizer/LocalFileAuthorizerTest.java
@@ -256,7 +256,7 @@ public class LocalFileAuthorizerTest {
IAuthorizer authorizer = AuthorizerManager.getInstance();
List<String> userList = authorizer.listAllUsers();
assertEquals(1, userList.size());
- assertEquals(CommonDescriptor.getInstance().getConfig().getAdminName(), userList.get(0));
+ assertEquals(CommonDescriptor.getInstance().getConf().getAdminName(), userList.get(0));
int userCnt = 10;
for (int i = 0; i < userCnt; i++) {
diff --git a/server/src/test/java/org/apache/iotdb/db/auth/authorizer/OpenIdAuthorizerTest.java b/server/src/test/java/org/apache/iotdb/db/auth/authorizer/OpenIdAuthorizerTest.java
index c6b1e6f28f..bab3cf2a8c 100644
--- a/server/src/test/java/org/apache/iotdb/db/auth/authorizer/OpenIdAuthorizerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/auth/authorizer/OpenIdAuthorizerTest.java
@@ -38,7 +38,7 @@ public class OpenIdAuthorizerTest {
private static final String OPEN_ID_PUBLIC_JWK =
"{\"kty\":\"RSA\",\"x5t#S256\":\"TZFbbj6HsRU28HYvrcVnDs03KreV3DE24-Cxb9EPdS4\",\"e\":\"AQAB\",\"use\":\"sig\",\"x5t\":\"l_N2UlC_a624iu5eYFypnB1Wr20\",\"kid\":\"q1-Wm0ozQ5O0mQH8-SJap2ZcN4MmucWwnQWKYxZJ4ow\",\"x5c\":[\"MIICmTCCAYECBgFyRdXW2DANBgkqhkiG9w0BAQsFADAQMQ4wDAYDVQQDDAVJb1REQjAeFw0yMDA1MjQwODM3MjJaFw0zMDA1MjQwODM5MDJaMBAxDjAMBgNVBAMMBUlvVERCMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAozDCZTVc9946VvhZ6E\\/OP8Yx6tJe0i9GR2Q9jR9S3jQoo0haT\\/P1b\\/zvQK52qA1xj6tBVg64xl3+LUxtCvh3HfA [...]
- private static final CommonConfig config = CommonDescriptor.getInstance().getConfig();
+ private static final CommonConfig config = CommonDescriptor.getInstance().getConf();
@Test
public void loginWithJWT() throws AuthException, ParseException {
diff --git a/server/src/test/java/org/apache/iotdb/db/auth/user/LocalFileUserManagerTest.java b/server/src/test/java/org/apache/iotdb/db/auth/user/LocalFileUserManagerTest.java
index 87cf266a4b..7276b6306b 100644
--- a/server/src/test/java/org/apache/iotdb/db/auth/user/LocalFileUserManagerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/auth/user/LocalFileUserManagerTest.java
@@ -211,7 +211,7 @@ public class LocalFileUserManagerTest {
// list users
List<String> usernames = manager.listAllUsers();
usernames.sort(null);
- assertEquals(CommonDescriptor.getInstance().getConfig().getAdminName(), usernames.get(0));
+ assertEquals(CommonDescriptor.getInstance().getConf().getAdminName(), usernames.get(0));
for (int i = 0; i < users.length - 1; i++) {
assertEquals(users[i].getName(), usernames.get(i + 1));
}
diff --git a/server/src/test/java/org/apache/iotdb/db/conf/adapter/CompressionRatioTest.java b/server/src/test/java/org/apache/iotdb/db/conf/adapter/CompressionRatioTest.java
index 2d2ac9fe46..3ffa281b32 100644
--- a/server/src/test/java/org/apache/iotdb/db/conf/adapter/CompressionRatioTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/conf/adapter/CompressionRatioTest.java
@@ -37,7 +37,7 @@ import static org.junit.Assert.fail;
public class CompressionRatioTest {
- private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConfig();
+ private static final IoTDBConfig CONFIG = IoTDBDescriptor.getInstance().getConf();
private CompressionRatio compressionRatio = CompressionRatio.getInstance();
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/AbstractCompactionTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/AbstractCompactionTest.java
index dbf41d5390..e9d233e3ed 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/AbstractCompactionTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/AbstractCompactionTest.java
@@ -85,26 +85,26 @@ public class AbstractCompactionTest {
private TSDataType dataType;
private static final long oldTargetChunkSize =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkSize();
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
private static final long oldTargetChunkPointNum =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkPointNum();
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
private static final int oldChunkGroupSize =
TSFileDescriptor.getInstance().getConfig().getGroupSizeInByte();
private static final int oldPagePointMaxNumber =
TSFileDescriptor.getInstance().getConfig().getMaxNumberOfPointsInPage();
private static final int oldMaxCrossCompactionFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxCrossCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().getMaxCrossCompactionCandidateFileNum();
private final int oldMaxDegreeOfIndexNode =
TSFileDescriptor.getInstance().getConfig().getMaxDegreeOfIndexNode();
private final long oldLowerTargetChunkSize =
- IoTDBDescriptor.getInstance().getConfig().getChunkSizeLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkSizeLowerBoundInCompaction();
private final long oldLowerTargetChunkPointNum =
- IoTDBDescriptor.getInstance().getConfig().getChunkPointNumLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkPointNumLowerBoundInCompaction();
protected static File STORAGE_GROUP_DIR =
new File(
@@ -374,16 +374,16 @@ public class AbstractCompactionTest {
CompactionTaskManager.getInstance().stop();
seqResources.clear();
unseqResources.clear();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(oldTargetChunkSize);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(oldTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(oldTargetChunkSize);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(oldTargetChunkPointNum);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxCrossCompactionCandidateFileNum(oldMaxCrossCompactionFileNum);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(oldTargetChunkPointNum);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(oldLowerTargetChunkPointNum);
TSFileDescriptor.getInstance().getConfig().setGroupSizeInByte(oldChunkGroupSize);
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 954398ace0..59d2436284 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
@@ -87,18 +87,18 @@ public class CompactionSchedulerTest {
EnvironmentUtils.cleanAllDir();
File basicOutputDir = new File(TestConstant.BASE_OUTPUT_PATH);
- IoTDBDescriptor.getInstance().getConfig().setCompactionPriority(CompactionPriority.INNER_CROSS);
+ IoTDBDescriptor.getInstance().getConf().setCompactionPriority(CompactionPriority.INNER_CROSS);
if (!basicOutputDir.exists()) {
assertTrue(basicOutputDir.mkdirs());
}
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCrossCompactionPerformer(CrossCompactionPerformer.READ_POINT);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setInnerSeqCompactionPerformer(InnerSeqCompactionPerformer.READ_CHUNK);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setInnerUnseqCompactionPerformer(InnerUnseqCompactionPerformer.READ_POINT);
CompactionTaskManager.getInstance().start();
while (CompactionTaskManager.getInstance().getExecutingTaskCount() > 0) {
@@ -129,20 +129,20 @@ public class CompactionSchedulerTest {
public void test1() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test1");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(true);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(true);
- IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().setEnableCrossSpaceCompaction(true);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(100);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setTargetCompactionFileSize(2L * 1024L * 1024L * 1024L);
String sgName = COMPACTION_TEST_SG + "test1";
try {
@@ -226,16 +226,16 @@ public class CompactionSchedulerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -248,18 +248,18 @@ public class CompactionSchedulerTest {
public void test2() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test2");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(false);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(true);
- IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().setEnableCrossSpaceCompaction(true);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(100);
long origin = SystemInfo.getInstance().getMemorySizeForCompaction();
SystemInfo.getInstance()
.setMemorySizeForCompaction(
@@ -267,7 +267,7 @@ public class CompactionSchedulerTest {
* 1024
* 1024L
* 1024L
- * IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount());
+ * IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount());
try {
String sgName = COMPACTION_TEST_SG + "test2";
try {
@@ -344,16 +344,16 @@ public class CompactionSchedulerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
} finally {
@@ -369,17 +369,17 @@ public class CompactionSchedulerTest {
public void test3() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test3");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(true);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(100);
String sgName = COMPACTION_TEST_SG + "test3";
try {
CompactionTaskManager.getInstance().restart();
@@ -442,16 +442,16 @@ public class CompactionSchedulerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -464,19 +464,19 @@ public class CompactionSchedulerTest {
public void test4() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test4");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(false);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(100);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setTargetCompactionFileSize(2L * 1024L * 1024L * 1024L);
String sgName = COMPACTION_TEST_SG + "test4";
try {
@@ -528,16 +528,16 @@ public class CompactionSchedulerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -549,18 +549,18 @@ public class CompactionSchedulerTest {
public void test5() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test5");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(true);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(true);
- IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().setEnableCrossSpaceCompaction(true);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(1);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(1);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(100);
String sgName = COMPACTION_TEST_SG + "test5";
try {
CompactionTaskManager.getInstance().restart();
@@ -642,16 +642,16 @@ public class CompactionSchedulerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -664,18 +664,18 @@ public class CompactionSchedulerTest {
public void test6() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test6");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(false);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(true);
- IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().setEnableCrossSpaceCompaction(true);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(1);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(1);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(100);
String sgName = COMPACTION_TEST_SG + "test6";
try {
CompactionTaskManager.getInstance().restart();
@@ -749,16 +749,16 @@ public class CompactionSchedulerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -770,17 +770,17 @@ public class CompactionSchedulerTest {
public void test7() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test7");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(true);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(1);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(1);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(100);
String sgName = COMPACTION_TEST_SG + "test7";
try {
CompactionTaskManager.getInstance().restart();
@@ -850,16 +850,16 @@ public class CompactionSchedulerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -871,17 +871,17 @@ public class CompactionSchedulerTest {
public void test8() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test8");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(false);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(1);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(1);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(100);
String sgName = COMPACTION_TEST_SG + "test8";
try {
CompactionTaskManager.getInstance().restart();
@@ -937,16 +937,16 @@ public class CompactionSchedulerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -958,17 +958,17 @@ public class CompactionSchedulerTest {
public void test9() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test9");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(true);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(2);
String sgName = COMPACTION_TEST_SG + "test9";
try {
CompactionTaskManager.getInstance().restart();
@@ -1037,16 +1037,16 @@ public class CompactionSchedulerTest {
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -1058,20 +1058,20 @@ public class CompactionSchedulerTest {
public void test10() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test10");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(false);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
boolean prevEnableCrossCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableCrossSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(false);
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableCrossSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableCrossSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(true);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(2);
String sgName = COMPACTION_TEST_SG + "test10";
try {
CompactionTaskManager.getInstance().restart();
@@ -1144,19 +1144,19 @@ public class CompactionSchedulerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableCrossSpaceCompaction(prevEnableCrossCompaction);
}
}
@@ -1168,17 +1168,17 @@ public class CompactionSchedulerTest {
public void test11() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test11");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(true);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(2);
String sgName = COMPACTION_TEST_SG + "test11";
try {
CompactionTaskManager.getInstance().restart();
@@ -1250,16 +1250,16 @@ public class CompactionSchedulerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -1272,17 +1272,17 @@ public class CompactionSchedulerTest {
public void test12() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test12");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(false);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(2);
String sgName = COMPACTION_TEST_SG + "test12";
try {
CompactionTaskManager.getInstance().restart();
@@ -1356,16 +1356,16 @@ public class CompactionSchedulerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -1378,17 +1378,17 @@ public class CompactionSchedulerTest {
public void test14() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test14");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(false);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(true);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(1);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(1);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(2);
String sgName = COMPACTION_TEST_SG + "test13";
try {
CompactionTaskManager.getInstance().restart();
@@ -1466,16 +1466,16 @@ public class CompactionSchedulerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -1487,17 +1487,17 @@ public class CompactionSchedulerTest {
public void test15() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test15");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(true);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(1);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(1);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(2);
String sgName = COMPACTION_TEST_SG + "test14";
try {
CompactionTaskManager.getInstance().restart();
@@ -1583,16 +1583,16 @@ public class CompactionSchedulerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -1604,17 +1604,17 @@ public class CompactionSchedulerTest {
public void test16() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test16");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(false);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(1);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(1);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(2);
String sgName = COMPACTION_TEST_SG + "test16";
try {
CompactionTaskManager.getInstance().restart();
@@ -1687,16 +1687,16 @@ public class CompactionSchedulerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -1705,10 +1705,10 @@ public class CompactionSchedulerTest {
public void testLargeFileInLowerLevel() throws Exception {
logger.warn("Running test16");
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
- long originTargetSize = IoTDBDescriptor.getInstance().getConfig().getTargetCompactionFileSize();
- IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(1024 * 1024);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(2);
+ long originTargetSize = IoTDBDescriptor.getInstance().getConf().getTargetCompactionFileSize();
+ IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(1024 * 1024);
String sgName = COMPACTION_TEST_SG + "test17";
try {
CompactionTaskManager.getInstance().restart();
@@ -1796,9 +1796,9 @@ public class CompactionSchedulerTest {
assertEquals(3, tsFileManager.getTsFileList(true).size());
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
- IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(originTargetSize);
+ IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(originTargetSize);
}
}
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 99987678bb..6d7f260154 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
@@ -88,18 +88,18 @@ public class CompactionSchedulerWithFastPerformerTest {
EnvironmentUtils.cleanAllDir();
File basicOutputDir = new File(TestConstant.BASE_OUTPUT_PATH);
- IoTDBDescriptor.getInstance().getConfig().setCompactionPriority(CompactionPriority.INNER_CROSS);
+ IoTDBDescriptor.getInstance().getConf().setCompactionPriority(CompactionPriority.INNER_CROSS);
if (!basicOutputDir.exists()) {
assertTrue(basicOutputDir.mkdirs());
}
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCrossCompactionPerformer(CrossCompactionPerformer.FAST);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setInnerSeqCompactionPerformer(InnerSeqCompactionPerformer.FAST);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setInnerUnseqCompactionPerformer(InnerUnseqCompactionPerformer.FAST);
CompactionTaskManager.getInstance().start();
while (CompactionTaskManager.getInstance().getExecutingTaskCount() > 0) {
@@ -130,20 +130,20 @@ public class CompactionSchedulerWithFastPerformerTest {
public void test1() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test1");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(true);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(true);
- IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().setEnableCrossSpaceCompaction(true);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(100);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setTargetCompactionFileSize(2L * 1024L * 1024L * 1024L);
String sgName = COMPACTION_TEST_SG + "test1";
try {
@@ -227,16 +227,16 @@ public class CompactionSchedulerWithFastPerformerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -249,18 +249,18 @@ public class CompactionSchedulerWithFastPerformerTest {
public void test2() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test2");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(false);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(true);
- IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().setEnableCrossSpaceCompaction(true);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(100);
long origin = SystemInfo.getInstance().getMemorySizeForCompaction();
SystemInfo.getInstance()
.setMemorySizeForCompaction(
@@ -268,7 +268,7 @@ public class CompactionSchedulerWithFastPerformerTest {
* 1024
* 1024L
* 1024L
- * IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount());
+ * IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount());
try {
String sgName = COMPACTION_TEST_SG + "test2";
try {
@@ -345,16 +345,16 @@ public class CompactionSchedulerWithFastPerformerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
} finally {
@@ -370,17 +370,17 @@ public class CompactionSchedulerWithFastPerformerTest {
public void test3() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test3");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(true);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(100);
String sgName = COMPACTION_TEST_SG + "test3";
try {
CompactionTaskManager.getInstance().restart();
@@ -443,16 +443,16 @@ public class CompactionSchedulerWithFastPerformerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -465,19 +465,19 @@ public class CompactionSchedulerWithFastPerformerTest {
public void test4() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test4");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(false);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(100);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setTargetCompactionFileSize(2L * 1024L * 1024L * 1024L);
String sgName = COMPACTION_TEST_SG + "test4";
try {
@@ -529,16 +529,16 @@ public class CompactionSchedulerWithFastPerformerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -550,18 +550,18 @@ public class CompactionSchedulerWithFastPerformerTest {
public void test5() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test5");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(true);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(true);
- IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().setEnableCrossSpaceCompaction(true);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(1);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(1);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(100);
String sgName = COMPACTION_TEST_SG + "test5";
try {
CompactionTaskManager.getInstance().restart();
@@ -643,16 +643,16 @@ public class CompactionSchedulerWithFastPerformerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -665,18 +665,18 @@ public class CompactionSchedulerWithFastPerformerTest {
public void test6() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test6");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(false);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(true);
- IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().setEnableCrossSpaceCompaction(true);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(1);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(1);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(100);
String sgName = COMPACTION_TEST_SG + "test6";
try {
CompactionTaskManager.getInstance().restart();
@@ -750,16 +750,16 @@ public class CompactionSchedulerWithFastPerformerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -771,17 +771,17 @@ public class CompactionSchedulerWithFastPerformerTest {
public void test7() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test7");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(true);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(1);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(1);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(100);
String sgName = COMPACTION_TEST_SG + "test7";
try {
CompactionTaskManager.getInstance().restart();
@@ -851,16 +851,16 @@ public class CompactionSchedulerWithFastPerformerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -872,17 +872,17 @@ public class CompactionSchedulerWithFastPerformerTest {
public void test8() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test8");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(false);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(1);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(1);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(100);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(100);
String sgName = COMPACTION_TEST_SG + "test8";
try {
CompactionTaskManager.getInstance().restart();
@@ -938,16 +938,16 @@ public class CompactionSchedulerWithFastPerformerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -959,17 +959,17 @@ public class CompactionSchedulerWithFastPerformerTest {
public void test9() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test9");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(true);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(2);
String sgName = COMPACTION_TEST_SG + "test9";
try {
CompactionTaskManager.getInstance().restart();
@@ -1038,16 +1038,16 @@ public class CompactionSchedulerWithFastPerformerTest {
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -1059,20 +1059,20 @@ public class CompactionSchedulerWithFastPerformerTest {
public void test10() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test10");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(false);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
boolean prevEnableCrossCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableCrossSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableCrossSpaceCompaction(false);
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableCrossSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableCrossSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(true);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(2);
String sgName = COMPACTION_TEST_SG + "test10";
try {
CompactionTaskManager.getInstance().restart();
@@ -1145,19 +1145,19 @@ public class CompactionSchedulerWithFastPerformerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableCrossSpaceCompaction(prevEnableCrossCompaction);
}
}
@@ -1169,17 +1169,17 @@ public class CompactionSchedulerWithFastPerformerTest {
public void test11() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test11");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(true);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(2);
String sgName = COMPACTION_TEST_SG + "test11";
try {
CompactionTaskManager.getInstance().restart();
@@ -1251,16 +1251,16 @@ public class CompactionSchedulerWithFastPerformerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -1273,17 +1273,17 @@ public class CompactionSchedulerWithFastPerformerTest {
public void test12() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test12");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(false);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(50);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(2);
String sgName = COMPACTION_TEST_SG + "test12";
try {
CompactionTaskManager.getInstance().restart();
@@ -1357,16 +1357,16 @@ public class CompactionSchedulerWithFastPerformerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -1379,17 +1379,17 @@ public class CompactionSchedulerWithFastPerformerTest {
public void test14() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test14");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(false);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(true);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(1);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(1);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(2);
String sgName = COMPACTION_TEST_SG + "test13";
try {
CompactionTaskManager.getInstance().restart();
@@ -1467,16 +1467,16 @@ public class CompactionSchedulerWithFastPerformerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -1488,17 +1488,17 @@ public class CompactionSchedulerWithFastPerformerTest {
public void test15() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test15");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(true);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(1);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(1);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(2);
String sgName = COMPACTION_TEST_SG + "test14";
try {
CompactionTaskManager.getInstance().restart();
@@ -1584,16 +1584,16 @@ public class CompactionSchedulerWithFastPerformerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -1605,17 +1605,17 @@ public class CompactionSchedulerWithFastPerformerTest {
public void test16() throws IOException, MetadataException, InterruptedException {
logger.warn("Running test16");
boolean prevEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(false);
boolean prevEnableUnseqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(false);
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(false);
int prevCompactionConcurrentThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(1);
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(1);
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(2);
String sgName = COMPACTION_TEST_SG + "test16";
try {
CompactionTaskManager.getInstance().restart();
@@ -1688,16 +1688,16 @@ public class CompactionSchedulerWithFastPerformerTest {
stopCompactionTaskManager();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(prevEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(prevEnableUnseqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(prevCompactionConcurrentThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
}
}
@@ -1706,10 +1706,10 @@ public class CompactionSchedulerWithFastPerformerTest {
public void testLargeFileInLowerLevel() throws Exception {
logger.warn("Running test16");
int prevMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
- long originTargetSize = IoTDBDescriptor.getInstance().getConfig().getTargetCompactionFileSize();
- IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(1024 * 1024);
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(2);
+ long originTargetSize = IoTDBDescriptor.getInstance().getConf().getTargetCompactionFileSize();
+ IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(1024 * 1024);
String sgName = COMPACTION_TEST_SG + "test17";
try {
CompactionTaskManager.getInstance().restart();
@@ -1797,9 +1797,9 @@ public class CompactionSchedulerWithFastPerformerTest {
assertEquals(3, tsFileManager.getTsFileList(true).size());
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(prevMaxCompactionCandidateFileNum);
- IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(originTargetSize);
+ IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(originTargetSize);
}
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/CompactionTaskComparatorTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/CompactionTaskComparatorTest.java
index 07d962bce8..a66450cd5b 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/CompactionTaskComparatorTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/CompactionTaskComparatorTest.java
@@ -186,7 +186,7 @@ public class CompactionTaskComparatorTest {
/** Test the comparation of different type of compaction task */
@Test
public void testComparationOfDifferentTaskType() throws InterruptedException {
- IoTDBDescriptor.getInstance().getConfig().setCompactionPriority(CompactionPriority.INNER_CROSS);
+ IoTDBDescriptor.getInstance().getConf().setCompactionPriority(CompactionPriority.INNER_CROSS);
AbstractCompactionTask[] innerCompactionTasks = new AbstractCompactionTask[100];
AbstractCompactionTask[] crossCompactionTasks = new AbstractCompactionTask[100];
for (int i = 0; i < 100; ++i) {
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/FastAlignedCrossCompactionTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/FastAlignedCrossCompactionTest.java
index 016b5b0739..5824be5116 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/FastAlignedCrossCompactionTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/FastAlignedCrossCompactionTest.java
@@ -61,8 +61,8 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest {
public void setUp()
throws IOException, WriteProcessException, MetadataException, InterruptedException {
super.setUp();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(512);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(100);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(512);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(100);
TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(30);
TSFileDescriptor.getInstance().getConfig().setMaxDegreeOfIndexNode(3);
}
@@ -248,7 +248,7 @@ public class FastAlignedCrossCompactionTest extends AbstractCompactionTest {
@Test
public void test2() throws MetadataException, IOException {
- IoTDBDescriptor.getInstance().getConfig().setChunkPointNumLowerBoundInCompaction(1000);
+ IoTDBDescriptor.getInstance().getConf().setChunkPointNumLowerBoundInCompaction(1000);
List<PartialPath> timeserisPathList = new ArrayList<>();
List<TSDataType> tsDataTypes = new ArrayList<>();
// seq file 1
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/FastCrossCompactionPerformerTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/FastCrossCompactionPerformerTest.java
index 3097dc13c8..668f754244 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/FastCrossCompactionPerformerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/FastCrossCompactionPerformerTest.java
@@ -70,8 +70,8 @@ public class FastCrossCompactionPerformerTest extends AbstractCompactionTest {
public void setUp()
throws IOException, WriteProcessException, MetadataException, InterruptedException {
super.setUp();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(512);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(100);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(512);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(100);
TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(10);
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/FastInnerCompactionPerformerTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/FastInnerCompactionPerformerTest.java
index 76b723bf47..0df7233449 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/FastInnerCompactionPerformerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/FastInnerCompactionPerformerTest.java
@@ -66,8 +66,8 @@ public class FastInnerCompactionPerformerTest extends AbstractCompactionTest {
public void setUp()
throws IOException, WriteProcessException, MetadataException, InterruptedException {
super.setUp();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(512);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(100);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(512);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(100);
TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(10);
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/FastNonAlignedCrossCompactionTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/FastNonAlignedCrossCompactionTest.java
index 293687a8b0..e045b63fdf 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/FastNonAlignedCrossCompactionTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/FastNonAlignedCrossCompactionTest.java
@@ -61,8 +61,8 @@ public class FastNonAlignedCrossCompactionTest extends AbstractCompactionTest {
public void setUp()
throws IOException, WriteProcessException, MetadataException, InterruptedException {
super.setUp();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(512);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(100);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(512);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(100);
TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(30);
TSFileDescriptor.getInstance().getConfig().setMaxDegreeOfIndexNode(3);
}
@@ -264,7 +264,7 @@ public class FastNonAlignedCrossCompactionTest extends AbstractCompactionTest {
@Test
public void test2() throws MetadataException, IOException {
- IoTDBDescriptor.getInstance().getConfig().setChunkPointNumLowerBoundInCompaction(1000);
+ IoTDBDescriptor.getInstance().getConf().setChunkPointNumLowerBoundInCompaction(1000);
List<PartialPath> timeserisPathList = new ArrayList<>();
List<TSDataType> tsDataTypes = new ArrayList<>();
// seq file 1
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/ReadPointCompactionPerformerTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/ReadPointCompactionPerformerTest.java
index 4749227bdf..01cb93088e 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/ReadPointCompactionPerformerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/ReadPointCompactionPerformerTest.java
@@ -71,8 +71,8 @@ public class ReadPointCompactionPerformerTest extends AbstractCompactionTest {
public void setUp()
throws IOException, WriteProcessException, MetadataException, InterruptedException {
super.setUp();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(512);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(100);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(512);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(100);
Thread.currentThread().setName("pool-1-IoTDB-Compaction-1");
TSFileDescriptor.getInstance().getConfig().setMaxDegreeOfIndexNode(2);
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/TsFileIdentifierUT.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/TsFileIdentifierUT.java
index ecee4c5f04..fee1d74d57 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/TsFileIdentifierUT.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/TsFileIdentifierUT.java
@@ -134,7 +134,7 @@ public class TsFileIdentifierUT {
+ "0"
+ File.separator
+ "100-10-5-1.tsfile";
- String[] dataDirs = IoTDBDescriptor.getInstance().getConfig().getDnDataDirs();
+ String[] dataDirs = IoTDBDescriptor.getInstance().getConf().getDnDataDirs();
File file = new File(dataDirs[0], firstPath);
if (file.exists()) {
@@ -156,7 +156,7 @@ public class TsFileIdentifierUT {
@Test
public void testGetInfoFromFileFromMultiDirs() throws Exception {
- IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
+ IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
String[] originDataDirs = config.getDnDataDirs();
Class configClass = config.getClass();
Field dataDirField = configClass.getDeclaredField("dataDirs");
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionExceptionTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionExceptionTest.java
index b02915db9e..6c1397fcea 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionExceptionTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionExceptionTest.java
@@ -61,7 +61,7 @@ public class CrossSpaceCompactionExceptionTest extends AbstractCompactionTest {
public void setUp()
throws IOException, WriteProcessException, MetadataException, InterruptedException {
super.setUp();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(1024);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(1024);
Thread.currentThread().setName("pool-1-IoTDB-Compaction-1");
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithFastPerformerValidationTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithFastPerformerValidationTest.java
index c77954187d..29dd071570 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithFastPerformerValidationTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithFastPerformerValidationTest.java
@@ -69,7 +69,7 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
public void setUp()
throws IOException, WriteProcessException, MetadataException, InterruptedException {
super.setUp();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(1024);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(1024);
TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(30);
Thread.currentThread().setName("pool-1-IoTDB-Compaction-1");
}
@@ -275,7 +275,7 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
*/
@Test
public void test5() throws MetadataException, IOException, WriteProcessException, MergeException {
- IoTDBDescriptor.getInstance().getConfig().setMaxCrossCompactionCandidateFileNum(7);
+ IoTDBDescriptor.getInstance().getConf().setMaxCrossCompactionCandidateFileNum(7);
registerTimeseriesInMManger(5, 10, true);
createFiles(7, 5, 10, 1000, 0, 0, 100, 100, true, true);
createFiles(1, 5, 10, 3300, 2150, 2150, 100, 100, true, false);
@@ -2140,7 +2140,7 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
// start selecting files and then start a cross space compaction task
ICrossSpaceSelector selector =
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.getCrossCompactionSelector()
.createInstance(COMPACTION_TEST_SG, "0", 0, tsFileManager);
// In the process of getting the file list and starting to select files, the file list is
@@ -2206,8 +2206,8 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
*/
@Test
public void testCompactionSchedule() throws Exception {
- IoTDBDescriptor.getInstance().getConfig().setMaxCrossCompactionCandidateFileNum(1);
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(2);
+ IoTDBDescriptor.getInstance().getConf().setMaxCrossCompactionCandidateFileNum(1);
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(2);
createFiles(10, 10, 5, 1000, 0, 0, 100, 100, false, true);
createFiles(1, 5, 10, 1000, 4000, 4000, 0, 100, false, false);
createFiles(1, 5, 10, 1000, 5000, 5000, 0, 100, false, false);
@@ -2218,7 +2218,7 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
// first cross compaction task
ICrossSpaceSelector crossSpaceCompactionSelector =
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.getCrossCompactionSelector()
.createInstance(COMPACTION_TEST_SG, "0", 0, tsFileManager);
CrossCompactionTaskResource sourceFiles =
@@ -2259,7 +2259,7 @@ public class CrossSpaceCompactionWithFastPerformerValidationTest extends Abstrac
// tasks.
ICompactionSelector innerSelector =
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.getInnerSequenceCompactionSelector()
.createInstance(COMPACTION_TEST_SG, "0", 0, tsFileManager);
Assert.assertEquals(0, innerSelector.selectInnerSpaceTask(targetResources).size());
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithReadPointPerformerValidationTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithReadPointPerformerValidationTest.java
index eca8b24164..e0d1868748 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithReadPointPerformerValidationTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/CrossSpaceCompactionWithReadPointPerformerValidationTest.java
@@ -67,7 +67,7 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
public void setUp()
throws IOException, WriteProcessException, MetadataException, InterruptedException {
super.setUp();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(1024);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(1024);
TSFileDescriptor.getInstance().getConfig().setMaxNumberOfPointsInPage(30);
Thread.currentThread().setName("pool-1-IoTDB-Compaction-1");
}
@@ -273,7 +273,7 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
*/
@Test
public void test5() throws MetadataException, IOException, WriteProcessException, MergeException {
- IoTDBDescriptor.getInstance().getConfig().setMaxCrossCompactionCandidateFileNum(7);
+ IoTDBDescriptor.getInstance().getConf().setMaxCrossCompactionCandidateFileNum(7);
registerTimeseriesInMManger(5, 10, true);
createFiles(7, 5, 10, 1000, 0, 0, 100, 100, true, true);
createFiles(1, 5, 10, 3300, 2150, 2150, 100, 100, true, false);
@@ -2136,7 +2136,7 @@ public class CrossSpaceCompactionWithReadPointPerformerValidationTest
// start selecting files and then start a cross space compaction task
ICrossSpaceSelector selector =
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.getCrossCompactionSelector()
.createInstance(COMPACTION_TEST_SG, "0", 0, tsFileManager);
// In the process of getting the file list and starting to select files, the file list is
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 1aff9e4d6f..2d996927b3 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
@@ -146,7 +146,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
timeIndexField.setAccessible(true);
ITimeIndex timeIndex = (ITimeIndex) timeIndexField.get(secondTsFileResource);
ITimeIndex newTimeIndex =
- IoTDBDescriptor.getInstance().getConfig().getTimeIndexLevel().getTimeIndex();
+ IoTDBDescriptor.getInstance().getConf().getTimeIndexLevel().getTimeIndex();
for (String device : devices) {
newTimeIndex.updateStartTime(device, timeIndex.getStartTime(device));
}
@@ -198,7 +198,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
timeIndexField.setAccessible(true);
ITimeIndex timeIndex = (ITimeIndex) timeIndexField.get(secondTsFileResource);
ITimeIndex newTimeIndex =
- IoTDBDescriptor.getInstance().getConfig().getTimeIndexLevel().getTimeIndex();
+ IoTDBDescriptor.getInstance().getConf().getTimeIndexLevel().getTimeIndex();
for (String device : devices) {
newTimeIndex.updateStartTime(device, timeIndex.getStartTime(device));
}
@@ -306,7 +306,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
long originMemoryBudget = SystemInfo.getInstance().getMemorySizeForCompaction();
SystemInfo.getInstance()
.setMemorySizeForCompaction(
- 29000L * IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount());
+ 29000L * IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount());
try {
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
@@ -389,7 +389,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
500L
* 1024
* 1024
- * IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount());
+ * IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount());
try {
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
@@ -462,7 +462,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
500L
* 1024
* 1024
- * IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount());
+ * IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount());
try {
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
@@ -537,7 +537,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
500L
* 1024
* 1024
- * IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount());
+ * IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount());
try {
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
@@ -613,7 +613,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
500L
* 1024
* 1024
- * IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount());
+ * IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount());
try {
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
@@ -692,7 +692,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
500L
* 1024
* 1024
- * IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount());
+ * IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount());
try {
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
@@ -924,7 +924,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
500L
* 1024
* 1024
- * IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount());
+ * IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount());
try {
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
@@ -941,8 +941,8 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
@Test
public void testMaxFileSelection() throws MergeException, IOException {
int oldMaxCrossCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxCrossCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxCrossCompactionCandidateFileNum(5);
+ IoTDBDescriptor.getInstance().getConf().getMaxCrossCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxCrossCompactionCandidateFileNum(5);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
List<CrossCompactionTaskResource> selected =
@@ -954,15 +954,15 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
assertEquals(2, unseqSelected.size());
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxCrossCompactionCandidateFileNum(oldMaxCrossCompactionCandidateFileNum);
}
@Test
public void testAtLeastOneUnseqFileBeenSelected() throws IOException, MergeException {
int maxCrossFilesNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxCrossCompactionCandidateFileNum();
- IoTDBDescriptor.getInstance().getConfig().setMaxCrossCompactionCandidateFileNum(1);
+ IoTDBDescriptor.getInstance().getConf().getMaxCrossCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().setMaxCrossCompactionCandidateFileNum(1);
RewriteCrossSpaceCompactionSelector selector =
new RewriteCrossSpaceCompactionSelector("", "", 0, null);
@@ -975,7 +975,7 @@ public class RewriteCompactionFileSelectorTest extends MergeTest {
assertEquals(1, unseqSelected.size());
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxCrossCompactionCandidateFileNum(maxCrossFilesNum);
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCrossSpaceCompactionRecoverTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCrossSpaceCompactionRecoverTest.java
index 8139c74fc7..9e93ca3048 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCrossSpaceCompactionRecoverTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCrossSpaceCompactionRecoverTest.java
@@ -59,7 +59,7 @@ public class RewriteCrossSpaceCompactionRecoverTest extends AbstractCompactionTe
public void setUp()
throws IOException, WriteProcessException, MetadataException, InterruptedException {
super.setUp();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(1024);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(1024);
Thread.currentThread().setName("pool-1-IoTDB-Compaction-1");
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java
index 4dba1f8ca6..a392daaad4 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCrossSpaceCompactionWithFastPerformerTest.java
@@ -76,7 +76,7 @@ public class RewriteCrossSpaceCompactionWithFastPerformerTest extends AbstractCo
throws IOException, WriteProcessException, MetadataException, InterruptedException {
super.setUp();
WALRecoverManager.getInstance().setAllDataRegionScannedLatch(new CountDownLatch(1));
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(1024);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(1024);
Thread.currentThread().setName("pool-1-IoTDB-Compaction-1");
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java
index 908491b3f8..83862f89f5 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/cross/RewriteCrossSpaceCompactionWithReadPointPerformerTest.java
@@ -76,7 +76,7 @@ public class RewriteCrossSpaceCompactionWithReadPointPerformerTest extends Abstr
throws IOException, WriteProcessException, MetadataException, InterruptedException {
super.setUp();
WALRecoverManager.getInstance().setAllDataRegionScannedLatch(new CountDownLatch(1));
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(1024);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(1024);
Thread.currentThread().setName("pool-1-IoTDB-Compaction-1");
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/FastCompactionPerformerNoAlignedTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/FastCompactionPerformerNoAlignedTest.java
index b666869d9a..36de6688e7 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/FastCompactionPerformerNoAlignedTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/FastCompactionPerformerNoAlignedTest.java
@@ -170,11 +170,11 @@ public class FastCompactionPerformerNoAlignedTest {
*/
@Test
public void testDirectlyFlushChunk() throws Exception {
- long originTargetChunkSize = IoTDBDescriptor.getInstance().getConfig().getTargetChunkSize();
+ long originTargetChunkSize = IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
long originTargetChunkPointNum =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkPointNum();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(100);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(100);
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(100);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(100);
try {
List<TsFileResource> sourceFiles = new ArrayList();
int fileNum = 6;
@@ -214,8 +214,8 @@ public class FastCompactionPerformerNoAlignedTest {
paths, schemaList, Collections.singletonList(targetResource), new ArrayList<>());
CompactionCheckerUtils.validDataByValueList(originData, compactedData);
} finally {
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(originTargetChunkSize);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(originTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(originTargetChunkSize);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(originTargetChunkPointNum);
}
}
@@ -231,20 +231,20 @@ public class FastCompactionPerformerNoAlignedTest {
long testTargetChunkPointNum = 2000L;
long testChunkSizeLowerBound = 1024L;
long testChunkPointNumLowerBound = 100L;
- long originTargetChunkSize = IoTDBDescriptor.getInstance().getConfig().getTargetChunkSize();
+ long originTargetChunkSize = IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
long originTargetChunkPointNum =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkPointNum();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(1024 * 1024);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(testTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(1024 * 1024);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(testTargetChunkPointNum);
long originChunkSizeLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkSizeLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkSizeLowerBoundInCompaction();
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(testChunkSizeLowerBound);
long originChunkPointNumLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkPointNumLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkPointNumLowerBoundInCompaction();
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(testChunkPointNumLowerBound);
try {
List<TsFileResource> sourceFiles = new ArrayList();
@@ -296,13 +296,13 @@ public class FastCompactionPerformerNoAlignedTest {
paths, schemaList, Collections.singletonList(targetResource), new ArrayList<>());
CompactionCheckerUtils.validDataByValueList(originData, compactedData);
} finally {
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(originTargetChunkSize);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(originTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(originTargetChunkSize);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(originTargetChunkPointNum);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(originChunkSizeLowerBound);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(originChunkPointNumLowerBound);
}
}
@@ -318,20 +318,20 @@ public class FastCompactionPerformerNoAlignedTest {
long testTargetChunkPointNum = 2000L;
long testChunkSizeLowerBound = 1024L;
long testChunkPointNumLowerBound = 100L;
- long originTargetChunkSize = IoTDBDescriptor.getInstance().getConfig().getTargetChunkSize();
+ long originTargetChunkSize = IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
long originTargetChunkPointNum =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkPointNum();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(1024 * 1024);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(testTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(1024 * 1024);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(testTargetChunkPointNum);
long originChunkSizeLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkSizeLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkSizeLowerBoundInCompaction();
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(testChunkSizeLowerBound);
long originChunkPointNumLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkPointNumLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkPointNumLowerBoundInCompaction();
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(testChunkPointNumLowerBound);
try {
List<TsFileResource> sourceFiles = new ArrayList();
@@ -386,13 +386,13 @@ public class FastCompactionPerformerNoAlignedTest {
paths, schemaList, Collections.singletonList(targetResource), new ArrayList<>());
CompactionCheckerUtils.validDataByValueList(originData, compactedData);
} finally {
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(originTargetChunkSize);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(originTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(originTargetChunkSize);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(originTargetChunkPointNum);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(originChunkSizeLowerBound);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(originChunkPointNumLowerBound);
}
}
@@ -406,17 +406,17 @@ public class FastCompactionPerformerNoAlignedTest {
@Test
public void testMergeChunk() throws Exception {
long testTargetChunkPointNum = 1000L;
- long originTargetChunkSize = IoTDBDescriptor.getInstance().getConfig().getTargetChunkSize();
+ long originTargetChunkSize = IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
long originTargetChunkPointNum =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkPointNum();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(10240);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(testTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(10240);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(testTargetChunkPointNum);
long originChunkSizeLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkSizeLowerBoundInCompaction();
- IoTDBDescriptor.getInstance().getConfig().setChunkSizeLowerBoundInCompaction(1);
+ IoTDBDescriptor.getInstance().getConf().getChunkSizeLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().setChunkSizeLowerBoundInCompaction(1);
long originChunkPointNumLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkPointNumLowerBoundInCompaction();
- IoTDBDescriptor.getInstance().getConfig().setChunkPointNumLowerBoundInCompaction(1);
+ IoTDBDescriptor.getInstance().getConf().getChunkPointNumLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().setChunkPointNumLowerBoundInCompaction(1);
try {
List<TsFileResource> sourceFiles = new ArrayList();
Set<String> fullPathSetWithDeleted = new HashSet<>(fullPathSet);
@@ -472,13 +472,13 @@ public class FastCompactionPerformerNoAlignedTest {
paths, schemaList, Collections.singletonList(targetResource), new ArrayList<>());
CompactionCheckerUtils.validDataByValueList(originData, compactedData);
} finally {
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(originTargetChunkSize);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(originTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(originTargetChunkSize);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(originTargetChunkPointNum);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(originChunkSizeLowerBound);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(originChunkPointNumLowerBound);
}
}
@@ -495,20 +495,20 @@ public class FastCompactionPerformerNoAlignedTest {
long testTargetChunkPointNum = 2000L;
long testChunkSizeLowerBound = 1024L;
long testChunkPointNumLowerBound = 100L;
- long originTargetChunkSize = IoTDBDescriptor.getInstance().getConfig().getTargetChunkSize();
+ long originTargetChunkSize = IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
long originTargetChunkPointNum =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkPointNum();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(1024 * 1024);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(testTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(1024 * 1024);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(testTargetChunkPointNum);
long originChunkSizeLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkSizeLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkSizeLowerBoundInCompaction();
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(testChunkSizeLowerBound);
long originChunkPointNumLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkPointNumLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkPointNumLowerBoundInCompaction();
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(testChunkPointNumLowerBound);
try {
List<TsFileResource> sourceFiles = new ArrayList();
@@ -563,13 +563,13 @@ public class FastCompactionPerformerNoAlignedTest {
paths, schemaList, Collections.singletonList(targetResource), new ArrayList<>());
CompactionCheckerUtils.validDataByValueList(originData, compactedData);
} finally {
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(originTargetChunkSize);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(originTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(originTargetChunkSize);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(originTargetChunkPointNum);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(originChunkSizeLowerBound);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(originChunkPointNumLowerBound);
}
}
@@ -583,20 +583,20 @@ public class FastCompactionPerformerNoAlignedTest {
long testTargetChunkPointNum = 1500L;
long testChunkSizeLowerBound = 1024L;
long testChunkPointNumLowerBound = 1000L;
- long originTargetChunkSize = IoTDBDescriptor.getInstance().getConfig().getTargetChunkSize();
+ long originTargetChunkSize = IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
long originTargetChunkPointNum =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkPointNum();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(10240);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(testTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(10240);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(testTargetChunkPointNum);
long originChunkSizeLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkSizeLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkSizeLowerBoundInCompaction();
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(testChunkSizeLowerBound);
long originChunkPointNumLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkPointNumLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkPointNumLowerBoundInCompaction();
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(testChunkPointNumLowerBound);
try {
List<TsFileResource> sourceFiles = new ArrayList();
@@ -636,13 +636,13 @@ public class FastCompactionPerformerNoAlignedTest {
paths, schemaList, Collections.singletonList(targetResource), new ArrayList<>());
CompactionCheckerUtils.validDataByValueList(originData, compactedData);
} finally {
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(originTargetChunkSize);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(originTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(originTargetChunkSize);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(originTargetChunkPointNum);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(originChunkSizeLowerBound);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(originChunkPointNumLowerBound);
}
}
@@ -659,20 +659,20 @@ public class FastCompactionPerformerNoAlignedTest {
long testTargetChunkPointNum = 1500L;
long testChunkSizeLowerBound = 1024L;
long testChunkPointNumLowerBound = 100L;
- long originTargetChunkSize = IoTDBDescriptor.getInstance().getConfig().getTargetChunkSize();
+ long originTargetChunkSize = IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
long originTargetChunkPointNum =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkPointNum();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(10240);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(testTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(10240);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(testTargetChunkPointNum);
long originChunkSizeLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkSizeLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkSizeLowerBoundInCompaction();
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(testChunkSizeLowerBound);
long originChunkPointNumLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkPointNumLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkPointNumLowerBoundInCompaction();
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(testChunkPointNumLowerBound);
try {
List<TsFileResource> sourceFiles = new ArrayList();
@@ -713,13 +713,13 @@ public class FastCompactionPerformerNoAlignedTest {
paths, schemaList, Collections.singletonList(targetResource), new ArrayList<>());
CompactionCheckerUtils.validDataByValueList(originData, compactedData);
} finally {
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(originTargetChunkSize);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(originTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(originTargetChunkSize);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(originTargetChunkPointNum);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(originChunkSizeLowerBound);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(originChunkPointNumLowerBound);
}
}
@@ -729,20 +729,20 @@ public class FastCompactionPerformerNoAlignedTest {
long testTargetChunkPointNum = 2000L;
long testChunkSizeLowerBound = 1024L;
long testChunkPointNumLowerBound = 100L;
- long originTargetChunkSize = IoTDBDescriptor.getInstance().getConfig().getTargetChunkSize();
+ long originTargetChunkSize = IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
long originTargetChunkPointNum =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkPointNum();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(1024 * 1024);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(testTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(1024 * 1024);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(testTargetChunkPointNum);
long originChunkSizeLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkSizeLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkSizeLowerBoundInCompaction();
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(testChunkSizeLowerBound);
long originChunkPointNumLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkPointNumLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkPointNumLowerBoundInCompaction();
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(testChunkPointNumLowerBound);
try {
List<TsFileResource> sourceFiles = new ArrayList();
@@ -785,13 +785,13 @@ public class FastCompactionPerformerNoAlignedTest {
paths, schemaList, Collections.singletonList(targetResource), new ArrayList<>());
CompactionCheckerUtils.validDataByValueList(originData, compactedData);
} finally {
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(originTargetChunkSize);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(originTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(originTargetChunkSize);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(originTargetChunkPointNum);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(originChunkSizeLowerBound);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(originChunkPointNumLowerBound);
}
}
@@ -801,20 +801,20 @@ public class FastCompactionPerformerNoAlignedTest {
long testTargetChunkPointNum = 2000L;
long testChunkSizeLowerBound = 1024L;
long testChunkPointNumLowerBound = 100L;
- long originTargetChunkSize = IoTDBDescriptor.getInstance().getConfig().getTargetChunkSize();
+ long originTargetChunkSize = IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
long originTargetChunkPointNum =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkPointNum();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(1024 * 1024);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(testTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(1024 * 1024);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(testTargetChunkPointNum);
long originChunkSizeLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkSizeLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkSizeLowerBoundInCompaction();
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(testChunkSizeLowerBound);
long originChunkPointNumLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkPointNumLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkPointNumLowerBoundInCompaction();
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(testChunkPointNumLowerBound);
try {
List<TsFileResource> sourceFiles = new ArrayList();
@@ -861,13 +861,13 @@ public class FastCompactionPerformerNoAlignedTest {
paths, schemaList, Collections.singletonList(targetResource), new ArrayList<>());
CompactionCheckerUtils.validDataByValueList(originData, compactedData);
} finally {
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(originTargetChunkSize);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(originTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(originTargetChunkSize);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(originTargetChunkPointNum);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(originChunkSizeLowerBound);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(originChunkPointNumLowerBound);
}
}
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 66f272bf0a..897997c7d7 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
@@ -41,38 +41,38 @@ public class InnerCompactionSchedulerTest extends AbstractCompactionTest {
private long originFileSize;
long MAX_WAITING_TIME = 120_000L;
boolean oldEnableSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableSeqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().isEnableSeqSpaceCompaction();
boolean oldEnableUnSeqSpaceCompaction =
- IoTDBDescriptor.getInstance().getConfig().isEnableUnseqSpaceCompaction();
+ IoTDBDescriptor.getInstance().getConf().isEnableUnseqSpaceCompaction();
int oldConcurrentCompactionThread =
- IoTDBDescriptor.getInstance().getConfig().getCompactionThreadCount();
+ IoTDBDescriptor.getInstance().getConf().getCompactionThreadCount();
int oldMaxCompactionCandidateFileNum =
- IoTDBDescriptor.getInstance().getConfig().getMaxInnerCompactionCandidateFileNum();
+ IoTDBDescriptor.getInstance().getConf().getMaxInnerCompactionCandidateFileNum();
@Before
public void setUp()
throws IOException, WriteProcessException, MetadataException, InterruptedException {
CompactionTaskManager.getInstance().start();
super.setUp();
- originFileSize = IoTDBDescriptor.getInstance().getConfig().getTargetCompactionFileSize();
- IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(90);
+ originFileSize = IoTDBDescriptor.getInstance().getConf().getTargetCompactionFileSize();
+ IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(90);
}
@After
public void tearDown() throws IOException, StorageEngineException {
CompactionTaskManager.getInstance().stop();
- IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(originFileSize);
+ IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(originFileSize);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableSeqSpaceCompaction(oldEnableSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setEnableUnseqSpaceCompaction(oldEnableUnSeqSpaceCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setCompactionThreadCount(oldConcurrentCompactionThread);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setMaxInnerCompactionCandidateFileNum(oldMaxCompactionCandidateFileNum);
super.tearDown();
}
@@ -80,11 +80,11 @@ public class InnerCompactionSchedulerTest extends AbstractCompactionTest {
@Test
public void testFileSelector1()
throws IOException, MetadataException, WriteProcessException, InterruptedException {
- IoTDBDescriptor.getInstance().getConfig().setEnableSeqSpaceCompaction(true);
- IoTDBDescriptor.getInstance().getConfig().setEnableUnseqSpaceCompaction(true);
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(4);
- IoTDBDescriptor.getInstance().getConfig().setTargetCompactionFileSize(1000000);
+ IoTDBDescriptor.getInstance().getConf().setEnableSeqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().setEnableUnseqSpaceCompaction(true);
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(50);
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(4);
+ IoTDBDescriptor.getInstance().getConf().setTargetCompactionFileSize(1000000);
createFiles(2, 2, 3, 100, 0, 0, 50, 50, false, true);
registerTimeseriesInMManger(2, 3, false);
createFiles(2, 3, 5, 50, 250, 250, 50, 50, false, true);
@@ -106,8 +106,8 @@ public class InnerCompactionSchedulerTest extends AbstractCompactionTest {
@Test
public void testFileSelector2()
throws IOException, MetadataException, WriteProcessException, InterruptedException {
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(50);
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(50);
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(50);
TsFileResourceList tsFileResources = new TsFileResourceList();
createFiles(2, 2, 3, 100, 0, 0, 50, 50, false, true);
createFiles(2, 3, 5, 50, 250, 250, 50, 50, false, true);
@@ -136,8 +136,8 @@ public class InnerCompactionSchedulerTest extends AbstractCompactionTest {
@Test
public void testFileSelectorWithUnclosedFile()
throws IOException, MetadataException, WriteProcessException, InterruptedException {
- IoTDBDescriptor.getInstance().getConfig().setCompactionThreadCount(50);
- IoTDBDescriptor.getInstance().getConfig().setMaxInnerCompactionCandidateFileNum(50);
+ IoTDBDescriptor.getInstance().getConf().setCompactionThreadCount(50);
+ IoTDBDescriptor.getInstance().getConf().setMaxInnerCompactionCandidateFileNum(50);
TsFileResourceList tsFileResources = new TsFileResourceList();
createFiles(2, 2, 3, 100, 0, 0, 50, 50, false, true);
createFiles(2, 3, 5, 50, 250, 250, 50, 50, false, true);
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 76d74fcd55..66e5ce5d58 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
@@ -114,11 +114,11 @@ public class InnerSeqCompactionWithFastPerformerTest {
public void testDeserializePage() throws MetadataException, IOException, WriteProcessException {
long chunkSizeLowerBoundInCompaction =
- IoTDBDescriptor.getInstance().getConfig().getChunkSizeLowerBoundInCompaction();
- IoTDBDescriptor.getInstance().getConfig().setChunkSizeLowerBoundInCompaction(10240000);
+ IoTDBDescriptor.getInstance().getConf().getChunkSizeLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().setChunkSizeLowerBoundInCompaction(10240000);
long chunkPointNumLowerBoundInCompaction =
- IoTDBDescriptor.getInstance().getConfig().getChunkPointNumLowerBoundInCompaction();
- IoTDBDescriptor.getInstance().getConfig().setChunkPointNumLowerBoundInCompaction(200000);
+ IoTDBDescriptor.getInstance().getConf().getChunkPointNumLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().setChunkPointNumLowerBoundInCompaction(200000);
try {
for (int toMergeFileNum : toMergeFileNums) {
for (CompactionTimeseriesType compactionTimeseriesType : compactionTimeseriesTypes) {
@@ -343,10 +343,10 @@ public class InnerSeqCompactionWithFastPerformerTest {
throw new RuntimeException(e);
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(chunkPointNumLowerBoundInCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(chunkSizeLowerBoundInCompaction);
}
}
@@ -625,16 +625,16 @@ public class InnerSeqCompactionWithFastPerformerTest {
@Test
public void testAppendChunk() throws Exception {
long prevChunkPointNumLowerBoundInCompaction =
- IoTDBDescriptor.getInstance().getConfig().getChunkPointNumLowerBoundInCompaction();
- IoTDBDescriptor.getInstance().getConfig().setChunkPointNumLowerBoundInCompaction(10);
+ IoTDBDescriptor.getInstance().getConf().getChunkPointNumLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().setChunkPointNumLowerBoundInCompaction(10);
long prevChunkSizeLowerBoundInCompaction =
- IoTDBDescriptor.getInstance().getConfig().getChunkSizeLowerBoundInCompaction();
- IoTDBDescriptor.getInstance().getConfig().setChunkSizeLowerBoundInCompaction(10000);
+ IoTDBDescriptor.getInstance().getConf().getChunkSizeLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().setChunkSizeLowerBoundInCompaction(10000);
long prevTargetChunkPointNum =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkPointNum();
- long prevTargetChunkSize = IoTDBDescriptor.getInstance().getConfig().getTargetChunkSize();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(10000);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(100);
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
+ long prevTargetChunkSize = IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(10000);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(100);
try {
for (int toMergeFileNum : toMergeFileNums) {
@@ -980,13 +980,13 @@ public class InnerSeqCompactionWithFastPerformerTest {
e.printStackTrace();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(prevChunkSizeLowerBoundInCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(prevChunkPointNumLowerBoundInCompaction);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(prevTargetChunkPointNum);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(prevTargetChunkSize);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(prevTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(prevTargetChunkSize);
}
}
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 36ddbf3b6e..d725df6af8 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
@@ -113,11 +113,11 @@ public class InnerSeqCompactionWithReadChunkPerformerTest {
public void testDeserializePage() throws Exception {
long chunkSizeLowerBoundInCompaction =
- IoTDBDescriptor.getInstance().getConfig().getChunkSizeLowerBoundInCompaction();
- IoTDBDescriptor.getInstance().getConfig().setChunkSizeLowerBoundInCompaction(10240);
+ IoTDBDescriptor.getInstance().getConf().getChunkSizeLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().setChunkSizeLowerBoundInCompaction(10240);
long chunkPointNumLowerBoundInCompaction =
- IoTDBDescriptor.getInstance().getConfig().getChunkPointNumLowerBoundInCompaction();
- IoTDBDescriptor.getInstance().getConfig().setChunkPointNumLowerBoundInCompaction(1000);
+ IoTDBDescriptor.getInstance().getConf().getChunkPointNumLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().setChunkPointNumLowerBoundInCompaction(1000);
try {
for (int toMergeFileNum : toMergeFileNums) {
for (CompactionTimeseriesType compactionTimeseriesType : compactionTimeseriesTypes) {
@@ -339,10 +339,10 @@ public class InnerSeqCompactionWithReadChunkPerformerTest {
e.printStackTrace();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(chunkPointNumLowerBoundInCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(chunkSizeLowerBoundInCompaction);
}
}
@@ -615,16 +615,16 @@ public class InnerSeqCompactionWithReadChunkPerformerTest {
@Test
public void testAppendChunk() throws Exception {
long prevChunkPointNumLowerBoundInCompaction =
- IoTDBDescriptor.getInstance().getConfig().getChunkPointNumLowerBoundInCompaction();
- IoTDBDescriptor.getInstance().getConfig().setChunkPointNumLowerBoundInCompaction(1);
+ IoTDBDescriptor.getInstance().getConf().getChunkPointNumLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().setChunkPointNumLowerBoundInCompaction(1);
long prevChunkSizeLowerBoundInCompaction =
- IoTDBDescriptor.getInstance().getConfig().getChunkSizeLowerBoundInCompaction();
- IoTDBDescriptor.getInstance().getConfig().setChunkSizeLowerBoundInCompaction(1);
+ IoTDBDescriptor.getInstance().getConf().getChunkSizeLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().setChunkSizeLowerBoundInCompaction(1);
long prevTargetChunkPointNum =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkPointNum();
- long prevTargetChunkSize = IoTDBDescriptor.getInstance().getConfig().getTargetChunkSize();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(1);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(1);
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
+ long prevTargetChunkSize = IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(1);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(1);
try {
for (int toMergeFileNum : toMergeFileNums) {
@@ -948,13 +948,13 @@ public class InnerSeqCompactionWithReadChunkPerformerTest {
e.printStackTrace();
} finally {
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(prevChunkSizeLowerBoundInCompaction);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(prevChunkPointNumLowerBoundInCompaction);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(prevTargetChunkPointNum);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(prevTargetChunkSize);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(prevTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(prevTargetChunkSize);
}
}
diff --git a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/ReadChunkCompactionPerformerNoAlignedTest.java b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/ReadChunkCompactionPerformerNoAlignedTest.java
index 863a1e47bf..85a27fb44b 100644
--- a/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/ReadChunkCompactionPerformerNoAlignedTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/engine/compaction/inner/ReadChunkCompactionPerformerNoAlignedTest.java
@@ -167,11 +167,11 @@ public class ReadChunkCompactionPerformerNoAlignedTest {
*/
@Test
public void testDirectlyFlushChunk() throws Exception {
- long originTargetChunkSize = IoTDBDescriptor.getInstance().getConfig().getTargetChunkSize();
+ long originTargetChunkSize = IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
long originTargetChunkPointNum =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkPointNum();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(100);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(100);
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(100);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(100);
try {
List<TsFileResource> sourceFiles = new ArrayList();
int fileNum = 6;
@@ -212,8 +212,8 @@ public class ReadChunkCompactionPerformerNoAlignedTest {
paths, schemaList, Collections.singletonList(targetResource), new ArrayList<>());
CompactionCheckerUtils.validDataByValueList(originData, compactedData);
} finally {
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(originTargetChunkSize);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(originTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(originTargetChunkSize);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(originTargetChunkPointNum);
}
}
@@ -229,20 +229,20 @@ public class ReadChunkCompactionPerformerNoAlignedTest {
long testTargetChunkPointNum = 2000L;
long testChunkSizeLowerBound = 1024L;
long testChunkPointNumLowerBound = 100L;
- long originTargetChunkSize = IoTDBDescriptor.getInstance().getConfig().getTargetChunkSize();
+ long originTargetChunkSize = IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
long originTargetChunkPointNum =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkPointNum();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(1024 * 1024);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(testTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(1024 * 1024);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(testTargetChunkPointNum);
long originChunkSizeLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkSizeLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkSizeLowerBoundInCompaction();
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(testChunkSizeLowerBound);
long originChunkPointNumLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkPointNumLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkPointNumLowerBoundInCompaction();
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(testChunkPointNumLowerBound);
try {
List<TsFileResource> sourceFiles = new ArrayList();
@@ -295,13 +295,13 @@ public class ReadChunkCompactionPerformerNoAlignedTest {
CompactionCheckerUtils.validDataByValueList(originData, compactedData);
CompactionCheckerUtils.checkChunkAndPage(chunkPagePointsNumMerged, targetResource);
} finally {
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(originTargetChunkSize);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(originTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(originTargetChunkSize);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(originTargetChunkPointNum);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(originChunkSizeLowerBound);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(originChunkPointNumLowerBound);
}
}
@@ -317,20 +317,20 @@ public class ReadChunkCompactionPerformerNoAlignedTest {
long testTargetChunkPointNum = 2000L;
long testChunkSizeLowerBound = 1024L;
long testChunkPointNumLowerBound = 100L;
- long originTargetChunkSize = IoTDBDescriptor.getInstance().getConfig().getTargetChunkSize();
+ long originTargetChunkSize = IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
long originTargetChunkPointNum =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkPointNum();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(1024 * 1024);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(testTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(1024 * 1024);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(testTargetChunkPointNum);
long originChunkSizeLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkSizeLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkSizeLowerBoundInCompaction();
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(testChunkSizeLowerBound);
long originChunkPointNumLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkPointNumLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkPointNumLowerBoundInCompaction();
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(testChunkPointNumLowerBound);
try {
List<TsFileResource> sourceFiles = new ArrayList();
@@ -386,13 +386,13 @@ public class ReadChunkCompactionPerformerNoAlignedTest {
CompactionCheckerUtils.validDataByValueList(originData, compactedData);
CompactionCheckerUtils.checkChunkAndPage(chunkPagePointsNumMerged, targetResource);
} finally {
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(originTargetChunkSize);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(originTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(originTargetChunkSize);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(originTargetChunkPointNum);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(originChunkSizeLowerBound);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(originChunkPointNumLowerBound);
}
}
@@ -406,17 +406,17 @@ public class ReadChunkCompactionPerformerNoAlignedTest {
@Test
public void testMergeChunk() throws Exception {
long testTargetChunkPointNum = 1000L;
- long originTargetChunkSize = IoTDBDescriptor.getInstance().getConfig().getTargetChunkSize();
+ long originTargetChunkSize = IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
long originTargetChunkPointNum =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkPointNum();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(10240);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(testTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(10240);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(testTargetChunkPointNum);
long originChunkSizeLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkSizeLowerBoundInCompaction();
- IoTDBDescriptor.getInstance().getConfig().setChunkSizeLowerBoundInCompaction(1);
+ IoTDBDescriptor.getInstance().getConf().getChunkSizeLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().setChunkSizeLowerBoundInCompaction(1);
long originChunkPointNumLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkPointNumLowerBoundInCompaction();
- IoTDBDescriptor.getInstance().getConfig().setChunkPointNumLowerBoundInCompaction(1);
+ IoTDBDescriptor.getInstance().getConf().getChunkPointNumLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().setChunkPointNumLowerBoundInCompaction(1);
try {
List<TsFileResource> sourceFiles = new ArrayList();
Set<String> fullPathSetWithDeleted = new HashSet<>(fullPathSet);
@@ -473,13 +473,13 @@ public class ReadChunkCompactionPerformerNoAlignedTest {
paths, schemaList, Collections.singletonList(targetResource), new ArrayList<>());
CompactionCheckerUtils.validDataByValueList(originData, compactedData);
} finally {
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(originTargetChunkSize);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(originTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(originTargetChunkSize);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(originTargetChunkPointNum);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(originChunkSizeLowerBound);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(originChunkPointNumLowerBound);
}
}
@@ -496,20 +496,20 @@ public class ReadChunkCompactionPerformerNoAlignedTest {
long testTargetChunkPointNum = 2000L;
long testChunkSizeLowerBound = 1024L;
long testChunkPointNumLowerBound = 100L;
- long originTargetChunkSize = IoTDBDescriptor.getInstance().getConfig().getTargetChunkSize();
+ long originTargetChunkSize = IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
long originTargetChunkPointNum =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkPointNum();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(1024 * 1024);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(testTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(1024 * 1024);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(testTargetChunkPointNum);
long originChunkSizeLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkSizeLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkSizeLowerBoundInCompaction();
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(testChunkSizeLowerBound);
long originChunkPointNumLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkPointNumLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkPointNumLowerBoundInCompaction();
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(testChunkPointNumLowerBound);
try {
List<TsFileResource> sourceFiles = new ArrayList();
@@ -565,13 +565,13 @@ public class ReadChunkCompactionPerformerNoAlignedTest {
CompactionCheckerUtils.validDataByValueList(originData, compactedData);
CompactionCheckerUtils.checkChunkAndPage(chunkPagePointsNumMerged, targetResource);
} finally {
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(originTargetChunkSize);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(originTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(originTargetChunkSize);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(originTargetChunkPointNum);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(originChunkSizeLowerBound);
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkPointNumLowerBoundInCompaction(originChunkPointNumLowerBound);
}
}
@@ -585,20 +585,20 @@ public class ReadChunkCompactionPerformerNoAlignedTest {
long testTargetChunkPointNum = 1500L;
long testChunkSizeLowerBound = 1024L;
long testChunkPointNumLowerBound = 1000L;
- long originTargetChunkSize = IoTDBDescriptor.getInstance().getConfig().getTargetChunkSize();
+ long originTargetChunkSize = IoTDBDescriptor.getInstance().getConf().getTargetChunkSize();
long originTargetChunkPointNum =
- IoTDBDescriptor.getInstance().getConfig().getTargetChunkPointNum();
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkSize(10240);
- IoTDBDescriptor.getInstance().getConfig().setTargetChunkPointNum(testTargetChunkPointNum);
+ IoTDBDescriptor.getInstance().getConf().getTargetChunkPointNum();
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkSize(10240);
+ IoTDBDescriptor.getInstance().getConf().setTargetChunkPointNum(testTargetChunkPointNum);
long originChunkSizeLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkSizeLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkSizeLowerBoundInCompaction();
IoTDBDescriptor.getInstance()
- .getConfig()
+ .getConf()
.setChunkSizeLowerBoundInCompaction(testChunkSizeLowerBound);
long originChunkPointNumLowerBound =
- IoTDBDescriptor.getInstance().getConfig().getChunkPointNumLowerBoundInCompaction();
+ IoTDBDescriptor.getInstance().getConf().getChunkPointNumLowerBoundInCompaction();
... 2037 lines suppressed ...
[iotdb] 03/04: stash
Posted by yo...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
yongzao pushed a commit to branch Move-ConfigNodeConfig-into-CommonConfig
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 79f1bb261dc249e1c82e4d347dbf252ba1633cca
Author: YongzaoDan <53...@qq.com>
AuthorDate: Thu Jan 12 23:18:26 2023 +0800
stash
---
.../iotdb/db/client/DataNodeClientPoolFactory.java | 8 ++++----
.../statemachine/DataRegionStateMachine.java | 2 +-
.../impl/RewriteCrossSpaceCompactionSelector.java | 3 ++-
.../db/exception/sql/PathNumOverLimitException.java | 4 ++--
.../db/metadata/cache/DataNodeLastCacheManager.java | 3 ++-
.../operator/process/last/LastQueryUtil.java | 4 ++--
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 9 +++++----
.../db/mpp/plan/analyze/ClusterPartitionFetcher.java | 20 +++++++++-----------
.../mpp/plan/analyze/ColumnPaginationController.java | 5 +++--
.../plan/analyze/schema/ClusterSchemaFetcher.java | 10 +++++-----
.../metadata/CreateContinuousQueryStatement.java | 6 +++---
.../db/protocol/rest/impl/GrafanaApiServiceImpl.java | 8 ++++----
.../db/protocol/rest/impl/RestApiServiceImpl.java | 6 +++---
.../db/service/basic/QueryFrequencyRecorder.java | 4 +++-
.../iotdb/db/sync/externalpipe/ExtPipePlugin.java | 4 ++--
.../iotdb/db/sync/pipedata/load/DeletionLoader.java | 2 +-
.../iotdb/db/sync/pipedata/load/TsFileLoader.java | 4 ++--
.../db/trigger/executor/TriggerFireVisitor.java | 4 ++--
.../org/apache/iotdb/db/utils/OpenFileNumUtil.java | 6 +++---
.../allocation/AbstractNodeAllocationStrategy.java | 8 ++++----
.../org/apache/iotdb/db/wal/buffer/WALInfoEntry.java | 6 +++---
.../iotdb/db/wal/recover/WALNodeRecoverTask.java | 6 ++++--
.../iotdb/db/wal/recover/WALRecoverManager.java | 9 +++++----
23 files changed, 74 insertions(+), 67 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/client/DataNodeClientPoolFactory.java b/server/src/main/java/org/apache/iotdb/db/client/DataNodeClientPoolFactory.java
index f8f77e1ff7..41d6857147 100644
--- a/server/src/main/java/org/apache/iotdb/db/client/DataNodeClientPoolFactory.java
+++ b/server/src/main/java/org/apache/iotdb/db/client/DataNodeClientPoolFactory.java
@@ -50,8 +50,8 @@ public class DataNodeClientPoolFactory {
.setRpcThriftCompressionEnabled(conf.isDnRpcThriftCompressionEnable())
.build()),
new ClientPoolProperty.Builder<ConfigNodeClient>()
- .setCoreClientNumForEachNode(conf.getCoreClientNumForEachNode())
- .setMaxClientNumForEachNode(conf.getMaxClientNumForEachNode())
+ .setCoreClientNumForEachNode(conf.getDnCoreClientCountForEachNodeInClientManager())
+ .setMaxClientNumForEachNode(conf.getDnMaxClientCountForEachNodeInClientManager())
.build()
.getConfig());
}
@@ -75,8 +75,8 @@ public class DataNodeClientPoolFactory {
: 1)
.build()),
new ClientPoolProperty.Builder<ConfigNodeClient>()
- .setCoreClientNumForEachNode(conf.getCoreClientNumForEachNode())
- .setMaxClientNumForEachNode(conf.getMaxClientNumForEachNode())
+ .setCoreClientNumForEachNode(conf.getDnCoreClientCountForEachNodeInClientManager())
+ .setMaxClientNumForEachNode(conf.getDnMaxClientCountForEachNodeInClientManager())
.build()
.getConfig());
}
diff --git a/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/DataRegionStateMachine.java b/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/DataRegionStateMachine.java
index d420207111..2d2844d97d 100644
--- a/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/DataRegionStateMachine.java
+++ b/server/src/main/java/org/apache/iotdb/db/consensus/statemachine/DataRegionStateMachine.java
@@ -76,7 +76,7 @@ public class DataRegionStateMachine extends BaseStateMachine {
private static final int MAX_REQUEST_CACHE_SIZE = 5;
private static final long CACHE_WINDOW_TIME_IN_MS =
- IoTDBDescriptor.getInstance().getConf().getCacheWindowTimeInMs();
+ CommonDescriptor.getInstance().getConf().getIotConsensusCacheWindowTimeInMs();
private ConcurrentHashMap<String, SyncLogCacheQueue> cacheQueueMap;
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/impl/RewriteCrossSpaceCompactionSelector.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/impl/RewriteCrossSpaceCompactionSelector.java
index fd9ee62960..467965b794 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/impl/RewriteCrossSpaceCompactionSelector.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/impl/RewriteCrossSpaceCompactionSelector.java
@@ -17,7 +17,7 @@
* under the License.
*/
package org.apache.iotdb.db.engine.compaction.selector.impl;
-
+import org.apache.iotdb.commons.conf.CommonConfig;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.db.conf.IoTDBConfig;
@@ -46,6 +46,7 @@ import java.util.stream.Collectors;
public class RewriteCrossSpaceCompactionSelector implements ICrossSpaceSelector {
private static final Logger LOGGER =
LoggerFactory.getLogger(IoTDBConstant.COMPACTION_LOGGER_NAME);
+
private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private final int SELECT_WARN_THRESHOLD = 10;
diff --git a/server/src/main/java/org/apache/iotdb/db/exception/sql/PathNumOverLimitException.java b/server/src/main/java/org/apache/iotdb/db/exception/sql/PathNumOverLimitException.java
index e0a4272ecd..9fa3f66160 100644
--- a/server/src/main/java/org/apache/iotdb/db/exception/sql/PathNumOverLimitException.java
+++ b/server/src/main/java/org/apache/iotdb/db/exception/sql/PathNumOverLimitException.java
@@ -19,7 +19,7 @@
package org.apache.iotdb.db.exception.sql;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
public class PathNumOverLimitException extends SemanticException {
@@ -28,6 +28,6 @@ public class PathNumOverLimitException extends SemanticException {
String.format(
"Too many paths in one query! Currently allowed max deduplicated path number is %d. "
+ "Please use slimit or adjust max_deduplicated_path_num in iotdb-common.properties.",
- IoTDBDescriptor.getInstance().getConf().getMaxQueryDeduplicatedPathNum()));
+ CommonDescriptor.getInstance().getConf().getMaxDeduplicatedPathNum()));
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeLastCacheManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeLastCacheManager.java
index 4a3db43783..7f7a58b2f5 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeLastCacheManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeLastCacheManager.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.db.metadata.cache;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.metadata.cache.lastCache.container.ILastCacheContainer;
import org.apache.iotdb.tsfile.read.TimeValuePair;
@@ -30,7 +31,7 @@ public class DataNodeLastCacheManager {
private static final Logger logger = LoggerFactory.getLogger(DataNodeLastCacheManager.class);
private static final boolean CACHE_ENABLED =
- IoTDBDescriptor.getInstance().getConf().isLastCacheEnabled();
+ CommonDescriptor.getInstance().getConf().isEnableLastCache();
/**
* get the last cache value from time series
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/last/LastQueryUtil.java b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/last/LastQueryUtil.java
index f685c29388..9268445d0e 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/last/LastQueryUtil.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/execution/operator/process/last/LastQueryUtil.java
@@ -18,7 +18,7 @@
*/
package org.apache.iotdb.db.mpp.execution.operator.process.last;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.db.mpp.aggregation.Aggregator;
import org.apache.iotdb.db.mpp.aggregation.LastValueDescAccumulator;
import org.apache.iotdb.db.mpp.aggregation.MaxTimeDescAccumulator;
@@ -43,7 +43,7 @@ import java.util.List;
public class LastQueryUtil {
private static final boolean CACHE_ENABLED =
- IoTDBDescriptor.getInstance().getConf().isLastCacheEnabled();
+ CommonDescriptor.getInstance().getConf().isEnableLastCache();
public static TsBlockBuilder createTsBlockBuilder() {
return new TsBlockBuilder(ImmutableList.of(TSDataType.TEXT, TSDataType.TEXT, TSDataType.TEXT));
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
index 53db286673..d67be07f85 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java
@@ -21,6 +21,7 @@ package org.apache.iotdb.db.mpp.plan.analyze;
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot;
import org.apache.iotdb.commons.client.exception.ClientManagerException;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.exception.MetadataException;
@@ -1147,8 +1148,8 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
if (res.left.isEmpty() && !res.right.left) {
return new DataPartition(
Collections.emptyMap(),
- CONFIG.getSeriesPartitionExecutorClass(),
- CONFIG.getSeriesPartitionSlotNum());
+ CommonDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
+ CommonDescriptor.getInstance().getConf().getSeriesSlotNum());
}
Map<String, List<DataPartitionQueryParam>> sgNameToQueryParamsMap = new HashMap<>();
for (String devicePath : deviceSet) {
@@ -1815,7 +1816,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
try (TsFileSequenceReader reader = new TsFileSequenceReader(tsFile.getAbsolutePath())) {
Map<String, List<TimeseriesMetadata>> device2Metadata = reader.getAllTimeseriesMetadata(true);
- if (IoTDBDescriptor.getInstance().getConf().isAutoCreateSchemaEnabled()
+ if (CommonDescriptor.getInstance().getConf().isEnableAutoCreateSchema()
|| statement.isVerifySchema()) {
// construct schema
for (Map.Entry<String, List<TimeseriesMetadata>> entry : device2Metadata.entrySet()) {
@@ -1918,7 +1919,7 @@ public class AnalyzeVisitor extends StatementVisitor<Analysis, MPPQueryContext>
"",
partitionFetcher,
schemaFetcher,
- IoTDBDescriptor.getInstance().getConf().getQueryTimeoutThreshold());
+ CommonDescriptor.getInstance().getConf().getQueryTimeoutThreshold());
if (result.status.code != TSStatusCode.SUCCESS_STATUS.getStatusCode()
&& result.status.code != TSStatusCode.DATABASE_ALREADY_EXISTS.getStatusCode()) {
logger.warn(
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterPartitionFetcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterPartitionFetcher.java
index 943e5dbc2d..cd9e58256b 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterPartitionFetcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ClusterPartitionFetcher.java
@@ -24,6 +24,8 @@ import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot;
import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot;
import org.apache.iotdb.commons.client.IClientManager;
import org.apache.iotdb.commons.client.exception.ClientManagerException;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.consensus.ConfigNodeRegionId;
import org.apache.iotdb.commons.exception.IoTDBException;
import org.apache.iotdb.commons.partition.DataPartition;
@@ -42,8 +44,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TTimeSlotList;
import org.apache.iotdb.db.client.ConfigNodeClient;
import org.apache.iotdb.db.client.ConfigNodeClientManager;
import org.apache.iotdb.db.client.ConfigNodeInfo;
-import org.apache.iotdb.db.conf.IoTDBConfig;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.sql.StatementAnalyzeException;
import org.apache.iotdb.db.mpp.plan.analyze.cache.PartitionCache;
import org.apache.iotdb.mpp.rpc.thrift.TRegionRouteReq;
@@ -65,7 +65,7 @@ import java.util.Map;
public class ClusterPartitionFetcher implements IPartitionFetcher {
private static final Logger logger = LoggerFactory.getLogger(ClusterPartitionFetcher.class);
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
+ private static final CommonConfig config = CommonDescriptor.getInstance().getConf();
private final SeriesPartitionExecutor partitionExecutor;
@@ -88,7 +88,7 @@ public class ClusterPartitionFetcher implements IPartitionFetcher {
private ClusterPartitionFetcher() {
this.partitionExecutor =
SeriesPartitionExecutor.getSeriesPartitionExecutor(
- config.getSeriesPartitionExecutorClass(), config.getSeriesPartitionSlotNum());
+ config.getSeriesPartitionExecutorClass(), config.getSeriesSlotNum());
this.partitionCache = new PartitionCache();
}
@@ -385,16 +385,16 @@ public class ClusterPartitionFetcher implements IPartitionFetcher {
return new SchemaPartition(
regionReplicaMap,
- IoTDBDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
- IoTDBDescriptor.getInstance().getConf().getSeriesPartitionSlotNum());
+ CommonDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
+ CommonDescriptor.getInstance().getConf().getSeriesSlotNum());
}
private SchemaNodeManagementPartition parseSchemaNodeManagementPartitionResp(
TSchemaNodeManagementResp schemaNodeManagementResp) {
return new SchemaNodeManagementPartition(
schemaNodeManagementResp.getSchemaRegionMap(),
- IoTDBDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
- IoTDBDescriptor.getInstance().getConf().getSeriesPartitionSlotNum(),
+ CommonDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
+ CommonDescriptor.getInstance().getConf().getSeriesSlotNum(),
schemaNodeManagementResp.getMatchedNode());
}
@@ -422,8 +422,6 @@ public class ClusterPartitionFetcher implements IPartitionFetcher {
}
return new DataPartition(
- regionReplicaSet,
- config.getSeriesPartitionExecutorClass(),
- config.getSeriesPartitionSlotNum());
+ regionReplicaSet, config.getSeriesPartitionExecutorClass(), config.getSeriesSlotNum());
}
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ColumnPaginationController.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ColumnPaginationController.java
index f8405391d1..1de6a6f81d 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ColumnPaginationController.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ColumnPaginationController.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.db.mpp.plan.analyze;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.sql.PathNumOverLimitException;
@@ -26,7 +27,7 @@ import org.apache.iotdb.db.exception.sql.PathNumOverLimitException;
public class ColumnPaginationController {
private int curLimit =
- IoTDBDescriptor.getInstance().getConf().getMaxQueryDeduplicatedPathNum() + 1;
+ CommonDescriptor.getInstance().getConf().getMaxDeduplicatedPathNum() + 1;
private int curOffset;
// records the path number that the SchemaProcessor totally returned
@@ -69,7 +70,7 @@ public class ColumnPaginationController {
public void consumeLimit() {
consumed++;
- if (consumed > IoTDBDescriptor.getInstance().getConf().getMaxQueryDeduplicatedPathNum()) {
+ if (consumed > CommonDescriptor.getInstance().getConf().getMaxDeduplicatedPathNum()) {
throw new PathNumOverLimitException();
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/ClusterSchemaFetcher.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/ClusterSchemaFetcher.java
index 0939b6e1c6..4bacc5c79a 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/ClusterSchemaFetcher.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/schema/ClusterSchemaFetcher.java
@@ -18,10 +18,10 @@
*/
package org.apache.iotdb.db.mpp.plan.analyze.schema;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
-import org.apache.iotdb.db.conf.IoTDBConfig;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.metadata.cache.DataNodeSchemaCache;
import org.apache.iotdb.db.metadata.template.ClusterTemplateManager;
import org.apache.iotdb.db.metadata.template.ITemplateManager;
@@ -50,7 +50,7 @@ import java.util.stream.IntStream;
public class ClusterSchemaFetcher implements ISchemaFetcher {
- private final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
+ private final CommonConfig config = CommonDescriptor.getInstance().getConf();
private final Coordinator coordinator = Coordinator.getInstance();
private final DataNodeSchemaCache schemaCache = DataNodeSchemaCache.getInstance();
@@ -178,7 +178,7 @@ public class ClusterSchemaFetcher implements ISchemaFetcher {
schemaTree.mergeSchemaTree(remoteSchemaTree);
}
- if (!config.isAutoCreateSchemaEnabled()) {
+ if (!config.isEnableAutoCreateSchema()) {
return schemaTree;
}
@@ -247,7 +247,7 @@ public class ClusterSchemaFetcher implements ISchemaFetcher {
schemaTree.mergeSchemaTree(remoteSchemaTree);
}
- if (!config.isAutoCreateSchemaEnabled()) {
+ if (!config.isEnableAutoCreateSchema()) {
return schemaTree;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/CreateContinuousQueryStatement.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/CreateContinuousQueryStatement.java
index 969ef478b8..7f4c0c2b9f 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/CreateContinuousQueryStatement.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/statement/metadata/CreateContinuousQueryStatement.java
@@ -19,9 +19,9 @@
package org.apache.iotdb.db.mpp.plan.statement.metadata;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.cq.TimeoutPolicy;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.sql.SemanticException;
import org.apache.iotdb.db.mpp.plan.analyze.ExpressionAnalyzer;
import org.apache.iotdb.db.mpp.plan.analyze.QueryType;
@@ -175,12 +175,12 @@ public class CreateContinuousQueryStatement extends Statement implements IConfig
public void semanticCheck() {
if (everyInterval
- < IoTDBDescriptor.getInstance().getConf().getContinuousQueryMinimumEveryInterval()) {
+ < CommonDescriptor.getInstance().getConf().getContinuousQueryMinEveryIntervalInMs()) {
throw new SemanticException(
String.format(
"CQ: Every interval [%d] should not be lower than the `continuous_query_minimum_every_interval` [%d] configured.",
everyInterval,
- IoTDBDescriptor.getInstance().getConf().getContinuousQueryMinimumEveryInterval()));
+ CommonDescriptor.getInstance().getConf().getContinuousQueryMinEveryIntervalInMs()));
}
if (startTimeOffset <= 0) {
throw new SemanticException("CQ: The start time offset should be greater than 0.");
diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java
index a0f3808fdf..ee5a76b730 100644
--- a/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/GrafanaApiServiceImpl.java
@@ -17,9 +17,9 @@
package org.apache.iotdb.db.protocol.rest.impl;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.db.conf.IoTDBConfig;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.mpp.plan.Coordinator;
import org.apache.iotdb.db.mpp.plan.analyze.ClusterPartitionFetcher;
import org.apache.iotdb.db.mpp.plan.analyze.IPartitionFetcher;
@@ -55,7 +55,7 @@ import java.util.List;
public class GrafanaApiServiceImpl extends GrafanaApiService {
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
+ private static final CommonConfig config = CommonDescriptor.getInstance().getConf();
private static final Coordinator COORDINATOR = Coordinator.getInstance();
@@ -73,7 +73,7 @@ public class GrafanaApiServiceImpl extends GrafanaApiService {
SCHEMA_FETCHER = ClusterSchemaFetcher.getInstance();
authorizationHandler = new AuthorizationHandler();
- switch (IoTDBDescriptor.getInstance().getConf().getTimestampPrecision()) {
+ switch (CommonDescriptor.getInstance().getConf().getTimestampPrecision()) {
case "ns":
timePrecision = 1000000;
break;
diff --git a/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java
index 51f727444d..901e59f44a 100644
--- a/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/protocol/rest/impl/RestApiServiceImpl.java
@@ -17,8 +17,8 @@
package org.apache.iotdb.db.protocol.rest.impl;
-import org.apache.iotdb.db.conf.IoTDBConfig;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.db.conf.rest.IoTDBRestServiceDescriptor;
import org.apache.iotdb.db.mpp.plan.Coordinator;
import org.apache.iotdb.db.mpp.plan.analyze.ClusterPartitionFetcher;
@@ -51,7 +51,7 @@ import java.time.ZoneId;
public class RestApiServiceImpl extends RestApiService {
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
+ private static final CommonConfig config = CommonDescriptor.getInstance().getConf();
private static final Coordinator COORDINATOR = Coordinator.getInstance();
diff --git a/server/src/main/java/org/apache/iotdb/db/service/basic/QueryFrequencyRecorder.java b/server/src/main/java/org/apache/iotdb/db/service/basic/QueryFrequencyRecorder.java
index 5c4290f4c4..14444468db 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/basic/QueryFrequencyRecorder.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/basic/QueryFrequencyRecorder.java
@@ -20,8 +20,10 @@ package org.apache.iotdb.db.service.basic;
import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory;
import org.apache.iotdb.commons.concurrent.threadpool.ScheduledExecutorUtil;
+import org.apache.iotdb.commons.conf.CommonConfig;
import org.apache.iotdb.db.conf.IoTDBConfig;
+import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -34,7 +36,7 @@ public class QueryFrequencyRecorder {
private static final Logger QUERY_FREQUENCY_LOGGER = LoggerFactory.getLogger("QUERY_FREQUENCY");
private static final AtomicInteger QUERY_COUNT = new AtomicInteger(0);
- public QueryFrequencyRecorder(IoTDBConfig config) {
+ public QueryFrequencyRecorder(TSFileConfig config) {
ScheduledExecutorService timedQuerySqlCountThread =
IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor("timedQuerySqlCount");
ScheduledExecutorUtil.safelyScheduleAtFixedRate(
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePlugin.java b/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePlugin.java
index 9928e1ff87..e87b9e7073 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePlugin.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/externalpipe/ExtPipePlugin.java
@@ -21,9 +21,9 @@ package org.apache.iotdb.db.sync.externalpipe;
import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory;
import org.apache.iotdb.commons.concurrent.ThreadName;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.path.MeasurementPath;
import org.apache.iotdb.commons.utils.TestOnly;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.sync.datasource.PipeOpManager;
import org.apache.iotdb.db.sync.datasource.PipeStorageGroupInfo;
import org.apache.iotdb.db.sync.externalpipe.operation.DeleteOperation;
@@ -93,7 +93,7 @@ public class ExtPipePlugin {
this.pipeOpManager = pipeOpManager;
this.extPipePluginManager = extPipePluginManager;
- String timePrecision = IoTDBDescriptor.getInstance().getConf().getTimestampPrecision();
+ String timePrecision = CommonDescriptor.getInstance().getConf().getTimestampPrecision();
switch (timePrecision) {
case "ms":
timestampDivisor = 1;
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/DeletionLoader.java b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/DeletionLoader.java
index 048a296f3d..832392d9ed 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/DeletionLoader.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/DeletionLoader.java
@@ -63,7 +63,7 @@ public class DeletionLoader implements ILoader {
"",
PARTITION_FETCHER,
SCHEMA_FETCHER,
- IoTDBDescriptor.getInstance().getConf().getQueryTimeoutThreshold());
+ CommonDescriptor.getInstance().getConf().getQueryTimeoutThreshold());
if (result.status.code != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
logger.error("Delete {} error, statement: {}.", deletion, statement);
logger.error("Delete result status : {}.", result.status);
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/TsFileLoader.java b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/TsFileLoader.java
index d17c4531e9..1413fa06f6 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/TsFileLoader.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/TsFileLoader.java
@@ -18,10 +18,10 @@
*/
package org.apache.iotdb.db.sync.pipedata.load;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.exception.sync.PipeDataLoadException;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.LoadFileException;
import org.apache.iotdb.db.mpp.plan.Coordinator;
import org.apache.iotdb.db.mpp.plan.execution.ExecutionResult;
@@ -66,7 +66,7 @@ public class TsFileLoader implements ILoader {
"",
PARTITION_FETCHER,
SCHEMA_FETCHER,
- IoTDBDescriptor.getInstance().getConf().getQueryTimeoutThreshold());
+ CommonDescriptor.getInstance().getConf().getQueryTimeoutThreshold());
if (result.status.code != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
logger.error("Load TsFile {} error, statement: {}.", tsFile.getPath(), statement);
logger.error("Load TsFile result status : {}.", result.status);
diff --git a/server/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java b/server/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java
index 4c1a3f6070..f6f0d49ea6 100644
--- a/server/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java
+++ b/server/src/main/java/org/apache/iotdb/db/trigger/executor/TriggerFireVisitor.java
@@ -23,6 +23,7 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.commons.client.IClientManager;
import org.apache.iotdb.commons.client.exception.ClientManagerException;
import org.apache.iotdb.commons.client.sync.SyncDataNodeInternalServiceClient;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.consensus.ConfigNodeRegionId;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.trigger.TriggerInformation;
@@ -32,7 +33,6 @@ import org.apache.iotdb.confignode.rpc.thrift.TTriggerState;
import org.apache.iotdb.db.client.ConfigNodeClient;
import org.apache.iotdb.db.client.ConfigNodeClientManager;
import org.apache.iotdb.db.client.ConfigNodeInfo;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.mpp.plan.Coordinator;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNode;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanVisitor;
@@ -75,7 +75,7 @@ public class TriggerFireVisitor extends PlanVisitor<TriggerFireResult, TriggerEv
* How many times should we retry when error occurred during firing a trigger on another datanode
*/
private static final int FIRE_RETRY_NUM =
- IoTDBDescriptor.getInstance().getConf().getRetryNumToFindStatefulTrigger();
+ CommonDescriptor.getInstance().getConf().getStatefulTriggerRetryNumWhenNotFound();
@Override
public TriggerFireResult process(PlanNode node, TriggerEvent context) {
diff --git a/server/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java b/server/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java
index 2d70e7cf1d..24a3cc5405 100644
--- a/server/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java
+++ b/server/src/main/java/org/apache/iotdb/db/utils/OpenFileNumUtil.java
@@ -52,8 +52,8 @@ public class OpenFileNumUtil {
// command 'lsof -p' is available on most Linux distro except CentOS.
private static final String SEARCH_OPEN_DATA_FILE_BY_PID = "lsof -p %d";
- private static IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
- private static CommonConfig commonConfig = CommonDescriptor.getInstance().getConf();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
+ private static final CommonConfig commonConfig = CommonDescriptor.getInstance().getConf();
private static DirectoryManager directoryManager = DirectoryManager.getInstance();
private static final String[] COMMAND_TEMPLATE = {"/bin/bash", "-c", ""};
private static boolean isOutputValid = false;
@@ -268,7 +268,7 @@ public class OpenFileNumUtil {
TOTAL_OPEN_FILE_NUM(null),
SEQUENCE_FILE_OPEN_NUM(directoryManager.getAllSequenceFileFolders()),
UNSEQUENCE_FILE_OPEN_NUM(directoryManager.getAllUnSequenceFileFolders()),
- WAL_OPEN_FILE_NUM(Arrays.asList(commonConfig.getWalDirs())),
+ WAL_OPEN_FILE_NUM(Arrays.asList(config.getDnWalDirs())),
DIGEST_OPEN_FILE_NUM(Collections.singletonList(config.getDnSystemDir())),
SOCKET_OPEN_FILE_NUM(null);
diff --git a/server/src/main/java/org/apache/iotdb/db/wal/allocation/AbstractNodeAllocationStrategy.java b/server/src/main/java/org/apache/iotdb/db/wal/allocation/AbstractNodeAllocationStrategy.java
index f63da81a0a..669b0d4046 100644
--- a/server/src/main/java/org/apache/iotdb/db/wal/allocation/AbstractNodeAllocationStrategy.java
+++ b/server/src/main/java/org/apache/iotdb/db/wal/allocation/AbstractNodeAllocationStrategy.java
@@ -18,8 +18,8 @@
*/
package org.apache.iotdb.db.wal.allocation;
-import org.apache.iotdb.commons.conf.CommonConfig;
-import org.apache.iotdb.commons.conf.CommonDescriptor;
+import org.apache.iotdb.db.conf.IoTDBConfig;
+import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.conf.directories.FolderManager;
import org.apache.iotdb.db.conf.directories.strategy.DirectoryStrategyType;
import org.apache.iotdb.db.exception.DiskSpaceInsufficientException;
@@ -37,7 +37,7 @@ import java.util.Arrays;
public abstract class AbstractNodeAllocationStrategy implements NodeAllocationStrategy {
private static final Logger logger =
LoggerFactory.getLogger(AbstractNodeAllocationStrategy.class);
- private static final CommonConfig commonConfig = CommonDescriptor.getInstance().getConf();
+ private static final IoTDBConfig iotdbConfig = IoTDBDescriptor.getInstance().getConf();
/** manage wal folders */
protected FolderManager folderManager;
@@ -46,7 +46,7 @@ public abstract class AbstractNodeAllocationStrategy implements NodeAllocationSt
try {
folderManager =
new FolderManager(
- Arrays.asList(commonConfig.getWalDirs()), DirectoryStrategyType.SEQUENCE_STRATEGY);
+ Arrays.asList(iotdbConfig.getDnWalDirs()), DirectoryStrategyType.SEQUENCE_STRATEGY);
} catch (DiskSpaceInsufficientException e) {
logger.error(
"Fail to create wal node allocation strategy because all disks of wal folders are full.",
diff --git a/server/src/main/java/org/apache/iotdb/db/wal/buffer/WALInfoEntry.java b/server/src/main/java/org/apache/iotdb/db/wal/buffer/WALInfoEntry.java
index 4036a9aed3..1e1ecb5f73 100644
--- a/server/src/main/java/org/apache/iotdb/db/wal/buffer/WALInfoEntry.java
+++ b/server/src/main/java/org/apache/iotdb/db/wal/buffer/WALInfoEntry.java
@@ -18,14 +18,14 @@
*/
package org.apache.iotdb.db.wal.buffer;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.wal.WALMode;
-import org.apache.iotdb.db.conf.IoTDBConfig;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertTabletNode;
/** This entry class stores info for persistence */
public class WALInfoEntry extends WALEntry {
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
+ private static final CommonConfig config = CommonDescriptor.getInstance().getConf();
/** wal entry type 1 byte, memTable id 8 bytes */
public static final int FIXED_SERIALIZED_SIZE = Byte.BYTES + Long.BYTES;
diff --git a/server/src/main/java/org/apache/iotdb/db/wal/recover/WALNodeRecoverTask.java b/server/src/main/java/org/apache/iotdb/db/wal/recover/WALNodeRecoverTask.java
index bd02dea8c2..aa37866f1c 100644
--- a/server/src/main/java/org/apache/iotdb/db/wal/recover/WALNodeRecoverTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/wal/recover/WALNodeRecoverTask.java
@@ -18,6 +18,8 @@
*/
package org.apache.iotdb.db.wal.recover;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.file.SystemFileFactory;
import org.apache.iotdb.commons.utils.FileUtils;
import org.apache.iotdb.consensus.ConsensusFactory;
@@ -53,7 +55,7 @@ import static org.apache.iotdb.consensus.iot.wal.ConsensusReqReader.DEFAULT_SEAR
/** This task is responsible for the recovery of one wal node. */
public class WALNodeRecoverTask implements Runnable {
private static final Logger logger = LoggerFactory.getLogger(WALNodeRecoverTask.class);
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
+ private static final CommonConfig config = CommonDescriptor.getInstance().getConf();
private static final WALRecoverManager walRecoverManger = WALRecoverManager.getInstance();
/** this directory store one wal node's .wal and .checkpoint files */
@@ -94,7 +96,7 @@ public class WALNodeRecoverTask implements Runnable {
}
}
- if (!config.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.IOT_CONSENSUS)) {
+ if (!config.getDataRegionConsensusProtocolClass().getProtocol().equals(ConsensusFactory.IOT_CONSENSUS)) {
// delete this wal node folder
FileUtils.deleteDirectory(logDirectory);
logger.info(
diff --git a/server/src/main/java/org/apache/iotdb/db/wal/recover/WALRecoverManager.java b/server/src/main/java/org/apache/iotdb/db/wal/recover/WALRecoverManager.java
index 860a1cdab0..8d1dae4507 100644
--- a/server/src/main/java/org/apache/iotdb/db/wal/recover/WALRecoverManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/wal/recover/WALRecoverManager.java
@@ -20,10 +20,10 @@ package org.apache.iotdb.db.wal.recover;
import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory;
import org.apache.iotdb.commons.concurrent.ThreadName;
-import org.apache.iotdb.commons.conf.CommonConfig;
-import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.file.SystemFileFactory;
import org.apache.iotdb.commons.utils.TestOnly;
+import org.apache.iotdb.db.conf.IoTDBConfig;
+import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.DataRegionException;
import org.apache.iotdb.db.exception.runtime.StorageEngineFailureException;
import org.apache.iotdb.db.wal.exception.WALRecoverException;
@@ -48,7 +48,8 @@ import java.util.concurrent.Future;
/** First set allVsgScannedLatch, then call recover method. */
public class WALRecoverManager {
private static final Logger logger = LoggerFactory.getLogger(WALRecoverManager.class);
- private static final CommonConfig commonConfig = CommonDescriptor.getInstance().getConf();
+
+ private static final IoTDBConfig IOTDB_CONFIG = IoTDBDescriptor.getInstance().getConf();
/** true when the recover procedure has started */
private volatile boolean hasStarted = false;
@@ -67,7 +68,7 @@ public class WALRecoverManager {
try {
// collect wal nodes' information
List<File> walNodeDirs = new ArrayList<>();
- for (String walDir : commonConfig.getWalDirs()) {
+ for (String walDir : IOTDB_CONFIG.getDnWalDirs()) {
File walDirFile = SystemFileFactory.INSTANCE.getFile(walDir);
File[] nodeDirs = walDirFile.listFiles(File::isDirectory);
if (nodeDirs == null) {
[iotdb] 04/04: For test
Posted by yo...@apache.org.
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 1d82745221e8c31091dac6afaee270e4923b256e
Author: YongzaoDan <53...@qq.com>
AuthorDate: Thu Jan 12 23:35:02 2023 +0800
For test
---
.../impl/RewriteCrossSpaceCompactionSelector.java | 2 +-
.../metadata/cache/DataNodeLastCacheManager.java | 1 -
.../plan/analyze/ColumnPaginationController.java | 4 +---
.../db/service/basic/QueryFrequencyRecorder.java | 4 +---
.../db/sync/pipedata/load/DeletionLoader.java | 1 -
.../iotdb/db/wal/recover/WALNodeRecoverTask.java | 7 ++++---
.../schemaRegion/SchemaRegionManagementTest.java | 22 +++++++++++++---------
.../execution/schedule/DriverSchedulerTest.java | 3 ++-
.../mpp/plan/analyze/FakePartitionFetcherImpl.java | 17 +++++++++--------
.../mpp/plan/analyze/cache/PartitionCacheTest.java | 6 ++++--
.../mpp/plan/plan/FragmentInstanceSerdeTest.java | 4 +++-
.../iotdb/db/mpp/plan/plan/distribution/Util.java | 13 +++++++------
.../plan/node/write/WritePlanNodeSplitTest.java | 6 ++++--
.../org/apache/iotdb/db/wal/WALManagerTest.java | 6 +++---
.../db/wal/allocation/ElasticStrategyTest.java | 10 +++++++---
.../db/wal/allocation/FirstCreateStrategyTest.java | 10 ++++++----
.../db/wal/allocation/RoundRobinStrategyTest.java | 9 ++++++---
.../iotdb/db/wal/buffer/WALBufferCommonTest.java | 10 +++++++---
18 files changed, 78 insertions(+), 57 deletions(-)
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 467965b794..5eeb806725 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/impl/RewriteCrossSpaceCompactionSelector.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/selector/impl/RewriteCrossSpaceCompactionSelector.java
@@ -17,7 +17,7 @@
* under the License.
*/
package org.apache.iotdb.db.engine.compaction.selector.impl;
-import org.apache.iotdb.commons.conf.CommonConfig;
+
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.db.conf.IoTDBConfig;
diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeLastCacheManager.java b/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeLastCacheManager.java
index 7f7a58b2f5..88106639e3 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeLastCacheManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/cache/DataNodeLastCacheManager.java
@@ -20,7 +20,6 @@
package org.apache.iotdb.db.metadata.cache;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.metadata.cache.lastCache.container.ILastCacheContainer;
import org.apache.iotdb.tsfile.read.TimeValuePair;
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ColumnPaginationController.java b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ColumnPaginationController.java
index 1de6a6f81d..08ada6a243 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ColumnPaginationController.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/plan/analyze/ColumnPaginationController.java
@@ -20,14 +20,12 @@
package org.apache.iotdb.db.mpp.plan.analyze;
import org.apache.iotdb.commons.conf.CommonDescriptor;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.exception.sql.PathNumOverLimitException;
/** apply MaxQueryDeduplicatedPathNum and SLIMIT & SOFFSET */
public class ColumnPaginationController {
- private int curLimit =
- CommonDescriptor.getInstance().getConf().getMaxDeduplicatedPathNum() + 1;
+ private int curLimit = CommonDescriptor.getInstance().getConf().getMaxDeduplicatedPathNum() + 1;
private int curOffset;
// records the path number that the SchemaProcessor totally returned
diff --git a/server/src/main/java/org/apache/iotdb/db/service/basic/QueryFrequencyRecorder.java b/server/src/main/java/org/apache/iotdb/db/service/basic/QueryFrequencyRecorder.java
index 14444468db..542d32def1 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/basic/QueryFrequencyRecorder.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/basic/QueryFrequencyRecorder.java
@@ -20,10 +20,8 @@ package org.apache.iotdb.db.service.basic;
import org.apache.iotdb.commons.concurrent.IoTDBThreadPoolFactory;
import org.apache.iotdb.commons.concurrent.threadpool.ScheduledExecutorUtil;
-import org.apache.iotdb.commons.conf.CommonConfig;
-import org.apache.iotdb.db.conf.IoTDBConfig;
-
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/DeletionLoader.java b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/DeletionLoader.java
index 832392d9ed..ee2f058e68 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/DeletionLoader.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/pipedata/load/DeletionLoader.java
@@ -20,7 +20,6 @@ package org.apache.iotdb.db.sync.pipedata.load;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.exception.sync.PipeDataLoadException;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.modification.Deletion;
import org.apache.iotdb.db.exception.LoadFileException;
import org.apache.iotdb.db.mpp.plan.Coordinator;
diff --git a/server/src/main/java/org/apache/iotdb/db/wal/recover/WALNodeRecoverTask.java b/server/src/main/java/org/apache/iotdb/db/wal/recover/WALNodeRecoverTask.java
index aa37866f1c..a7cc6550f7 100644
--- a/server/src/main/java/org/apache/iotdb/db/wal/recover/WALNodeRecoverTask.java
+++ b/server/src/main/java/org/apache/iotdb/db/wal/recover/WALNodeRecoverTask.java
@@ -23,8 +23,6 @@ import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.file.SystemFileFactory;
import org.apache.iotdb.commons.utils.FileUtils;
import org.apache.iotdb.consensus.ConsensusFactory;
-import org.apache.iotdb.db.conf.IoTDBConfig;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.engine.memtable.AbstractMemTable;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertNode;
import org.apache.iotdb.db.wal.WALManager;
@@ -96,7 +94,10 @@ public class WALNodeRecoverTask implements Runnable {
}
}
- if (!config.getDataRegionConsensusProtocolClass().getProtocol().equals(ConsensusFactory.IOT_CONSENSUS)) {
+ if (!config
+ .getDataRegionConsensusProtocolClass()
+ .getProtocol()
+ .equals(ConsensusFactory.IOT_CONSENSUS)) {
// delete this wal node folder
FileUtils.deleteDirectory(logDirectory);
logger.info(
diff --git a/server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionManagementTest.java b/server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionManagementTest.java
index c85b87b329..89ea99f0a5 100644
--- a/server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionManagementTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionManagementTest.java
@@ -19,6 +19,9 @@
package org.apache.iotdb.db.metadata.schemaRegion;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
+import org.apache.iotdb.commons.consensus.ConsensusProtocolClass;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.file.SystemFileFactory;
import org.apache.iotdb.commons.path.PartialPath;
@@ -49,6 +52,7 @@ import java.util.Map;
public class SchemaRegionManagementTest extends AbstractSchemaRegionTest {
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
public SchemaRegionManagementTest(SchemaRegionTestParams testParams) {
@@ -57,8 +61,8 @@ public class SchemaRegionManagementTest extends AbstractSchemaRegionTest {
@Test
public void testRatisModeSnapshot() throws Exception {
- String schemaRegionConsensusProtocolClass = config.getSchemaRegionConsensusProtocolClass();
- config.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS);
+ String schemaRegionConsensusProtocolClass = COMMON_CONFIG.getSchemaRegionConsensusProtocolClass().getProtocol();
+ COMMON_CONFIG.setSchemaRegionConsensusProtocolClass(ConsensusProtocolClass.RATIS_CONSENSUS);
try {
ISchemaRegion schemaRegion = getSchemaRegion("root.sg", 0);
@@ -139,7 +143,7 @@ public class SchemaRegionManagementTest extends AbstractSchemaRegionTest {
new PartialPath("root.sg.d2.s1").getFullPath(), result.get(1).getFullPath());
} finally {
- config.setSchemaRegionConsensusProtocolClass(schemaRegionConsensusProtocolClass);
+ COMMON_CONFIG.setSchemaRegionConsensusProtocolClass(ConsensusProtocolClass.parse(schemaRegionConsensusProtocolClass));
}
}
@@ -157,8 +161,8 @@ public class SchemaRegionManagementTest extends AbstractSchemaRegionTest {
@Test
public void testEmptySnapshot() throws Exception {
- String schemaRegionConsensusProtocolClass = config.getSchemaRegionConsensusProtocolClass();
- config.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS);
+ String schemaRegionConsensusProtocolClass = COMMON_CONFIG.getSchemaRegionConsensusProtocolClass().getProtocol();
+ COMMON_CONFIG.setSchemaRegionConsensusProtocolClass(ConsensusProtocolClass.RATIS_CONSENSUS);
try {
ISchemaRegion schemaRegion = getSchemaRegion("root.sg", 0);
@@ -196,15 +200,15 @@ public class SchemaRegionManagementTest extends AbstractSchemaRegionTest {
Assert.assertEquals(0, result.size());
} finally {
- config.setSchemaRegionConsensusProtocolClass(schemaRegionConsensusProtocolClass);
+ COMMON_CONFIG.setSchemaRegionConsensusProtocolClass(ConsensusProtocolClass.parse(schemaRegionConsensusProtocolClass));
}
}
@Test
@Ignore
public void testSnapshotPerformance() throws Exception {
- String schemaRegionConsensusProtocolClass = config.getSchemaRegionConsensusProtocolClass();
- config.setSchemaRegionConsensusProtocolClass(ConsensusFactory.RATIS_CONSENSUS);
+ String schemaRegionConsensusProtocolClass = COMMON_CONFIG.getSchemaRegionConsensusProtocolClass().getProtocol();
+ COMMON_CONFIG.setSchemaRegionConsensusProtocolClass(ConsensusProtocolClass.RATIS_CONSENSUS);
try {
ISchemaRegion schemaRegion = getSchemaRegion("root.sg", 0);
@@ -236,7 +240,7 @@ public class SchemaRegionManagementTest extends AbstractSchemaRegionTest {
schemaRegion.loadSnapshot(snapshotDir);
} finally {
- config.setSchemaRegionConsensusProtocolClass(schemaRegionConsensusProtocolClass);
+ COMMON_CONFIG.setSchemaRegionConsensusProtocolClass(ConsensusProtocolClass.parse(schemaRegionConsensusProtocolClass));
}
}
}
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/execution/schedule/DriverSchedulerTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/execution/schedule/DriverSchedulerTest.java
index 65e25badee..cbdf040b89 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/execution/schedule/DriverSchedulerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/execution/schedule/DriverSchedulerTest.java
@@ -18,6 +18,7 @@
*/
package org.apache.iotdb.db.mpp.execution.schedule;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.mpp.common.FragmentInstanceId;
import org.apache.iotdb.db.mpp.common.PlanFragmentId;
@@ -41,7 +42,7 @@ public class DriverSchedulerTest {
private final DriverScheduler manager = DriverScheduler.getInstance();
private static final long QUERY_TIMEOUT_MS =
- IoTDBDescriptor.getInstance().getConf().getQueryTimeoutThreshold();
+ CommonDescriptor.getInstance().getConf().getQueryTimeoutThreshold();
@After
public void tearDown() {
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/plan/analyze/FakePartitionFetcherImpl.java b/server/src/test/java/org/apache/iotdb/db/mpp/plan/analyze/FakePartitionFetcherImpl.java
index f021296565..209b9e4bf2 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/plan/analyze/FakePartitionFetcherImpl.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/plan/analyze/FakePartitionFetcherImpl.java
@@ -26,6 +26,7 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot;
import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.partition.DataPartition;
import org.apache.iotdb.commons.partition.DataPartitionQueryParam;
import org.apache.iotdb.commons.partition.SchemaNodeManagementPartition;
@@ -44,10 +45,10 @@ import java.util.Map;
public class FakePartitionFetcherImpl implements IPartitionFetcher {
private final String seriesSlotExecutorName =
- IoTDBDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass();
+ CommonDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass();
private final int seriesPartitionSlotNum =
- IoTDBDescriptor.getInstance().getConf().getSeriesPartitionSlotNum();
+ CommonDescriptor.getInstance().getConf().getSeriesSlotNum();
private final SeriesPartitionExecutor partitionExecutor =
SeriesPartitionExecutor.getSeriesPartitionExecutor(
@@ -61,8 +62,8 @@ public class FakePartitionFetcherImpl implements IPartitionFetcher {
SchemaPartition schemaPartition =
new SchemaPartition(
- IoTDBDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
- IoTDBDescriptor.getInstance().getConf().getSeriesPartitionSlotNum());
+ CommonDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
+ CommonDescriptor.getInstance().getConf().getSeriesSlotNum());
Map<String, Map<TSeriesPartitionSlot, TRegionReplicaSet>> schemaPartitionMap = new HashMap<>();
Map<TSeriesPartitionSlot, TRegionReplicaSet> regionMap = new HashMap<>();
@@ -129,8 +130,8 @@ public class FakePartitionFetcherImpl implements IPartitionFetcher {
DataPartition dataPartition =
new DataPartition(
- IoTDBDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
- IoTDBDescriptor.getInstance().getConf().getSeriesPartitionSlotNum());
+ CommonDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
+ CommonDescriptor.getInstance().getConf().getSeriesSlotNum());
Map<String, Map<TSeriesPartitionSlot, Map<TTimePartitionSlot, List<TRegionReplicaSet>>>>
dataPartitionMap = new HashMap<>();
Map<TSeriesPartitionSlot, Map<TTimePartitionSlot, List<TRegionReplicaSet>>> sgPartitionMap =
@@ -228,8 +229,8 @@ public class FakePartitionFetcherImpl implements IPartitionFetcher {
// only test root.sg
DataPartition dataPartition =
new DataPartition(
- IoTDBDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
- IoTDBDescriptor.getInstance().getConf().getSeriesPartitionSlotNum());
+ CommonDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
+ CommonDescriptor.getInstance().getConf().getSeriesSlotNum());
Map<String, Map<TSeriesPartitionSlot, Map<TTimePartitionSlot, List<TRegionReplicaSet>>>>
dataPartitionMap = new HashMap<>();
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/plan/analyze/cache/PartitionCacheTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/plan/analyze/cache/PartitionCacheTest.java
index 19fa3ff21d..f2d94e4eb3 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/plan/analyze/cache/PartitionCacheTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/plan/analyze/cache/PartitionCacheTest.java
@@ -25,6 +25,8 @@ import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot;
import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.partition.DataPartition;
import org.apache.iotdb.commons.partition.DataPartitionQueryParam;
import org.apache.iotdb.commons.partition.SchemaPartition;
@@ -53,10 +55,10 @@ import static org.junit.Assert.fail;
public class PartitionCacheTest {
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
+ private static final CommonConfig config = CommonDescriptor.getInstance().getConf();
private static final SeriesPartitionExecutor partitionExecutor =
SeriesPartitionExecutor.getSeriesPartitionExecutor(
- config.getSeriesPartitionExecutorClass(), config.getSeriesPartitionSlotNum());
+ config.getSeriesPartitionExecutorClass(), config.getSeriesSlotNum());
private static final Set<String> storageGroups = new HashSet<>();
private static final Map<String, Map<TSeriesPartitionSlot, TConsensusGroupId>>
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/FragmentInstanceSerdeTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/FragmentInstanceSerdeTest.java
index e7f3d96a6c..ec976b613d 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/FragmentInstanceSerdeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/FragmentInstanceSerdeTest.java
@@ -23,6 +23,8 @@ import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType;
import org.apache.iotdb.common.rpc.thrift.TDataNodeLocation;
import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.partition.QueryExecutor;
import org.apache.iotdb.commons.partition.StorageExecutor;
@@ -53,7 +55,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
public class FragmentInstanceSerdeTest {
- private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
+ private static final CommonConfig config = CommonDescriptor.getInstance().getConf();
private static final SessionInfo sessionInfo =
new SessionInfo(1, "test", ZoneId.systemDefault().getId());
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/distribution/Util.java b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/distribution/Util.java
index 8282b1bcfa..d283fac011 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/distribution/Util.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/distribution/Util.java
@@ -26,6 +26,7 @@ import org.apache.iotdb.common.rpc.thrift.TEndPoint;
import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot;
import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.partition.DataPartition;
import org.apache.iotdb.commons.partition.DataPartitionQueryParam;
@@ -78,8 +79,8 @@ public class Util {
try {
SeriesPartitionExecutor executor =
SeriesPartitionExecutor.getSeriesPartitionExecutor(
- IoTDBDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
- IoTDBDescriptor.getInstance().getConf().getSeriesPartitionSlotNum());
+ CommonDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
+ CommonDescriptor.getInstance().getConf().getSeriesSlotNum());
Analysis analysis = new Analysis();
String device1 = "root.sg.d1";
@@ -121,8 +122,8 @@ public class Util {
DataPartition dataPartition =
new DataPartition(
- IoTDBDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
- IoTDBDescriptor.getInstance().getConf().getSeriesPartitionSlotNum());
+ CommonDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
+ CommonDescriptor.getInstance().getConf().getSeriesSlotNum());
Map<String, Map<TSeriesPartitionSlot, Map<TTimePartitionSlot, List<TRegionReplicaSet>>>>
dataPartitionMap = new HashMap<>();
@@ -197,8 +198,8 @@ public class Util {
// construct schema partition
SchemaPartition schemaPartition =
new SchemaPartition(
- IoTDBDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
- IoTDBDescriptor.getInstance().getConf().getSeriesPartitionSlotNum());
+ CommonDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass(),
+ CommonDescriptor.getInstance().getConf().getSeriesSlotNum());
Map<String, Map<TSeriesPartitionSlot, TRegionReplicaSet>> schemaPartitionMap =
new HashMap<>();
diff --git a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/write/WritePlanNodeSplitTest.java b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/write/WritePlanNodeSplitTest.java
index 1da51e2df1..5b0bd0c69c 100644
--- a/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/write/WritePlanNodeSplitTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/mpp/plan/plan/node/write/WritePlanNodeSplitTest.java
@@ -19,11 +19,13 @@
package org.apache.iotdb.db.mpp.plan.plan.node.write;
+import org.aopalliance.reflect.Code;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupId;
import org.apache.iotdb.common.rpc.thrift.TConsensusGroupType;
import org.apache.iotdb.common.rpc.thrift.TRegionReplicaSet;
import org.apache.iotdb.common.rpc.thrift.TSeriesPartitionSlot;
import org.apache.iotdb.common.rpc.thrift.TTimePartitionSlot;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.partition.DataPartition;
import org.apache.iotdb.commons.partition.DataPartitionQueryParam;
@@ -73,8 +75,8 @@ public class WritePlanNodeSplitTest {
IoTDBDescriptor.getInstance().getConf().setDnTimePartitionInterval(100);
TimePartitionUtils.setTimePartitionInterval(100);
- executorClassName = IoTDBDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass();
- seriesSlotPartitionNum = IoTDBDescriptor.getInstance().getConf().getSeriesPartitionSlotNum();
+ executorClassName = CommonDescriptor.getInstance().getConf().getSeriesPartitionExecutorClass();
+ seriesSlotPartitionNum = CommonDescriptor.getInstance().getConf().getSeriesSlotNum();
partitionExecutor =
SeriesPartitionExecutor.getSeriesPartitionExecutor(
executorClassName, seriesSlotPartitionNum);
diff --git a/server/src/test/java/org/apache/iotdb/db/wal/WALManagerTest.java b/server/src/test/java/org/apache/iotdb/db/wal/WALManagerTest.java
index 2e8bfe5dd6..451c1f6e98 100644
--- a/server/src/test/java/org/apache/iotdb/db/wal/WALManagerTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/wal/WALManagerTest.java
@@ -58,8 +58,8 @@ public class WALManagerTest {
@Before
public void setUp() throws Exception {
- prevWalDirs = commonConfig.getWalDirs();
- commonConfig.setWalDirs(walDirs);
+ prevWalDirs = config.getDnWalDirs();
+ config.setDnWalDirs(walDirs);
EnvironmentUtils.envSetUp();
}
@@ -69,7 +69,7 @@ public class WALManagerTest {
for (String walDir : walDirs) {
EnvironmentUtils.cleanDir(walDir);
}
- commonConfig.setWalDirs(prevWalDirs);
+ config.setDnWalDirs(prevWalDirs);
}
@Test
diff --git a/server/src/test/java/org/apache/iotdb/db/wal/allocation/ElasticStrategyTest.java b/server/src/test/java/org/apache/iotdb/db/wal/allocation/ElasticStrategyTest.java
index 9b1a2bda66..692e89f8c2 100644
--- a/server/src/test/java/org/apache/iotdb/db/wal/allocation/ElasticStrategyTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/wal/allocation/ElasticStrategyTest.java
@@ -22,6 +22,8 @@ import org.apache.iotdb.commons.conf.CommonConfig;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.exception.IllegalPathException;
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.TestConstant;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertRowNode;
@@ -43,6 +45,8 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class ElasticStrategyTest {
+
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private static final CommonConfig commonConfig = CommonDescriptor.getInstance().getConf();
private final String[] walDirs =
new String[] {
@@ -54,9 +58,9 @@ public class ElasticStrategyTest {
@Before
public void setUp() throws Exception {
- prevWalDirs = commonConfig.getWalDirs();
+ prevWalDirs = config.getDnWalDirs();
EnvironmentUtils.envSetUp();
- commonConfig.setWalDirs(walDirs);
+ config.setDnWalDirs(walDirs);
}
@After
@@ -65,7 +69,7 @@ public class ElasticStrategyTest {
for (String walDir : walDirs) {
EnvironmentUtils.cleanDir(walDir);
}
- commonConfig.setWalDirs(prevWalDirs);
+ config.setDnWalDirs(prevWalDirs);
}
@Test
diff --git a/server/src/test/java/org/apache/iotdb/db/wal/allocation/FirstCreateStrategyTest.java b/server/src/test/java/org/apache/iotdb/db/wal/allocation/FirstCreateStrategyTest.java
index 5bddd6338f..ccb4730f14 100644
--- a/server/src/test/java/org/apache/iotdb/db/wal/allocation/FirstCreateStrategyTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/wal/allocation/FirstCreateStrategyTest.java
@@ -22,6 +22,8 @@ import org.apache.iotdb.commons.conf.CommonConfig;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.exception.IllegalPathException;
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.TestConstant;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertRowNode;
@@ -43,7 +45,7 @@ import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
public class FirstCreateStrategyTest {
- private static final CommonConfig commonConfig = CommonDescriptor.getInstance().getConf();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private final String[] walDirs =
new String[] {
TestConstant.BASE_OUTPUT_PATH.concat("wal_test1"),
@@ -54,9 +56,9 @@ public class FirstCreateStrategyTest {
@Before
public void setUp() throws Exception {
- prevWalDirs = commonConfig.getWalDirs();
+ prevWalDirs = config.getDnWalDirs();
EnvironmentUtils.envSetUp();
- commonConfig.setWalDirs(walDirs);
+ config.setDnWalDirs(walDirs);
}
@After
@@ -65,7 +67,7 @@ public class FirstCreateStrategyTest {
for (String walDir : walDirs) {
EnvironmentUtils.cleanDir(walDir);
}
- commonConfig.setWalDirs(prevWalDirs);
+ config.setDnWalDirs(prevWalDirs);
}
@Test
diff --git a/server/src/test/java/org/apache/iotdb/db/wal/allocation/RoundRobinStrategyTest.java b/server/src/test/java/org/apache/iotdb/db/wal/allocation/RoundRobinStrategyTest.java
index 42b6f79dda..acf0072d80 100644
--- a/server/src/test/java/org/apache/iotdb/db/wal/allocation/RoundRobinStrategyTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/wal/allocation/RoundRobinStrategyTest.java
@@ -22,6 +22,8 @@ import org.apache.iotdb.commons.conf.CommonConfig;
import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.exception.IllegalPathException;
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.TestConstant;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.mpp.plan.planner.plan.node.write.InsertRowNode;
@@ -44,6 +46,7 @@ import static org.junit.Assert.assertTrue;
public class RoundRobinStrategyTest {
private static final CommonConfig commonConfig = CommonDescriptor.getInstance().getConf();
+ private static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
private final String[] walDirs =
new String[] {
TestConstant.BASE_OUTPUT_PATH.concat("wal_test1"),
@@ -54,9 +57,9 @@ public class RoundRobinStrategyTest {
@Before
public void setUp() throws Exception {
- prevWalDirs = commonConfig.getWalDirs();
+ prevWalDirs = config.getDnWalDirs();
EnvironmentUtils.envSetUp();
- commonConfig.setWalDirs(walDirs);
+ config.setDnWalDirs(walDirs);
}
@After
@@ -65,7 +68,7 @@ public class RoundRobinStrategyTest {
for (String walDir : walDirs) {
EnvironmentUtils.cleanDir(walDir);
}
- commonConfig.setWalDirs(prevWalDirs);
+ config.setDnWalDirs(prevWalDirs);
}
@Test
diff --git a/server/src/test/java/org/apache/iotdb/db/wal/buffer/WALBufferCommonTest.java b/server/src/test/java/org/apache/iotdb/db/wal/buffer/WALBufferCommonTest.java
index 0d9d9eac2d..230cef9660 100644
--- a/server/src/test/java/org/apache/iotdb/db/wal/buffer/WALBufferCommonTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/wal/buffer/WALBufferCommonTest.java
@@ -18,6 +18,8 @@
*/
package org.apache.iotdb.db.wal.buffer;
+import org.apache.iotdb.commons.conf.CommonConfig;
+import org.apache.iotdb.commons.conf.CommonDescriptor;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.db.conf.IoTDBConfig;
@@ -51,6 +53,8 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
public abstract class WALBufferCommonTest {
+
+ private static final CommonConfig COMMON_CONFIG = CommonDescriptor.getInstance().getConf();
protected static final IoTDBConfig config = IoTDBDescriptor.getInstance().getConf();
protected static final String identifier = String.valueOf(Integer.MAX_VALUE);
protected static final boolean preIsClusterMode = config.isClusterMode();
@@ -167,12 +171,12 @@ public abstract class WALBufferCommonTest {
@Test
public void testHugeWrite() throws Exception {
// use small buffer (only 32 bytes) to simulate huge write request
- int prevWalBufferSize = config.getWalBufferSize();
- config.setWalBufferSize(32);
+ int prevWalBufferSize = COMMON_CONFIG.getWalBufferSizeInByte();
+ COMMON_CONFIG.setWalBufferSizeInByte(32);
try {
testConcurrentWrite();
} finally {
- config.setWalBufferSize(prevWalBufferSize);
+ COMMON_CONFIG.setWalBufferSizeInByte(prevWalBufferSize);
}
}
}
[iotdb] 02/04: stash
Posted by yo...@apache.org.
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;