Pipe: Fix filter issue when both tree extraction and table extraction…

… are enabled and one extraction has non default pattern (#14184)
apache · Nov 22, 2024 · 76066d4 · 76066d4
1 parent a689726
commit 76066d4
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 6 deletions.
diff --git a/...e/extractor/dataregion/historical/PipeHistoricalDataRegionTsFileAndDeletionExtractor.java b/...e/extractor/dataregion/historical/PipeHistoricalDataRegionTsFileAndDeletionExtractor.java
@@ -133,6 +133,7 @@ public class PipeHistoricalDataRegionTsFileAndDeletionExtractor
   private TreePattern treePattern;
   private TablePattern tablePattern;
   private boolean isDbNameCoveredByPattern = false;
+  private boolean isModelDetected = false;
 
   private boolean isHistoricalExtractorEnabled = false;
   private long historicalDataExtractionStartTime = Long.MIN_VALUE; // Event time
@@ -336,10 +337,9 @@ public void customize(
       final String databaseName = dataRegion.getDatabaseName();
       if (Objects.nonNull(databaseName)) {
         isDbNameCoveredByPattern =
-            treePattern.isTreeModelDataAllowedToBeCaptured() && treePattern.coversDb(databaseName)
+            treePattern.coversDb(databaseName)
                 // The database name is prefixed with "root."
-                || tablePattern.isTableModelDataAllowedToBeCaptured()
-                    && tablePattern.coversDb(databaseName.substring(5));
+                && tablePattern.coversDb(databaseName.substring(5));
       }
     }
 
@@ -673,6 +673,7 @@ private boolean mayTsFileResourceOverlappedWithPattern(final TsFileResource reso
                   || deviceID.getTableName().startsWith(TREE_MODEL_EVENT_TABLE_NAME_PREFIX)
                   || deviceID.getTableName().equals(PATH_ROOT)) {
                 // In case of tree model deviceID
+                updateIsDbNameCoveredByPattern(resource, false);
                 if (treePattern.isTreeModelDataAllowedToBeCaptured()
                     && treePattern.mayOverlapWithDevice(deviceID)) {
                   tsfile2IsTableModelMap.computeIfAbsent(
@@ -681,6 +682,7 @@ private boolean mayTsFileResourceOverlappedWithPattern(final TsFileResource reso
                 }
               } else {
                 // In case of table model deviceID
+                updateIsDbNameCoveredByPattern(resource, true);
                 if (tablePattern.isTableModelDataAllowedToBeCaptured()
                     // The database name in resource is prefixed with "root."
                     && tablePattern.matchesDatabase(resource.getDatabaseName().substring(5))
@@ -694,6 +696,24 @@ private boolean mayTsFileResourceOverlappedWithPattern(final TsFileResource reso
             });
   }
 
+  private void updateIsDbNameCoveredByPattern(
+      final TsFileResource resource, final boolean isTableModel) {
+    if (isModelDetected) {
+      return;
+    }
+
+    final String databaseName = resource.getDatabaseName();
+    if (Objects.nonNull(databaseName)) {
+      isDbNameCoveredByPattern =
+          isTableModel
+              ? tablePattern.isTableModelDataAllowedToBeCaptured()
+                  && tablePattern.coversDb(databaseName.substring(5))
+              : treePattern.isTreeModelDataAllowedToBeCaptured()
+                  && treePattern.coversDb(databaseName);
+      isModelDetected = true;
+    }
+  }
+
   private boolean isTsFileResourceOverlappedWithTimeRange(final TsFileResource resource) {
     return !(resource.getFileEndTime() < historicalDataExtractionStartTime
         || historicalDataExtractionEndTime < resource.getFileStartTime());

diff --git a/...g/apache/iotdb/db/pipe/extractor/dataregion/realtime/PipeRealtimeDataRegionExtractor.java b/...g/apache/iotdb/db/pipe/extractor/dataregion/realtime/PipeRealtimeDataRegionExtractor.java
@@ -221,10 +221,9 @@ public void customize(
       final String databaseName = dataRegion.getDatabaseName();
       if (databaseName != null) {
         isDbNameCoveredByPattern =
-            treePattern.isTreeModelDataAllowedToBeCaptured() && treePattern.coversDb(databaseName)
+            treePattern.coversDb(databaseName)
                 // The database name is prefixed with "root."
-                || tablePattern.isTableModelDataAllowedToBeCaptured()
-                    && tablePattern.coversDb(databaseName.substring(5));
+                && tablePattern.coversDb(databaseName.substring(5));
       }
     }