This is an automated email from the ASF dual-hosted git repository. lta pushed a commit to branch cluster_scalability in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit dd64f0e157514e2cacd4e6496c1e483af0619b02 Author: lta <[email protected]> AuthorDate: Tue Jan 19 19:29:36 2021 +0800 merge master --- .../main/java/org/apache/iotdb/cluster/coordinator/Coordinator.java | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/coordinator/Coordinator.java b/cluster/src/main/java/org/apache/iotdb/cluster/coordinator/Coordinator.java index c6bccfb..b22d54c 100644 --- a/cluster/src/main/java/org/apache/iotdb/cluster/coordinator/Coordinator.java +++ b/cluster/src/main/java/org/apache/iotdb/cluster/coordinator/Coordinator.java @@ -372,15 +372,9 @@ public class Coordinator { long startTime = Timer.Statistic.META_GROUP_MEMBER_EXECUTE_NON_QUERY_IN_LOCAL_GROUP .getOperationStartTime(); logger.debug("Execute {} in a local group of {}", entry.getKey(), -<<<<<<< HEAD entry.getValue().getHeader()); result = metaGroupMember.getLocalDataMember(new RaftNode(entry.getValue().getHeader(), entry.getValue().getId())) .executeNonQueryPlan(entry.getKey()); -======= - entry.getValue().getHeader()); - result = metaGroupMember.getLocalDataMember(entry.getValue().getHeader()) - .executeNonQueryPlan(entry.getKey()); ->>>>>>> master Timer.Statistic.META_GROUP_MEMBER_EXECUTE_NON_QUERY_IN_LOCAL_GROUP .calOperationCostTimeFromStart(startTime); } else {
