[incubator-iotdb] 02/02: rename markMeasurementInsertionFailed to markFailedMeasurementInsertion

[qiaojialin]

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/incubator-iotdb.git

commit 58b10ff72ae515d52b847f01e951e1b9c4c28475
Author: LebronAl <txypot...@gmail.com>
AuthorDate: Tue Jun 30 00:08:39 2020 +0800

    rename markMeasurementInsertionFailed to markFailedMeasurementInsertion
---
 server/src/main/java/org/apache/iotdb/db/metadata/MManager.java   | 4 ++--
 .../java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java     | 2 +-
 .../java/org/apache/iotdb/db/qp/physical/crud/InsertRowPlan.java  | 8 ++++----
 .../org/apache/iotdb/db/qp/physical/crud/InsertTabletPlan.java    | 4 ++--
 .../test/java/org/apache/iotdb/db/writelog/WriteLogNodeTest.java  | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java 
b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
index 48acc44..1dcd3a2 100644
--- a/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/metadata/MManager.java
@@ -1892,7 +1892,7 @@ public class MManager {
           } else {
             // mark failed measurement
             if( plan instanceof InsertPlan){
-              ((InsertPlan) plan).markMeasurementInsertionFailed(i);
+              ((InsertPlan) plan).markFailedMeasurementInsertion(i);
             }
             continue;
           }
@@ -1913,7 +1913,7 @@ public class MManager {
         if (config.isEnablePartialInsert()) {
           // mark failed measurement
           if (plan instanceof InsertPlan) {
-            ((InsertPlan) plan).markMeasurementInsertionFailed(i);
+            ((InsertPlan) plan).markFailedMeasurementInsertion(i);
           }
         } else {
           throw e;
diff --git 
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java 
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java
index 503175c..2914779 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertPlan.java
@@ -84,7 +84,7 @@ abstract public class InsertPlan extends PhysicalPlan {
   /**
    * @param index failed measurement index
    */
-  public void markMeasurementInsertionFailed(int index) {
+  public void markFailedMeasurementInsertion(int index) {
     if (failedMeasurements == null) {
       failedMeasurements = new ArrayList<>();
     }
diff --git 
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowPlan.java 
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowPlan.java
index 3b63efc..fc26300 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowPlan.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowPlan.java
@@ -163,7 +163,7 @@ public class InsertRowPlan extends InsertPlan {
       for (int i = 0; i < schemas.length; i++) {
         if (schemas[i] == null) {
           if 
(IoTDBDescriptor.getInstance().getConfig().isEnablePartialInsert()) {
-            markMeasurementInsertionFailed(i);
+            markFailedMeasurementInsertion(i);
           } else {
             throw new QueryProcessException(new PathNotExistException(
                 deviceId + IoTDBConstant.PATH_SEPARATOR + measurements[i]));
@@ -177,7 +177,7 @@ public class InsertRowPlan extends InsertPlan {
           logger.warn("{}.{} data type is not consistent, input {}, registered 
{}", deviceId,
               measurements[i], values[i], dataTypes[i]);
           if 
(IoTDBDescriptor.getInstance().getConfig().isEnablePartialInsert()) {
-            markMeasurementInsertionFailed(i);
+            markFailedMeasurementInsertion(i);
             schemas[i] = null;
           } else {
             throw e;
@@ -188,8 +188,8 @@ public class InsertRowPlan extends InsertPlan {
   }
 
   @Override
-  public void markMeasurementInsertionFailed(int index) {
-    super.markMeasurementInsertionFailed(index);
+  public void markFailedMeasurementInsertion(int index) {
+    super.markFailedMeasurementInsertion(index);
     values[index] = null;
   }
 
diff --git 
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertTabletPlan.java
 
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertTabletPlan.java
index 687a3d9..7fff034 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertTabletPlan.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertTabletPlan.java
@@ -444,8 +444,8 @@ public class InsertTabletPlan extends InsertPlan {
   }
 
   @Override
-  public void markMeasurementInsertionFailed(int index) {
-    super.markMeasurementInsertionFailed(index);
+  public void markFailedMeasurementInsertion(int index) {
+    super.markFailedMeasurementInsertion(index);
     columns[index] = null;
   }
 
diff --git 
a/server/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeTest.java 
b/server/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeTest.java
index 95f9ec8..347e2c5 100644
--- a/server/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeTest.java
+++ b/server/src/test/java/org/apache/iotdb/db/writelog/WriteLogNodeTest.java
@@ -102,7 +102,7 @@ public class WriteLogNodeTest {
     tabletPlan.setStart(0);
     tabletPlan.setEnd(4);
 
-    tabletPlan.markMeasurementInsertionFailed(1);
+    tabletPlan.markFailedMeasurementInsertion(1);
 
     logNode.write(bwInsertPlan);
     logNode.write(deletePlan);