This is an automated email from the ASF dual-hosted git repository.
tanxinyu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new acf07a220d2 Remove isClusterMode configuration (#12193)
acf07a220d2 is described below
commit acf07a220d232210e60ebe0ae63cc41d9f6ccf38
Author: Haonan <[email protected]>
AuthorDate: Fri Mar 22 09:57:32 2024 +0800
Remove isClusterMode configuration (#12193)
---
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 37 +++++++---------------
.../org/apache/iotdb/db/conf/IoTDBStartCheck.java | 17 +++-------
.../iotdb/db/queryengine/plan/Coordinator.java | 3 +-
.../db/queryengine/plan/parser/ASTVisitor.java | 22 -------------
.../plan/planner/plan/node/write/InsertNode.java | 30 +++---------------
.../apache/iotdb/db/schemaengine/SchemaEngine.java | 5 +--
.../schemaregion/impl/SchemaRegionMemoryImpl.java | 12 +++----
.../schemaregion/impl/SchemaRegionPBTreeImpl.java | 7 ++--
.../java/org/apache/iotdb/db/service/DataNode.java | 5 +--
.../apache/iotdb/db/service/IoTDBShutdownHook.java | 9 +++---
.../iotdb/db/storageengine/StorageEngine.java | 8 ++---
.../db/storageengine/dataregion/DataRegion.java | 7 ++--
.../storageengine/dataregion/wal/WALManager.java | 5 +--
.../schemaRegion/AbstractSchemaRegionTest.java | 22 ++++---------
.../event/TsFileInsertionDataContainerTest.java | 2 +-
.../wal/allocation/ElasticStrategyTest.java | 12 +++++++
.../wal/allocation/FirstCreateStrategyTest.java | 12 +++++++
.../wal/allocation/RoundRobinStrategyTest.java | 12 +++++++
.../dataregion/wal/buffer/WALBufferCommonTest.java | 3 --
.../dataregion/wal/io/WALFileTest.java | 5 ---
.../wal/node/ConsensusReqReaderTest.java | 2 --
.../dataregion/wal/node/WALEntryHandlerTest.java | 4 ---
.../dataregion/wal/node/WALNodeTest.java | 23 +++++++++++---
.../wal/node/WalDeleteOutdatedNewTest.java | 16 ++++++----
.../wal/recover/WALRecoverManagerTest.java | 5 ---
.../wal/recover/file/TsFilePlanRedoerTest.java | 4 ---
.../file/UnsealedTsFileRecoverPerformerTest.java | 5 ---
.../wal/utils/WALInsertNodeCacheTest.java | 4 ---
.../org/apache/iotdb/db/tools/MLogParserTest.java | 8 +++++
.../iotdb/db/tools/TsFileSelfCheckToolTest.java | 2 +-
.../iotdb/db/tools/TsFileSketchToolTest.java | 2 +-
.../db/utils/SchemaRegionSnapshotParserTest.java | 18 +++--------
32 files changed, 127 insertions(+), 201 deletions(-)
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
index 6be4d80e36d..a574e0260e5 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java
@@ -600,9 +600,6 @@ public class IoTDBConfig {
/** Replace implementation class of JDBC service */
private String rpcImplClassName = ClientRPCServiceImpl.class.getName();
- /** 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
@@ -1547,21 +1544,20 @@ public class IoTDBConfig {
}
public void checkMultiDirStrategyClassName() {
- if (isClusterMode) {
- for (String multiDirStrategy : CLUSTER_ALLOWED_MULTI_DIR_STRATEGIES) {
- // If the multiDirStrategyClassName is one of cluster allowed
strategy, the check is passed.
- if (multiDirStrategyClassName.equals(multiDirStrategy)
- || multiDirStrategyClassName.equals(MULTI_DIR_STRATEGY_PREFIX +
multiDirStrategy)) {
- return;
- }
+ confirmMultiDirStrategy();
+ for (String multiDirStrategy : CLUSTER_ALLOWED_MULTI_DIR_STRATEGIES) {
+ // If the multiDirStrategyClassName is one of cluster allowed strategy,
the check is passed.
+ if (multiDirStrategyClassName.equals(multiDirStrategy)
+ || multiDirStrategyClassName.equals(MULTI_DIR_STRATEGY_PREFIX +
multiDirStrategy)) {
+ return;
}
- String msg =
- String.format(
- "Cannot set multi_dir_strategy to %s, because cluster mode only
allows %s.",
- multiDirStrategyClassName,
Arrays.toString(CLUSTER_ALLOWED_MULTI_DIR_STRATEGIES));
- logger.error(msg);
- throw new RuntimeException(msg);
}
+ String msg =
+ String.format(
+ "Cannot set multi_dir_strategy to %s, because cluster mode only
allows %s.",
+ multiDirStrategyClassName,
Arrays.toString(CLUSTER_ALLOWED_MULTI_DIR_STRATEGIES));
+ logger.error(msg);
+ throw new RuntimeException(msg);
}
public int getBatchSize() {
@@ -3027,15 +3023,6 @@ public class IoTDBConfig {
this.selectorNumOfClientManager = selectorNumOfClientManager;
}
- public boolean isClusterMode() {
- return isClusterMode;
- }
-
- public void setClusterMode(boolean isClusterMode) {
- this.isClusterMode = isClusterMode;
- checkMultiDirStrategyClassName();
- }
-
public String getClusterName() {
return clusterName;
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java
index 6f5229d656a..e37df2a3d66 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/conf/IoTDBStartCheck.java
@@ -209,8 +209,7 @@ public class IoTDBStartCheck {
for (String dataDir : config.getLocalDataDirs()) {
DirectoryChecker.getInstance().registerDirectory(new File(dataDir));
}
- if (config.isClusterMode()
- &&
config.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.RATIS_CONSENSUS))
{
+ if
(config.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.RATIS_CONSENSUS))
{
if (DirectoryChecker.getInstance().isCrossDisk(config.getDataDirs())) {
throw new ConfigurationException(
"Configuring the data directories as cross-disk directories is not
supported under RatisConsensus(it will be supported in a later version).");
@@ -219,19 +218,14 @@ public class IoTDBStartCheck {
// check system dir
DirectoryChecker.getInstance().registerDirectory(new
File(config.getSystemDir()));
// check WAL dir
- if (!(config.isClusterMode()
- && config
- .getDataRegionConsensusProtocolClass()
- .equals(ConsensusFactory.RATIS_CONSENSUS))
+ if
(!(config.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.RATIS_CONSENSUS))
&& !config.getWalMode().equals(WALMode.DISABLE)) {
for (String walDir : commonConfig.getWalDirs()) {
DirectoryChecker.getInstance().registerDirectory(new File(walDir));
}
}
- // in cluster mode, check consensus dir
- if (config.isClusterMode()) {
- DirectoryChecker.getInstance().registerDirectory(new
File(config.getConsensusDir()));
- }
+ // check consensus dir
+ DirectoryChecker.getInstance().registerDirectory(new
File(config.getConsensusDir()));
}
/**
@@ -274,8 +268,7 @@ public class IoTDBStartCheck {
systemProperties.forEach((k, v) -> properties.setProperty(k, v.get()));
properties.store(outputStream, SYSTEM_PROPERTIES_STRING);
}
- if (config.isClusterMode()
- &&
config.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.IOT_CONSENSUS)
+ if
(config.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.IOT_CONSENSUS)
&& config.getWalMode().equals(WALMode.DISABLE)) {
throw new ConfigurationException(
"Configuring the WALMode as disable is not supported under
IoTConsensus");
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/Coordinator.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/Coordinator.java
index d68f022c6dd..78c5be03828 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/Coordinator.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/Coordinator.java
@@ -225,8 +225,7 @@ public class Coordinator {
// TODO: (xingtanzjr) need to redo once we have a concrete policy for the
threadPool management
private ExecutorService getQueryExecutor() {
- int coordinatorReadExecutorSize =
- CONFIG.isClusterMode() ? CONFIG.getCoordinatorReadExecutorSize() : 1;
+ int coordinatorReadExecutorSize = CONFIG.getCoordinatorReadExecutorSize();
return IoTDBThreadPoolFactory.newFixedThreadPool(
coordinatorReadExecutorSize,
ThreadName.MPP_COORDINATOR_EXECUTOR_POOL.getName());
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java
index 22a8556a7cb..b478b0e79a5 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/parser/ASTVisitor.java
@@ -3166,9 +3166,6 @@ 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()) {
- throw new SemanticException("FLUSH ON CLUSTER is not supported in
standalone mode");
- }
flushStatement.setOnCluster(ctx.LOCAL() == null);
if (ctx.prefixPath(0) != null) {
storageGroups = new ArrayList<>();
@@ -3185,9 +3182,6 @@ 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()) {
- throw new SemanticException("CLEAR CACHE ON CLUSTER is not supported in
standalone mode");
- }
clearCacheStatement.setOnCluster(ctx.LOCAL() == null);
return clearCacheStatement;
}
@@ -3198,10 +3192,6 @@ public class ASTVisitor extends
IoTDBSqlParserBaseVisitor<Statement> {
public Statement visitStartRepairData(IoTDBSqlParser.StartRepairDataContext
ctx) {
StartRepairDataStatement startRepairDataStatement =
new StartRepairDataStatement(StatementType.START_REPAIR_DATA);
- if (ctx.CLUSTER() != null &&
!IoTDBDescriptor.getInstance().getConfig().isClusterMode()) {
- throw new SemanticException(
- "START REPAIR DATA ON CLUSTER is not supported in standalone mode");
- }
startRepairDataStatement.setOnCluster(ctx.LOCAL() == null);
return startRepairDataStatement;
}
@@ -3212,10 +3202,6 @@ public class ASTVisitor extends
IoTDBSqlParserBaseVisitor<Statement> {
public Statement visitStopRepairData(IoTDBSqlParser.StopRepairDataContext
ctx) {
StopRepairDataStatement stopRepairDataStatement =
new StopRepairDataStatement(StatementType.STOP_REPAIR_DATA);
- if (ctx.CLUSTER() != null &&
!IoTDBDescriptor.getInstance().getConfig().isClusterMode()) {
- throw new SemanticException(
- "STOP REPAIR DATA ON CLUSTER is not supported in standalone mode");
- }
stopRepairDataStatement.setOnCluster(ctx.LOCAL() == null);
return stopRepairDataStatement;
}
@@ -3226,10 +3212,6 @@ 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()) {
- throw new SemanticException(
- "LOAD CONFIGURATION ON CLUSTER is not supported in standalone mode");
- }
loadConfigurationStatement.setOnCluster(ctx.LOCAL() == null);
return loadConfigurationStatement;
}
@@ -3239,10 +3221,6 @@ 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()) {
- throw new SemanticException(
- "SET SYSTEM STATUS ON CLUSTER is not supported in standalone mode");
- }
setSystemStatusStatement.setOnCluster(ctx.LOCAL() == null);
if (ctx.RUNNING() != null) {
setSystemStatusStatement.setStatus(NodeStatus.Running);
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java
index 363c7894477..b4284f1d6d3 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/plan/node/write/InsertNode.java
@@ -25,7 +25,6 @@ import org.apache.iotdb.commons.consensus.index.ProgressIndex;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.utils.TestOnly;
import org.apache.iotdb.consensus.iot.log.ConsensusReqReader;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.WritePlanNode;
import org.apache.iotdb.db.storageengine.dataregion.memtable.DeviceIDFactory;
@@ -34,7 +33,6 @@ import
org.apache.iotdb.db.storageengine.dataregion.wal.utils.WALWriteUtils;
import org.apache.iotdb.tsfile.exception.NotImplementedException;
import org.apache.iotdb.tsfile.file.metadata.IDeviceID;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
-import org.apache.iotdb.tsfile.utils.ReadWriteIOUtils;
import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import java.io.DataInputStream;
@@ -189,13 +187,7 @@ public abstract class InsertNode extends WritePlanNode
implements ComparableCons
if (measurements[i] == null) {
continue;
}
- if (IoTDBDescriptor.getInstance().getConfig().isClusterMode()) {
- byteLen += WALWriteUtils.sizeToWrite(measurementSchemas[i]);
- } else {
- byteLen += ReadWriteIOUtils.sizeToWrite(measurements[i]);
- // datatype size
- byteLen++;
- }
+ byteLen += WALWriteUtils.sizeToWrite(measurementSchemas[i]);
}
return byteLen;
}
@@ -207,14 +199,7 @@ public abstract class InsertNode extends WritePlanNode
implements ComparableCons
if (measurements[i] == null) {
continue;
}
-
- // serialize measurementId only for standalone version for better write
performance
- if (IoTDBDescriptor.getInstance().getConfig().isClusterMode()) {
- WALWriteUtils.write(measurementSchemas[i], buffer);
- } else {
- WALWriteUtils.write(measurements[i], buffer);
- WALWriteUtils.write(dataTypes[i], buffer);
- }
+ WALWriteUtils.write(measurementSchemas[i], buffer);
}
}
@@ -224,14 +209,9 @@ public abstract class InsertNode extends WritePlanNode
implements ComparableCons
*/
protected void deserializeMeasurementSchemas(DataInputStream stream) throws
IOException {
for (int i = 0; i < measurements.length; i++) {
- if (IoTDBDescriptor.getInstance().getConfig().isClusterMode()) {
- measurementSchemas[i] = MeasurementSchema.deserializeFrom(stream);
- measurements[i] = measurementSchemas[i].getMeasurementId();
- dataTypes[i] = measurementSchemas[i].getType();
- } else {
- measurements[i] = ReadWriteIOUtils.readString(stream);
- dataTypes[i] =
TSDataType.deserialize(ReadWriteIOUtils.readByte(stream));
- }
+ measurementSchemas[i] = MeasurementSchema.deserializeFrom(stream);
+ measurements[i] = measurementSchemas[i].getMeasurementId();
+ dataTypes[i] = measurementSchemas[i].getType();
}
}
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java
index bca3bd490d4..65b6f312036 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/SchemaEngine.java
@@ -119,10 +119,7 @@ public class SchemaEngine {
initSchemaRegion();
- if (!(config.isClusterMode()
- && config
- .getSchemaRegionConsensusProtocolClass()
- .equals(ConsensusFactory.RATIS_CONSENSUS))
+ if
(!(config.getSchemaRegionConsensusProtocolClass().equals(ConsensusFactory.RATIS_CONSENSUS))
&& config.getSyncMlogPeriodInMs() != 0) {
timedForceMLogThread =
IoTDBThreadPoolFactory.newSingleThreadScheduledExecutor(
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionMemoryImpl.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionMemoryImpl.java
index 6a00d430ad0..42c67f41b6f 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionMemoryImpl.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionMemoryImpl.java
@@ -170,10 +170,7 @@ public class SchemaRegionMemoryImpl implements
ISchemaRegion {
// In ratis mode, no matter create schemaRegion or recover schemaRegion,
the working dir should
// be clear first
- if (config.isClusterMode()
- && config
- .getSchemaRegionConsensusProtocolClass()
- .equals(ConsensusFactory.RATIS_CONSENSUS)) {
+ if
(config.getSchemaRegionConsensusProtocolClass().equals(ConsensusFactory.RATIS_CONSENSUS))
{
File schemaRegionDir = new File(schemaRegionDirPath);
if (schemaRegionDir.exists()) {
FileUtils.deleteDirectory(schemaRegionDir);
@@ -207,10 +204,9 @@ public class SchemaRegionMemoryImpl implements
ISchemaRegion {
regionStatistics,
metric);
- if (!(config.isClusterMode()
- && config
- .getSchemaRegionConsensusProtocolClass()
- .equals(ConsensusFactory.RATIS_CONSENSUS))) {
+ if (!config
+ .getSchemaRegionConsensusProtocolClass()
+ .equals(ConsensusFactory.RATIS_CONSENSUS)) {
usingMLog = true;
initMLog();
} else {
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionPBTreeImpl.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionPBTreeImpl.java
index 8c5e52fbd36..e00ad35fd43 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionPBTreeImpl.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/impl/SchemaRegionPBTreeImpl.java
@@ -205,10 +205,9 @@ public class SchemaRegionPBTreeImpl implements
ISchemaRegion {
regionStatistics,
metric);
- if (!(config.isClusterMode()
- && config
- .getSchemaRegionConsensusProtocolClass()
- .equals(ConsensusFactory.RATIS_CONSENSUS))) {
+ if (!config
+ .getSchemaRegionConsensusProtocolClass()
+ .equals(ConsensusFactory.RATIS_CONSENSUS)) {
usingMLog = true;
initMLog();
} else {
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java
index 9fb5325ca8f..1a35c785fed 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode.java
@@ -237,8 +237,6 @@ public class DataNode implements DataNodeMBean {
/** Prepare cluster IoTDB-DataNode */
private boolean prepareDataNode() throws StartupException, IOException {
long startTime = System.currentTimeMillis();
- // Set cluster mode
- config.setClusterMode(true);
// Notice: Consider this DataNode as first start if the system.properties
file doesn't exist
IoTDBStartCheck.getInstance().checkOldSystemConfig();
@@ -572,8 +570,7 @@ public class DataNode implements DataNodeMBean {
registerManager.register(CacheHitRatioMonitor.getInstance());
// Close wal when using ratis consensus
- if (config.isClusterMode()
- &&
config.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.RATIS_CONSENSUS))
{
+ if
(config.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.RATIS_CONSENSUS))
{
config.setWalMode(WALMode.DISABLE);
}
registerManager.register(WALManager.getInstance());
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/IoTDBShutdownHook.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/IoTDBShutdownHook.java
index 214142a9e13..6d71aaf27bb 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/IoTDBShutdownHook.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/IoTDBShutdownHook.java
@@ -85,11 +85,10 @@ public class IoTDBShutdownHook extends Thread {
// 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()
- && IoTDBDescriptor.getInstance()
- .getConfig()
- .getDataRegionConsensusProtocolClass()
- .equals(ConsensusFactory.RATIS_CONSENSUS)) {
+ if (IoTDBDescriptor.getInstance()
+ .getConfig()
+ .getDataRegionConsensusProtocolClass()
+ .equals(ConsensusFactory.RATIS_CONSENSUS)) {
DataRegionConsensusImpl.getInstance()
.getAllConsensusGroupIds()
.parallelStream()
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/StorageEngine.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/StorageEngine.java
index fce7f95b6c8..14c34907c63 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/StorageEngine.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/StorageEngine.java
@@ -211,8 +211,7 @@ public class StorageEngine implements IService {
asyncRecover(futures);
// wait until wal is recovered
- if (!CONFIG.isClusterMode()
- ||
!CONFIG.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.RATIS_CONSENSUS))
{
+ if
(!CONFIG.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.RATIS_CONSENSUS))
{
try {
WALRecoverManager.getInstance().recover();
} catch (WALException e) {
@@ -730,10 +729,7 @@ public class StorageEngine implements IService {
region.abortCompaction();
region.syncDeleteDataFiles();
region.deleteFolder(systemDir);
- if (CONFIG.isClusterMode()
- && CONFIG
- .getDataRegionConsensusProtocolClass()
- .equals(ConsensusFactory.IOT_CONSENSUS)) {
+ if
(CONFIG.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.IOT_CONSENSUS))
{
// delete wal
WALManager.getInstance()
.deleteWALNode(
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
index 24eeb87455e..7b8aa508e21 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
@@ -312,11 +312,10 @@ public class DataRegion implements IDataRegionForQuery {
lastFlushTimeMap = new HashLastFlushTimeMap();
// recover tsfiles unless consensus protocol is ratis and storage
storageengine is not ready
- if (config.isClusterMode()
- &&
config.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.RATIS_CONSENSUS)
+ if
(config.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.RATIS_CONSENSUS)
&& !StorageEngine.getInstance().isAllSgReady()) {
logger.debug(
- "Skip recovering data region {}[{}] when consensus protocol is ratis
and storage storageengine is not ready.",
+ "Skip recovering data region {}[{}] when consensus protocol is ratis
and storage engine is not ready.",
databaseName,
dataRegionId);
for (String fileFolder : TierManager.getInstance().getAllFilesFolders())
{
@@ -619,7 +618,7 @@ public class DataRegion implements IDataRegionForQuery {
compactionRecoverManager.recoverCrossSpaceCompaction();
}
- private void updatePartitionFileVersion(long partitionNum, long fileVersion)
{
+ public void updatePartitionFileVersion(long partitionNum, long fileVersion) {
partitionMaxFileVersions.compute(
partitionNum,
(key, oldVersion) ->
diff --git
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALManager.java
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALManager.java
index aa4ad28bb57..c9830ebf2ba 100644
---
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALManager.java
+++
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/wal/WALManager.java
@@ -69,8 +69,7 @@ public class WALManager implements IService {
private final AtomicLong totalFileNum = new AtomicLong();
private WALManager() {
- if (config.isClusterMode()
- &&
config.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.IOT_CONSENSUS))
{
+ if
(config.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.IOT_CONSENSUS))
{
walNodesManager = new FirstCreateStrategy();
} else if (config.getMaxWalNodesNum() == 0) {
walNodesManager = new ElasticStrategy();
@@ -100,7 +99,6 @@ public class WALManager implements IService {
public void registerWALNode(
String applicantUniqueId, String logDirectory, long startFileVersion,
long startSearchIndex) {
if (config.getWalMode() == WALMode.DISABLE
- || !config.isClusterMode()
||
!config.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.IOT_CONSENSUS))
{
return;
}
@@ -113,7 +111,6 @@ public class WALManager implements IService {
/** WAL node will be deleted only when using iot consensus protocol. */
public void deleteWALNode(String applicantUniqueId) {
if (config.getWalMode() == WALMode.DISABLE
- || !config.isClusterMode()
||
!config.getDataRegionConsensusProtocolClass().equals(ConsensusFactory.IOT_CONSENSUS))
{
return;
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/AbstractSchemaRegionTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/AbstractSchemaRegionTest.java
index 00900ea1697..4df89c425a1 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/AbstractSchemaRegionTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/AbstractSchemaRegionTest.java
@@ -52,10 +52,10 @@ public abstract class AbstractSchemaRegionTest {
@Parameterized.Parameters(name = "{0}")
public static List<SchemaRegionTestParams> getTestModes() {
return Arrays.asList(
- new SchemaRegionTestParams("MemoryMode", "Memory", -1, true),
- new SchemaRegionTestParams("PBTree-FullMemory", "PBTree", 10000, true),
- new SchemaRegionTestParams("PBTree-PartialMemory", "PBTree", 3, true),
- new SchemaRegionTestParams("PBTree-NonMemory", "PBTree", 0, true));
+ new SchemaRegionTestParams("MemoryMode", "Memory", -1),
+ new SchemaRegionTestParams("PBTree-FullMemory", "PBTree", 10000),
+ new SchemaRegionTestParams("PBTree-PartialMemory", "PBTree", 3),
+ new SchemaRegionTestParams("PBTree-NonMemory", "PBTree", 0));
}
public AbstractSchemaRegionTest(SchemaRegionTestParams testParams) {
@@ -68,11 +68,9 @@ public abstract class AbstractSchemaRegionTest {
new SchemaRegionTestParams(
"Raw-Config",
COMMON_CONFIG.getSchemaEngineMode(),
- config.getCachedMNodeSizeInPBTreeMode(),
- config.isClusterMode());
+ config.getCachedMNodeSizeInPBTreeMode());
COMMON_CONFIG.setSchemaEngineMode(testParams.schemaEngineMode);
config.setCachedMNodeSizeInPBTreeMode(testParams.cachedMNodeSize);
- config.setClusterMode(testParams.isClusterMode);
SchemaEngine.getInstance().init();
}
@@ -82,7 +80,6 @@ public abstract class AbstractSchemaRegionTest {
cleanEnv();
COMMON_CONFIG.setSchemaEngineMode(rawConfig.schemaEngineMode);
config.setCachedMNodeSizeInPBTreeMode(rawConfig.cachedMNodeSize);
- config.setClusterMode(rawConfig.isClusterMode);
}
protected void cleanEnv() throws IOException {
@@ -110,14 +107,11 @@ public abstract class AbstractSchemaRegionTest {
private final int cachedMNodeSize;
- private final boolean isClusterMode;
-
private SchemaRegionTestParams(
- String testModeName, String schemaEngineMode, int cachedMNodeSize,
boolean isClusterMode) {
+ String testModeName, String schemaEngineMode, int cachedMNodeSize) {
this.testModeName = testModeName;
this.schemaEngineMode = schemaEngineMode;
this.cachedMNodeSize = cachedMNodeSize;
- this.isClusterMode = isClusterMode;
}
public String getTestModeName() {
@@ -132,10 +126,6 @@ public abstract class AbstractSchemaRegionTest {
return cachedMNodeSize;
}
- public boolean isClusterMode() {
- return isClusterMode;
- }
-
@Override
public String toString() {
return testModeName;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/TsFileInsertionDataContainerTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/TsFileInsertionDataContainerTest.java
index 87de7b21f63..b8fc65e23c0 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/TsFileInsertionDataContainerTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/pipe/event/TsFileInsertionDataContainerTest.java
@@ -235,7 +235,7 @@ public class TsFileInsertionDataContainerTest {
long startTime,
long endTime)
throws Exception {
- LOGGER.info(
+ LOGGER.debug(
"testToTabletInsertionEvents: deviceNumber: {}, measurementNumber: {},
rowNumberInOneDevice: {}, patternFormat: {}, startTime: {}, endTime: {}",
deviceNumber,
measurementNumber,
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/ElasticStrategyTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/ElasticStrategyTest.java
index e48cf1d556b..36f5c5ceedc 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/ElasticStrategyTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/ElasticStrategyTest.java
@@ -31,6 +31,7 @@ import org.apache.iotdb.db.utils.constant.TestConstant;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.utils.Binary;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
@@ -123,12 +124,23 @@ public class ElasticStrategyTest {
columns[4] = false;
columns[5] = new Binary("hh" + 0, TSFileConfig.STRING_CHARSET);
+ MeasurementSchema[] schemas =
+ new MeasurementSchema[] {
+ new MeasurementSchema("s1", dataTypes[0]),
+ new MeasurementSchema("s2", dataTypes[1]),
+ new MeasurementSchema("s3", dataTypes[2]),
+ new MeasurementSchema("s4", dataTypes[3]),
+ new MeasurementSchema("s5", dataTypes[4]),
+ new MeasurementSchema("s6", dataTypes[5]),
+ };
+
return new InsertRowNode(
new PlanNodeId("0"),
new PartialPath("root.test_sg.test_d"),
false,
new String[] {"s1", "s2", "s3", "s4", "s5", "s6"},
dataTypes,
+ schemas,
time,
columns,
true);
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/FirstCreateStrategyTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/FirstCreateStrategyTest.java
index 5514887c0f6..393f5fedf8a 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/FirstCreateStrategyTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/FirstCreateStrategyTest.java
@@ -31,6 +31,7 @@ import org.apache.iotdb.db.utils.constant.TestConstant;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.utils.Binary;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
@@ -160,12 +161,23 @@ public class FirstCreateStrategyTest {
columns[4] = false;
columns[5] = new Binary("hh" + 0, TSFileConfig.STRING_CHARSET);
+ MeasurementSchema[] schemas =
+ new MeasurementSchema[] {
+ new MeasurementSchema("s1", dataTypes[0]),
+ new MeasurementSchema("s2", dataTypes[1]),
+ new MeasurementSchema("s3", dataTypes[2]),
+ new MeasurementSchema("s4", dataTypes[3]),
+ new MeasurementSchema("s5", dataTypes[4]),
+ new MeasurementSchema("s6", dataTypes[5]),
+ };
+
return new InsertRowNode(
new PlanNodeId("0"),
new PartialPath("root.test_sg.test_d"),
false,
new String[] {"s1", "s2", "s3", "s4", "s5", "s6"},
dataTypes,
+ schemas,
time,
columns,
true);
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/RoundRobinStrategyTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/RoundRobinStrategyTest.java
index 7559e838d5e..2634f91cf0a 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/RoundRobinStrategyTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/allocation/RoundRobinStrategyTest.java
@@ -31,6 +31,7 @@ import org.apache.iotdb.db.utils.constant.TestConstant;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.file.metadata.enums.TSDataType;
import org.apache.iotdb.tsfile.utils.Binary;
+import org.apache.iotdb.tsfile.write.schema.MeasurementSchema;
import org.junit.After;
import org.junit.Before;
@@ -123,12 +124,23 @@ public class RoundRobinStrategyTest {
columns[4] = false;
columns[5] = new Binary("hh" + 0, TSFileConfig.STRING_CHARSET);
+ MeasurementSchema[] schemas =
+ new MeasurementSchema[] {
+ new MeasurementSchema("s1", dataTypes[0]),
+ new MeasurementSchema("s2", dataTypes[1]),
+ new MeasurementSchema("s3", dataTypes[2]),
+ new MeasurementSchema("s4", dataTypes[3]),
+ new MeasurementSchema("s5", dataTypes[4]),
+ new MeasurementSchema("s6", dataTypes[5]),
+ };
+
return new InsertRowNode(
new PlanNodeId("0"),
new PartialPath("root.test_sg.test_d"),
false,
new String[] {"s1", "s2", "s3", "s4", "s5", "s6"},
dataTypes,
+ schemas,
time,
columns,
true);
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBufferCommonTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBufferCommonTest.java
index 2304c4d0257..179c2acf2b4 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBufferCommonTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/buffer/WALBufferCommonTest.java
@@ -54,7 +54,6 @@ import static org.junit.Assert.fail;
public abstract class WALBufferCommonTest {
protected static final IoTDBConfig config =
IoTDBDescriptor.getInstance().getConfig();
protected static final String identifier = String.valueOf(Integer.MAX_VALUE);
- protected static final boolean preIsClusterMode = config.isClusterMode();
protected static final String logDirectory =
TestConstant.BASE_OUTPUT_PATH.concat("wal-test");
protected static final String devicePath = "root.test_sg.test_d";
protected IWALBuffer walBuffer;
@@ -62,13 +61,11 @@ public abstract class WALBufferCommonTest {
@Before
public void setUp() throws Exception {
walBuffer = new WALBuffer(identifier, logDirectory);
- config.setClusterMode(true);
}
@After
public void tearDown() throws Exception {
walBuffer.close();
- config.setClusterMode(preIsClusterMode);
}
@Test
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALFileTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALFileTest.java
index 1034a716f27..949ad207872 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALFileTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/io/WALFileTest.java
@@ -20,7 +20,6 @@ package org.apache.iotdb.db.storageengine.dataregion.wal.io;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.PartialPath;
-import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import
org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.DeleteDataNode;
import
org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode;
@@ -54,7 +53,6 @@ import static org.junit.Assert.assertEquals;
public class WALFileTest {
- boolean prevIsCluster;
private final File walFile =
new File(
TestConstant.BASE_OUTPUT_PATH.concat(
@@ -66,8 +64,6 @@ public class WALFileTest {
if (walFile.exists()) {
Files.delete(walFile.toPath());
}
- prevIsCluster = IoTDBDescriptor.getInstance().getConfig().isClusterMode();
- IoTDBDescriptor.getInstance().getConfig().setClusterMode(true);
}
@After
@@ -75,7 +71,6 @@ public class WALFileTest {
if (walFile.exists()) {
Files.delete(walFile.toPath());
}
- IoTDBDescriptor.getInstance().getConfig().setClusterMode(prevIsCluster);
}
@Test
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/ConsensusReqReaderTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/ConsensusReqReaderTest.java
index 7f6fe5fab00..533f870c74a 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/ConsensusReqReaderTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/ConsensusReqReaderTest.java
@@ -63,7 +63,6 @@ public class ConsensusReqReaderTest {
@Before
public void setUp() throws Exception {
EnvironmentUtils.cleanDir(logDirectory);
- config.setClusterMode(true);
prevMode = config.getWalMode();
config.setWalMode(WALMode.SYNC);
walNode = new WALNode(identifier, logDirectory);
@@ -73,7 +72,6 @@ public class ConsensusReqReaderTest {
public void tearDown() throws Exception {
walNode.close();
config.setWalMode(prevMode);
- config.setClusterMode(false);
EnvironmentUtils.cleanDir(logDirectory);
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALEntryHandlerTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALEntryHandlerTest.java
index 58e9aefec32..0a09c964873 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALEntryHandlerTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALEntryHandlerTest.java
@@ -73,7 +73,6 @@ public class WALEntryHandlerTest {
private static final String devicePath = databasePath + ".test_d";
private static final String dataRegionId = "1";
private WALMode prevMode;
- private boolean prevIsClusterMode;
private WALNode walNode1;
private WALNode walNode2;
@@ -82,9 +81,7 @@ public class WALEntryHandlerTest {
EnvironmentUtils.cleanDir(logDirectory1);
EnvironmentUtils.cleanDir(logDirectory2);
prevMode = config.getWalMode();
- prevIsClusterMode = config.isClusterMode();
config.setWalMode(WALMode.SYNC);
- config.setClusterMode(true);
walNode1 = new WALNode(identifier1, logDirectory1);
walNode2 = new WALNode(identifier2, logDirectory2);
}
@@ -94,7 +91,6 @@ public class WALEntryHandlerTest {
walNode1.close();
walNode2.close();
config.setWalMode(prevMode);
- config.setClusterMode(prevIsClusterMode);
EnvironmentUtils.cleanDir(logDirectory1);
EnvironmentUtils.cleanDir(logDirectory2);
WALInsertNodeCache.getInstance(1).clear();
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNodeTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNodeTest.java
index 67d71ad8992..8a4f5bf57fd 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNodeTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WALNodeTest.java
@@ -18,12 +18,15 @@
*/
package org.apache.iotdb.db.storageengine.dataregion.wal.node;
+import org.apache.iotdb.commons.consensus.DataRegionId;
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.queryengine.plan.planner.plan.node.PlanNodeId;
import
org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertTabletNode;
+import org.apache.iotdb.db.storageengine.StorageEngine;
+import org.apache.iotdb.db.storageengine.dataregion.DataRegionTest;
import org.apache.iotdb.db.storageengine.dataregion.memtable.IMemTable;
import org.apache.iotdb.db.storageengine.dataregion.memtable.PrimitiveMemTable;
import
org.apache.iotdb.db.storageengine.dataregion.wal.checkpoint.MemTableInfo;
@@ -74,16 +77,13 @@ public class WALNodeTest {
private static final String devicePath = databasePath + ".test_d";
private static final String dataRegionId = "1";
private WALMode prevMode;
- private boolean prevIsClusterMode;
private WALNode walNode;
@Before
public void setUp() throws Exception {
EnvironmentUtils.cleanDir(logDirectory);
prevMode = config.getWalMode();
- prevIsClusterMode = config.isClusterMode();
config.setWalMode(WALMode.SYNC);
- config.setClusterMode(true);
walNode = new WALNode(identifier, logDirectory);
}
@@ -91,8 +91,8 @@ public class WALNodeTest {
public void tearDown() throws Exception {
walNode.close();
config.setWalMode(prevMode);
- config.setClusterMode(prevIsClusterMode);
EnvironmentUtils.cleanDir(logDirectory);
+ StorageEngine.getInstance().reset();
}
@Test
@@ -268,7 +268,20 @@ public class WALNodeTest {
long time = 0;
IMemTable memTable = new PrimitiveMemTable(databasePath, dataRegionId);
long memTableId = memTable.getMemTableId();
- String tsFilePath = logDirectory + File.separator + memTableId + ".tsfile";
+ String tsFilePath =
+ logDirectory
+ + File.separator
+ + databasePath
+ + File.separator
+ + dataRegionId
+ + File.separator
+ + "-1"
+ + File.separator
+ + memTableId
+ + ".tsfile";
+ StorageEngine.getInstance()
+ .setDataRegion(
+ new DataRegionId(1), new
DataRegionTest.DummyDataRegion(logDirectory, databasePath));
walNode.onMemTableCreated(memTable, tsFilePath);
while (walNode.getCurrentLogVersion() == 0) {
++time;
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WalDeleteOutdatedNewTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WalDeleteOutdatedNewTest.java
index c528965b58f..a7c81e2f71f 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WalDeleteOutdatedNewTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/node/WalDeleteOutdatedNewTest.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.db.storageengine.dataregion.wal.node;
+import org.apache.iotdb.commons.consensus.DataRegionId;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.consensus.iot.log.ConsensusReqReader;
@@ -26,6 +27,9 @@ import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.db.queryengine.plan.planner.plan.node.PlanNodeId;
import
org.apache.iotdb.db.queryengine.plan.planner.plan.node.write.InsertRowNode;
+import org.apache.iotdb.db.storageengine.StorageEngine;
+import org.apache.iotdb.db.storageengine.dataregion.DataRegion;
+import org.apache.iotdb.db.storageengine.dataregion.DataRegionTest;
import org.apache.iotdb.db.storageengine.dataregion.memtable.IMemTable;
import org.apache.iotdb.db.storageengine.dataregion.memtable.PrimitiveMemTable;
import
org.apache.iotdb.db.storageengine.dataregion.wal.exception.MemTablePinException;
@@ -54,31 +58,31 @@ import java.util.Set;
public class WalDeleteOutdatedNewTest {
private static final IoTDBConfig config =
IoTDBDescriptor.getInstance().getConfig();
private static final String identifier1 = String.valueOf(Integer.MAX_VALUE);
- private static final String logDirectory1 =
TestConstant.BASE_OUTPUT_PATH.concat("1/2910/");
+ private static final String logDirectory1 =
+ TestConstant.BASE_OUTPUT_PATH.concat("sequence/root.test_sg/1/2910/");
private static final String databasePath = "root.test_sg";
private static final String devicePath = databasePath + ".test_d";
private static final String dataRegionId = "1";
private WALMode prevMode;
- private boolean prevIsClusterMode;
private WALNode walNode1;
@Before
public void setUp() throws Exception {
EnvironmentUtils.cleanDir(logDirectory1);
prevMode = config.getWalMode();
- prevIsClusterMode = config.isClusterMode();
config.setWalMode(WALMode.SYNC);
- config.setClusterMode(true);
walNode1 = new WALNode(identifier1, logDirectory1);
+ DataRegion dataRegion = new DataRegionTest.DummyDataRegion(logDirectory1,
databasePath);
+ dataRegion.updatePartitionFileVersion(2911, 0);
+ StorageEngine.getInstance().setDataRegion(new DataRegionId(1), dataRegion);
}
@After
public void tearDown() throws Exception {
walNode1.close();
config.setWalMode(prevMode);
- config.setClusterMode(prevIsClusterMode);
EnvironmentUtils.cleanDir(logDirectory1);
-
+ StorageEngine.getInstance().reset();
WALInsertNodeCache.getInstance(1).clear();
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRecoverManagerTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRecoverManagerTest.java
index 089220ba100..72f4a804153 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRecoverManagerTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/WALRecoverManagerTest.java
@@ -109,14 +109,10 @@ public class WALRecoverManagerTest {
private TsFileResource tsFileWithWALResource;
private TsFileResource tsFileWithoutWALResource;
- private boolean isClusterMode;
-
@Before
public void setUp() throws Exception {
- isClusterMode = config.isClusterMode();
EnvironmentUtils.cleanDir(new File(FILE_WITH_WAL_NAME).getParent());
EnvironmentUtils.envSetUp();
- config.setClusterMode(true);
prevMode = config.getWalMode();
config.setWalMode(WALMode.SYNC);
walBuffer = new WALBuffer(WAL_NODE_IDENTIFIER, WAL_NODE_FOLDER);
@@ -134,7 +130,6 @@ public class WALRecoverManagerTest {
checkpointManager.close();
walBuffer.close();
config.setWalMode(prevMode);
- config.setClusterMode(isClusterMode);
EnvironmentUtils.cleanDir(new File(FILE_WITH_WAL_NAME).getParent());
EnvironmentUtils.cleanDir(new File(FILE_WITHOUT_WAL_NAME).getParent());
EnvironmentUtils.cleanEnv();
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/TsFilePlanRedoerTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/TsFilePlanRedoerTest.java
index dfc8c2c538c..8b9e0034aa9 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/TsFilePlanRedoerTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/TsFilePlanRedoerTest.java
@@ -83,13 +83,10 @@ public class TsFilePlanRedoerTest {
private CompressionType compressionType;
boolean prevIsAutoCreateSchemaEnabled;
boolean prevIsEnablePartialInsert;
- boolean prevIsCluster;
@Before
public void setUp() throws Exception {
- prevIsCluster = IoTDBDescriptor.getInstance().getConfig().isClusterMode();
EnvironmentUtils.envSetUp();
- IoTDBDescriptor.getInstance().getConfig().setClusterMode(true);
// set recover config, avoid creating deleted time series when recovering
wal
prevIsAutoCreateSchemaEnabled =
@@ -109,7 +106,6 @@ public class TsFilePlanRedoerTest {
if (modsFile.exists()) {
modsFile.delete();
}
- IoTDBDescriptor.getInstance().getConfig().setClusterMode(prevIsCluster);
EnvironmentUtils.cleanEnv();
// reset config
// IoTDBDescriptor.getInstance()
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/UnsealedTsFileRecoverPerformerTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/UnsealedTsFileRecoverPerformerTest.java
index 93c072296b6..cf679e62fe5 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/UnsealedTsFileRecoverPerformerTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/recover/file/UnsealedTsFileRecoverPerformerTest.java
@@ -75,14 +75,10 @@ public class UnsealedTsFileRecoverPerformerTest {
TsFileUtilsForRecoverTest.getTestTsFilePath(SG_NAME, 0, 0, 1);
private TsFileResource tsFileResource;
- private boolean isClusterMode;
-
@Before
public void setUp() throws Exception {
EnvironmentUtils.cleanDir(new File(FILE_NAME).getParent());
EnvironmentUtils.envSetUp();
- isClusterMode = config.isClusterMode();
- config.setClusterMode(true);
}
@After
@@ -90,7 +86,6 @@ public class UnsealedTsFileRecoverPerformerTest {
if (tsFileResource != null) {
tsFileResource.close();
}
- config.setClusterMode(isClusterMode);
EnvironmentUtils.cleanDir(new File(FILE_NAME).getParent());
EnvironmentUtils.cleanEnv();
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/utils/WALInsertNodeCacheTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/utils/WALInsertNodeCacheTest.java
index 915ef756d55..c519f807510 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/utils/WALInsertNodeCacheTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/storageengine/dataregion/wal/utils/WALInsertNodeCacheTest.java
@@ -57,7 +57,6 @@ public class WALInsertNodeCacheTest {
private static final String dataRegionId = "1";
private static final WALInsertNodeCache cache =
WALInsertNodeCache.getInstance(1);
private WALMode prevMode;
- private boolean prevIsClusterMode;
private WALNode walNode;
@Before
@@ -65,9 +64,7 @@ public class WALInsertNodeCacheTest {
EnvironmentUtils.cleanDir(logDirectory);
cache.clear();
prevMode = config.getWalMode();
- prevIsClusterMode = config.isClusterMode();
config.setWalMode(WALMode.SYNC);
- config.setClusterMode(true);
walNode = new WALNode(identifier, logDirectory);
}
@@ -76,7 +73,6 @@ public class WALInsertNodeCacheTest {
walNode.close();
cache.clear();
config.setWalMode(prevMode);
- config.setClusterMode(prevIsClusterMode);
EnvironmentUtils.cleanDir(logDirectory);
}
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/tools/MLogParserTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/tools/MLogParserTest.java
index aa48e283f7c..70277e808ca 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/tools/MLogParserTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/tools/MLogParserTest.java
@@ -24,6 +24,8 @@ import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.path.PartialPath;
import org.apache.iotdb.commons.path.PathPatternTree;
import org.apache.iotdb.commons.schema.SchemaConstant;
+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.schemaengine.SchemaEngine;
import
org.apache.iotdb.db.schemaengine.schemaregion.write.req.SchemaRegionWritePlanFactory;
@@ -49,6 +51,7 @@ import java.util.Map;
public class MLogParserTest {
+ private static final IoTDBConfig config =
IoTDBDescriptor.getInstance().getConfig();
private String[] storageGroups = new String[] {"root.sg0", "root.sg1",
"root.sg"};
private int[] schemaRegionIds = new int[] {0, 1, 2};
@@ -63,8 +66,12 @@ public class MLogParserTest {
* */
private int[] mlogLineNum = new int[] {50, 54, 0};
+ private String schemaRegionConsensusProtocolClass;
+
@Before
public void setUp() {
+ schemaRegionConsensusProtocolClass =
config.getSchemaRegionConsensusProtocolClass();
+
config.setSchemaRegionConsensusProtocolClass(ConsensusFactory.SIMPLE_CONSENSUS);
EnvironmentUtils.envSetUp();
}
@@ -75,6 +82,7 @@ public class MLogParserTest {
file = new File("target" + File.separator + "tmp" + File.separator +
"text.snapshot");
file.delete();
EnvironmentUtils.cleanEnv();
+
config.setSchemaRegionConsensusProtocolClass(schemaRegionConsensusProtocolClass);
}
private void prepareData() throws Exception {
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/tools/TsFileSelfCheckToolTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/tools/TsFileSelfCheckToolTest.java
index 00106e438f2..01488d06bae 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/tools/TsFileSelfCheckToolTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/tools/TsFileSelfCheckToolTest.java
@@ -53,7 +53,7 @@ import static org.junit.Assert.fail;
public class TsFileSelfCheckToolTest {
String path =
- "data"
+ "target"
.concat(File.separator)
.concat("data")
.concat(File.separator)
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/tools/TsFileSketchToolTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/tools/TsFileSketchToolTest.java
index 4237c0abf37..160dd2b417c 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/tools/TsFileSketchToolTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/tools/TsFileSketchToolTest.java
@@ -45,7 +45,7 @@ import java.util.List;
public class TsFileSketchToolTest {
String path =
- "data"
+ "target"
.concat(File.separator)
.concat("data")
.concat(File.separator)
diff --git
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/SchemaRegionSnapshotParserTest.java
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/SchemaRegionSnapshotParserTest.java
index 242c9f9639d..d0d48b09027 100644
---
a/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/SchemaRegionSnapshotParserTest.java
+++
b/iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/SchemaRegionSnapshotParserTest.java
@@ -75,13 +75,10 @@ public class SchemaRegionSnapshotParserTest {
protected static class SchemaRegionSnapshotParserTestParams {
private final String testModeName;
private final String schemaRegionMode;
- private final boolean isClusterMode;
- private SchemaRegionSnapshotParserTestParams(
- String testModeName, String schemaEngineMode, boolean isClusterMode) {
+ private SchemaRegionSnapshotParserTestParams(String testModeName, String
schemaEngineMode) {
this.testModeName = testModeName;
this.schemaRegionMode = schemaEngineMode;
- this.isClusterMode = isClusterMode;
}
public String getTestModeName() {
@@ -92,10 +89,6 @@ public class SchemaRegionSnapshotParserTest {
return this.schemaRegionMode;
}
- public boolean getClusterMode() {
- return this.isClusterMode;
- }
-
@Override
public String toString() {
return testModeName;
@@ -107,17 +100,15 @@ public class SchemaRegionSnapshotParserTest {
@Parameterized.Parameters(name = "{0}")
public static List<SchemaRegionSnapshotParserTestParams> getTestModes() {
return Arrays.asList(
- new SchemaRegionSnapshotParserTestParams("MemoryMode", "Memory", true),
- new SchemaRegionSnapshotParserTestParams("PBTree", "PBTree", true));
+ new SchemaRegionSnapshotParserTestParams("MemoryMode", "Memory"),
+ new SchemaRegionSnapshotParserTestParams("PBTree", "PBTree"));
}
@Before
public void setUp() throws Exception {
rawConfig =
- new SchemaRegionSnapshotParserTestParams(
- "Raw-Config", COMMON_CONFIG.getSchemaEngineMode(),
config.isClusterMode());
+ new SchemaRegionSnapshotParserTestParams("Raw-Config",
COMMON_CONFIG.getSchemaEngineMode());
COMMON_CONFIG.setSchemaEngineMode(testParams.schemaRegionMode);
- config.setClusterMode(testParams.isClusterMode);
SchemaEngine.getInstance().init();
if (testParams.schemaRegionMode.equals("Memory")) {
snapshotFileName = SchemaConstant.MTREE_SNAPSHOT;
@@ -131,7 +122,6 @@ public class SchemaRegionSnapshotParserTest {
SchemaEngine.getInstance().clear();
cleanEnv();
COMMON_CONFIG.setSchemaEngineMode(rawConfig.schemaRegionMode);
- config.setClusterMode(rawConfig.isClusterMode);
}
protected void cleanEnv() throws IOException {
