test/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2024-12-01 11:29:48 +08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

Fix wrong result topks when reduce search result (#16815)

Browse Source 
Signed-off-by: bigsheeper <yihao.dai@zilliz.com>
This commit is contained in:
bigsheeper 2022-05-06 21:17:51 +08:00 committed by GitHub
parent c55c793da3
commit 64d2793fe9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
internal/core/src/segcore/reduce_c.cpp
View File

@ -112,23 +112,21 @@ ReduceResultData(std::vector<SearchResult*>& search_results, int64_t nq, int64_t
// after reduce, remove redundant values in primary_keys, distances and ids
for (int i = 0; i < num_segments; i++) {
auto search_result = search_results[i];
if (search_result->result_offsets_.size() == 0) {
continue;
}
if (search_result->result_offsets_.size() != 0) {
std::vector<milvus::PkType> primary_keys;
std::vector<float> distances;
std::vector<int64_t> ids;
for (int j = 0; j < search_records[i].size(); j++) {
auto& offset = search_records[i][j];
primary_keys.push_back(search_result->primary_keys_[offset]);
distances.push_back(search_result->distances_[offset]);
ids.push_back(search_result->seg_offsets_[offset]);
}
std::vector<milvus::PkType> primary_keys;
std::vector<float> distances;
std::vector<int64_t> ids;
for (int j = 0; j < search_records[i].size(); j++) {
auto& offset = search_records[i][j];
primary_keys.push_back(search_result->primary_keys_[offset]);
distances.push_back(search_result->distances_[offset]);
ids.push_back(search_result->seg_offsets_[offset]);
search_result->primary_keys_ = std::move(primary_keys);
search_result->distances_ = std::move(distances);
search_result->seg_offsets_ = std::move(ids);
}
search_result->primary_keys_ = std::move(primary_keys);
search_result->distances_ = std::move(distances);
search_result->seg_offsets_ = std::move(ids);
search_result->real_topK_per_nq_ = std::move(final_real_topks[i]);
}
}

29
internal/core/unittest/test_c_api.cpp
View File

@ -20,6 +20,7 @@
#include <knowhere/index/vector_index/adapter/VectorAdapter.h>
#include <knowhere/index/vector_index/VecIndexFactory.h>
#include <knowhere/index/vector_index/IndexIVFPQ.h>
#include <boost/format.hpp>
#include "common/LoadInfo.h"
#include "pb/milvus.pb.h"
@ -619,12 +620,12 @@ TEST(CApiTest, ReduceRemoveDuplicates) {
DeleteSegment(segment);
}
TEST(CApiTest, ReduceSearchWithExpr) {
void
testReduceSearchWithExpr(int N, int topK, int num_queries) {
auto collection = NewCollection(get_default_schema_config());
auto segment = NewSegment(collection, Growing, -1);
auto schema = ((milvus::segcore::Collection*)collection)->get_schema();
int N = 10000;
auto dataset = DataGen(schema, N);
int64_t offset;
@ -636,22 +637,22 @@ TEST(CApiTest, ReduceSearchWithExpr) {
auto ins_res = Insert(segment, offset, N, dataset.row_ids_.data(), dataset.timestamps_.data(), insert_data.c_str());
assert(ins_res.error_code == Success);
const char* serialized_expr_plan = R"(vector_anns: <
auto fmt = boost::format(R"(vector_anns: <
field_id: 100
query_info: <
topk: 10
topk: %1%
metric_type: "L2"
search_params: "{\"nprobe\": 10}"
>
placeholder_tag: "$0">
output_field_ids: 100)";
output_field_ids: 100)") %
topK;
int topK = 10;
int num_queries = 10;
auto serialized_expr_plan = fmt.str();
auto blob = generate_query_data(num_queries);
void* plan = nullptr;
auto binary_plan = translate_text_plan_to_binary_plan(serialized_expr_plan);
auto binary_plan = translate_text_plan_to_binary_plan(serialized_expr_plan.data());
auto status = CreateSearchPlanByExpr(collection, binary_plan.data(), binary_plan.size(), &plan);
assert(status.error_code == Success);
@ -680,7 +681,10 @@ TEST(CApiTest, ReduceSearchWithExpr) {
// 2. marshal
CSearchResultDataBlobs cSearchResultData;
auto req_sizes = std::vector<int32_t>{5, 5};
auto req_sizes = std::vector<int32_t>{num_queries / 2, num_queries / 2};
if (num_queries == 1) {
req_sizes = std::vector<int32_t>{num_queries};
}
status = Marshal(&cSearchResultData, results.data(), plan, results.size(), req_sizes.data(), req_sizes.size());
assert(status.error_code == Success);
auto search_result_data_blobs = reinterpret_cast<milvus::segcore::SearchResultDataBlobs*>(cSearchResultData);
@ -706,6 +710,13 @@ TEST(CApiTest, ReduceSearchWithExpr) {
DeleteSegment(segment);
}
TEST(CApiTest, ReduceSearchWithExpr) {
testReduceSearchWithExpr(100, 1, 1);
testReduceSearchWithExpr(100, 10, 10);
testReduceSearchWithExpr(10000, 1, 1);
testReduceSearchWithExpr(10000, 10, 10);
}
TEST(CApiTest, LoadIndexInfo) {
// generator index
constexpr auto TOPK = 10;