[CP] fix set_force_partition

obdev · linbo-lin · ob-robot · commit 7d14e9056452 · 2026-02-11T07:37:05.000Z
Co-authored-by: linbo-lin &lt;1434442536@qq.com&gt;
diff --git a/src/sql/optimizer/ob_log_table_scan.cpp b/src/sql/optimizer/ob_log_table_scan.cpp
@@ -2817,7 +2817,14 @@ int ObLogTableScan::allocate_granule_post(AllocGIContext &ctx)
     ctx.hash_part_ = table_schema->is_hash_part() || table_schema->is_hash_subpart()
                      || table_schema->is_key_part() || table_schema->is_key_subpart();
     //Before GI is adapted to the real agent table, block gi cannot be assigned to it
-    if (table_schema->is_spatial_index() || table_schema->is_vec_index()) {
+    if (is_text_retrieval_scan()
+        || is_vec_idx_scan_post_filter()
+        || is_multivalue_index_scan()
+        || use_index_merge()
+        || is_ivf_adaptive_scan()
+        || is_ipivf_adaptive_scan()
+        || table_schema->is_spatial_index()
+        || table_schema->is_vec_index()) {
      ctx.set_force_partition();
    }
   } else { /*do nothing*/ }
diff --git a/src/sql/optimizer/ob_log_table_scan.h b/src/sql/optimizer/ob_log_table_scan.h
@@ -270,6 +270,10 @@ struct ObVecIndexInfo
            vector_index_param_.type_ == ObVectorIndexAlgorithmType::VIAT_HNSW_BQ ||
            vector_index_param_.type_ == ObVectorIndexAlgorithmType::VIAT_IPIVF;
   }
+  inline bool is_ipivf_vec_scan() const
+  {
+    return vector_index_param_.type_ == ObVectorIndexAlgorithmType::VIAT_IPIVF;
+  }
   inline bool is_spiv_scan() const { return vector_index_param_.type_ == ObVectorIndexAlgorithmType::VIAT_SPIV; }
   inline bool is_ivf_vec_scan() const
   {
@@ -290,6 +294,8 @@ struct ObVecIndexInfo
                                                   || ObVecIndexType::VEC_INDEX_POST_ITERATIVE_FILTER == vec_type_; }
   inline bool is_vec_adaptive_scan() const { return vec_type_ == ObVecIndexType::VEC_INDEX_ADAPTIVE_SCAN; }
   inline bool is_vec_adaptive_iter_scan() const { return is_vec_adaptive_scan() && (adaptive_try_path_ == ObVecIdxAdaTryPath::VEC_INDEX_ITERATIVE_FILTER || adaptive_try_path_ == ObVecIdxAdaTryPath::VEC_INDEX_POST_FILTER); }
+  inline bool is_ivf_adaptive_scan() const { return is_ivf_vec_scan() && is_vec_adaptive_scan(); }
+  inline bool is_ipivf_adaptive_scan() const { return is_ipivf_vec_scan() && is_vec_adaptive_scan(); }
   inline bool need_index_back() const { return is_ivf_vec_scan() || is_hnsw_vec_scan() || is_spiv_scan();}
   uint64_t get_aux_table_id(ObVectorAuxTableIdx idx) const { return idx < aux_table_id_.count() ? aux_table_id_[idx] : OB_INVALID_ID; }
   ObColumnRefRawExpr* get_aux_table_column(int idx) const { return idx < aux_table_column_.count() ? aux_table_column_[idx] : nullptr; }
@@ -1025,6 +1031,8 @@ class ObLogTableScan : public ObLogicalOperator
   inline bool is_vec_idx_scan_post_filter() const { return is_index_scan() && vector_index_info_.vec_index_post_filter(); }
   inline bool is_vec_idx_scan() const { return is_vec_idx_scan_pre_filter() || is_vec_idx_scan_post_filter(); }
   inline bool is_vec_adaptive_scan() const { return vector_index_info_.is_vec_adaptive_scan(); }
+  inline bool is_ivf_adaptive_scan() const { return vector_index_info_.is_ivf_adaptive_scan(); }
+  inline bool is_ipivf_adaptive_scan() const { return vector_index_info_.is_ipivf_adaptive_scan(); }
   inline bool is_spiv_vec_scan() const {return vector_index_info_.is_spiv_scan();}
   inline ObVecIndexInfo &get_vector_index_info() { return vector_index_info_; }
   inline const ObVecIndexInfo &get_vector_index_info() const { return vector_index_info_; }
