admin/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2025-12-07 17:48:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fill output fields for count request (#27967)

Browse Source 
Signed-off-by: longjiquan <jiquan.long@zilliz.com>
This commit is contained in:
Jiquan Long 2023-10-30 10:00:12 +08:00 committed by GitHub
parent 98e2aad752
commit 6913283716
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
internal/proxy/count_reducer.go
View File

@ -6,7 +6,9 @@ import (
"github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/funcutil"
) )
type cntReducer struct{} type cntReducer struct {
collectionName string
}
func (r *cntReducer) Reduce(results []*internalpb.RetrieveResults) (*milvuspb.QueryResults, error) { func (r *cntReducer) Reduce(results []*internalpb.RetrieveResults) (*milvuspb.QueryResults, error) {
cnt := int64(0) cnt := int64(0)
@ -17,5 +19,7 @@ func (r *cntReducer) Reduce(results []*internalpb.RetrieveResults) (*milvuspb.Qu
} }
cnt += c cnt += c
} }
return funcutil.WrapCntToQueryResults(cnt), nil res := funcutil.WrapCntToQueryResults(cnt)
res.CollectionName = r.collectionName
return res, nil
} }

4
internal/proxy/reducer.go
View File

@ -15,7 +15,9 @@ type milvusReducer interface {
func createMilvusReducer(ctx context.Context, params *queryParams, req *internalpb.RetrieveRequest, schema *schemapb.CollectionSchema, plan *planpb.PlanNode, collectionName string) milvusReducer { func createMilvusReducer(ctx context.Context, params *queryParams, req *internalpb.RetrieveRequest, schema *schemapb.CollectionSchema, plan *planpb.PlanNode, collectionName string) milvusReducer {
if plan.GetQuery().GetIsCount() { if plan.GetQuery().GetIsCount() {
return &cntReducer{} return &cntReducer{
collectionName: collectionName,
}
} }
return newDefaultLimitReducer(ctx, params, req, schema, collectionName) return newDefaultLimitReducer(ctx, params, req, schema, collectionName)
} }

1
internal/proxy/task_query.go
View File

@ -207,6 +207,7 @@ func (t *queryTask) createPlan(ctx context.Context) error {
if cntMatch { if cntMatch {
var err error var err error
t.plan, err = createCntPlan(t.request.GetExpr(), schema) t.plan, err = createCntPlan(t.request.GetExpr(), schema)
t.userOutputFields = []string{"count(*)"}
return err return err
} }