You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2021/11/19 12:01:07 UTC
[iotdb] branch master updated: add javadoc for cluster (#4417)
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 05158d1 add javadoc for cluster (#4417)
05158d1 is described below
commit 05158d177376b698ab60466db6d4373487f9c9a4
Author: Jialin Qiao <qj...@mails.tsinghua.edu.cn>
AuthorDate: Fri Nov 19 05:59:55 2021 -0600
add javadoc for cluster (#4417)
---
.../log/snapshot/PullSnapshotTaskDescriptor.java | 2 +-
.../apache/iotdb/cluster/metadata/CMManager.java | 8 ++--
.../cluster/partition/NodeAdditionResult.java | 4 +-
.../iotdb/cluster/partition/NodeRemovalResult.java | 4 +-
.../iotdb/cluster/partition/PartitionGroup.java | 33 ++++++++-------
.../iotdb/cluster/partition/PartitionTable.java | 6 +--
.../partition/balancer/DefaultSlotBalancer.java | 6 ++-
.../cluster/partition/balancer/SlotBalancer.java | 4 +-
.../iotdb/cluster/partition/slot/SlotManager.java | 2 +-
.../partition/slot/SlotNodeAdditionResult.java | 2 +-
.../cluster/partition/slot/SlotPartitionTable.java | 48 +++++++++++-----------
.../iotdb/cluster/partition/slot/SlotStrategy.java | 2 +-
.../partition/slot/SlotTimePartitionFilter.java | 3 +-
.../iotdb/cluster/query/ClusterPlanExecutor.java | 6 +--
.../cluster/query/aggregate/ClusterAggregator.java | 3 +-
.../cluster/query/fill/ClusterPreviousFill.java | 2 +-
.../query/last/ClusterLastQueryExecutor.java | 2 +-
.../cluster/query/reader/ClusterReaderFactory.java | 6 ++-
.../cluster/server/PullSnapshotHintService.java | 2 +-
.../iotdb/cluster/server/StoppedMemberManager.java | 2 +-
.../cluster/server/member/DataGroupMember.java | 7 ++--
.../cluster/server/member/MetaGroupMember.java | 4 +-
.../iotdb/cluster/server/member/RaftMember.java | 2 +-
.../cluster/server/service/DataGroupEngine.java | 4 +-
.../cluster/utils/nodetool/ClusterMonitor.java | 2 +-
.../cluster/utils/nodetool/function/Slot.java | 2 +-
.../cluster/partition/SlotPartitionTableTest.java | 2 +-
.../server/heartbeat/MetaHeartbeatThreadTest.java | 2 +-
.../iotdb/cluster/server/member/BaseMember.java | 4 +-
.../cluster/server/member/DataGroupMemberTest.java | 13 +++---
.../cluster/server/member/RaftMemberTest.java | 4 +-
31 files changed, 101 insertions(+), 92 deletions(-)
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/log/snapshot/PullSnapshotTaskDescriptor.java b/cluster/src/main/java/org/apache/iotdb/cluster/log/snapshot/PullSnapshotTaskDescriptor.java
index 7587fa1..66925c7 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/log/snapshot/PullSnapshotTaskDescriptor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/log/snapshot/PullSnapshotTaskDescriptor.java
@@ -75,7 +75,7 @@ public class PullSnapshotTaskDescriptor {
dataOutputStream.writeInt(slot);
}
- dataOutputStream.writeInt(previousHolders.getId());
+ dataOutputStream.writeInt(previousHolders.getRaftId());
dataOutputStream.writeInt(previousHolders.size());
for (Node previousHolder : previousHolders) {
NodeSerializeUtils.serialize(previousHolder, dataOutputStream);
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java b/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java
index 70f6ff2..e2d9280 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/metadata/CMManager.java
@@ -948,7 +948,7 @@ public class CMManager extends MManager {
// leader
try {
metaGroupMember
- .getLocalDataMember(partitionGroup.getHeader(), partitionGroup.getId())
+ .getLocalDataMember(partitionGroup.getHeader(), partitionGroup.getRaftId())
.syncLeader(null);
} catch (CheckConsistencyException e) {
logger.warn("Failed to check consistency.", e);
@@ -1093,7 +1093,7 @@ public class CMManager extends MManager {
// leader
try {
metaGroupMember
- .getLocalDataMember(partitionGroup.getHeader(), partitionGroup.getId())
+ .getLocalDataMember(partitionGroup.getHeader(), partitionGroup.getRaftId())
.syncLeader(null);
} catch (CheckConsistencyException e) {
logger.warn("Failed to check consistency.", e);
@@ -1506,7 +1506,7 @@ public class CMManager extends MManager {
PartitionGroup group, ShowDevicesPlan plan, Set<ShowDevicesResult> resultSet)
throws CheckConsistencyException, MetadataException {
DataGroupMember localDataMember =
- metaGroupMember.getLocalDataMember(group.getHeader(), group.getId());
+ metaGroupMember.getLocalDataMember(group.getHeader(), group.getRaftId());
localDataMember.syncLeaderWithConsistencyCheck(false);
try {
List<ShowDevicesResult> localResult = super.getMatchedDevices(plan);
@@ -1525,7 +1525,7 @@ public class CMManager extends MManager {
QueryContext context)
throws CheckConsistencyException, MetadataException {
DataGroupMember localDataMember =
- metaGroupMember.getLocalDataMember(group.getHeader(), group.getId());
+ metaGroupMember.getLocalDataMember(group.getHeader(), group.getRaftId());
localDataMember.syncLeaderWithConsistencyCheck(false);
try {
List<ShowTimeSeriesResult> localResult = super.showTimeseries(plan, context);
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/partition/NodeAdditionResult.java b/cluster/src/main/java/org/apache/iotdb/cluster/partition/NodeAdditionResult.java
index 2d8dadd..95256b9 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/partition/NodeAdditionResult.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/partition/NodeAdditionResult.java
@@ -24,8 +24,8 @@ import java.util.List;
public class NodeAdditionResult {
- /** A new data group headed by the new node. */
- private List<PartitionGroup> newGroupList = new ArrayList<>();
+ /** new data groups(multi raft) headed by the new node. */
+ private final List<PartitionGroup> newGroupList = new ArrayList<>();
public List<PartitionGroup> getNewGroupList() {
return newGroupList;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/partition/NodeRemovalResult.java b/cluster/src/main/java/org/apache/iotdb/cluster/partition/NodeRemovalResult.java
index ab4d413..b5e3b28 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/partition/NodeRemovalResult.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/partition/NodeRemovalResult.java
@@ -28,11 +28,11 @@ import java.util.List;
/** NodeRemovalResult stores the removed partition group. */
public class NodeRemovalResult {
- private List<PartitionGroup> removedGroupList = new ArrayList<>();
+ private final List<PartitionGroup> removedGroupList = new ArrayList<>();
public PartitionGroup getRemovedGroup(int raftId) {
for (PartitionGroup group : removedGroupList) {
- if (group.getId() == raftId) {
+ if (group.getRaftId() == raftId) {
return group;
}
}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/partition/PartitionGroup.java b/cluster/src/main/java/org/apache/iotdb/cluster/partition/PartitionGroup.java
index b86726b..bb2f1d9 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/partition/PartitionGroup.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/partition/PartitionGroup.java
@@ -32,13 +32,12 @@ import java.util.Collection;
import java.util.Objects;
/**
- * PartitionGroup contains all the nodes that will form a data group with a certain node, which are
- * the REPLICATION_NUM - 1 different physical nodes after this node. The first element of the list
- * is called header, which is also the identifier of the data group.
+ * PartitionGroup contains all the nodes of a data group. The first element of the list is called
+ * header.
*/
public class PartitionGroup extends ArrayList<Node> {
- private int id;
+ private int raftId;
public PartitionGroup() {}
@@ -46,14 +45,14 @@ public class PartitionGroup extends ArrayList<Node> {
this.addAll(nodes);
}
- public PartitionGroup(int id, Node... nodes) {
+ public PartitionGroup(int raftId, Node... nodes) {
this.addAll(Arrays.asList(nodes));
- this.id = id;
+ this.raftId = raftId;
}
public PartitionGroup(PartitionGroup other) {
super(other);
- this.id = other.getId();
+ this.raftId = other.getRaftId();
}
@Override
@@ -65,11 +64,11 @@ public class PartitionGroup extends ArrayList<Node> {
return false;
}
PartitionGroup group = (PartitionGroup) o;
- return Objects.equals(id, group.getId()) && super.equals(group);
+ return Objects.equals(raftId, group.getRaftId()) && super.equals(group);
}
public void serialize(DataOutputStream dataOutputStream) throws IOException {
- dataOutputStream.writeInt(getId());
+ dataOutputStream.writeInt(getRaftId());
dataOutputStream.writeInt(size());
for (Node node : this) {
NodeSerializeUtils.serialize(node, dataOutputStream);
@@ -77,7 +76,7 @@ public class PartitionGroup extends ArrayList<Node> {
}
public void deserialize(ByteBuffer buffer) {
- id = buffer.getInt();
+ raftId = buffer.getInt();
int nodeNum = buffer.getInt();
for (int i2 = 0; i2 < nodeNum; i2++) {
Node node = new Node();
@@ -88,23 +87,23 @@ public class PartitionGroup extends ArrayList<Node> {
@Override
public int hashCode() {
- return Objects.hash(id, super.hashCode());
+ return Objects.hash(raftId, super.hashCode());
}
public RaftNode getHeader() {
- return new RaftNode(get(0), getId());
+ return new RaftNode(get(0), getRaftId());
}
- public int getId() {
- return id;
+ public int getRaftId() {
+ return raftId;
}
- public void setId(int id) {
- this.id = id;
+ public void setRaftId(int raftId) {
+ this.raftId = raftId;
}
@Override
public String toString() {
- return super.toString() + ", id = " + id;
+ return super.toString() + ", id = " + raftId;
}
}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/partition/PartitionTable.java b/cluster/src/main/java/org/apache/iotdb/cluster/partition/PartitionTable.java
index 0d704ae..2767d4e 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/partition/PartitionTable.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/partition/PartitionTable.java
@@ -34,7 +34,7 @@ import java.util.List;
/**
* PartitionTable manages the map whose key is the StorageGroupName with a time interval and the
- * value is a PartitionGroup witch contains all nodes that manage the corresponding data.
+ * value is a PartitionGroup which contains all nodes that manage the corresponding data.
*/
public interface PartitionTable {
@@ -88,10 +88,10 @@ public interface PartitionTable {
List<PartitionGroup> getLocalGroups();
/**
- * @param raftNode
+ * @param headerNode from which node the partition starts
* @return the partition group starting from the header.
*/
- PartitionGroup getHeaderGroup(RaftNode raftNode);
+ PartitionGroup getPartitionGroup(RaftNode headerNode);
ByteBuffer serialize();
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/partition/balancer/DefaultSlotBalancer.java b/cluster/src/main/java/org/apache/iotdb/cluster/partition/balancer/DefaultSlotBalancer.java
index f7bf377..2643123 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/partition/balancer/DefaultSlotBalancer.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/partition/balancer/DefaultSlotBalancer.java
@@ -75,7 +75,7 @@ public class DefaultSlotBalancer implements SlotBalancer {
newNodeSlotMap.get(curNode).addAll(slotsToMove);
for (Integer slot : slotsToMove) {
// record what node previously hold the integer
- previousNodeMap.get(curNode).put(slot, table.getHeaderGroup(entry.getKey(), oldRing));
+ previousNodeMap.get(curNode).put(slot, table.getPartitionGroup(entry.getKey(), oldRing));
slotNodes[slot] = curNode;
}
slotsToMove.clear();
@@ -86,7 +86,9 @@ public class DefaultSlotBalancer implements SlotBalancer {
newNodeSlotMap.get(curNode).addAll(slotsToMove);
for (Integer slot : slotsToMove) {
// record what node previously hold the integer
- previousNodeMap.get(curNode).put(slot, table.getHeaderGroup(entry.getKey(), oldRing));
+ previousNodeMap
+ .get(curNode)
+ .put(slot, table.getPartitionGroup(entry.getKey(), oldRing));
slotNodes[slot] = curNode;
}
slotsToMove.clear();
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/partition/balancer/SlotBalancer.java b/cluster/src/main/java/org/apache/iotdb/cluster/partition/balancer/SlotBalancer.java
index 3bfe241..20f7e4d 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/partition/balancer/SlotBalancer.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/partition/balancer/SlotBalancer.java
@@ -25,7 +25,7 @@ import org.apache.iotdb.cluster.rpc.thrift.RaftNode;
import java.util.List;
import java.util.Map;
-/** When add/remove node, the slots need to be redistributed. */
+/** When add/remove a node, the slots need to be redistributed. */
public interface SlotBalancer {
/**
@@ -34,7 +34,7 @@ public interface SlotBalancer {
void moveSlotsToNew(Node newNode, List<Node> oldRing);
/**
- * When remove a old node, all hash slots of the removed groups will assigned to other raft
+ * When remove an old node, all hash slots of the removed groups will assigned to other raft
* groups.
*
* @param target the node to be removed
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/partition/slot/SlotManager.java b/cluster/src/main/java/org/apache/iotdb/cluster/partition/slot/SlotManager.java
index 4b9be78..fb1928d 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/partition/slot/SlotManager.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/partition/slot/SlotManager.java
@@ -316,7 +316,7 @@ public class SlotManager {
}
}
- public int getSloNumInDataMigration() {
+ public int getSlotNumInDataMigration() {
int res = 0;
for (Entry<Integer, SlotDescriptor> entry : idSlotMap.entrySet()) {
SlotDescriptor descriptor = entry.getValue();
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/partition/slot/SlotNodeAdditionResult.java b/cluster/src/main/java/org/apache/iotdb/cluster/partition/slot/SlotNodeAdditionResult.java
index c6c702c..139aed4 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/partition/slot/SlotNodeAdditionResult.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/partition/slot/SlotNodeAdditionResult.java
@@ -27,7 +27,7 @@ import java.util.Set;
public class SlotNodeAdditionResult extends NodeAdditionResult {
- /** What slots will the old data groups transfer to the new one. */
+ /** which slots will the old data groups transfer to the new one. */
private Map<RaftNode, Set<Integer>> lostSlots;
public Map<RaftNode, Set<Integer>> getLostSlots() {
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/partition/slot/SlotPartitionTable.java b/cluster/src/main/java/org/apache/iotdb/cluster/partition/slot/SlotPartitionTable.java
index 7a46baa..ea77244 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/partition/slot/SlotPartitionTable.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/partition/slot/SlotPartitionTable.java
@@ -65,9 +65,11 @@ public class SlotPartitionTable implements PartitionTable {
private static final Logger logger = LoggerFactory.getLogger(SlotPartitionTable.class);
private static SlotStrategy slotStrategy = new DefaultStrategy();
- private int replicationNum = ClusterDescriptor.getInstance().getConfig().getReplicationNum();
+ private final int replicationNum =
+ ClusterDescriptor.getInstance().getConfig().getReplicationNum();
- private int multiRaftFactor = ClusterDescriptor.getInstance().getConfig().getMultiRaftFactor();
+ private final int multiRaftFactor =
+ ClusterDescriptor.getInstance().getConfig().getMultiRaftFactor();
// all nodes
private List<Node> nodeRing = new ArrayList<>();
@@ -203,7 +205,7 @@ public class SlotPartitionTable implements PartitionTable {
startIndex = startIndex + nodeRing.size();
}
for (int j = 0; j < multiRaftFactor; j++) {
- ret.add(getHeaderGroup(new RaftNode(nodeRing.get(startIndex), j)));
+ ret.add(getPartitionGroup(new RaftNode(nodeRing.get(startIndex), j)));
}
}
@@ -211,37 +213,37 @@ public class SlotPartitionTable implements PartitionTable {
return ret;
}
- public PartitionGroup getHeaderGroup(RaftNode raftNode, List<Node> nodeRing) {
- PartitionGroup ret = new PartitionGroup(raftNode.getRaftId());
+ public PartitionGroup getPartitionGroup(RaftNode header, List<Node> nodeRing) {
+ PartitionGroup ret = new PartitionGroup(header.getRaftId());
// assuming the nodes are [1,2,3,4,5]
- int nodeIndex = nodeRing.indexOf(raftNode.getNode());
+ int nodeIndex = nodeRing.indexOf(header.getNode());
if (nodeIndex == -1) {
- logger.warn("Node {} is not in the cluster", raftNode.getNode());
+ logger.warn("Node {} is not in the cluster", header.getNode());
return null;
}
int endIndex = nodeIndex + replicationNum;
if (endIndex > nodeRing.size()) {
- // for startIndex = 4, we concat [4, 5] and [1] to generate the group
+ // for startIndex = 4 and replicationNum = 3, we concat [4, 5] and [1] to generate the group
ret.addAll(nodeRing.subList(nodeIndex, nodeRing.size()));
ret.addAll(nodeRing.subList(0, endIndex - nodeRing.size()));
} else {
- // for startIndex = 2, [2,3,4] is the group
+ // for startIndex = 2 and replicationNum = 3, [2,3,4] is the group
ret.addAll(nodeRing.subList(nodeIndex, endIndex));
}
return ret;
}
@Override
- public PartitionGroup getHeaderGroup(RaftNode raftNode) {
- return getHeaderGroup(raftNode, this.nodeRing);
+ public PartitionGroup getPartitionGroup(RaftNode headerNode) {
+ return getPartitionGroup(headerNode, this.nodeRing);
}
@Override
public PartitionGroup route(String storageGroupName, long timestamp) {
synchronized (nodeRing) {
RaftNode raftNode = routeToHeaderByTime(storageGroupName, timestamp);
- return getHeaderGroup(raftNode);
+ return getPartitionGroup(raftNode);
}
}
@@ -259,7 +261,7 @@ public class SlotPartitionTable implements PartitionTable {
logger.warn("The slot {} is incorrect", slot);
return null;
}
- return getHeaderGroup(raftNode);
+ return getPartitionGroup(raftNode);
}
@Override
@@ -290,7 +292,7 @@ public class SlotPartitionTable implements PartitionTable {
for (int i = 0; i < localGroups.size(); i++) {
PartitionGroup oldGroup = localGroups.get(i);
RaftNode header = oldGroup.getHeader();
- PartitionGroup newGrp = getHeaderGroup(header);
+ PartitionGroup newGrp = getPartitionGroup(header);
if (newGrp.contains(node) && newGrp.contains(thisNode)) {
// this group changes but still contains the local node
localGroups.set(i, newGrp);
@@ -306,7 +308,7 @@ public class SlotPartitionTable implements PartitionTable {
PartitionGroup partitionGroup = groupIterator.next();
for (PartitionGroup retiredGroup : retiredGroups) {
if (retiredGroup.getHeader().equals(partitionGroup.getHeader())
- && retiredGroup.getId() == partitionGroup.getId()) {
+ && retiredGroup.getRaftId() == partitionGroup.getRaftId()) {
groupIterator.remove();
break;
}
@@ -315,7 +317,7 @@ public class SlotPartitionTable implements PartitionTable {
}
for (int raftId = 0; raftId < multiRaftFactor; raftId++) {
- PartitionGroup newGroup = getHeaderGroup(new RaftNode(node, raftId));
+ PartitionGroup newGroup = getPartitionGroup(new RaftNode(node, raftId));
if (newGroup.contains(thisNode)) {
localGroups.add(newGroup);
}
@@ -335,7 +337,7 @@ public class SlotPartitionTable implements PartitionTable {
Map<RaftNode, Set<Integer>> lostSlotsMap = new HashMap<>();
for (int raftId = 0; raftId < multiRaftFactor; raftId++) {
RaftNode raftNode = new RaftNode(node, raftId);
- result.addNewGroup(getHeaderGroup(raftNode));
+ result.addNewGroup(getPartitionGroup(raftNode));
for (Entry<Integer, PartitionGroup> entry : previousNodeMap.get(raftNode).entrySet()) {
RaftNode header = entry.getValue().getHeader();
lostSlotsMap.computeIfAbsent(header, k -> new HashSet<>()).add(entry.getKey());
@@ -506,7 +508,7 @@ public class SlotPartitionTable implements PartitionTable {
SlotNodeRemovalResult result = new SlotNodeRemovalResult();
for (int raftId = 0; raftId < multiRaftFactor; raftId++) {
- result.addRemovedGroup(getHeaderGroup(new RaftNode(target, raftId)));
+ result.addRemovedGroup(getPartitionGroup(new RaftNode(target, raftId)));
}
nodeRing.remove(target);
@@ -519,13 +521,13 @@ public class SlotPartitionTable implements PartitionTable {
if (header.getNode().equals(target)) {
removedGroupIdxs.add(i);
} else {
- PartitionGroup newGrp = getHeaderGroup(header);
+ PartitionGroup newGrp = getPartitionGroup(header);
localGroups.set(i, newGrp);
}
}
for (int i = removedGroupIdxs.size() - 1; i >= 0; i--) {
int removedGroupIdx = removedGroupIdxs.get(i);
- int raftId = localGroups.get(removedGroupIdx).getId();
+ int raftId = localGroups.get(removedGroupIdx).getRaftId();
localGroups.remove(removedGroupIdx);
// each node exactly joins replicationNum groups, so when a group is removed, the node
// should join a new one
@@ -540,7 +542,7 @@ public class SlotPartitionTable implements PartitionTable {
int headerNodeIdx = thisNodeIdx - (replicationNum - 1);
headerNodeIdx = headerNodeIdx < 0 ? headerNodeIdx + nodeRing.size() : headerNodeIdx;
Node header = nodeRing.get(headerNodeIdx);
- PartitionGroup newGrp = getHeaderGroup(new RaftNode(header, raftId));
+ PartitionGroup newGrp = getPartitionGroup(new RaftNode(header, raftId));
localGroups.add(newGrp);
}
@@ -576,7 +578,7 @@ public class SlotPartitionTable implements PartitionTable {
* @param node target node
*/
public boolean judgeHoldSlot(Node node, int slot) {
- return getHeaderGroup(slotNodes[slot]).contains(node);
+ return getPartitionGroup(slotNodes[slot]).contains(node);
}
@Override
@@ -584,7 +586,7 @@ public class SlotPartitionTable implements PartitionTable {
List<PartitionGroup> result = new ArrayList<>();
for (Node node : nodeRing) {
for (int i = 0; i < multiRaftFactor; i++) {
- result.add(getHeaderGroup(new RaftNode(node, i), nodeRing));
+ result.add(getPartitionGroup(new RaftNode(node, i), nodeRing));
}
}
return result;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/partition/slot/SlotStrategy.java b/cluster/src/main/java/org/apache/iotdb/cluster/partition/slot/SlotStrategy.java
index 6d0032c..00680b9 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/partition/slot/SlotStrategy.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/partition/slot/SlotStrategy.java
@@ -24,7 +24,7 @@ import org.apache.iotdb.tsfile.utils.Murmur128Hash;
import static org.apache.iotdb.cluster.config.ClusterConstant.HASH_SALT;
-/** SlotStrategy determines how a {storageGroupName, value} pair is distributed to a slot. */
+/** SlotStrategy determines which slot a {sg, timestamp} or {sg, partition} belongs. */
public interface SlotStrategy {
int calculateSlotByTime(String storageGroupName, long timestamp, int maxSlotNum);
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/partition/slot/SlotTimePartitionFilter.java b/cluster/src/main/java/org/apache/iotdb/cluster/partition/slot/SlotTimePartitionFilter.java
index 1296179..a864a1a 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/partition/slot/SlotTimePartitionFilter.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/partition/slot/SlotTimePartitionFilter.java
@@ -25,9 +25,10 @@ import org.apache.iotdb.db.engine.storagegroup.StorageGroupProcessor.TimePartiti
import java.util.Objects;
import java.util.Set;
+/** Used for checking if a data partition belongs to the slotSet */
public class SlotTimePartitionFilter implements TimePartitionFilter {
- private Set<Integer> slotSet;
+ private final Set<Integer> slotSet;
public SlotTimePartitionFilter(Set<Integer> slotSet) {
this.slotSet = slotSet;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/ClusterPlanExecutor.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/ClusterPlanExecutor.java
index 3eb0228..8a71cbb 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/ClusterPlanExecutor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/ClusterPlanExecutor.java
@@ -180,7 +180,7 @@ public class ClusterPlanExecutor extends PlanExecutor {
// this node is a member of the group, perform a local query after synchronizing with the
// leader
metaGroupMember
- .getLocalDataMember(partitionGroup.getHeader(), partitionGroup.getId())
+ .getLocalDataMember(partitionGroup.getHeader(), partitionGroup.getRaftId())
.syncLeaderWithConsistencyCheck(false);
int localResult = getLocalDeviceCount(targetPath);
logger.debug(
@@ -382,7 +382,7 @@ public class ClusterPlanExecutor extends PlanExecutor {
// this node is a member of the group, perform a local query after synchronizing with the
// leader
metaGroupMember
- .getLocalDataMember(partitionGroup.getHeader(), partitionGroup.getId())
+ .getLocalDataMember(partitionGroup.getHeader(), partitionGroup.getRaftId())
.syncLeaderWithConsistencyCheck(false);
int localResult = getLocalPathCount(pathUnderSG, level);
logger.debug(
@@ -647,7 +647,7 @@ public class ClusterPlanExecutor extends PlanExecutor {
private Set<String> getLocalChildNodeInNextLevel(PartitionGroup group, PartialPath path)
throws CheckConsistencyException {
DataGroupMember localDataMember =
- metaGroupMember.getLocalDataMember(group.getHeader(), group.getId());
+ metaGroupMember.getLocalDataMember(group.getHeader(), group.getRaftId());
localDataMember.syncLeaderWithConsistencyCheck(false);
try {
return IoTDB.metaManager.getChildNodeNameInNextLevel(path);
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/aggregate/ClusterAggregator.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/aggregate/ClusterAggregator.java
index 4ca6e23..e4f4755 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/aggregate/ClusterAggregator.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/aggregate/ClusterAggregator.java
@@ -156,7 +156,8 @@ public class ClusterAggregator {
} else {
// perform the aggregations locally
DataGroupMember dataMember =
- metaGroupMember.getLocalDataMember(partitionGroup.getHeader(), partitionGroup.getId());
+ metaGroupMember.getLocalDataMember(
+ partitionGroup.getHeader(), partitionGroup.getRaftId());
LocalQueryExecutor localQueryExecutor = new LocalQueryExecutor(dataMember);
try {
logger.debug(
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/fill/ClusterPreviousFill.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/fill/ClusterPreviousFill.java
index 05919cd..7ac61cf 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/fill/ClusterPreviousFill.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/fill/ClusterPreviousFill.java
@@ -160,7 +160,7 @@ public class ClusterPreviousFill extends PreviousFill {
PartitionGroup group,
PreviousFillHandler fillHandler) {
DataGroupMember localDataMember =
- metaGroupMember.getLocalDataMember(group.getHeader(), group.getId());
+ metaGroupMember.getLocalDataMember(group.getHeader(), group.getRaftId());
try {
fillHandler.onComplete(
localDataMember
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/last/ClusterLastQueryExecutor.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/last/ClusterLastQueryExecutor.java
index 3bb71fd..c4900d1 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/last/ClusterLastQueryExecutor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/last/ClusterLastQueryExecutor.java
@@ -189,7 +189,7 @@ public class ClusterLastQueryExecutor extends LastQueryExecutor {
PartitionGroup group, List<PartialPath> seriesPaths, QueryContext context)
throws StorageEngineException, QueryProcessException, IOException {
DataGroupMember localDataMember =
- metaGroupMember.getLocalDataMember(group.getHeader(), group.getId());
+ metaGroupMember.getLocalDataMember(group.getHeader(), group.getRaftId());
try {
localDataMember.syncLeaderWithConsistencyCheck(false);
} catch (CheckConsistencyException e) {
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactory.java b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactory.java
index f74b406..21ab3a6 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactory.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/query/reader/ClusterReaderFactory.java
@@ -168,7 +168,8 @@ public class ClusterReaderFactory {
if (partitionGroup.contains(metaGroupMember.getThisNode())) {
// the target storage group contains this node, perform a local query
DataGroupMember dataGroupMember =
- metaGroupMember.getLocalDataMember(partitionGroup.getHeader(), partitionGroup.getId());
+ metaGroupMember.getLocalDataMember(
+ partitionGroup.getHeader(), partitionGroup.getRaftId());
if (logger.isDebugEnabled()) {
logger.debug(
"{}: creating a local reader for {}#{}",
@@ -805,7 +806,8 @@ public class ClusterReaderFactory {
if (partitionGroup.contains(metaGroupMember.getThisNode())) {
// the target storage group contains this node, perform a local query
DataGroupMember dataGroupMember =
- metaGroupMember.getLocalDataMember(partitionGroup.getHeader(), partitionGroup.getId());
+ metaGroupMember.getLocalDataMember(
+ partitionGroup.getHeader(), partitionGroup.getRaftId());
LocalQueryExecutor localQueryExecutor = new LocalQueryExecutor(dataGroupMember);
logger.debug(
"{}: creating a local group by executor for {}#{}",
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/PullSnapshotHintService.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/PullSnapshotHintService.java
index d594d05..fa7861c 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/PullSnapshotHintService.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/PullSnapshotHintService.java
@@ -173,7 +173,7 @@ public class PullSnapshotHintService {
}
public int getRaftId() {
- return receivers.getId();
+ return receivers.getRaftId();
}
}
}
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/StoppedMemberManager.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/StoppedMemberManager.java
index a4abde2..c8efe39 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/StoppedMemberManager.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/StoppedMemberManager.java
@@ -142,7 +142,7 @@ public class StoppedMemberManager {
private void parseRemoved(String[] split) {
PartitionGroup partitionGroup = new PartitionGroup();
int raftId = Integer.parseInt(split[1]);
- partitionGroup.setId(raftId);
+ partitionGroup.setRaftId(raftId);
for (int i = 2; i < split.length; i++) {
Node node = ClusterUtils.stringToNode(split[i]);
partitionGroup.add(node);
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 e7fcf92..690a826 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
@@ -178,7 +178,7 @@ public class DataGroupMember extends RaftMember implements DataGroupMemberMBean
+ "-"
+ nodes.getHeader().getNode().getDataPort()
+ "-raftId-"
- + nodes.getId()
+ + nodes.getRaftId()
+ "";
allNodes = nodes;
mbeanName =
@@ -201,7 +201,7 @@ public class DataGroupMember extends RaftMember implements DataGroupMemberMBean
+ "-"
+ nodes.getHeader().getNode().getDataPort()
+ "-raftId-"
- + nodes.getId()
+ + nodes.getRaftId()
+ "",
new ClientManager(
ClusterDescriptor.getInstance().getConfig().isUseAsyncServer(),
@@ -927,7 +927,8 @@ public class DataGroupMember extends RaftMember implements DataGroupMemberMBean
synchronized (allNodes) {
if (allNodes.contains(removedNode) && allNodes.size() == config.getReplicationNum()) {
// update the group if the deleted node was in it
- PartitionGroup newGroup = metaGroupMember.getPartitionTable().getHeaderGroup(getHeader());
+ PartitionGroup newGroup =
+ metaGroupMember.getPartitionTable().getPartitionGroup(getHeader());
if (newGroup == null) {
return;
}
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 ac419c2..f057131 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
@@ -1464,7 +1464,7 @@ public class MetaGroupMember extends RaftMember implements IService, MetaGroupMe
}
// translate the headers to groups
for (RaftNode groupHeader : groupHeaders) {
- partitionGroups.add(partitionTable.getHeaderGroup(groupHeader));
+ partitionGroups.add(partitionTable.getPartitionGroup(groupHeader));
}
}
return partitionGroups;
@@ -1873,7 +1873,7 @@ public class MetaGroupMember extends RaftMember implements IService, MetaGroupMe
syncLocalApply(getPartitionTable().getLastMetaLogIndex(), false);
synchronized (headerMap) {
for (DataGroupMember dataMember : headerMap.values()) {
- int num = dataMember.getSlotManager().getSloNumInDataMigration();
+ int num = dataMember.getSlotManager().getSlotNumInDataMigration();
if (num > 0) {
groupSlotMap.put(dataMember.getPartitionGroup(), num);
}
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 1ee811a..ad356fb 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
@@ -2075,7 +2075,7 @@ public abstract class RaftMember implements RaftMemberMBean {
}
public int getRaftGroupId() {
- return allNodes.getId();
+ return allNodes.getRaftId();
}
enum AppendLogResult {
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/service/DataGroupEngine.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/service/DataGroupEngine.java
index 52672bc..58593af 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/service/DataGroupEngine.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/service/DataGroupEngine.java
@@ -220,11 +220,11 @@ public class DataGroupEngine implements IService, DataGroupEngineMBean {
private DataGroupMember createNewMember(RaftNode header)
throws NotInSameGroupException, CheckConsistencyException {
PartitionGroup partitionGroup;
- partitionGroup = partitionTable.getHeaderGroup(header);
+ partitionGroup = partitionTable.getPartitionGroup(header);
if (partitionGroup == null || !partitionGroup.contains(thisNode)) {
// if the partition table is old, this node may have not been moved to the new group
metaGroupMember.syncLeaderWithConsistencyCheck(true);
- partitionGroup = partitionTable.getHeaderGroup(header);
+ partitionGroup = partitionTable.getPartitionGroup(header);
}
DataGroupMember member;
synchronized (headerGroupMap) {
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/utils/nodetool/ClusterMonitor.java b/cluster/src/main/java/org/apache/iotdb/cluster/utils/nodetool/ClusterMonitor.java
index efcebef..fa5c5d2 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/utils/nodetool/ClusterMonitor.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/utils/nodetool/ClusterMonitor.java
@@ -187,7 +187,7 @@ public class ClusterMonitor implements ClusterMonitorMBean, IService {
raftId++) {
RaftNode raftNode = new RaftNode(header, raftId);
raftGroupMapSlotNum.put(
- partitionTable.getHeaderGroup(raftNode), nodeSlotMap.get(raftNode).size());
+ partitionTable.getPartitionGroup(raftNode), nodeSlotMap.get(raftNode).size());
}
}
return raftGroupMapSlotNum;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/utils/nodetool/function/Slot.java b/cluster/src/main/java/org/apache/iotdb/cluster/utils/nodetool/function/Slot.java
index fe946a3..c319b013 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/utils/nodetool/function/Slot.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/utils/nodetool/function/Slot.java
@@ -56,7 +56,7 @@ public class Slot extends NodeToolCmd {
for (int i = 1; i < raftGroup.size(); i++) {
builder.append(", ").append(nodeToString(raftGroup.get(i)));
}
- builder.append("),id=").append(raftGroup.getId());
+ builder.append("),id=").append(raftGroup.getRaftId());
msgPrintln(String.format("%-50s->%20s", builder.toString(), slotNum));
}
}
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/partition/SlotPartitionTableTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/partition/SlotPartitionTableTest.java
index d131e8e..db55eb5 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/partition/SlotPartitionTableTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/partition/SlotPartitionTableTest.java
@@ -205,7 +205,7 @@ public class SlotPartitionTableTest {
private void assertGetHeaderGroup(int start, int last) {
PartitionGroup group =
- localTable.getHeaderGroup(
+ localTable.getPartitionGroup(
new RaftNode(
new Node(
"localhost",
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/server/heartbeat/MetaHeartbeatThreadTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/server/heartbeat/MetaHeartbeatThreadTest.java
index 63b4271..00b3f83 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/server/heartbeat/MetaHeartbeatThreadTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/server/heartbeat/MetaHeartbeatThreadTest.java
@@ -91,7 +91,7 @@ public class MetaHeartbeatThreadTest extends HeartbeatThreadTest {
}
@Override
- public PartitionGroup getHeaderGroup(RaftNode header) {
+ public PartitionGroup getPartitionGroup(RaftNode headerNode) {
return null;
}
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 88ad9cd..d6ad1b7 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
@@ -215,7 +215,7 @@ public class BaseMember {
private DataGroupMember newDataGroupMember(RaftNode raftNode) {
DataGroupMember newMember =
- new TestDataGroupMember(raftNode.getNode(), partitionTable.getHeaderGroup(raftNode)) {
+ new TestDataGroupMember(raftNode.getNode(), partitionTable.getPartitionGroup(raftNode)) {
@Override
public boolean syncLeader(RaftMember.CheckConsistency checkConsistency) {
@@ -247,7 +247,7 @@ public class BaseMember {
newMember.setCharacter(NodeCharacter.LEADER);
newMember.setLogManager(
getLogManager(
- partitionTable.getHeaderGroup(new RaftNode(TestUtils.getNode(0), 0)), newMember));
+ partitionTable.getPartitionGroup(new RaftNode(TestUtils.getNode(0), 0)), newMember));
newMember.setAppendLogThreadPool(testThreadPool);
return newMember;
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 aa15f79..fcb7a64 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
@@ -183,7 +183,7 @@ public class DataGroupMemberTest extends BaseMember {
@Override
DataGroupMember getDataGroupMember(RaftNode raftNode) {
- PartitionGroup nodes = partitionTable.getHeaderGroup(raftNode);
+ PartitionGroup nodes = partitionTable.getPartitionGroup(raftNode);
return dataGroupMemberMap.computeIfAbsent(
raftNode, n -> getDataGroupMember(n.getNode(), nodes));
}
@@ -626,7 +626,8 @@ public class DataGroupMemberTest extends BaseMember {
testMetaMember.setPartitionTable(partitionTable);
dataGroupMember.setLogManager(
getLogManager(
- partitionTable.getHeaderGroup(new RaftNode(TestUtils.getNode(0), 0)), dataGroupMember));
+ partitionTable.getPartitionGroup(new RaftNode(TestUtils.getNode(0), 0)),
+ dataGroupMember));
assertEquals(200, dataGroupMember.executeNonQueryPlan(createTimeSeriesPlan).code);
assertTrue(IoTDB.metaManager.isPathExist(new PartialPath(timeseriesSchema.getFullPath())));
testThreadPool.shutdownNow();
@@ -732,7 +733,7 @@ public class DataGroupMemberTest extends BaseMember {
// node1 manages the data above
dataGroupMember.setThisNode(TestUtils.getNode(10));
dataGroupMember.setAllNodes(
- partitionTable.getHeaderGroup(new RaftNode(TestUtils.getNode(10), raftId)));
+ partitionTable.getPartitionGroup(new RaftNode(TestUtils.getNode(10), raftId)));
dataGroupMember.setCharacter(NodeCharacter.LEADER);
SingleSeriesQueryRequest request = new SingleSeriesQueryRequest();
request.setPath(TestUtils.getTestSeries(0, 0));
@@ -800,7 +801,7 @@ public class DataGroupMemberTest extends BaseMember {
// node1 manages the data above
dataGroupMember.setThisNode(TestUtils.getNode(10));
dataGroupMember.setAllNodes(
- partitionTable.getHeaderGroup(new RaftNode(TestUtils.getNode(10), raftId)));
+ partitionTable.getPartitionGroup(new RaftNode(TestUtils.getNode(10), raftId)));
dataGroupMember.setCharacter(NodeCharacter.LEADER);
SingleSeriesQueryRequest request = new SingleSeriesQueryRequest();
request.setPath(TestUtils.getTestSeries(0, 0));
@@ -868,7 +869,7 @@ public class DataGroupMemberTest extends BaseMember {
// node1 manages the data above
dataGroupMember.setThisNode(TestUtils.getNode(10));
dataGroupMember.setAllNodes(
- partitionTable.getHeaderGroup(new RaftNode(TestUtils.getNode(10), 0)));
+ partitionTable.getPartitionGroup(new RaftNode(TestUtils.getNode(10), 0)));
dataGroupMember.setCharacter(NodeCharacter.LEADER);
SingleSeriesQueryRequest request = new SingleSeriesQueryRequest();
request.setPath(TestUtils.getTestSeries(0, 0));
@@ -936,7 +937,7 @@ public class DataGroupMemberTest extends BaseMember {
// node1 manages the data above
dataGroupMember.setThisNode(TestUtils.getNode(10));
dataGroupMember.setAllNodes(
- partitionTable.getHeaderGroup(new RaftNode(TestUtils.getNode(10), 0)));
+ partitionTable.getPartitionGroup(new RaftNode(TestUtils.getNode(10), 0)));
dataGroupMember.setCharacter(NodeCharacter.LEADER);
SingleSeriesQueryRequest request = new SingleSeriesQueryRequest();
request.setPath(TestUtils.getTestSeries(0, 0));
diff --git a/cluster/src/test/java/org/apache/iotdb/cluster/server/member/RaftMemberTest.java b/cluster/src/test/java/org/apache/iotdb/cluster/server/member/RaftMemberTest.java
index 0e94750..b94da9e 100644
--- a/cluster/src/test/java/org/apache/iotdb/cluster/server/member/RaftMemberTest.java
+++ b/cluster/src/test/java/org/apache/iotdb/cluster/server/member/RaftMemberTest.java
@@ -172,7 +172,7 @@ public class RaftMemberTest extends BaseMember {
private DataGroupMember newDataGroupMemberWithSyncLeaderFalse(Node node, boolean syncLeader) {
DataGroupMember newMember =
- new TestDataGroupMember(node, partitionTable.getHeaderGroup(new RaftNode(node, 0))) {
+ new TestDataGroupMember(node, partitionTable.getPartitionGroup(new RaftNode(node, 0))) {
@Override
public boolean syncLeader(RaftMember.CheckConsistency checkConsistency) {
@@ -209,7 +209,7 @@ public class RaftMemberTest extends BaseMember {
private DataGroupMember newDataGroupMemberWithSyncLeaderTrue(Node node, boolean syncLeader) {
DataGroupMember newMember =
- new TestDataGroupMember(node, partitionTable.getHeaderGroup(new RaftNode(node, 0))) {
+ new TestDataGroupMember(node, partitionTable.getPartitionGroup(new RaftNode(node, 0))) {
@Override
public boolean syncLeader(RaftMember.CheckConsistency checkConsistency) {