fix review issue

Signed-off-by: OneSizeFitQuorum <[email protected]>
apache · Jun 13, 2024 · 0793a93 · 0793a93
1 parent 5d5e3d9
commit 0793a93
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/...ain/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/partition/PartitionCache.java b/...ain/java/org/apache/iotdb/db/queryengine/plan/analyze/cache/partition/PartitionCache.java
@@ -348,6 +348,7 @@ private void getStorageGroupCacheResult(
       boolean isAutoCreate,
       String userName) {
     if (!isAutoCreate) {
+      // TODO: avoid IDeviceID contains "*"
       // miss when deviceId contains *
       for (IDeviceID deviceID : devicePaths) {
         for (int i = 0; i < deviceID.segmentNum(); i++) {

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
@@ -39,7 +39,6 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 public class PathPatternTree {
 
@@ -174,10 +173,15 @@ public boolean isEmpty() {
 
   public List<IDeviceID> getAllDevicePatterns() {
     List<String> nodes = new ArrayList<>();
-    Set<String> results = new HashSet<>();
-    searchDevicePattern(root, nodes, results);
-    // TODO avoid unnecessary conversion
-    return results.stream().map(Factory.DEFAULT_FACTORY::create).collect(Collectors.toList());
+    Set<List<String>> resultNodesSet = new HashSet<>();
+    searchDevicePath(root, nodes, resultNodesSet);
+
+    Set<IDeviceID> resultPaths = new HashSet<>();
+    for (List<String> resultNodes : resultNodesSet) {
+      resultPaths.add(Factory.DEFAULT_FACTORY.create(resultNodes.toArray(new String[0])));
+    }
+
+    return new ArrayList<>(resultPaths);
   }
 
   public List<PartialPath> getAllDevicePaths() {