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

Fix golint error in proxy (#10486) 

Signed-off-by: zhenshan.cao <zhenshan.cao@zilliz.com>
pull/10517/head
zhenshan.cao 2021-10-23 18:23:44 +08:00 committed by GitHub
parent 7669075ae3
commit 169359448f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
internal/proxy/task.go
View File

@ -753,7 +753,7 @@ func (it *insertTask) PreExecute(ctx context.Context) error {
}
partitionTag := it.BaseInsertTask.PartitionName
if err := ValidatePartitionTag(partitionTag, true); err != nil {
if err := validatePartitionTag(partitionTag, true); err != nil {
return err
}
@ -1458,7 +1458,7 @@ func (st *searchTask) PreExecute(ctx context.Context) error {
}
for _, tag := range st.query.PartitionNames {
if err := ValidatePartitionTag(tag, false); err != nil {
if err := validatePartitionTag(tag, false); err != nil {
return err
}
}
@ -2249,7 +2249,7 @@ func (qt *queryTask) PreExecute(ctx context.Context) error {
zap.Any("requestID", qt.Base.MsgID), zap.Any("requestType", "query"))
for _, tag := range qt.query.PartitionNames {
if err := ValidatePartitionTag(tag, false); err != nil {
if err := validatePartitionTag(tag, false); err != nil {
log.Debug("Invalid partition name.", zap.Any("partitionName", tag),
zap.Any("requestID", qt.Base.MsgID), zap.Any("requestType", "query"))
return err
@ -3152,7 +3152,7 @@ func (cpt *createPartitionTask) PreExecute(ctx context.Context) error {
return err
}
if err := ValidatePartitionTag(partitionTag, true); err != nil {
if err := validatePartitionTag(partitionTag, true); err != nil {
return err
}
@ -3229,7 +3229,7 @@ func (dpt *dropPartitionTask) PreExecute(ctx context.Context) error {
return err
}
if err := ValidatePartitionTag(partitionTag, true); err != nil {
if err := validatePartitionTag(partitionTag, true); err != nil {
return err
}
@ -3306,7 +3306,7 @@ func (hpt *hasPartitionTask) PreExecute(ctx context.Context) error {
return err
}
if err := ValidatePartitionTag(partitionTag, true); err != nil {
if err := validatePartitionTag(partitionTag, true); err != nil {
return err
}
return nil
@ -3383,7 +3383,7 @@ func (spt *showPartitionsTask) PreExecute(ctx context.Context) error {
if spt.GetType() == milvuspb.ShowType_InMemory {
for _, partitionName := range spt.PartitionNames {
if err := ValidatePartitionTag(partitionName, true); err != nil {
if err := validatePartitionTag(partitionName, true); err != nil {
return err
}
}
@ -4754,7 +4754,7 @@ func (dt *deleteTask) PreExecute(ctx context.Context) error {
// If partitionName is not empty, partitionID will be set.
if len(dt.req.PartitionName) > 0 {
partName := dt.req.PartitionName
if err := ValidatePartitionTag(partName, true); err != nil {
if err := validatePartitionTag(partName, true); err != nil {
log.Error("Invalid partition name", zap.String("partitionName", partName))
return err
}

2
internal/proxy/validate_util.go
View File

@ -74,7 +74,7 @@ func validateCollectionName(collName string) error {
return validateCollectionNameOrAlias(collName, "name")
}
func ValidatePartitionTag(partitionTag string, strictCheck bool) error {
func validatePartitionTag(partitionTag string, strictCheck bool) error {
partitionTag = strings.TrimSpace(partitionTag)
invalidMsg := "Invalid partition name: " + partitionTag + ". "

14
internal/proxy/validate_util_test.go
View File

@ -46,10 +46,10 @@ func TestValidateCollectionName(t *testing.T) {
}
func TestValidatePartitionTag(t *testing.T) {
assert.Nil(t, ValidatePartitionTag("abc", true))
assert.Nil(t, ValidatePartitionTag("123abc", true))
assert.Nil(t, ValidatePartitionTag("_123abc", true))
assert.Nil(t, ValidatePartitionTag("abc123_$", true))
assert.Nil(t, validatePartitionTag("abc", true))
assert.Nil(t, validatePartitionTag("123abc", true))
assert.Nil(t, validatePartitionTag("_123abc", true))
assert.Nil(t, validatePartitionTag("abc123_$", true))
longName := make([]byte, 256)
for i := 0; i < len(longName); i++ {
@ -65,11 +65,11 @@ func TestValidatePartitionTag(t *testing.T) {
}
for _, name := range invalidNames {
assert.NotNil(t, ValidatePartitionTag(name, true))
assert.NotNil(t, validatePartitionTag(name, true))
}
assert.Nil(t, ValidatePartitionTag("ab cd", false))
assert.Nil(t, ValidatePartitionTag("ab*", false))
assert.Nil(t, validatePartitionTag("ab cd", false))
assert.Nil(t, validatePartitionTag("ab*", false))
}
func TestValidateFieldName(t *testing.T) {