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

shuwenwei pushed a commit to branch fix/external-tsfile-bloom-filter
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit a6c762eaed5d07ad5380fa11558af0e7da3b3451
Author: shuwenwei <[email protected]>
AuthorDate: Fri Nov 20 11:42:27 2026 +0800

    Fix BloomFilter checks for external TsFile metadata reads
---
 .../buffer/TimeSeriesMetadataCache.java            | 61 ++++++++++------------
 1 file changed, 28 insertions(+), 33 deletions(-)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/TimeSeriesMetadataCache.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/TimeSeriesMetadataCache.java
index 68457df0ebb..cbb186cb318 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/TimeSeriesMetadataCache.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/buffer/TimeSeriesMetadataCache.java
@@ -176,17 +176,15 @@ public class TimeSeriesMetadataCache {
         TsFileSequenceReader reader =
             FileReaderManager.getInstance()
                 .get(filePath, key.tsFileID, true, bloomFilterIoSizeRecorder, 
externalTsFile);
-        if (deviceMetadataIndexNodeOffset == null) {
-          BloomFilter bloomFilter = 
reader.readBloomFilter(bloomFilterIoSizeRecorder);
-          
queryContext.getQueryStatistics().getLoadBloomFilterFromDiskCount().incrementAndGet();
-          if (bloomFilter != null
-              && !bloomFilter.contains(
-                  deviceStringFormat + IoTDBConstant.PATH_SEPARATOR + 
key.measurement)) {
-            loadBloomFilterTime = System.nanoTime() - startTime;
-            return null;
-          }
+        BloomFilter bloomFilter = 
reader.readBloomFilter(bloomFilterIoSizeRecorder);
+        
queryContext.getQueryStatistics().getLoadBloomFilterFromDiskCount().incrementAndGet();
+        if (bloomFilter != null
+            && !bloomFilter.contains(
+                deviceStringFormat + IoTDBConstant.PATH_SEPARATOR + 
key.measurement)) {
           loadBloomFilterTime = System.nanoTime() - startTime;
+          return null;
         }
+        loadBloomFilterTime = System.nanoTime() - startTime;
 
         TimeseriesMetadata timeseriesMetadata =
             reader.readTimeseriesMetadata(
@@ -218,33 +216,30 @@ public class TimeSeriesMetadataCache {
           if (timeseriesMetadata == null) {
             cacheHit = false;
 
-            if (deviceMetadataIndexNodeOffset == null) {
-              long loadBloomFilterStartTime = System.nanoTime();
-              // bloom filter part
-              BloomFilter bloomFilter =
-                  BloomFilterCache.getInstance()
-                      .get(
-                          new BloomFilterCache.BloomFilterCacheKey(filePath, 
key.tsFileID),
-                          debug,
-                          bloomFilterIoSizeRecorder,
-                          
queryContext.getQueryStatistics().getLoadBloomFilterFromCacheCount()
-                              ::addAndGet,
-                          
queryContext.getQueryStatistics().getLoadBloomFilterFromDiskCount()
-                              ::addAndGet,
-                          false);
-              if (bloomFilter != null
-                  && !bloomFilter.contains(
-                      deviceStringFormat + TsFileConstant.PATH_SEPARATOR + 
key.measurement)) {
-                if (debug) {
-                  DEBUG_LOGGER.info(
-                      
StorageEngineMessages.TS_METADATA_FILTERED_BY_BLOOM_FILTER, key);
-                }
-                loadBloomFilterTime = System.nanoTime() - 
loadBloomFilterStartTime;
-                return null;
+            long loadBloomFilterStartTime = System.nanoTime();
+            // bloom filter part
+            BloomFilter bloomFilter =
+                BloomFilterCache.getInstance()
+                    .get(
+                        new BloomFilterCache.BloomFilterCacheKey(filePath, 
key.tsFileID),
+                        debug,
+                        bloomFilterIoSizeRecorder,
+                        
queryContext.getQueryStatistics().getLoadBloomFilterFromCacheCount()
+                            ::addAndGet,
+                        
queryContext.getQueryStatistics().getLoadBloomFilterFromDiskCount()
+                            ::addAndGet,
+                        false);
+            if (bloomFilter != null
+                && !bloomFilter.contains(
+                    deviceStringFormat + TsFileConstant.PATH_SEPARATOR + 
key.measurement)) {
+              if (debug) {
+                
DEBUG_LOGGER.info(StorageEngineMessages.TS_METADATA_FILTERED_BY_BLOOM_FILTER, 
key);
               }
-
               loadBloomFilterTime = System.nanoTime() - 
loadBloomFilterStartTime;
+              return null;
             }
+            loadBloomFilterTime = System.nanoTime() - loadBloomFilterStartTime;
+
             TsFileSequenceReader reader =
                 FileReaderManager.getInstance()
                     .get(filePath, key.tsFileID, true, 
timeSeriesMetadataIoSizeRecorder, false);

Reply via email to