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

Fix bug: remove duplicated primary field id when retrieve entities (#6577)

Browse Source 
Signed-off-by: dragondriver <jiquan.long@zilliz.com>
This commit is contained in:
dragondriver 2021-07-17 10:53:30 +08:00 committed by GitHub
parent a7856ddeab
commit 2d9361e0ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
internal/proxy/task.go
View File

@ -1420,6 +1420,7 @@ func (st *SearchTask) PreExecute(ctx context.Context) error {
if err != nil { if err != nil {
return err return err
} }
log.Debug("translate output fields", zap.Any("OutputFields", outputFields))
st.query.OutputFields = outputFields st.query.OutputFields = outputFields
if st.query.GetDslType() == commonpb.DslType_BoolExprV1 { if st.query.GetDslType() == commonpb.DslType_BoolExprV1 {
@ -2102,6 +2103,7 @@ func (rt *RetrieveTask) PreExecute(ctx context.Context) error {
if err != nil { if err != nil {
return err return err
} }
log.Debug("translate output fields", zap.Any("OutputFields", rt.retrieve.OutputFields))
if len(rt.retrieve.OutputFields) == 0 { if len(rt.retrieve.OutputFields) == 0 {
for _, field := range schema.Fields { for _, field := range schema.Fields {
if field.FieldID >= 100 && field.DataType != schemapb.DataType_FloatVector && field.DataType != schemapb.DataType_BinaryVector { if field.FieldID >= 100 && field.DataType != schemapb.DataType_FloatVector && field.DataType != schemapb.DataType_BinaryVector {
@ -2109,9 +2111,9 @@ func (rt *RetrieveTask) PreExecute(ctx context.Context) error {
} }
} }
} else { } else {
addPrimaryKey := false
for _, reqField := range rt.retrieve.OutputFields { for _, reqField := range rt.retrieve.OutputFields {
findField := false findField := false
addPrimaryKey := false
for _, field := range schema.Fields { for _, field := range schema.Fields {
if reqField == field.Name { if reqField == field.Name {
if field.IsPrimaryKey { if field.IsPrimaryKey {
@ -2132,6 +2134,7 @@ func (rt *RetrieveTask) PreExecute(ctx context.Context) error {
} }
} }
} }
log.Debug("translate output fields to field ids", zap.Any("OutputFieldsID", rt.OutputFieldsId))
travelTimestamp := rt.retrieve.TravelTimestamp travelTimestamp := rt.retrieve.TravelTimestamp
if travelTimestamp == 0 { if travelTimestamp == 0 {