update

Signed-off-by: chasingegg <[email protected]>
milvus-io · Jan 15, 2025 · be80c5e · be80c5e
1 parent db424cb
commit be80c5e
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 20 deletions.
diff --git a/internal/core/src/plan/PlanNode.h b/internal/core/src/plan/PlanNode.h
@@ -212,6 +212,13 @@ class FilterNode : public PlanNode {
         return "";
     }
 
+    expr::ExprInfo
+    GatherInfo() const override {
+        expr::ExprInfo info;
+        filter_->GatherInfo(info);
+        return info;
+    }
+
  private:
     const std::vector<PlanNodePtr> sources_;
     const expr::TypedExprPtr filter_;

diff --git a/internal/core/src/query/PlanProto.cpp b/internal/core/src/query/PlanProto.cpp
@@ -56,17 +56,17 @@ ProtoParser::PlanNodeFromProto(const planpb::PlanNode& plan_node_proto) {
         // currently, iterative filter does not support range search
         if (!search_info.search_params_.contains(RADIUS)) {
             if (query_info_proto.hints() != "") {
-                if (query_info_proto.hints() == ITERATIVE_FILTER) {
+                if (query_info_proto.hints() == "disable") {
+                    search_info.iterative_filter_execution = false;
+                } else if (query_info_proto.hints() == ITERATIVE_FILTER) {
                     search_info.iterative_filter_execution = true;
                 } else {
                     // check if hints is valid
                     PanicInfo(ConfigInvalid,
                               "hints: {} not supported",
                               query_info_proto.hints());
                 }
-            }
-            if (!search_info.iterative_filter_execution &&
-                search_info.search_params_.contains(HINTS)) {
+            } else if (search_info.search_params_.contains(HINTS)) {
                 if (search_info.search_params_[HINTS] == ITERATIVE_FILTER) {
                     search_info.iterative_filter_execution = true;
                 } else {
@@ -133,6 +133,25 @@ ProtoParser::PlanNodeFromProto(const planpb::PlanNode& plan_node_proto) {
     milvus::plan::PlanNodePtr plannode;
     std::vector<milvus::plan::PlanNodePtr> sources;
 
+    auto set_mv_info = [&](const plan::PlanNode* plannode) {
+        if (plan_node->search_info_.materialized_view_involved) {
+            const auto expr_info = plannode->GatherInfo();
+            knowhere::MaterializedViewSearchInfo materialized_view_search_info;
+            for (const auto& [expr_field_id, vals] :
+                 expr_info.field_id_to_values) {
+                materialized_view_search_info
+                    .field_id_to_touched_categories_cnt[expr_field_id] =
+                    vals.size();
+            }
+            materialized_view_search_info.is_pure_and = expr_info.is_pure_and;
+            materialized_view_search_info.has_not = expr_info.has_not;
+
+            plan_node->search_info_
+                .search_params_[knowhere::meta::MATERIALIZED_VIEW_SEARCH_INFO] =
+                materialized_view_search_info;
+        }
+    };
+
     // mvcc node -> vector search node -> iterative filter node
     auto iterative_filter_plan = [&]() {
         plannode = std::make_shared<milvus::plan::MvccNode>(
@@ -145,28 +164,14 @@ ProtoParser::PlanNodeFromProto(const planpb::PlanNode& plan_node_proto) {
         auto expr = ParseExprs(anns_proto.predicates());
         plannode = std::make_shared<plan::FilterNode>(
             milvus::plan::GetNextPlanNodeId(), expr, sources);
+        set_mv_info(plannode.get());
         sources = std::vector<milvus::plan::PlanNodePtr>{plannode};
     };
 
     // pre filter node -> mvcc node -> vector search node
     auto pre_filter_plan = [&]() {
         plannode = std::move(expr_parser());
-        if (plan_node->search_info_.materialized_view_involved) {
-            const auto expr_info = plannode->GatherInfo();
-            knowhere::MaterializedViewSearchInfo materialized_view_search_info;
-            for (const auto& [expr_field_id, vals] :
-                 expr_info.field_id_to_values) {
-                materialized_view_search_info
-                    .field_id_to_touched_categories_cnt[expr_field_id] =
-                    vals.size();
-            }
-            materialized_view_search_info.is_pure_and = expr_info.is_pure_and;
-            materialized_view_search_info.has_not = expr_info.has_not;
-
-            plan_node->search_info_
-                .search_params_[knowhere::meta::MATERIALIZED_VIEW_SEARCH_INFO] =
-                materialized_view_search_info;
-        }
+        set_mv_info(plannode.get());
         sources = std::vector<milvus::plan::PlanNodePtr>{plannode};
         plannode = std::make_shared<milvus::plan::MvccNode>(
             milvus::plan::GetNextPlanNodeId(), sources);

diff --git a/internal/proxy/task_search.go b/internal/proxy/task_search.go
@@ -342,6 +342,8 @@ func setQueryInfoIfMvEnable(queryInfo *planpb.QueryInfo, t *searchTask, plan *pl
 				if err != nil {
 					return err
 				}
+				// force set hints to disable
+				queryInfo.Hints = "disable"
 			}
 			queryInfo.MaterializedViewInvolved = true
 		} else {

diff --git a/internal/proxy/task_search_test.go b/internal/proxy/task_search_test.go
@@ -3461,6 +3461,7 @@ func (s *MaterializedViewTestSuite) TestMvNotEnabledWithNoPartitionKey() {
 	s.NoError(err)
 	s.NotZero(len(task.queryInfos))
 	s.Equal(false, task.queryInfos[0].MaterializedViewInvolved)
+	s.Equal("", task.queryInfos[0].Hints)
 }
 
 func (s *MaterializedViewTestSuite) TestMvNotEnabledWithPartitionKey() {
@@ -3477,6 +3478,7 @@ func (s *MaterializedViewTestSuite) TestMvNotEnabledWithPartitionKey() {
 	s.NoError(err)
 	s.NotZero(len(task.queryInfos))
 	s.Equal(false, task.queryInfos[0].MaterializedViewInvolved)
+	s.Equal("", task.queryInfos[0].Hints)
 }
 
 func (s *MaterializedViewTestSuite) TestMvEnabledNoPartitionKey() {
@@ -3490,6 +3492,7 @@ func (s *MaterializedViewTestSuite) TestMvEnabledNoPartitionKey() {
 	s.NoError(err)
 	s.NotZero(len(task.queryInfos))
 	s.Equal(false, task.queryInfos[0].MaterializedViewInvolved)
+	s.Equal("", task.queryInfos[0].Hints)
 }
 
 func (s *MaterializedViewTestSuite) TestMvEnabledPartitionKeyOnInt64() {
@@ -3506,6 +3509,7 @@ func (s *MaterializedViewTestSuite) TestMvEnabledPartitionKeyOnInt64() {
 	s.NoError(err)
 	s.NotZero(len(task.queryInfos))
 	s.Equal(true, task.queryInfos[0].MaterializedViewInvolved)
+	s.Equal("", task.queryInfos[0].Hints)
 }
 
 func (s *MaterializedViewTestSuite) TestMvEnabledPartitionKeyOnVarChar() {
@@ -3522,6 +3526,7 @@ func (s *MaterializedViewTestSuite) TestMvEnabledPartitionKeyOnVarChar() {
 	s.NoError(err)
 	s.NotZero(len(task.queryInfos))
 	s.Equal(true, task.queryInfos[0].MaterializedViewInvolved)
+	s.Equal("", task.queryInfos[0].Hints)
 }
 
 func (s *MaterializedViewTestSuite) TestMvEnabledPartitionKeyOnVarCharWithIsolation() {
@@ -3540,6 +3545,7 @@ func (s *MaterializedViewTestSuite) TestMvEnabledPartitionKeyOnVarCharWithIsolat
 		s.NoError(err)
 		s.NotZero(len(task.queryInfos))
 		s.Equal(true, task.queryInfos[0].MaterializedViewInvolved)
+		s.Equal("disable", task.queryInfos[0].Hints)
 	}
 }