Storages: load RSResult only once

dbms/src/Storages/DeltaMerge/ColumnFile/ColumnFileBig.cpp

@@ -38,22 +38,14 @@ ColumnFileBig::ColumnFileBig(const DMContext & dm_context, const DMFilePtr & fil
 
 void ColumnFileBig::calculateStat(const DMContext & dm_context)
 {
-    auto index_cache = dm_context.global_context.getMinMaxIndexCache();
-
     auto pack_filter = DMFilePackFilter::loadFrom(
+        dm_context,
         file,
-        index_cache,
         /*set_cache_if_miss*/ false,
         {segment_range},
         EMPTY_RS_OPERATOR,
-        {},
-        dm_context.global_context.getFileProvider(),
-        dm_context.getReadLimiter(),
-        dm_context.scan_context,
-        /*tracing_id*/ dm_context.tracing_id,
-        ReadTag::Internal);
-
-    std::tie(valid_rows, valid_bytes) = pack_filter.validRowsAndBytes();
+        {});
+    std::tie(valid_rows, valid_bytes) = pack_filter->validRowsAndBytes();
 }
 
 void ColumnFileBig::removeData(WriteBatches & wbs) const

dbms/src/Storages/DeltaMerge/File/ColumnStream.cpp

@@ -157,7 +157,7 @@ std::unique_ptr<CompressedSeekableReaderBuffer> ColumnReadStream::buildColDataRe
 
     // Try to get the largest buffer size of reading continuous packs
     size_t buffer_size = 0;
-    const auto & pack_res = reader.pack_filter.getPackResConst();
+    const auto & pack_res = reader.pack_filter->getPackRes();
     for (size_t i = 0; i < n_packs; /*empty*/)
     {
         if (!pack_res[i].isUse())

dbms/src/Storages/DeltaMerge/File/DMFile.h

@@ -210,6 +210,8 @@ class DMFile : private boost::noncopyable
 
     UInt32 metaVersion() const { return meta->metaVersion(); }
 
+    bool isColIndexExist(const ColId & col_id) const;
+
 private:
     DMFile(
         UInt64 file_id_,
@@ -293,8 +295,6 @@ class DMFile : private boost::noncopyable
     String colIndexCacheKey(const FileNameBase & file_name_base) const;
     String colMarkCacheKey(const FileNameBase & file_name_base) const;
 
-    bool isColIndexExist(const ColId & col_id) const;
-
     String encryptionBasePath() const;
     EncryptionPath encryptionDataPath(const FileNameBase & file_name_base) const;
     EncryptionPath encryptionIndexPath(const FileNameBase & file_name_base) const;

dbms/src/Storages/DeltaMerge/File/DMFileBlockInputStream.cpp

@@ -19,7 +19,6 @@
 #include <Storages/DeltaMerge/Index/VectorIndex.h>
 #include <Storages/DeltaMerge/ScanContext.h>
 
-
 namespace DB::DM
 {
 
@@ -58,19 +57,6 @@ DMFileBlockInputStreamPtr DMFileBlockInputStreamBuilder::build(
 
     bool is_common_handle = !rowkey_ranges.empty() && rowkey_ranges[0].is_common_handle;
 
-    DMFilePackFilter pack_filter = DMFilePackFilter::loadFrom(
-        dmfile,
-        index_cache,
-        /*set_cache_if_miss*/ true,
-        rowkey_ranges,
-        rs_filter,
-        read_packs,
-        file_provider,
-        read_limiter,
-        scan_context,
-        tracing_id,
-        read_tag);
-
     bool enable_read_thread = SegmentReaderPoolManager::instance().isSegmentReader();
 
     if (!enable_read_thread || max_sharing_column_bytes_for_all <= 0)
@@ -79,6 +65,22 @@ DMFileBlockInputStreamPtr DMFileBlockInputStreamBuilder::build(
         max_sharing_column_bytes_for_all = 0;
     }
 
+    // If pack_filter is not set, we will create a default one.
+    if (!pack_filter)
+    {
+        pack_filter = DMFilePackFilter::loadFrom(
+            index_cache,
+            file_provider,
+            read_limiter,
+            scan_context,
+            dmfile,
+            true,
+            rowkey_ranges,
+            EMPTY_RS_OPERATOR,
+            read_packs,
+            tracing_id);
+    }
+
     DMFileReader reader(
         dmfile,
         read_columns,
@@ -87,7 +89,7 @@ DMFileBlockInputStreamPtr DMFileBlockInputStreamBuilder::build(
         enable_del_clean_read,
         is_fast_scan,
         max_data_version,
-        std::move(pack_filter),
+        pack_filter,
         mark_cache,
         enable_column_cache,
         column_cache,
@@ -140,18 +142,13 @@ SkippableBlockInputStreamPtr DMFileBlockInputStreamBuilder::tryBuildWithVectorIn
         return build(dmfile, read_columns, rowkey_ranges, scan_context);
     };
 
-    if (!rs_filter)
-        return fallback();
-
-    auto filter_with_ann = std::dynamic_pointer_cast<WithANNQueryInfo>(rs_filter);
-    if (!filter_with_ann)
+    if (!ann_query_info)
         return fallback();
 
     if (!bitmap_filter.has_value())
         return fallback();
 
     Block header_layout = toEmptyBlock(read_columns);
-    auto ann_query_info = filter_with_ann->ann_query_info;
 
     // Copy out the vector column for later use. Copy is intentionally performed after the
     // fast check so that in fallback conditions we don't need unnecessary copies.
@@ -181,22 +178,25 @@ SkippableBlockInputStreamPtr DMFileBlockInputStreamBuilder::tryBuildWithVectorIn
 
     // All check passed. Let's read via vector index.
 
-    DMFilePackFilter pack_filter = DMFilePackFilter::loadFrom(
-        dmfile,
-        index_cache,
-        /*set_cache_if_miss*/ true,
-        rowkey_ranges,
-        rs_filter,
-        read_packs,
-        file_provider,
-        read_limiter,
-        scan_context,
-        tracing_id,
-        ReadTag::Query);
-
     bool enable_read_thread = SegmentReaderPoolManager::instance().isSegmentReader();
     bool is_common_handle = !rowkey_ranges.empty() && rowkey_ranges[0].is_common_handle;
 
+    // If pack_filter is not set, we will create a default one.
+    if (!pack_filter)
+    {
+        pack_filter = DMFilePackFilter::loadFrom(
+            index_cache,
+            file_provider,
+            read_limiter,
+            scan_context,
+            dmfile,
+            true,
+            rowkey_ranges,
+            EMPTY_RS_OPERATOR,
+            read_packs,
+            tracing_id);
+    }
+
     DMFileReader rest_columns_reader(
         dmfile,
         rest_columns,
@@ -205,7 +205,7 @@ SkippableBlockInputStreamPtr DMFileBlockInputStreamBuilder::tryBuildWithVectorIn
         enable_del_clean_read,
         is_fast_scan,
         max_data_version,
-        std::move(pack_filter),
+        pack_filter,
         mark_cache,
         enable_column_cache,
         column_cache,
@@ -217,7 +217,7 @@ SkippableBlockInputStreamPtr DMFileBlockInputStreamBuilder::tryBuildWithVectorIn
         tracing_id,
         enable_read_thread,
         scan_context,
-        ReadTag::Query);
+        read_tag);
 
     if (column_cache_long_term && pk_col_id)
         // ColumnCacheLongTerm is only filled in Vector Search.

dbms/src/Storages/DeltaMerge/File/DMFileBlockInputStream.h

@@ -138,9 +138,9 @@ class DMFileBlockInputStreamBuilder
         return *this;
     }
 
-    DMFileBlockInputStreamBuilder & setRSOperator(const RSOperatorPtr & filter_)
+    DMFileBlockInputStreamBuilder & setAnnQureyInfo(const ANNQueryInfoPtr & ann_query_info_)
     {
-        rs_filter = filter_;
+        ann_query_info = ann_query_info_;
         return *this;
     }
 
@@ -162,6 +162,7 @@ class DMFileBlockInputStreamBuilder
         read_one_pack_every_time = true;
         return *this;
     }
+
     DMFileBlockInputStreamBuilder & setRowsThreshold(size_t rows_threshold_per_read_)
     {
         rows_threshold_per_read = rows_threshold_per_read_;
@@ -180,6 +181,12 @@ class DMFileBlockInputStreamBuilder
         return *this;
     }
 
+    DMFileBlockInputStreamBuilder & setDMFilePackFilterResult(const DMFilePackFilterResultPtr & pack_filter_)
+    {
+        pack_filter = pack_filter_;
+        return *this;
+    }
+
     /**
      * @note To really enable the long term cache, you also need to ensure
      * ColumnCacheLongTerm is initialized in the global context.
@@ -217,8 +224,6 @@ class DMFileBlockInputStreamBuilder
     bool is_fast_scan = false;
     bool enable_del_clean_read = false;
     UInt64 max_data_version = std::numeric_limits<UInt64>::max();
-    // Rough set filter
-    RSOperatorPtr rs_filter;
     // packs filter (filter by pack index)
     IdSetPtr read_packs;
     MarkCachePtr mark_cache;
@@ -234,6 +239,10 @@ class DMFileBlockInputStreamBuilder
     String tracing_id;
     ReadTag read_tag = ReadTag::Internal;
 
+    DMFilePackFilterResultPtr pack_filter;
+
+    ANNQueryInfoPtr ann_query_info = nullptr;
+
     VectorIndexCachePtr vector_index_cache;
     // Note: Currently thie field is assigned only for Stable streams, not available for ColumnFileBig
     std::optional<BitmapFilterView> bitmap_filter;