[iotdb] branch master updated: [Distributed] fix the plan index miss (#3007)

[ch...@apache.org]

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

chaow 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 1382d2e  [Distributed] fix the plan index miss  (#3007)
1382d2e is described below

commit 1382d2e8262097f95cdb560ca7b295aff90da8f8
Author: HouliangQi <ne...@163.com>
AuthorDate: Thu Apr 15 17:49:19 2021 +0800

    [Distributed] fix the plan index miss  (#3007)
---
 .../iotdb/db/qp/physical/crud/InsertMultiTabletPlan.java       |  9 +++++++++
 .../iotdb/db/qp/physical/crud/InsertRowsOfOneDevicePlan.java   |  9 +++++++++
 .../org/apache/iotdb/db/qp/physical/crud/InsertRowsPlan.java   | 10 ++++++++++
 3 files changed, 28 insertions(+)

diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertMultiTabletPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertMultiTabletPlan.java
index 6749354..ba552b0 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertMultiTabletPlan.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertMultiTabletPlan.java
@@ -282,6 +282,15 @@ public class InsertMultiTabletPlan extends InsertPlan {
   }
 
   @Override
+  public void setIndex(long index) {
+    super.setIndex(index);
+    for (InsertTabletPlan insertTabletPlan : insertTabletPlanList) {
+      // use the InsertMultiTabletPlan's index as the sub InsertTabletPlan's index
+      insertTabletPlan.setIndex(index);
+    }
+  }
+
+  @Override
   public String toString() {
     return "InsertMultiTabletPlan{"
         + " insertTabletPlanList="
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowsOfOneDevicePlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowsOfOneDevicePlan.java
index e13dc83..41509bd 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowsOfOneDevicePlan.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowsOfOneDevicePlan.java
@@ -132,6 +132,15 @@ public class InsertRowsOfOneDevicePlan extends InsertPlan {
   }
 
   @Override
+  public void setIndex(long index) {
+    super.setIndex(index);
+    for (InsertRowPlan plan : rowPlans) {
+      // use the InsertRowsOfOneDevicePlan's index as the sub InsertRowPlan's index
+      plan.setIndex(index);
+    }
+  }
+
+  @Override
   public String toString() {
     return "deviceId: " + deviceId + ", times: " + rowPlans.length;
   }
diff --git a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowsPlan.java b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowsPlan.java
index 28f4f3f..d5122cf 100644
--- a/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowsPlan.java
+++ b/server/src/main/java/org/apache/iotdb/db/qp/physical/crud/InsertRowsPlan.java
@@ -35,6 +35,7 @@ import java.util.Map;
 import java.util.Objects;
 
 public class InsertRowsPlan extends InsertPlan {
+
   /**
    * Suppose there is an InsertRowsPlan, which contains 5 InsertRowPlans,
    * insertRowPlanList={InsertRowPlan_0, InsertRowPlan_1, InsertRowPlan_2, InsertRowPlan_3,
@@ -184,6 +185,15 @@ public class InsertRowsPlan extends InsertPlan {
     }
   }
 
+  @Override
+  public void setIndex(long index) {
+    super.setIndex(index);
+    for (InsertRowPlan insertRowPlan : insertRowPlanList) {
+      // use the InsertRowsPlan's index as the sub InsertRowPlan's index
+      insertRowPlan.setIndex(index);
+    }
+  }
+
   public Map<Integer, TSStatus> getResults() {
     return results;
   }