[iotdb] branch rel/1.2 updated: [IOTDB-6130] Delete data by specific pattern didn't work

[jackietien]

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

jackietien pushed a commit to branch rel/1.2
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/rel/1.2 by this push:
     new 9dd524d07b5 [IOTDB-6130] Delete data by specific pattern didn't work
9dd524d07b5 is described below

commit 9dd524d07b5b1fdb4af577b332f89e680d49b373
Author: Chen YZ <43774645+cpau...@users.noreply.github.com>
AuthorDate: Tue Sep 5 16:10:23 2023 +0800

    [IOTDB-6130] Delete data by specific pattern didn't work
---
 .../java/org/apache/iotdb/commons/path/PathPatternTree.java    | 10 ----------
 .../org/apache/iotdb/commons/path/PathPatternTreeTest.java     |  2 +-
 2 files changed, 1 insertion(+), 11 deletions(-)

diff --git 
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PathPatternTree.java
 
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PathPatternTree.java
index d91246b4374..68680c41a43 100644
--- 
a/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PathPatternTree.java
+++ 
b/iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/path/PathPatternTree.java
@@ -186,11 +186,6 @@ public class PathPatternTree {
         return;
       }
     }
-    if (curNode.isWildcard()) {
-      results.add(convertNodesToString(nodes));
-      nodes.remove(nodes.size() - 1);
-      return;
-    }
     for (PathPatternNode<Void, VoidSerializer> childNode : 
curNode.getChildren().values()) {
       searchDevicePattern(childNode, nodes, results);
     }
@@ -220,11 +215,6 @@ public class PathPatternTree {
         return;
       }
     }
-    if (curNode.isWildcard()) {
-      resultNodesSet.add(new ArrayList<>(nodes));
-      nodes.remove(nodes.size() - 1);
-      return;
-    }
     for (PathPatternNode<Void, VoidSerializer> childNode : 
curNode.getChildren().values()) {
       searchDevicePath(childNode, nodes, resultNodesSet);
     }
diff --git 
a/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/path/PathPatternTreeTest.java
 
b/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/path/PathPatternTreeTest.java
index 1566a82f75a..4b3eca0b08d 100644
--- 
a/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/path/PathPatternTreeTest.java
+++ 
b/iotdb-core/node-commons/src/test/java/org/apache/iotdb/commons/path/PathPatternTreeTest.java
@@ -58,7 +58,7 @@ public class PathPatternTreeTest {
             new PartialPath("root.sg1.*.t1.s1"),
             new PartialPath("root.sg1.d2.t1.s1")),
         Arrays.asList(new PartialPath("root.sg1.d1.t2.s2"), new 
PartialPath("root.sg1.*.t1.s1")),
-        Arrays.asList(new PartialPath("root.sg1.d1.t2"), new 
PartialPath("root.sg1.*")),
+        Arrays.asList(new PartialPath("root.sg1.d1.t2"), new 
PartialPath("root.sg1.*.t1")),
         true);
   }