[CP] Fix complete-data logic in brute force search path

obdev · linbo-lin · ob-robot · commit 853efa1ab84b · 2026-03-17T02:45:50.000Z
Co-authored-by: linbo-lin &lt;1434442536@qq.com&gt;
diff --git a/src/share/vector_index/ob_plugin_vector_index_adaptor.h b/src/share/vector_index/ob_plugin_vector_index_adaptor.h
@@ -366,6 +366,7 @@ class ObVectorQueryConditions {
     is_post_with_filter_ = false;
     ob_sparse_drop_ratio_search_ = 0;
     n_candidate_ = 0;
+    only_complete_data_ = false;
   }
   TO_STRING_KV(K_(query_limit), K_(query_order), K_(ef_search), K_(query_vector), K_(query_scn), K_(ob_sparse_drop_ratio_search), K_(n_candidate));
 
diff --git a/src/sql/das/iter/ob_das_hnsw_scan_iter.cpp b/src/sql/das/iter/ob_das_hnsw_scan_iter.cpp
@@ -380,7 +380,6 @@ int ObDASHNSWScanIter::inner_reuse()
   vec_op_alloc_.reset();
   query_cond_.reset();
   go_brute_force_ = false;
-  only_complete_data_ = false;
 
   if (OB_SUCC(ret) && OB_FAIL(set_vec_index_param(vec_aux_ctdef_->vec_index_param_))) {
     LOG_WARN("failed to set vec index param", K(ret));
@@ -849,7 +848,6 @@ int ObDASHNSWScanIter::reset_filter_path()
   } else {
     query_cond_.reset();
     go_brute_force_ = false;
-    only_complete_data_ = false;
     can_retry_ = false;
     if (OB_NOT_NULL(tmp_adaptor_vid_iter_)) {
       tmp_adaptor_vid_iter_->reset();
@@ -1515,9 +1513,10 @@ int ObDASHNSWScanIter::process_adaptor_state_pre_filter(
     if (OB_FAIL(process_adaptor_state_pre_filter_brute_force(ada_ctx, adaptor, brute_vids, brute_cnt, need_complete_data, true))) {
       LOG_WARN("hnsw pre filter(brute force) failed to query result.", K(ret));
     } else if (need_complete_data) {
-      only_complete_data_ = true;
+      query_cond_.only_complete_data_ = true;
       if (OB_FAIL(process_adaptor_state_post_filter(ada_ctx, adaptor, is_vectorized))) {
         LOG_WARN("failed to process adaptor state post filter", K(ret));
+      } else if (OB_FALSE_IT(need_complete_data = false)) {
       } else if (OB_FAIL(process_adaptor_state_pre_filter_brute_force(ada_ctx, adaptor, brute_vids, brute_cnt, need_complete_data, false))) {
         LOG_WARN("hnsw pre filter(brute force) failed to query result.", K(ret));
       }
@@ -3251,7 +3250,6 @@ int ObDASHNSWScanIter::set_vector_query_condition(ObVectorQueryConditions &query
   } else {
     query_cond.query_order_ = true;
     query_cond.query_scn_ = snapshot_scan_param_.snapshot_.core_.version_;
-    query_cond.only_complete_data_ = only_complete_data_; // ture when search brute force
     query_cond.scan_param_ = &snapshot_scan_param_;
     query_cond.rel_count_ = vec_aux_ctdef_->relevance_col_cnt_;
     query_cond.rel_map_ptr_ = &rel_map_;
@@ -3290,7 +3288,7 @@ int ObDASHNSWScanIter::set_vector_query_condition(ObVectorQueryConditions &query
     } else {
       query_cond.query_vector_ = hybrid_search_vec_;
     }
-    LOG_TRACE("vector index show basic hnsw query cond", K(query_cond.only_complete_data_), K(query_cond.ef_search_), K(query_cond.query_limit_),
+    LOG_TRACE("vector index show basic hnsw query cond", K(query_cond.ef_search_), K(query_cond.query_limit_),
                                             K(query_cond.extra_column_count_), K(query_cond.query_vector_));
   }
   return ret;
diff --git a/src/sql/das/iter/ob_das_hnsw_scan_iter.h b/src/sql/das/iter/ob_das_hnsw_scan_iter.h
@@ -297,7 +297,6 @@ class ObDASHNSWScanIter : public ObDASIter
       distance_calc_(nullptr),
       is_primary_pre_with_rowkey_with_filter_(false),
       go_brute_force_(false),
-      only_complete_data_(false),
       extra_column_count_(0),
       simple_cmp_info_(),
       vec_index_type_(ObVecIndexType::VEC_INDEX_INVALID),
@@ -581,7 +580,6 @@ class ObDASHNSWScanIter : public ObDASIter
   ObExpr* distance_calc_;
   bool is_primary_pre_with_rowkey_with_filter_;
   bool go_brute_force_;
-  bool only_complete_data_;
   int64_t extra_column_count_;
   ObHnswSimpleCmpInfo simple_cmp_info_;
   // extra_info idx to rowkey idx, because of extra_info is sort by column id

Original file line number	Diff line number	Diff line change
`@@ -366,6 +366,7 @@ class ObVectorQueryConditions {`
`366`	`366`	`is_post_with_filter_ = false;`
`367`	`367`	`ob_sparse_drop_ratio_search_ = 0;`
`368`	`368`	`n_candidate_ = 0;`
	`369`	`+ only_complete_data_ = false;`
`369`	`370`	`}`
`370`	`371`	`TO_STRING_KV(K_(query_limit), K_(query_order), K_(ef_search), K_(query_vector), K_(query_scn), K_(ob_sparse_drop_ratio_search), K_(n_candidate));`
`371`	`372`