@@ -175,17 +175,20 @@ void FaissVectorIndex::build(const FaissBuildParameter& params) {
175175 }
176176
177177 if (params.index_type == FaissBuildParameter::IndexType::HNSW ) {
178+ std::unique_ptr<faiss::IndexHNSWFlat> hnsw_index;
178179 if (params.metric_type == FaissBuildParameter::MetricType::L2 ) {
179- _index = std::make_unique<faiss::IndexHNSWFlat>(params.dim , params.max_degree ,
180- faiss::METRIC_L2 );
180+ hnsw_index = std::make_unique<faiss::IndexHNSWFlat>(params.dim , params.max_degree ,
181+ faiss::METRIC_L2 );
181182 } else if (params.metric_type == FaissBuildParameter::MetricType::IP ) {
182- _index = std::make_unique<faiss::IndexHNSWFlat>(params.dim , params.max_degree ,
183- faiss::METRIC_INNER_PRODUCT );
183+ hnsw_index = std::make_unique<faiss::IndexHNSWFlat>(params.dim , params.max_degree ,
184+ faiss::METRIC_INNER_PRODUCT );
184185 } else {
185186 throw doris::Exception (doris::ErrorCode::INVALID_ARGUMENT ,
186187 " Unsupported metric type: {}" ,
187188 static_cast <int >(params.metric_type ));
188189 }
190+ hnsw_index->hnsw .efConstruction = params.ef_construction ;
191+ _index = std::move (hnsw_index);
189192 } else {
190193 throw doris::Exception (doris::ErrorCode::INVALID_ARGUMENT , " Unsupported index type: {}" ,
191194 static_cast <int >(params.index_type ));
@@ -224,14 +227,13 @@ doris::Status FaissVectorIndex::ann_topn_search(const float* query_vec, int k,
224227 std::unique_ptr<faiss::IDSelector> id_sel = nullptr ;
225228 // Costs of roaring to faiss selector is very high especially when the cardinality is very high.
226229 if (params.roaring ->cardinality () != params.rows_of_segment ) {
227- LOG_INFO (" Roaring to faiss selector, roaring {} rows, segment {} rows" ,
228- params.roaring ->cardinality (), params.rows_of_segment );
229- {
230- SCOPED_RAW_TIMER (&result.engine_prepare_ns );
231- id_sel = roaring_to_faiss_selector (*params.roaring );
232- }
230+ SCOPED_RAW_TIMER (&result.engine_prepare_ns );
231+ id_sel = roaring_to_faiss_selector (*params.roaring );
233232 param.sel = id_sel.get ();
233+ } else {
234+ param.sel = nullptr ;
234235 }
236+
235237 {
236238 SCOPED_RAW_TIMER (&result.engine_search_ns );
237239 _index->search (1 , query_vec, k, distances, labels, ¶m);
@@ -283,26 +285,30 @@ doris::Status FaissVectorIndex::range_search(const float* query_vec, const float
283285 DCHECK (query_vec != nullptr );
284286 DCHECK (params.roaring != nullptr )
285287 << " Roaring should not be null for range search, please set roaring in params" ;
286- std::unique_ptr<faiss::IDSelector> sel;
287- {
288- // Engine prepare: convert roaring bitmap to FAISS selector
289- SCOPED_RAW_TIMER (&result.engine_prepare_ns );
290- sel = roaring_to_faiss_selector (*params.roaring );
291- }
292- faiss::RangeSearchResult native_search_result (1 , true );
293- const HNSWSearchParameters* hnsw_params = dynamic_cast <const HNSWSearchParameters*>(¶ms);
294- // Currently only support HNSW index for range search.
295- DCHECK (hnsw_params != nullptr ) << " HNSW search parameters should not be null for HNSW index" ;
296-
297288 faiss::SearchParametersHNSW param;
289+ const HNSWSearchParameters* hnsw_params = dynamic_cast <const HNSWSearchParameters*>(¶ms);
298290 {
299291 // Engine prepare: set search parameters and bind selector
300292 SCOPED_RAW_TIMER (&result.engine_prepare_ns );
301293 param.efSearch = hnsw_params->ef_search ;
302294 param.check_relative_distance = hnsw_params->check_relative_distance ;
303295 param.bounded_queue = hnsw_params->bounded_queue ;
304- param.sel = sel.get ();
305296 }
297+ std::unique_ptr<faiss::IDSelector> sel;
298+ {
299+ // Engine prepare: convert roaring bitmap to FAISS selector
300+ SCOPED_RAW_TIMER (&result.engine_prepare_ns );
301+ if (params.roaring ->cardinality () != params.rows_of_segment ) {
302+ sel = roaring_to_faiss_selector (*params.roaring );
303+ param.sel = sel.get ();
304+ } else {
305+ param.sel = nullptr ;
306+ }
307+ }
308+
309+ faiss::RangeSearchResult native_search_result (1 , true );
310+ // Currently only support HNSW index for range search.
311+ DCHECK (hnsw_params != nullptr ) << " HNSW search parameters should not be null for HNSW index" ;
306312 {
307313 // Engine search: FAISS range_search
308314 SCOPED_RAW_TIMER (&result.engine_search_ns );
@@ -347,7 +353,7 @@ doris::Status FaissVectorIndex::range_search(const float* query_vec, const float
347353 << " row_ids size: " << result.row_ids ->size ()
348354 << " , roaring size: " << result.roaring ->cardinality ();
349355 } else if (_metric == AnnIndexMetric::IP ) {
350- // For IP, we can use the distance directly.
356+ // For IP, we can not use the distance directly.
351357 // range search on ip gets all vectors with inner product greater than or equal to the radius.
352358 // so we need to do a convertion.
353359 const roaring::Roaring& origin_row_ids = *params.roaring ;
@@ -362,6 +368,8 @@ doris::Status FaissVectorIndex::range_search(const float* query_vec, const float
362368 // remove all rows that should not be included.
363369 *(result.roaring ) = origin_row_ids - *roaring;
364370 // Just update the roaring. distance can not be used.
371+ result.distances = nullptr ;
372+ result.row_ids = nullptr ;
365373 }
366374 } else {
367375 throw doris::Exception (doris::ErrorCode::INVALID_ARGUMENT ,
0 commit comments