[iotdb] branch master updated: fix merge bug for #2404

[tanxinyu]

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 acf33e2  fix merge bug for #2404
     new 8ed7071  Merge pull request #2415 from mychaow/fix_merge_bug_2404
acf33e2 is described below

commit acf33e23a15a81adddabc66553a8216684bce820
Author: chaow <xunmengzhu...@gmail.com>
AuthorDate: Mon Jan 4 19:16:54 2021 +0800

    fix merge bug for #2404
---
 .../java/org/apache/iotdb/cluster/server/member/MetaGroupMember.java | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

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 f7e7d6a..74b9d3b 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
@@ -66,7 +66,6 @@ import org.apache.iotdb.cluster.server.HardLinkCleaner;
 import org.apache.iotdb.cluster.server.NodeCharacter;
 import org.apache.iotdb.cluster.server.RaftServer;
 import org.apache.iotdb.cluster.server.Response;
-import org.apache.iotdb.cluster.server.Timer;
 import org.apache.iotdb.cluster.server.handlers.caller.AppendGroupEntryHandler;
 import org.apache.iotdb.cluster.server.handlers.caller.GenericHandler;
 import org.apache.iotdb.cluster.server.handlers.caller.NodeStatusHandler;
@@ -1353,7 +1352,7 @@ public class MetaGroupMember extends RaftMember {
   @Override
   public TSStatus executeNonQueryPlan(PhysicalPlan plan) {
     TSStatus result;
-    long startTime = 
Timer.Statistic.COORDINATOR_EXECUTE_NON_QUERY.getOperationStartTime();
+    long startTime = 
Timer.Statistic.META_GROUP_MEMBER_EXECUTE_NON_QUERY.getOperationStartTime();
     if (PartitionUtils.isGlobalMetaPlan(plan)) {
       // do it in local, only the follower forward the plan to local
       logger.debug("receive a global meta plan {}", plan);
@@ -1363,7 +1362,7 @@ public class MetaGroupMember extends RaftMember {
       logger.warn("receive a plan {} could not be processed in local", plan);
       result = StatusUtils.UNSUPPORTED_OPERATION;
     }
-    
Timer.Statistic.COORDINATOR_EXECUTE_NON_QUERY.calOperationCostTimeFromStart(startTime);
+    
Timer.Statistic.META_GROUP_MEMBER_EXECUTE_NON_QUERY.calOperationCostTimeFromStart(startTime);
     return result;
   }