remove override range_search from hnsw, use iterator-based instead

Signed-off-by: min.tian <min.tian.cn@gmail.com>

Author: alwayslove2013

src/index/hnsw/faiss_hnsw.cc

@@ -1326,171 +1326,6 @@ class BaseFaissRegularIndexHNSWNode : public BaseFaissRegularIndexNode {
         return res;
     }
 
-    expected<DataSetPtr>
-    RangeSearch(const DataSetPtr dataset, std::unique_ptr<Config> cfg, const BitsetView& bitset) const override {
-        if (this->indexes.empty()) {
-            return expected<DataSetPtr>::Err(Status::empty_index, "index not loaded");
-        }
-        for (const auto& index : indexes) {
-            if (index == nullptr) {
-                return expected<DataSetPtr>::Err(Status::empty_index, "index not loaded");
-            }
-            if (!index->is_trained) {
-                return expected<DataSetPtr>::Err(Status::index_not_trained, "index not trained");
-            }
-        }
-
-        const auto dim = dataset->GetDim();
-        const auto rows = dataset->GetRows();
-        const auto* data = dataset->GetTensor();
-
-        const auto hnsw_cfg = static_cast<const FaissHnswConfig&>(*cfg);
-        auto index_id = getIndexToSearchByScalarInfo(hnsw_cfg, bitset);
-        if (index_id < 0) {
-            return expected<DataSetPtr>::Err(Status::invalid_args, "partition key value not correctly set");
-        }
-
-        const bool is_similarity_metric = faiss::is_similarity_metric(indexes[index_id]->metric_type);
-
-        const float radius = hnsw_cfg.radius.value();
-        const float range_filter = hnsw_cfg.range_filter.value();
-
-        feder::hnsw::FederResultUniq feder_result;
-        if (hnsw_cfg.trace_visit.value()) {
-            if (rows != 1) {
-                return expected<DataSetPtr>::Err(Status::invalid_args, "a single query vector is required");
-            }
-            feder_result = std::make_unique<feder::hnsw::FederResult>();
-        }
-
-        // check for brute-force search
-        auto whether_bf_search = WhetherPerformBruteForceRangeSearch(indexes[index_id].get(), hnsw_cfg, bitset);
-
-        if (!whether_bf_search.has_value()) {
-            return expected<DataSetPtr>::Err(Status::invalid_args, "ef parameter is missing");
-        }
-
-        // whether a user wants a refine
-        const bool whether_to_enable_refine = true;
-
-        // set up an index wrapper
-        auto [index_wrapper, is_refined] = create_conditional_hnsw_wrapper(
-            indexes[index_id].get(), hnsw_cfg, whether_bf_search.value_or(false), whether_to_enable_refine);
-
-        if (index_wrapper == nullptr) {
-            return expected<DataSetPtr>::Err(Status::invalid_args, "an input index seems to be unrelated to HNSW");
-        }
-
-        faiss::Index* index_wrapper_ptr = index_wrapper.get();
-
-        // set up faiss search parameters
-        knowhere::SearchParametersHNSWWrapper hnsw_search_params;
-
-        if (hnsw_cfg.ef.has_value()) {
-            hnsw_search_params.efSearch = hnsw_cfg.ef.value();
-        }
-
-        // do not collect HNSW stats
-        hnsw_search_params.hnsw_stats = nullptr;
-        // set up feder
-        hnsw_search_params.feder = feder_result.get();
-        // set up kAlpha
-        hnsw_search_params.kAlpha = bitset.filter_ratio() * 0.7f;
-
-        // set up a selector
-        BitsetViewIDSelector bw_idselector(bitset);
-        BitsetViewWithMappingIDSelector bw_mapping_idselector(
-            bitset, labels.empty() ? nullptr : labels[index_id].get()->data());
-        faiss::IDSelector* id_selector = nullptr;
-        if (!bitset.empty()) {
-            if (labels.empty()) {
-                id_selector = &bw_idselector;
-            } else {
-                id_selector = &bw_mapping_idselector;
-            }
-        }
-        hnsw_search_params.sel = id_selector;
-
-        ////////////////////////////////////////////////////////////////
-        // run
-        std::vector<std::vector<int64_t>> result_id_array(rows);
-        std::vector<std::vector<float>> result_dist_array(rows);
-
-        std::vector<folly::Future<folly::Unit>> futs;
-        futs.reserve(rows);
-
-        // a sequential version
-        for (int64_t i = 0; i < rows; ++i) {
-            // const int64_t idx = i;
-            // {
-
-            futs.emplace_back(
-                search_pool->push([&, idx = i, is_refined = is_refined, index_wrapper_ptr = index_wrapper_ptr] {
-                    // 1 thread per element
-                    ThreadPool::ScopedSearchOmpSetter setter(1);
-
-                    // set up a query
-                    const float* cur_query = nullptr;
-
-                    std::vector<float> cur_query_tmp(dim);
-                    if (data_format == DataFormatEnum::fp32) {
-                        cur_query = (const float*)data + idx * dim;
-                    } else {
-                        convert_rows_to_fp32(data, cur_query_tmp.data(), data_format, idx, 1, dim);
-                        cur_query = cur_query_tmp.data();
-                    }
-
-                    // initialize a buffer
-                    faiss::RangeSearchResult res(1);
-
-                    // perform the search
-                    if (is_refined) {
-                        faiss::IndexRefineSearchParameters refine_params;
-                        refine_params.k_factor = hnsw_cfg.refine_k.value_or(1);
-                        // a refine procedure itself does not need to care about filtering
-                        refine_params.sel = nullptr;
-                        refine_params.base_index_params = &hnsw_search_params;
-
-                        index_wrapper_ptr->range_search(1, cur_query, radius, &res, &refine_params);
-                    } else {
-                        index_wrapper_ptr->range_search(1, cur_query, radius, &res, &hnsw_search_params);
-                    }
-
-                    // post-process
-                    const size_t elem_cnt = res.lims[1];
-                    result_dist_array[idx].resize(elem_cnt);
-                    result_id_array[idx].resize(elem_cnt);
-
-                    if (labels.empty()) {
-                        for (size_t j = 0; j < elem_cnt; j++) {
-                            result_dist_array[idx][j] = res.distances[j];
-                            result_id_array[idx][j] = res.labels[j];
-                        }
-                    } else {
-                        for (size_t j = 0; j < elem_cnt; j++) {
-                            result_dist_array[idx][j] = res.distances[j];
-                            result_id_array[idx][j] =
-                                res.labels[j] < 0 ? res.labels[j] : labels[index_id]->operator[](res.labels[j]);
-                        }
-                    }
-
-                    if (hnsw_cfg.range_filter.value() != defaultRangeFilter) {
-                        FilterRangeSearchResultForOneNq(result_dist_array[idx], result_id_array[idx],
-                                                        is_similarity_metric, radius, range_filter);
-                    }
-                }));
-        }
-
-        // wait for the completion
-        WaitAllSuccess(futs);
-
-        //
-        RangeSearchResult range_search_result =
-            GetRangeSearchResult(result_dist_array, result_id_array, is_similarity_metric, rows, radius, range_filter);
-
-        return GenResultDataSet(rows, std::move(range_search_result));
-    }
-
  protected:
     DataFormatEnum data_format;