test/milvus
1
0
Fork 0
mirror of https://gitee.com/milvus-io/milvus.git synced 2024-11-30 19:08:30 +08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity

enhance: improve the error messages and logs (#28684)

Browse Source 
- better name for log fields
- make the error and log consistent

Signed-off-by: yah01 <yah2er0ne@outlook.com>
This commit is contained in:
yah01 2023-11-24 15:08:24 +08:00 committed by GitHub
parent 24616e7838
commit 3ea0129eb3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
internal/proxy/util.go
View File

@ -1119,35 +1119,35 @@ func isPartitionLoaded(ctx context.Context, qc types.QueryCoordClient, collID in
}
func fillFieldsDataBySchema(schema *schemapb.CollectionSchema, insertMsg *msgstream.InsertMsg) error {
neededFieldsNum := 0
isPrimaryKeyNum := 0
requiredFieldsNum := 0
primaryKeyNum := 0
dataNameSet := typeutil.NewSet[string]()
for _, data := range insertMsg.FieldsData {
fieldName := data.GetFieldName()
if dataNameSet.Contain(fieldName) {
return merr.WrapErrParameterInvalidMsg("The FieldDatas parameter being passed contains duplicate data for field %s", fieldName)
return merr.WrapErrParameterInvalidMsg("duplicated field %s found", fieldName)
}
dataNameSet.Insert(fieldName)
}
for _, fieldSchema := range schema.Fields {
if fieldSchema.AutoID && !fieldSchema.IsPrimaryKey {
log.Error("not primary key field, but set autoID true", zap.String("fieldSchemaName", fieldSchema.GetName()))
return merr.WrapErrParameterInvalid("only primary key field can set autoID true", "")
log.Warn("not primary key field, but set autoID true", zap.String("field", fieldSchema.GetName()))
return merr.WrapErrParameterInvalidMsg("only primary key could be with AutoID enabled")
}
if fieldSchema.GetDefaultValue() != nil && fieldSchema.IsPrimaryKey {
return merr.WrapErrParameterInvalid("no default data", "", "pk field schema can not set default value")
return merr.WrapErrParameterInvalidMsg("primary key can't be with default value")
}
if !fieldSchema.AutoID {
neededFieldsNum++
requiredFieldsNum++
}
// if has no field pass in, consider use default value
// so complete it with field schema
if _, ok := dataNameSet[fieldSchema.GetName()]; !ok {
// primary key can not use default value
if fieldSchema.IsPrimaryKey {
isPrimaryKeyNum++
primaryKeyNum++
continue
}
dataToAppend := &schemapb.FieldData{
@ -1158,19 +1158,19 @@ func fillFieldsDataBySchema(schema *schemapb.CollectionSchema, insertMsg *msgstr
}
}
if isPrimaryKeyNum > 1 {
log.Error("the number of passed primary key fields is more than 1",
zap.Int64("primaryKeyNum", int64(isPrimaryKeyNum)),
zap.String("CollectionSchemaName", schema.GetName()))
return merr.WrapErrParameterInvalid("0 or 1", fmt.Sprint(isPrimaryKeyNum), "the number of passed primary key fields is more than 1")
if primaryKeyNum > 1 {
log.Warn("more than 1 primary keys not supported",
zap.Int64("primaryKeyNum", int64(primaryKeyNum)),
zap.String("collection", schema.GetName()))
return merr.WrapErrParameterInvalidMsg("more than 1 primary keys not supported, got %d", primaryKeyNum)
}
if len(insertMsg.FieldsData) != neededFieldsNum {
log.Error("the length of passed fields is not equal to needed",
zap.Int("expectFieldNumber", neededFieldsNum),
zap.Int("passFieldNumber", len(insertMsg.FieldsData)),
zap.String("CollectionSchemaName", schema.GetName()))
return merr.WrapErrParameterInvalid(neededFieldsNum, len(insertMsg.FieldsData), "the length of passed fields is equal to needed")
if len(insertMsg.FieldsData) != requiredFieldsNum {
log.Warn("the number of fields is less than needed",
zap.Int("fieldNum", len(insertMsg.FieldsData)),
zap.Int("requiredFieldNum", requiredFieldsNum),
zap.String("collection", schema.GetName()))
return merr.WrapErrParameterInvalid(requiredFieldsNum, len(insertMsg.FieldsData), "the number of fields is less than needed")
}
return nil