You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2022/09/16 02:47:27 UTC
[iotdb] branch expr_catch_up updated: fix tests
This is an automated email from the ASF dual-hosted git repository.
jiangtian pushed a commit to branch expr_catch_up
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/expr_catch_up by this push:
new 0ea3ad29b2 fix tests
0ea3ad29b2 is described below
commit 0ea3ad29b2a7f86ce6546a5f6714e226ff898350
Author: Tian Jiang <jt...@163.com>
AuthorDate: Fri Sep 16 10:39:55 2022 +0800
fix tests
---
.../iotdb/cluster/impl/PlanBasedStateMachine.java | 10 +++++++-
.../iotdb/cluster/log/applier/DataLogApplier.java | 4 +--
.../manage/FilePartitionedSnapshotLogManager.java | 9 +++----
.../log/manage/MetaSingleSnapshotLogManager.java | 6 ++---
.../cluster/server/member/DataGroupMember.java | 2 +-
.../cluster/server/member/MetaGroupMember.java | 2 +-
.../iotdb/cluster/server/member/RaftMember.java | 2 ++
.../iotdb/cluster/common/TestDataGroupMember.java | 6 +++--
.../iotdb/cluster/common/TestLogApplier.java | 3 ++-
.../iotdb/cluster/common/TestLogManager.java | 3 ++-
.../iotdb/cluster/common/TestMetaGroupMember.java | 5 ++--
.../cluster/common/TestPartitionedLogManager.java | 4 +--
.../log/applier/AsyncDataLogApplierTest.java | 4 +--
.../cluster/log/applier/DataLogApplierTest.java | 30 ++++++++++++----------
.../cluster/log/applier/MetaLogApplierTest.java | 2 +-
.../FilePartitionedSnapshotLogManagerTest.java | 2 --
.../manage/MetaSingleSnapshotLogManagerTest.java | 5 ++--
.../cluster/log/manage/RaftLogManagerTest.java | 3 ++-
.../cluster/query/manage/QueryCoordinatorTest.java | 3 ++-
.../reader/RemoteSeriesReaderByTimestampTest.java | 3 ++-
.../iotdb/cluster/server/member/BaseMember.java | 2 +-
.../cluster/server/member/DataGroupMemberTest.java | 8 +++---
.../cluster/server/member/MetaGroupMemberTest.java | 22 +++++++++-------
23 files changed, 82 insertions(+), 58 deletions(-)
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/impl/PlanBasedStateMachine.java b/cluster/src/main/java/org/apache/iotdb/cluster/impl/PlanBasedStateMachine.java
index f8b237e2dc..e4536e75b6 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/impl/PlanBasedStateMachine.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/impl/PlanBasedStateMachine.java
@@ -23,12 +23,14 @@ import org.apache.iotdb.cluster.query.ClusterPlanExecutor;
import org.apache.iotdb.cluster.server.member.MetaGroupMember;
import org.apache.iotdb.cluster.utils.StatusUtils;
import org.apache.iotdb.common.rpc.thrift.TSStatus;
+import org.apache.iotdb.commons.utils.TestOnly;
import org.apache.iotdb.consensus.IStateMachine;
import org.apache.iotdb.consensus.common.DataSet;
import org.apache.iotdb.consensus.common.request.IConsensusRequest;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.exception.metadata.StorageGroupNotSetException;
import org.apache.iotdb.db.exception.query.QueryProcessException;
+import org.apache.iotdb.db.qp.executor.PlanExecutor;
import org.apache.iotdb.db.qp.physical.PhysicalPlan;
import org.slf4j.Logger;
@@ -40,7 +42,7 @@ public class PlanBasedStateMachine implements IStateMachine {
private static final Logger logger = LoggerFactory.getLogger(PlanBasedStateMachine.class);
- private ClusterPlanExecutor planExecutor;
+ private PlanExecutor planExecutor;
private MetaGroupMember metaGroupMember;
public PlanBasedStateMachine() {}
@@ -92,4 +94,10 @@ public class PlanBasedStateMachine implements IStateMachine {
public void setMetaGroupMember(MetaGroupMember metaGroupMember) {
this.metaGroupMember = metaGroupMember;
}
+
+ @TestOnly
+ public IStateMachine setPlanExecutor(PlanExecutor planExecutor) {
+ this.planExecutor = planExecutor;
+ return this;
+ }
}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/log/applier/DataLogApplier.java b/cluster/src/main/java/org/apache/iotdb/cluster/log/applier/DataLogApplier.java
index 30a718d21b..7a4160a2c7 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/log/applier/DataLogApplier.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/log/applier/DataLogApplier.java
@@ -50,8 +50,8 @@ public class DataLogApplier extends BaseApplier {
protected DataGroupMember dataGroupMember;
- public DataLogApplier(DataGroupMember dataGroupMember, IStateMachine stateMachine) {
- super(stateMachine);
+ public DataLogApplier(DataGroupMember dataGroupMember) {
+ super(dataGroupMember.getStateMachine());
this.dataGroupMember = dataGroupMember;
}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/FilePartitionedSnapshotLogManager.java b/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/FilePartitionedSnapshotLogManager.java
index 1774a0c3ac..d1b682257d 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/FilePartitionedSnapshotLogManager.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/FilePartitionedSnapshotLogManager.java
@@ -66,24 +66,23 @@ public class FilePartitionedSnapshotLogManager extends PartitionedSnapshotLogMan
LoggerFactory.getLogger(FilePartitionedSnapshotLogManager.class);
public FilePartitionedSnapshotLogManager(
- IStateMachine stateMachine,
PartitionTable partitionTable,
Node header,
Node thisNode,
DataGroupMember dataGroupMember) {
super(
- createLogApplier(dataGroupMember, stateMachine),
+ createLogApplier(dataGroupMember),
partitionTable,
header,
thisNode,
Factory.INSTANCE,
dataGroupMember,
- stateMachine);
+ dataGroupMember.getStateMachine());
}
private static LogApplier createLogApplier(
- DataGroupMember dataGroupMember, IStateMachine stateMachine) {
- LogApplier applier = new DataLogApplier(dataGroupMember, stateMachine);
+ DataGroupMember dataGroupMember) {
+ LogApplier applier = new DataLogApplier(dataGroupMember);
if (ClusterDescriptor.getInstance().getConfig().isUseAsyncApplier()
&& ClusterDescriptor.getInstance().getConfig().getReplicationNum() != 1) {
applier = new AsyncDataLogApplier(applier, dataGroupMember.getName());
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/MetaSingleSnapshotLogManager.java b/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/MetaSingleSnapshotLogManager.java
index 5d5d5bfe28..25a7e02ac7 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/MetaSingleSnapshotLogManager.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/log/manage/MetaSingleSnapshotLogManager.java
@@ -53,12 +53,12 @@ public class MetaSingleSnapshotLogManager extends RaftLogManager {
private long commitIndex;
private long term;
- public MetaSingleSnapshotLogManager(IStateMachine stateMachine, MetaGroupMember metaGroupMember) {
+ public MetaSingleSnapshotLogManager(MetaGroupMember metaGroupMember) {
super(
new SyncLogDequeSerializer(0),
- new MetaLogApplier(metaGroupMember, stateMachine),
+ new MetaLogApplier(metaGroupMember, metaGroupMember.getStateMachine()),
metaGroupMember.getName(),
- stateMachine);
+ metaGroupMember.getStateMachine());
this.metaGroupMember = metaGroupMember;
}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/DataGroupMember.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/DataGroupMember.java
index 95c569db50..16db321abe 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/DataGroupMember.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/DataGroupMember.java
@@ -241,7 +241,7 @@ public class DataGroupMember extends RaftMember implements DataGroupMemberMBean
logManager =
new FilePartitionedSnapshotLogManager(
- stateMachine, metaGroupMember.getPartitionTable(), allNodes.get(0), thisNode, this);
+ metaGroupMember.getPartitionTable(), allNodes.get(0), thisNode, this);
logSequencer = SEQUENCER_FACTORY.create(this, logManager);
initPeerMap();
term.set(logManager.getHardState().getCurrentTerm());
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java
index 7f16f6fb78..bb8ec6e97b 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java
@@ -225,7 +225,7 @@ public class MetaGroupMember extends RaftMember implements IService, MetaGroupMe
initPeerMap();
// committed logs are applied to the state machine (the IoTDB instance) through the applier
- logManager = new MetaSingleSnapshotLogManager(stateMachine, this);
+ logManager = new MetaSingleSnapshotLogManager(this);
logSequencer = SEQUENCER_FACTORY.create(this, logManager);
term.set(logManager.getHardState().getCurrentTerm());
voteFor = logManager.getHardState().getVoteFor();
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/RaftMember.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/RaftMember.java
index bb40aea9ae..8d126b284c 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/member/RaftMember.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/member/RaftMember.java
@@ -296,6 +296,8 @@ public abstract class RaftMember implements RaftMemberMBean {
private ThreadLocal<String> threadBaseName = new ThreadLocal<>();
+ private boolean isVerifier = false;
+
protected RaftMember(IStateMachine stateMachine) {
this.stateMachine = stateMachine;
}
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/common/TestDataGroupMember.java b/cluster/src/test/java/org/apache/iotdb/cluster/common/TestDataGroupMember.java
index 89193775cd..fe274e55e1 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/common/TestDataGroupMember.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/common/TestDataGroupMember.java
@@ -20,6 +20,7 @@
package org.apache.iotdb.cluster.common;
import org.apache.iotdb.cluster.config.ClusterConstant;
+import org.apache.iotdb.cluster.impl.PlanBasedStateMachine;
import org.apache.iotdb.cluster.partition.PartitionGroup;
import org.apache.iotdb.cluster.partition.slot.SlotManager;
import org.apache.iotdb.cluster.query.manage.ClusterQueryManager;
@@ -32,13 +33,14 @@ public class TestDataGroupMember extends DataGroupMember {
public TestDataGroupMember() {
super(
- TestUtils.getNode(0), new PartitionGroup(Collections.singletonList(TestUtils.getNode(0))));
+ TestUtils.getNode(0), new PartitionGroup(Collections.singletonList(TestUtils.getNode(0))),
+ new PlanBasedStateMachine());
setQueryManager(new ClusterQueryManager());
this.slotManager = new SlotManager(ClusterConstant.SLOT_NUM, null, "");
}
public TestDataGroupMember(Node thisNode, PartitionGroup allNodes) {
- super(thisNode, allNodes);
+ super(thisNode, allNodes, new PlanBasedStateMachine());
this.slotManager = new SlotManager(ClusterConstant.SLOT_NUM, null, "");
setQueryManager(new ClusterQueryManager());
}
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/common/TestLogApplier.java b/cluster/src/test/java/org/apache/iotdb/cluster/common/TestLogApplier.java
index 663164dcf4..9c58e38881 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/common/TestLogApplier.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/common/TestLogApplier.java
@@ -29,6 +29,7 @@ import org.apache.iotdb.db.engine.StorageEngine;
import org.apache.iotdb.db.exception.metadata.StorageGroupNotSetException;
import org.apache.iotdb.db.exception.query.QueryProcessException;
import org.apache.iotdb.db.qp.executor.PlanExecutor;
+import org.apache.iotdb.db.qp.physical.PhysicalPlan;
public class TestLogApplier implements LogApplier {
@@ -39,7 +40,7 @@ public class TestLogApplier implements LogApplier {
try {
if (log instanceof RequestLog) {
RequestLog requestLog = (RequestLog) log;
- getPlanExecutor().processNonQuery(requestLog.getRequest());
+ getPlanExecutor().processNonQuery(((PhysicalPlan) requestLog.getRequest()));
} else if (log instanceof CloseFileLog) {
CloseFileLog closeFileLog = ((CloseFileLog) log);
try {
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/common/TestLogManager.java b/cluster/src/test/java/org/apache/iotdb/cluster/common/TestLogManager.java
index 9471f64771..d7b8a2456c 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/common/TestLogManager.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/common/TestLogManager.java
@@ -19,6 +19,7 @@
package org.apache.iotdb.cluster.common;
+import org.apache.iotdb.cluster.impl.PlanBasedStateMachine;
import org.apache.iotdb.cluster.log.Snapshot;
import org.apache.iotdb.cluster.log.manage.RaftLogManager;
import org.apache.iotdb.cluster.log.manage.serializable.SyncLogDequeSerializer;
@@ -26,7 +27,7 @@ import org.apache.iotdb.cluster.log.manage.serializable.SyncLogDequeSerializer;
public class TestLogManager extends RaftLogManager {
public TestLogManager(int nodeIdentifier) {
- super(new SyncLogDequeSerializer(nodeIdentifier), new TestLogApplier(), "Test");
+ super(new SyncLogDequeSerializer(nodeIdentifier), new TestLogApplier(), "Test", new PlanBasedStateMachine());
}
@Override
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/common/TestMetaGroupMember.java b/cluster/src/test/java/org/apache/iotdb/cluster/common/TestMetaGroupMember.java
index c0bd588e2b..130934832d 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/common/TestMetaGroupMember.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/common/TestMetaGroupMember.java
@@ -21,6 +21,7 @@ package org.apache.iotdb.cluster.common;
import org.apache.iotdb.cluster.client.ClientManager;
import org.apache.iotdb.cluster.config.ClusterDescriptor;
+import org.apache.iotdb.cluster.impl.PlanBasedStateMachine;
import org.apache.iotdb.cluster.log.manage.MetaSingleSnapshotLogManager;
import org.apache.iotdb.cluster.partition.PartitionGroup;
import org.apache.iotdb.cluster.server.member.MetaGroupMember;
@@ -28,10 +29,10 @@ import org.apache.iotdb.cluster.server.member.MetaGroupMember;
public class TestMetaGroupMember extends MetaGroupMember {
public TestMetaGroupMember() {
- super();
+ super(new PlanBasedStateMachine());
MetaSingleSnapshotLogManager manager =
- new MetaSingleSnapshotLogManager(new TestLogApplier(), this);
+ new MetaSingleSnapshotLogManager(this);
setLogManager(manager);
PartitionGroup group = new PartitionGroup();
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/common/TestPartitionedLogManager.java b/cluster/src/test/java/org/apache/iotdb/cluster/common/TestPartitionedLogManager.java
index 8a4c5eb3cf..1d37b53745 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/common/TestPartitionedLogManager.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/common/TestPartitionedLogManager.java
@@ -36,7 +36,7 @@ public class TestPartitionedLogManager extends PartitionedSnapshotLogManager {
null,
null,
null,
- stateMachine);
+ null);
}
public TestPartitionedLogManager(
@@ -48,7 +48,7 @@ public class TestPartitionedLogManager extends PartitionedSnapshotLogManager {
new Node("localhost", 30001, 1, 40001, Constants.RPC_PORT, "localhost"),
factory,
null,
- stateMachine);
+ null);
}
@Override
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/log/applier/AsyncDataLogApplierTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/log/applier/AsyncDataLogApplierTest.java
index 2866927b4f..90ba6e966c 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/log/applier/AsyncDataLogApplierTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/log/applier/AsyncDataLogApplierTest.java
@@ -70,7 +70,7 @@ public class AsyncDataLogApplierTest {
log -> {
if (log instanceof RequestLog) {
RequestLog requestLog = (RequestLog) log;
- PhysicalPlan plan = requestLog.getRequest();
+ PhysicalPlan plan = ((PhysicalPlan) requestLog.getRequest());
if (plan instanceof InsertRowPlan) {
appliedLogs.add(log);
log.setApplied(true);
@@ -118,7 +118,7 @@ public class AsyncDataLogApplierTest {
log -> {
if (log instanceof RequestLog) {
RequestLog requestLog = (RequestLog) log;
- PhysicalPlan plan = requestLog.getRequest();
+ PhysicalPlan plan = ((PhysicalPlan) requestLog.getRequest());
if (plan instanceof InsertRowPlan) {
appliedLogs.add(log);
log.setApplied(true);
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/log/applier/DataLogApplierTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/log/applier/DataLogApplierTest.java
index 16a7f23037..8835a84acb 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/log/applier/DataLogApplierTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/log/applier/DataLogApplierTest.java
@@ -29,6 +29,7 @@ import org.apache.iotdb.cluster.common.TestDataGroupMember;
import org.apache.iotdb.cluster.common.TestMetaGroupMember;
import org.apache.iotdb.cluster.common.TestUtils;
import org.apache.iotdb.cluster.coordinator.Coordinator;
+import org.apache.iotdb.cluster.impl.PlanBasedStateMachine;
import org.apache.iotdb.cluster.log.logtypes.CloseFileLog;
import org.apache.iotdb.cluster.log.logtypes.RequestLog;
import org.apache.iotdb.cluster.metadata.CSchemaProcessor;
@@ -281,7 +282,7 @@ public class DataLogApplierTest extends IoTDBTest {
});
((CSchemaProcessor) IoTDB.schemaProcessor).setMetaGroupMember(testMetaGroupMember);
testDataGroupMember.setMetaGroupMember(testMetaGroupMember);
- applier = new DataLogApplier(testMetaGroupMember, testDataGroupMember);
+ applier = new DataLogApplier(testDataGroupMember);
}
@Override
@@ -463,18 +464,21 @@ public class DataLogApplierTest extends IoTDBTest {
@Test
public void testApplyDeletePartitionFilter() throws QueryProcessException {
- applier.setS(
- new PlanExecutor() {
- @Override
- public boolean processNonQuery(PhysicalPlan plan) {
- assertTrue(plan instanceof DeletePlan);
- DeletePlan deletePlan = (DeletePlan) plan;
- TimePartitionFilter planFilter = deletePlan.getPartitionFilter();
- TimePartitionFilter memberFilter = testDataGroupMember.getTimePartitionFilter();
- assertEquals(planFilter, memberFilter);
- return true;
- }
- });
+ applier.setStateMachine(
+ new PlanBasedStateMachine().setPlanExecutor(
+ new PlanExecutor() {
+ @Override
+ public boolean processNonQuery(PhysicalPlan plan) {
+ assertTrue(plan instanceof DeletePlan);
+ DeletePlan deletePlan = (DeletePlan) plan;
+ TimePartitionFilter planFilter = deletePlan.getPartitionFilter();
+ TimePartitionFilter memberFilter = testDataGroupMember.getTimePartitionFilter();
+ assertEquals(planFilter, memberFilter);
+ return true;
+ }
+ }
+ )
+ );
DeletePlan deletePlan = new DeletePlan();
RequestLog log = new RequestLog(deletePlan);
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/log/applier/MetaLogApplierTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/log/applier/MetaLogApplierTest.java
index 7bb8130f44..b2e7525ff7 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/log/applier/MetaLogApplierTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/log/applier/MetaLogApplierTest.java
@@ -68,7 +68,7 @@ public class MetaLogApplierTest extends IoTDBTest {
}
};
- private LogApplier applier = new MetaLogApplier(testMetaGroupMember);
+ private LogApplier applier = new MetaLogApplier(testMetaGroupMember, testMetaGroupMember.getStateMachine());
@Override
@After
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/log/manage/FilePartitionedSnapshotLogManagerTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/log/manage/FilePartitionedSnapshotLogManagerTest.java
index 563ddc860b..4cc02b6137 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/log/manage/FilePartitionedSnapshotLogManagerTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/log/manage/FilePartitionedSnapshotLogManagerTest.java
@@ -61,10 +61,8 @@ public class FilePartitionedSnapshotLogManagerTest extends IoTDBTest {
@Test
public void testSnapshot() throws Exception {
PartitionTable partitionTable = TestUtils.getPartitionTable(3);
- LogApplier applier = new TestLogApplier();
FilePartitionedSnapshotLogManager manager =
new FilePartitionedSnapshotLogManager(
- applier,
partitionTable,
TestUtils.getNode(0),
TestUtils.getNode(0),
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/log/manage/MetaSingleSnapshotLogManagerTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/log/manage/MetaSingleSnapshotLogManagerTest.java
index f967b2beac..44beea3370 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/log/manage/MetaSingleSnapshotLogManagerTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/log/manage/MetaSingleSnapshotLogManagerTest.java
@@ -23,6 +23,7 @@ import org.apache.iotdb.cluster.common.IoTDBTest;
import org.apache.iotdb.cluster.common.TestLogApplier;
import org.apache.iotdb.cluster.common.TestUtils;
import org.apache.iotdb.cluster.coordinator.Coordinator;
+import org.apache.iotdb.cluster.impl.PlanBasedStateMachine;
import org.apache.iotdb.cluster.log.Log;
import org.apache.iotdb.cluster.log.snapshot.MetaSimpleSnapshot;
import org.apache.iotdb.cluster.partition.slot.SlotPartitionTable;
@@ -51,11 +52,11 @@ public class MetaSingleSnapshotLogManagerTest extends IoTDBTest {
@Before
public void setUp() throws QueryProcessException, StartupException, IllegalPathException {
super.setUp();
- MetaGroupMember metaGroupMember = new MetaGroupMember();
+ MetaGroupMember metaGroupMember = new MetaGroupMember(new PlanBasedStateMachine());
Coordinator coordinator = new Coordinator(metaGroupMember);
metaGroupMember.setCoordinator(coordinator);
metaGroupMember.setPartitionTable(new SlotPartitionTable(new Node()));
- logManager = new MetaSingleSnapshotLogManager(new TestLogApplier(), metaGroupMember);
+ logManager = new MetaSingleSnapshotLogManager(metaGroupMember);
}
@Override
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/log/manage/RaftLogManagerTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/log/manage/RaftLogManagerTest.java
index 4d47219693..fe5e7305c6 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/log/manage/RaftLogManagerTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/log/manage/RaftLogManagerTest.java
@@ -26,6 +26,7 @@ import org.apache.iotdb.cluster.exception.EntryCompactedException;
import org.apache.iotdb.cluster.exception.GetEntriesWrongParametersException;
import org.apache.iotdb.cluster.exception.LogExecutionException;
import org.apache.iotdb.cluster.exception.TruncateCommittedEntryException;
+import org.apache.iotdb.cluster.impl.PlanBasedStateMachine;
import org.apache.iotdb.cluster.log.HardState;
import org.apache.iotdb.cluster.log.Log;
import org.apache.iotdb.cluster.log.LogApplier;
@@ -62,7 +63,7 @@ public class RaftLogManagerTest {
public TestRaftLogManager(
StableEntryManager stableEntryManager, LogApplier applier, String name) {
- super(stableEntryManager, applier, name);
+ super(stableEntryManager, applier, name, new PlanBasedStateMachine());
}
public TestRaftLogManager(
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/query/manage/QueryCoordinatorTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/query/manage/QueryCoordinatorTest.java
index 23752a7fcd..2344fb765f 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/query/manage/QueryCoordinatorTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/query/manage/QueryCoordinatorTest.java
@@ -22,6 +22,7 @@ package org.apache.iotdb.cluster.query.manage;
import org.apache.iotdb.cluster.common.TestAsyncMetaClient;
import org.apache.iotdb.cluster.common.TestUtils;
import org.apache.iotdb.cluster.config.ClusterDescriptor;
+import org.apache.iotdb.cluster.impl.PlanBasedStateMachine;
import org.apache.iotdb.cluster.rpc.thrift.Node;
import org.apache.iotdb.cluster.rpc.thrift.RaftService.AsyncClient;
import org.apache.iotdb.cluster.rpc.thrift.TNodeStatus;
@@ -71,7 +72,7 @@ public class QueryCoordinatorTest {
}
MetaGroupMember metaGroupMember =
- new MetaGroupMember() {
+ new MetaGroupMember(new PlanBasedStateMachine()) {
@Override
public AsyncClient getAsyncClient(Node node) {
try {
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/query/reader/RemoteSeriesReaderByTimestampTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/query/reader/RemoteSeriesReaderByTimestampTest.java
index 88aca43cae..3c368259fa 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/query/reader/RemoteSeriesReaderByTimestampTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/query/reader/RemoteSeriesReaderByTimestampTest.java
@@ -25,6 +25,7 @@ import org.apache.iotdb.cluster.client.IClientManager;
import org.apache.iotdb.cluster.client.async.AsyncDataClient;
import org.apache.iotdb.cluster.common.TestUtils;
import org.apache.iotdb.cluster.config.ClusterDescriptor;
+import org.apache.iotdb.cluster.impl.PlanBasedStateMachine;
import org.apache.iotdb.cluster.partition.PartitionGroup;
import org.apache.iotdb.cluster.query.RemoteQueryContext;
import org.apache.iotdb.cluster.rpc.thrift.Node;
@@ -151,7 +152,7 @@ public class RemoteSeriesReaderByTimestampTest {
ClusterDescriptor.getInstance().getConfig().setUseAsyncServer(prevUseAsyncServer);
}
- private MetaGroupMember metaGroupMember = new MetaGroupMember();
+ private MetaGroupMember metaGroupMember = new MetaGroupMember(new PlanBasedStateMachine());
@Test
public void test() throws IOException, StorageEngineException {
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/server/member/BaseMember.java b/cluster/src/test/java/org/apache/iotdb/cluster/server/member/BaseMember.java
index 510621c128..c6037bf678 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/server/member/BaseMember.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/server/member/BaseMember.java
@@ -275,7 +275,7 @@ public class BaseMember {
private PartitionedSnapshotLogManager getLogManager(
PartitionGroup partitionGroup, DataGroupMember dataGroupMember) {
return new TestPartitionedLogManager(
- new DataLogApplier(testMetaMember, dataGroupMember),
+ new DataLogApplier(dataGroupMember),
testMetaMember.getPartitionTable(),
partitionGroup.getHeader().getNode(),
FileSnapshot.Factory.INSTANCE) {
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/server/member/DataGroupMemberTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/server/member/DataGroupMemberTest.java
index 64b167f3df..f517936c9e 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/server/member/DataGroupMemberTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/server/member/DataGroupMemberTest.java
@@ -170,7 +170,7 @@ public class DataGroupMemberTest extends BaseMember {
private PartitionedSnapshotLogManager getLogManager(
PartitionGroup partitionGroup, DataGroupMember dataGroupMember) {
return new TestPartitionedLogManager(
- new DataLogApplier(testMetaMember, dataGroupMember),
+ new DataLogApplier(dataGroupMember),
testMetaMember.getPartitionTable(),
partitionGroup.getHeader().getNode(),
FileSnapshot.Factory.INSTANCE) {
@@ -197,7 +197,7 @@ public class DataGroupMemberTest extends BaseMember {
private DataGroupMember getDataGroupMember(Node node, PartitionGroup nodes) {
DataGroupMember dataGroupMember =
- new DataGroupMember(node, nodes, testMetaMember) {
+ new DataGroupMember(node, nodes, testMetaMember.getStateMachine()) {
@Override
public boolean syncLeader(CheckConsistency checkConsistency) {
return true;
@@ -605,7 +605,7 @@ public class DataGroupMemberTest extends BaseMember {
Collections.emptyMap(),
Collections.emptyMap(),
null);
- assertEquals(200, dataGroupMember.executeRequest(createTimeSeriesPlan).code);
+ assertEquals(200, dataGroupMember.executeRequest(createTimeSeriesPlan).getStatus().code);
assertTrue(IoTDB.schemaProcessor.isPathExist(new PartialPath(timeseriesSchema.getFullPath())));
}
@@ -633,7 +633,7 @@ public class DataGroupMemberTest extends BaseMember {
getLogManager(
partitionTable.getPartitionGroup(new RaftNode(TestUtils.getNode(0), 0)),
dataGroupMember));
- assertEquals(200, dataGroupMember.executeRequest(createTimeSeriesPlan).code);
+ assertEquals(200, dataGroupMember.executeRequest(createTimeSeriesPlan).getStatus().code);
assertTrue(IoTDB.schemaProcessor.isPathExist(new PartialPath(timeseriesSchema.getFullPath())));
testThreadPool.shutdownNow();
}
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/server/member/MetaGroupMemberTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/server/member/MetaGroupMemberTest.java
index a0640edfc3..b8c73569bb 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/server/member/MetaGroupMemberTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/server/member/MetaGroupMemberTest.java
@@ -38,6 +38,7 @@ import org.apache.iotdb.cluster.exception.EmptyIntervalException;
import org.apache.iotdb.cluster.exception.LogExecutionException;
import org.apache.iotdb.cluster.exception.PartitionTableUnavailableException;
import org.apache.iotdb.cluster.exception.StartUpCheckFailureException;
+import org.apache.iotdb.cluster.impl.PlanBasedStateMachine;
import org.apache.iotdb.cluster.log.VotingLog;
import org.apache.iotdb.cluster.log.logtypes.AddNodeLog;
import org.apache.iotdb.cluster.log.logtypes.CloseFileLog;
@@ -88,6 +89,9 @@ import org.apache.iotdb.commons.auth.entity.User;
import org.apache.iotdb.commons.exception.IllegalPathException;
import org.apache.iotdb.commons.exception.MetadataException;
import org.apache.iotdb.commons.path.PartialPath;
+import org.apache.iotdb.consensus.common.request.IConsensusRequest;
+import org.apache.iotdb.consensus.common.response.ConsensusWriteResponse;
+import org.apache.iotdb.consensus.exception.ConsensusException;
import org.apache.iotdb.db.engine.StorageEngine;
import org.apache.iotdb.db.exception.StorageEngineException;
import org.apache.iotdb.db.exception.metadata.StorageGroupNotSetException;
@@ -187,7 +191,7 @@ public class MetaGroupMemberTest extends BaseMember {
dataGroupEngine =
new DataGroupEngine(
- new DataGroupMember.Factory(new Factory(), testMetaMember) {
+ new DataGroupMember.Factory(testMetaMember) {
@Override
public DataGroupMember create(Node thisNode, PartitionGroup partitionGroup) {
return getDataGroupMember(partitionGroup, thisNode);
@@ -231,7 +235,7 @@ public class MetaGroupMemberTest extends BaseMember {
private DataGroupMember getDataGroupMember(PartitionGroup group, Node node) {
DataGroupMember dataGroupMember =
- new DataGroupMember(node, group, testMetaMember) {
+ new DataGroupMember(node, group, testMetaMember.getStateMachine()) {
@Override
public boolean syncLeader(CheckConsistency checkConsistency) {
return true;
@@ -241,20 +245,20 @@ public class MetaGroupMemberTest extends BaseMember {
public void pullSlots(NodeRemovalResult removalResult) {}
@Override
- public TSStatus executeNonQueryPlan(PhysicalPlan plan) {
+ public ConsensusWriteResponse executeRequest(IConsensusRequest request) {
try {
- planExecutor.processNonQuery(plan);
- return StatusUtils.OK;
+ planExecutor.processNonQuery(((PhysicalPlan) request));
+ return new ConsensusWriteResponse(null, StatusUtils.OK);
} catch (QueryProcessException
| StorageGroupNotSetException
| StorageEngineException e) {
- return StatusUtils.getStatus(StatusUtils.EXECUTE_STATEMENT_ERROR, e.getMessage());
+ return new ConsensusWriteResponse(new ConsensusException(e.getMessage(), e), StatusUtils.EXECUTE_STATEMENT_ERROR);
}
}
@Override
- public TSStatus forwardPlan(PhysicalPlan plan, Node node, RaftNode header) {
- return executeNonQueryPlan(plan);
+ public TSStatus forwardPlan(IConsensusRequest request, Node node, RaftNode header) {
+ return executeRequest(request).getStatus();
}
@Override
@@ -355,7 +359,7 @@ public class MetaGroupMemberTest extends BaseMember {
@Override
protected MetaGroupMember getMetaGroupMember(Node node) {
MetaGroupMember metaGroupMember =
- new MetaGroupMember(node, new Coordinator()) {
+ new MetaGroupMember(node, new Coordinator(), new PlanBasedStateMachine()) {
@Override
public void applyAddNode(AddNodeLog addNodeLog) {