From a4a6f60279b38c05436e89da98d53c38773aa7a8 Mon Sep 17 00:00:00 2001 From: Ten Thousand Leaves <69466447+soothing-rain@users.noreply.github.com> Date: Tue, 18 Oct 2022 13:07:34 +0800 Subject: [PATCH] Refine NQ check logic (#19819) issue: #19682 /kind improvement Signed-off-by: Yuchen Gao Signed-off-by: Yuchen Gao --- internal/proxy/task_search.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/internal/proxy/task_search.go b/internal/proxy/task_search.go index 5d969efb0e..a96cb67c81 100644 --- a/internal/proxy/task_search.go +++ b/internal/proxy/task_search.go @@ -259,12 +259,6 @@ func (t *searchTask) PreExecute(ctx context.Context) error { sp, ctx := trace.StartSpanFromContextWithOperationName(t.TraceCtx(), "Proxy-Search-PreExecute") defer sp.Finish() - // Check the nq is valid: - // https://milvus.io/docs/limitations.md - if err := validateLimit(t.request.GetNq()); err != nil { - return fmt.Errorf("%s [%d] is invalid, %w", NQKey, t.request.GetNq(), err) - } - if t.searchShardPolicy == nil { t.searchShardPolicy = mergeRoundRobinPolicy } @@ -369,10 +363,16 @@ func (t *searchTask) PreExecute(ctx context.Context) error { t.SearchRequest.Dsl = t.request.Dsl t.SearchRequest.PlaceholderGroup = t.request.PlaceholderGroup + // Manually update nq if not set. nq, err := getNq(t.request) if err != nil { return err } + // Check if nq is valid: + // https://milvus.io/docs/limitations.md + if err := validateLimit(nq); err != nil { + return fmt.Errorf("%s [%d] is invalid, %w", NQKey, nq, err) + } t.SearchRequest.Nq = nq log.Ctx(ctx).Debug("search PreExecute done.", zap.Int64("msgID", t.ID()),