enhance: Use collection default consistency level for restv2 (milvus-…

…io#32956) Set `UseDefaultConsistency` to true so that restv2 read API shall use collection consistency level setting correctly. Signed-off-by: Congqi Xia <[email protected]>
congqixia · May 10, 2024 · c0e62e6 · c0e62e6
1 parent 4577394
commit c0e62e6
Showing 1 changed file with 31 additions and 31 deletions.
diff --git a/internal/distributed/proxy/httpserver/handler_v2.go b/internal/distributed/proxy/httpserver/handler_v2.go
@@ -558,13 +558,13 @@ func (h *HandlersV2) releaseCollection(ctx context.Context, c *gin.Context, anyR
 func (h *HandlersV2) query(ctx context.Context, c *gin.Context, anyReq any, dbName string) (interface{}, error) {
 	httpReq := anyReq.(*QueryReqV2)
 	req := &milvuspb.QueryRequest{
-		DbName:             dbName,
-		CollectionName:     httpReq.CollectionName,
-		Expr:               httpReq.Filter,
-		OutputFields:       httpReq.OutputFields,
-		PartitionNames:     httpReq.PartitionNames,
-		GuaranteeTimestamp: BoundedTimestamp,
-		QueryParams:        []*commonpb.KeyValuePair{},
+		DbName:                dbName,
+		CollectionName:        httpReq.CollectionName,
+		Expr:                  httpReq.Filter,
+		OutputFields:          httpReq.OutputFields,
+		PartitionNames:        httpReq.PartitionNames,
+		QueryParams:           []*commonpb.KeyValuePair{},
+		UseDefaultConsistency: true,
 	}
 	if httpReq.Offset > 0 {
 		req.QueryParams = append(req.QueryParams, &commonpb.KeyValuePair{Key: ParamOffset, Value: strconv.FormatInt(int64(httpReq.Offset), 10)})
@@ -612,12 +612,12 @@ func (h *HandlersV2) get(ctx context.Context, c *gin.Context, anyReq any, dbName
 		return nil, err
 	}
 	req := &milvuspb.QueryRequest{
-		DbName:             dbName,
-		CollectionName:     httpReq.CollectionName,
-		OutputFields:       httpReq.OutputFields,
-		PartitionNames:     httpReq.PartitionNames,
-		GuaranteeTimestamp: BoundedTimestamp,
-		Expr:               filter,
+		DbName:                dbName,
+		CollectionName:        httpReq.CollectionName,
+		OutputFields:          httpReq.OutputFields,
+		PartitionNames:        httpReq.PartitionNames,
+		Expr:                  filter,
+		UseDefaultConsistency: true,
 	}
 	resp, err := wrapperProxy(ctx, c, req, h.checkAuth, false, func(reqCtx context.Context, req any) (interface{}, error) {
 		return h.proxy.Query(reqCtx, req.(*milvuspb.QueryRequest))
@@ -915,15 +915,15 @@ func (h *HandlersV2) search(ctx context.Context, c *gin.Context, anyReq any, dbN
 		return nil, err
 	}
 	req := &milvuspb.SearchRequest{
-		DbName:             dbName,
-		CollectionName:     httpReq.CollectionName,
-		Dsl:                httpReq.Filter,
-		PlaceholderGroup:   placeholderGroup,
-		DslType:            commonpb.DslType_BoolExprV1,
-		OutputFields:       httpReq.OutputFields,
-		PartitionNames:     httpReq.PartitionNames,
-		SearchParams:       searchParams,
-		GuaranteeTimestamp: BoundedTimestamp,
+		DbName:                dbName,
+		CollectionName:        httpReq.CollectionName,
+		Dsl:                   httpReq.Filter,
+		PlaceholderGroup:      placeholderGroup,
+		DslType:               commonpb.DslType_BoolExprV1,
+		OutputFields:          httpReq.OutputFields,
+		PartitionNames:        httpReq.PartitionNames,
+		SearchParams:          searchParams,
+		UseDefaultConsistency: true,
 	}
 	resp, err := wrapperProxy(ctx, c, req, h.checkAuth, false, func(reqCtx context.Context, req any) (interface{}, error) {
 		return h.proxy.Search(reqCtx, req.(*milvuspb.SearchRequest))
@@ -984,15 +984,15 @@ func (h *HandlersV2) advancedSearch(ctx context.Context, c *gin.Context, anyReq
 			return nil, err
 		}
 		searchReq := &milvuspb.SearchRequest{
-			DbName:             dbName,
-			CollectionName:     httpReq.CollectionName,
-			Dsl:                subReq.Filter,
-			PlaceholderGroup:   placeholderGroup,
-			DslType:            commonpb.DslType_BoolExprV1,
-			OutputFields:       httpReq.OutputFields,
-			PartitionNames:     httpReq.PartitionNames,
-			SearchParams:       searchParams,
-			GuaranteeTimestamp: BoundedTimestamp,
+			DbName:                dbName,
+			CollectionName:        httpReq.CollectionName,
+			Dsl:                   subReq.Filter,
+			PlaceholderGroup:      placeholderGroup,
+			DslType:               commonpb.DslType_BoolExprV1,
+			OutputFields:          httpReq.OutputFields,
+			PartitionNames:        httpReq.PartitionNames,
+			SearchParams:          searchParams,
+			UseDefaultConsistency: true,
 		}
 		req.Requests = append(req.Requests, searchReq)
 	}