From d88a654db8f07af71f38e39afb93d41d7bac16bc Mon Sep 17 00:00:00 2001 From: bigsheeper Date: Mon, 30 Nov 2020 11:22:59 +0800 Subject: [PATCH] Fix search result Signed-off-by: bigsheeper --- internal/proxy/task.go | 2 ++ internal/querynode/search_service.go | 23 +++++++++-------------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/internal/proxy/task.go b/internal/proxy/task.go index 250c2894fe..0c358eed16 100644 --- a/internal/proxy/task.go +++ b/internal/proxy/task.go @@ -397,6 +397,7 @@ func (qt *QueryTask) PostExecute() error { hits[i][j] = &servicepb.Hits{} err := proto.Unmarshal(bs, hits[i][j]) if err != nil { + log.Println("unmarshal error") return err } } @@ -437,6 +438,7 @@ func (qt *QueryTask) PostExecute() error { } reducedHitsBs, err := proto.Marshal(reducedHits) if err != nil { + log.Println("marshal error") return err } qt.result.Hits = append(qt.result.Hits, reducedHitsBs) diff --git a/internal/querynode/search_service.go b/internal/querynode/search_service.go index 9ecf3d78c2..8e86b9e78e 100644 --- a/internal/querynode/search_service.go +++ b/internal/querynode/search_service.go @@ -139,10 +139,10 @@ func (ss *searchService) receiveSearchMsg() { err := ss.search(msg) if err != nil { log.Println("search Failed, error msg type: ", msg.Type()) - } - err = ss.publishFailedSearchResult(msg) - if err != nil { - log.Println("publish FailedSearchResult failed, error message: ", err) + err = ss.publishFailedSearchResult(msg) + if err != nil { + log.Println("publish FailedSearchResult failed, error message: ", err) + } } } log.Println("ReceiveSearchMsg, do search done, num of searchMsg = ", len(searchMsg)) @@ -191,10 +191,10 @@ func (ss *searchService) doUnsolvedMsgSearch() { err := ss.search(msg) if err != nil { log.Println("search Failed, error msg type: ", msg.Type()) - } - err = ss.publishFailedSearchResult(msg) - if err != nil { - log.Println("publish FailedSearchResult failed, error message: ", err) + err = ss.publishFailedSearchResult(msg) + if err != nil { + log.Println("publish FailedSearchResult failed, error message: ", err) + } } } log.Println("doUnsolvedMsgSearch, do search done, num of searchMsg = ", len(searchMsg)) @@ -251,12 +251,7 @@ func (ss *searchService) search(msg msgstream.TsMsg) error { } if len(searchResults) <= 0 { - log.Println("search Failed, invalid partitionTag") - err = ss.publishFailedSearchResult(msg) - if err != nil { - log.Println("publish FailedSearchResult failed, error message: ", err) - } - return err + return errors.New("search Failed, invalid partitionTag") } reducedSearchResult := reduceSearchResults(searchResults, int64(len(searchResults)))