[iotdb] branch expr updated: fix find index

[jiangtian]

This is an automated email from the ASF dual-hosted git repository.

jiangtian pushed a commit to branch expr
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/expr by this push:
     new 8608a0f  fix find index
8608a0f is described below

commit 8608a0fc6d33d3ccfc40c595854d3a1b14ece70f
Author: jt <jt2594...@163.com>
AuthorDate: Wed Jan 5 17:26:03 2022 +0800

    fix find index
---
 .../apache/iotdb/cluster/partition/slot/SlotPartitionTable.java   | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

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 233a90a..60c532a 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
@@ -192,7 +192,7 @@ public class SlotPartitionTable implements PartitionTable {
   private List<PartitionGroup> getPartitionGroups(Node node) {
     List<PartitionGroup> ret = new ArrayList<>();
 
-    int nodeIndex = findNodeIndex(node);
+    int nodeIndex = findNodeIndex(node, nodeRing);
     if (nodeIndex == -1) {
       logger.info("PartitionGroups is empty due to this node has been removed 
from the cluster!");
       return ret;
@@ -217,7 +217,7 @@ public class SlotPartitionTable implements PartitionTable {
     PartitionGroup ret = new PartitionGroup(header.getRaftId());
 
     // assuming the nodes are [1,2,3,4,5]
-    int nodeIndex = findNodeIndex(header.getNode());
+    int nodeIndex = findNodeIndex(header.getNode(), nodeRing);
     if (nodeIndex == -1) {
       logger.warn("Node {} is not in the cluster", header.getNode());
       return null;
@@ -531,7 +531,7 @@ public class SlotPartitionTable implements PartitionTable {
         localGroups.remove(removedGroupIdx);
         // each node exactly joins replicationNum groups, so when a group is 
removed, the node
         // should join a new one
-        int thisNodeIdx = findNodeIndex(thisNode);
+        int thisNodeIdx = findNodeIndex(thisNode, nodeRing);
 
         // check if this node is to be removed
         if (thisNodeIdx == -1) {
@@ -609,7 +609,7 @@ public class SlotPartitionTable implements PartitionTable {
     return slotNodes;
   }
 
-  private int findNodeIndex(Node node) {
+  private int findNodeIndex(Node node, List<Node> nodeRing) {
     for (int i = 0; i < nodeRing.size(); i++) {
       if (nodeRing.get(i).getInternalIp().equals(node.getInternalIp())
           && nodeRing.get(i).getMetaPort() == node.getMetaPort()) {