admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2026-01-07 19:31:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Optimize range search for nq > 1 (#22831)

Browse Source 
Signed-off-by: yah01 <yang.cen@zilliz.com>
This commit is contained in:
yah01 2023-03-20 10:17:56 +08:00 committed by GitHub
parent 65c58b3e41
commit 20974711a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
internal/core/src/common/RangeSearchHelper.cpp
View File

@ -55,30 +55,28 @@ SortRangeSearchResult(DatasetPtr data_set,
auto p_dist = new float[topk * nq];
std::fill_n(p_dist, topk * nq, std::numeric_limits<float>::max());
// cnt means the subscript of p_id and p_dist
int cnt = 0;
for (int i = 0; i < nq; i++) {
// if RangeSearch answer size of one nq is less than topk, set the capacity to size
int size = lims[i + 1] - lims[i];
int capacity = topk > size ? size : topk;
/*
/*
* get result for one nq
* IP: 1.0 range_filter radius
* |------------+---------------| min_heap descending_order
* L2: 0.0 range_filter radius
* |------------+---------------| max_heap ascending_order
*
*/
std::function<bool(const ResultPair&, const ResultPair&)> cmp =
std::less<std::pair<float, int64_t>>();
if (IsMetricType(metric_type, knowhere::metric::IP)) {
cmp = std::greater<std::pair<float, int64_t>>();
}
std::priority_queue<std::pair<float, int64_t>,
std::vector<std::pair<float, int64_t>>,
decltype(cmp)>
sub_result(cmp);
*/
std::function<bool(const ResultPair&, const ResultPair&)> cmp =
std::less<>();
if (IsMetricType(metric_type, knowhere::metric::IP)) {
cmp = std::greater<>();
}
std::priority_queue<ResultPair, std::vector<ResultPair>, decltype(cmp)>
sub_result(cmp);
// The subscript of p_id and p_dist
int cnt = 0;
for (int i = 0; i < nq; i++) {
// if RangeSearch answer size of one nq is less than topk, set the capacity to size
int size = lims[i + 1] - lims[i];
int capacity = topk > size ? size : topk;
for (int j = lims[i]; j < lims[i + 1]; j++) {
auto current = ResultPair(dist[j], id[j]);