update

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

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
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 {

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("disable", 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("disable", 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)
 	}
 }