This is an automated email from the ASF dual-hosted git repository.
qiaojialin 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 747786133b Remove redundant isMppMode configuration (#7974)
747786133b is described below
commit 747786133b3db738923fbe043b44a46cea7ddebc
Author: Haonan <[email protected]>
AuthorDate: Mon Nov 14 14:55:08 2022 +0800
Remove redundant isMppMode configuration (#7974)
---
.../src/main/java/org/apache/iotdb/db/conf/IoTDBConfig.java | 11 -----------
.../org/apache/iotdb/db/localconfignode/LocalConfigNode.java | 6 +++---
.../src/main/java/org/apache/iotdb/db/service/DataNode.java | 2 --
.../src/main/java/org/apache/iotdb/db/service/NewIoTDB.java | 6 ------
.../localconfignode/LocalConfigNodeMultiDataRegionTest.java | 4 ----
.../iotdb/db/metadata/schemaRegion/SchemaRegionBasicTest.java | 4 ----
.../apache/iotdb/db/mpp/plan/StandaloneCoordinatorTest.java | 2 --
.../iotdb/db/mpp/plan/scheduler/StandaloneSchedulerTest.java | 2 --
8 files changed, 3 insertions(+), 34 deletions(-)
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 6b20f37f0e..fe144761ef 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
@@ -556,9 +556,6 @@ public class IoTDBConfig {
/** Replace implementation class of JDBC service */
private String rpcImplClassName = TSServiceImpl.class.getName();
- /** indicate whether current mode is mpp */
- private boolean mppMode = false;
-
/** indicate whether current mode is cluster */
private boolean isClusterMode = false;
@@ -3090,14 +3087,6 @@ public class IoTDBConfig {
this.selectorNumOfClientManager = selectorNumOfClientManager;
}
- public boolean isMppMode() {
- return mppMode;
- }
-
- public void setMppMode(boolean mppMode) {
- this.mppMode = mppMode;
- }
-
public boolean isClusterMode() {
return isClusterMode;
}
diff --git
a/server/src/main/java/org/apache/iotdb/db/localconfignode/LocalConfigNode.java
b/server/src/main/java/org/apache/iotdb/db/localconfignode/LocalConfigNode.java
index ab593bf819..8b5fba03da 100644
---
a/server/src/main/java/org/apache/iotdb/db/localconfignode/LocalConfigNode.java
+++
b/server/src/main/java/org/apache/iotdb/db/localconfignode/LocalConfigNode.java
@@ -210,7 +210,7 @@ public class LocalConfigNode {
}
// TODO: the judgment should be removed after old standalone removed
- if (config.isMppMode() && !config.isClusterMode()) {
+ if (!config.isClusterMode()) {
Map<String, List<DataRegionId>> recoveredLocalDataRegionInfo =
storageEngine.getLocalDataRegionInfo();
dataPartitionInfo.init(recoveredLocalDataRegionInfo);
@@ -282,7 +282,7 @@ public class LocalConfigNode {
public void deleteStorageGroup(PartialPath storageGroup) throws
MetadataException {
- if (config.isMppMode() && !config.isClusterMode()) {
+ if (!config.isClusterMode()) {
deleteDataRegionsInStorageGroup(
dataPartitionInfo.getDataRegionIdsByStorageGroup(storageGroup));
dataPartitionInfo.deleteStorageGroup(storageGroup);
@@ -367,7 +367,7 @@ public class LocalConfigNode {
}
public void setTTL(PartialPath storageGroup, long dataTTL) throws
MetadataException, IOException {
- if (config.isMppMode() && !config.isClusterMode()) {
+ if (!config.isClusterMode()) {
storageEngine.setTTL(dataPartitionInfo.getDataRegionIdsByStorageGroup(storageGroup),
dataTTL);
}
storageGroupSchemaManager.setTTL(storageGroup, dataTTL);
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 7d5ff0f01e..6a76230349 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
@@ -129,8 +129,6 @@ public class DataNode implements DataNodeMBean {
}
protected void serverCheckAndInit() throws ConfigurationException,
IOException {
- // set the mpp mode to true
- config.setMppMode(true);
config.setClusterMode(true);
IoTDBStartCheck.getInstance().checkConfig();
IoTDBStartCheck.getInstance().checkDirectory();
diff --git a/server/src/main/java/org/apache/iotdb/db/service/NewIoTDB.java
b/server/src/main/java/org/apache/iotdb/db/service/NewIoTDB.java
index 7996705619..b0c72fb4b3 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/NewIoTDB.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/NewIoTDB.java
@@ -80,7 +80,6 @@ public class NewIoTDB implements NewIoTDBMBean {
System.exit(1);
}
NewIoTDB daemon = NewIoTDB.getInstance();
- config.setMppMode(true);
// In standalone mode, Consensus memory should be reclaimed
IoTDBDescriptor.getInstance().reclaimConsensusMemory();
@@ -169,11 +168,6 @@ public class NewIoTDB implements NewIoTDBMBean {
}
registerManager.register(UpgradeSevice.getINSTANCE());
- // in mpp mode we temporarily don't start settle service because it uses
StorageEngine directly
- // in itself, but currently we need to use StorageEngineV2 instead of
StorageEngine in mpp mode.
- if (!IoTDBDescriptor.getInstance().getConfig().isMppMode()) {
- registerManager.register(SettleService.getINSTANCE());
- }
registerManager.register(TriggerRegistrationService.getInstance());
registerManager.register(MetricService.getInstance());
registerManager.register(CompactionTaskManager.getInstance());
diff --git
a/server/src/test/java/org/apache/iotdb/db/localconfignode/LocalConfigNodeMultiDataRegionTest.java
b/server/src/test/java/org/apache/iotdb/db/localconfignode/LocalConfigNodeMultiDataRegionTest.java
index 7fa637ca9b..b17c65ebfa 100644
---
a/server/src/test/java/org/apache/iotdb/db/localconfignode/LocalConfigNodeMultiDataRegionTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/localconfignode/LocalConfigNodeMultiDataRegionTest.java
@@ -36,15 +36,12 @@ import java.util.List;
public class LocalConfigNodeMultiDataRegionTest {
int originDataRegionNum;
- boolean isMppMode = false;
boolean isClusterMode = false;
@Before
public void setUp() throws IllegalPathException {
originDataRegionNum =
IoTDBDescriptor.getInstance().getConfig().getDataRegionNum();
- isMppMode = IoTDBDescriptor.getInstance().getConfig().isMppMode();
isClusterMode = IoTDBDescriptor.getInstance().getConfig().isClusterMode();
- IoTDBDescriptor.getInstance().getConfig().setMppMode(true);
IoTDBDescriptor.getInstance().getConfig().setClusterMode(false);
IoTDB.configManager.init();
EnvironmentUtils.envSetUp();
@@ -55,7 +52,6 @@ public class LocalConfigNodeMultiDataRegionTest {
public void tearDown() throws Exception {
IoTDBDescriptor.getInstance().getConfig().setDataRegionNum(originDataRegionNum);
EnvironmentUtils.cleanEnv();
- IoTDBDescriptor.getInstance().getConfig().setMppMode(isMppMode);
IoTDBDescriptor.getInstance().getConfig().setClusterMode(isClusterMode);
}
diff --git
a/server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionBasicTest.java
b/server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionBasicTest.java
index d8cd6f8c3c..2fd109b35a 100644
---
a/server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionBasicTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/metadata/schemaRegion/SchemaRegionBasicTest.java
@@ -76,14 +76,11 @@ import java.util.stream.IntStream;
public abstract class SchemaRegionBasicTest {
IoTDBConfig config = IoTDBDescriptor.getInstance().getConfig();
- boolean isMppMode;
boolean isClusterMode;
@Before
public void setUp() {
- isMppMode = config.isMppMode();
isClusterMode = config.isClusterMode();
- config.setMppMode(true);
config.setClusterMode(true);
IoTDB.configManager.init();
}
@@ -91,7 +88,6 @@ public abstract class SchemaRegionBasicTest {
@After
public void tearDown() throws Exception {
EnvironmentUtils.cleanEnv();
- config.setMppMode(isMppMode);
config.setClusterMode(isClusterMode);
}
diff --git
a/server/src/test/java/org/apache/iotdb/db/mpp/plan/StandaloneCoordinatorTest.java
b/server/src/test/java/org/apache/iotdb/db/mpp/plan/StandaloneCoordinatorTest.java
index 2373ecdd02..abaff37ba7 100644
---
a/server/src/test/java/org/apache/iotdb/db/mpp/plan/StandaloneCoordinatorTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/mpp/plan/StandaloneCoordinatorTest.java
@@ -63,7 +63,6 @@ public class StandaloneCoordinatorTest {
@Before
public void setUp() throws Exception {
- conf.setMppMode(true);
conf.setDataNodeId(0);
coordinator = Coordinator.getInstance();
schemaFetcher = StandaloneSchemaFetcher.getInstance();
@@ -86,7 +85,6 @@ public class StandaloneCoordinatorTest {
FlushManager.getInstance().stop();
EnvironmentUtils.cleanAllDir();
conf.setDataNodeId(-1);
- conf.setMppMode(false);
}
@Test
diff --git
a/server/src/test/java/org/apache/iotdb/db/mpp/plan/scheduler/StandaloneSchedulerTest.java
b/server/src/test/java/org/apache/iotdb/db/mpp/plan/scheduler/StandaloneSchedulerTest.java
index 47c480e7e9..a3bdfc2da8 100644
---
a/server/src/test/java/org/apache/iotdb/db/mpp/plan/scheduler/StandaloneSchedulerTest.java
+++
b/server/src/test/java/org/apache/iotdb/db/mpp/plan/scheduler/StandaloneSchedulerTest.java
@@ -82,7 +82,6 @@ public class StandaloneSchedulerTest {
@Before
public void setUp() throws Exception {
- conf.setMppMode(true);
conf.setDataNodeId(0);
configNode = LocalConfigNode.getInstance();
@@ -101,7 +100,6 @@ public class StandaloneSchedulerTest {
FlushManager.getInstance().stop();
EnvironmentUtils.cleanAllDir();
conf.setDataNodeId(-1);
- conf.setMppMode(false);
}
@Test
