milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: [2.5] set iterative filter hint to false when no expr specified (#39034) 

issue: https://github.com/milvus-io/milvus/issues/39013
pr: #39033

Signed-off-by: chasingegg <chao.gao@zilliz.com>
lite
Gao 2025-01-08 12:58:56 +08:00 committed by GitHub
parent 4b62dfd11f
commit b2b7cca910
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/core/src/query/PlanProto.cpp
View File

@ -186,6 +186,8 @@ ProtoParser::PlanNodeFromProto(const planpb::PlanNode& plan_node_proto) {
pre_filter_plan();
}
} else {
// no filter, force set iterative filter hint to false, go with normal vector search path
plan_node->search_info_.iterative_filter_execution = false;
plannode = std::make_shared<milvus::plan::MvccNode>(
milvus::plan::GetNextPlanNodeId(), sources);
sources = std::vector<milvus::plan::PlanNodePtr>{plannode};

41
internal/core/unittest/test_iterative_filter.cpp
View File

@ -253,6 +253,47 @@ TEST(IterativeFilter, SealedIndex) {
CheckFilterSearchResult(
*search_result, *search_result2, topK, num_queries);
}
// no expr
{
const char* raw_plan = R"(vector_anns: <
field_id: 100
query_info: <
topk: 10
metric_type: "L2"
hints: "iterative_filter"
search_params: "{\"ef\": 50}"
>
placeholder_tag: "$0">)";
proto::plan::PlanNode plan_node;
auto ok =
google::protobuf::TextFormat::ParseFromString(raw_plan, &plan_node);
auto plan = CreateSearchPlanFromPlanNode(*schema, plan_node);
auto num_queries = 1;
auto seed = 1024;
auto ph_group_raw = CreatePlaceholderGroup(num_queries, dim, seed);
auto ph_group =
ParsePlaceholderGroup(plan.get(), ph_group_raw.SerializeAsString());
auto search_result =
segment->Search(plan.get(), ph_group.get(), 1L << 63);
const char* raw_plan2 = R"(vector_anns: <
field_id: 100
query_info: <
topk: 10
metric_type: "L2"
search_params: "{\"ef\": 50}"
>
placeholder_tag: "$0">)";
proto::plan::PlanNode plan_node2;
auto ok2 = google::protobuf::TextFormat::ParseFromString(raw_plan2,
&plan_node2);
auto plan2 = CreateSearchPlanFromPlanNode(*schema, plan_node2);
auto search_result2 =
segment->Search(plan2.get(), ph_group.get(), 1L << 63);
CheckFilterSearchResult(
*search_result, *search_result2, topK, num_queries);
}
}
TEST(IterativeFilter, SealedData) {