[iotdb] branch kyy updated: delete

[yuyuankang]

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

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


The following commit(s) were added to refs/heads/kyy by this push:
     new f0c1a33  delete
f0c1a33 is described below

commit f0c1a3313ddb02331889aa94b9d088851532c7ef
Author: Ring-k <yuyuank...@hotmail.com>
AuthorDate: Mon Oct 26 19:13:23 2020 +0800

    delete
---
 .../iotdb/cluster/server/member/MetaGroupMember.java   | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 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 8f231d7..d8bc64f 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
@@ -1655,17 +1655,13 @@ public class MetaGroupMember extends RaftMember {
             partitionGroup.getHeader());
         status = forwardPlan(plan, partitionGroup);
       }
-      if (status.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode()) {
-        if (plan instanceof DeleteTimeSeriesPlan
-            && status.getCode() == 
TSStatusCode.TIMESERIES_NOT_EXIST.getStatusCode()) {
-          status = StatusUtils.OK;
-        } else {
-          // execution failed, record the error message
-          errorCodePartitionGroups.add(String.format("[%s@%s:%s]",
-              status.getCode(), partitionGroup.getHeader(),
-              status.getMessage()));
-        }
-
+      if (status.getCode() != TSStatusCode.SUCCESS_STATUS.getStatusCode() && (
+          !(plan instanceof DeleteTimeSeriesPlan) ||
+              status.getCode() != 
TSStatusCode.TIMESERIES_NOT_EXIST.getStatusCode())) {
+        // execution failed, record the error message
+        errorCodePartitionGroups.add(String.format("[%s@%s:%s]",
+            status.getCode(), partitionGroup.getHeader(),
+            status.getMessage()));
       }
     }
     if (errorCodePartitionGroups.isEmpty()) {