milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix issue-5992 (#6158) 

Signed-off-by: fishpenguin <kun.yu@zilliz.com>
pull/6132/head
yukun 2021-06-28 12:16:13 +08:00 committed by GitHub
parent a9a806ace0
commit ae66446f16
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
internal/proxy/task.go
View File

@ -1294,10 +1294,13 @@ func (st *SearchTask) PreExecute(ctx context.Context) error {
if err != nil { if err != nil {
return errors.New("invalid expression: " + st.query.Dsl) return errors.New("invalid expression: " + st.query.Dsl)
} }
for _, name := range st.query.OutputFields {
for _, field := range schema.Fields { for _, field := range schema.Fields {
for _, name := range st.query.OutputFields {
if field.Name == name { if field.Name == name {
if field.DataType == schemapb.DataType_BinaryVector || field.DataType == schemapb.DataType_FloatVector {
return errors.New("Search doesn't support vector field as output_fields")
}
st.SearchRequest.OutputFieldsId = append(st.SearchRequest.OutputFieldsId, field.FieldID) st.SearchRequest.OutputFieldsId = append(st.SearchRequest.OutputFieldsId, field.FieldID)
plan.OutputFieldIds = append(plan.OutputFieldIds, field.FieldID) plan.OutputFieldIds = append(plan.OutputFieldIds, field.FieldID)
} }
@ -1867,11 +1870,13 @@ func (st *SearchTask) PostExecute(ctx context.Context) error {
if err != nil { if err != nil {
return err return err
} }
for k, fieldName := range st.query.OutputFields { if len(st.query.OutputFields) != 0 {
for _, field := range schema.Fields { for k, fieldName := range st.query.OutputFields {
if field.Name == fieldName { for _, field := range schema.Fields {
st.result.Results.FieldsData[k].FieldName = fieldName if field.Name == fieldName {
st.result.Results.FieldsData[k].Type = field.DataType st.result.Results.FieldsData[k].FieldName = fieldName
st.result.Results.FieldsData[k].Type = field.DataType
}
} }
} }
} }