[iotdb] branch xingtanzjr/delete_timeseries_plan updated: complete distribution plan for delete timeseries

[xingtanzjr]

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

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


The following commit(s) were added to 
refs/heads/xingtanzjr/delete_timeseries_plan by this push:
     new e956499d3e complete distribution plan for delete timeseries
e956499d3e is described below

commit e956499d3ef4507a4a29cf15dfd02f844edebb55
Author: Jinrui.Zhang <xingtan...@gmail.com>
AuthorDate: Tue May 24 18:19:45 2022 +0800

    complete distribution plan for delete timeseries
---
 .../org/apache/iotdb/db/mpp/common/schematree/PathPatternTree.java  | 6 +++++-
 .../iotdb/db/mpp/plan/planner/distribution/SourceRewriter.java      | 4 +++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git 
a/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/PathPatternTree.java
 
b/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/PathPatternTree.java
index 2a34c2ad1c..1700a4faa7 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/PathPatternTree.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/mpp/common/schematree/PathPatternTree.java
@@ -251,6 +251,10 @@ public class PathPatternTree {
   }
 
   public PathPatternTree findOverlappedPattern(PartialPath pattern) {
+    return new PathPatternTree(findOverlappedPaths(pattern));
+  }
+
+  public List<PartialPath> findOverlappedPaths(PartialPath pattern) {
     if (pathList.isEmpty()) {
       pathList = splitToPathList();
     }
@@ -261,7 +265,7 @@ public class PathPatternTree {
         results.add(path);
       }
     }
-    return new PathPatternTree(results);
+    return results;
   }
 
   @TestOnly
diff --git 
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/SourceRewriter.java
 
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/SourceRewriter.java
index d0ba535c26..d72a1d1b60 100644
--- 
a/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/SourceRewriter.java
+++ 
b/server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/distribution/SourceRewriter.java
@@ -61,6 +61,7 @@ import java.util.TreeSet;
 import java.util.stream.Collectors;
 
 import static com.google.common.base.Preconditions.checkArgument;
+import static 
org.apache.iotdb.commons.conf.IoTDBConstant.MULTI_LEVEL_PATH_WILDCARD;
 
 public class SourceRewriter extends 
SimplePlanNodeRewriter<DistributionPlanContext> {
 
@@ -144,7 +145,8 @@ public class SourceRewriter extends 
SimplePlanNodeRewriter<DistributionPlanConte
     for (String storageGroup : storageGroups) {
       try {
         ret.addAll(
-            patternTree.findOverlappedPattern(new 
PartialPath(storageGroup)).splitToPathList());
+            patternTree.findOverlappedPaths(
+                new 
PartialPath(storageGroup).concatNode(MULTI_LEVEL_PATH_WILDCARD)));
       } catch (IllegalPathException e) {
         // The IllegalPathException is definitely not threw here
         throw new RuntimeException(e);