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:16 UTC
[iotdb] 04/04: For test
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);
}
}
}