未验证 提交 59b0a61c 编写于 作者: C cai.zhang 提交者: GitHub

Fill outputFields for query/search result (#24352)

Signed-off-by: Ncai.zhang <cai.zhang@zilliz.com>
上级 49f75e5e
...@@ -2782,15 +2782,10 @@ func (node *Proxy) Query(ctx context.Context, request *milvuspb.QueryRequest) (* ...@@ -2782,15 +2782,10 @@ func (node *Proxy) Query(ctx context.Context, request *milvuspb.QueryRequest) (*
metrics.QueryLabel).Observe(float64(tr.ElapseSpan().Milliseconds())) metrics.QueryLabel).Observe(float64(tr.ElapseSpan().Milliseconds()))
metrics.ProxyCollectionSQLatency.WithLabelValues(strconv.FormatInt(paramtable.GetNodeID(), 10), metrics.ProxyCollectionSQLatency.WithLabelValues(strconv.FormatInt(paramtable.GetNodeID(), 10),
metrics.QueryLabel, request.CollectionName).Observe(float64(tr.ElapseSpan().Milliseconds())) metrics.QueryLabel, request.CollectionName).Observe(float64(tr.ElapseSpan().Milliseconds()))
ret := &milvuspb.QueryResults{
Status: qt.result.Status,
FieldsData: qt.result.FieldsData,
}
sentSize := proto.Size(qt.result) sentSize := proto.Size(qt.result)
rateCol.Add(metricsinfo.ReadResultThroughput, float64(sentSize)) rateCol.Add(metricsinfo.ReadResultThroughput, float64(sentSize))
metrics.ProxyReadReqSendBytes.WithLabelValues(strconv.FormatInt(paramtable.GetNodeID(), 10)).Add(float64(sentSize)) metrics.ProxyReadReqSendBytes.WithLabelValues(strconv.FormatInt(paramtable.GetNodeID(), 10)).Add(float64(sentSize))
return ret, nil return qt.result, nil
} }
// CreateAlias create alias for collection, then you can search the collection with alias. // CreateAlias create alias for collection, then you can search the collection with alias.
......
...@@ -452,6 +452,7 @@ func (t *queryTask) PostExecute(ctx context.Context) error { ...@@ -452,6 +452,7 @@ func (t *queryTask) PostExecute(ctx context.Context) error {
if err != nil { if err != nil {
return err return err
} }
t.result.OutputFields = t.userOutputFields
metrics.ProxyReduceResultLatency.WithLabelValues(strconv.FormatInt(paramtable.GetNodeID(), 10), metrics.QueryLabel).Observe(float64(tr.RecordSpan().Milliseconds())) metrics.ProxyReduceResultLatency.WithLabelValues(strconv.FormatInt(paramtable.GetNodeID(), 10), metrics.QueryLabel).Observe(float64(tr.RecordSpan().Milliseconds()))
log.Debug("Query PostExecute done") log.Debug("Query PostExecute done")
......
...@@ -453,6 +453,7 @@ func (t *searchTask) PostExecute(ctx context.Context) error { ...@@ -453,6 +453,7 @@ func (t *searchTask) PostExecute(ctx context.Context) error {
return err return err
} }
} }
t.result.Results.OutputFields = t.userOutputFields
log.Ctx(ctx).Debug("Search post execute done", log.Ctx(ctx).Debug("Search post execute done",
zap.Int64("collection", t.GetCollectionID()), zap.Int64("collection", t.GetCollectionID()),
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册