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

enhance: refine error message for invalid limit parameter (#34178)

Browse Source 
Signed-off-by: jaime <yun.zhang@zilliz.com>
This commit is contained in:
jaime 2024-06-26 22:14:04 +08:00 committed by GitHub
parent 51ebe95be5
commit 9c2eeff427
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/proxy/search_util.go
View File

@ -37,7 +37,7 @@ func parseSearchInfo(searchParamsPair []*commonpb.KeyValuePair, schema *schemapb
if err != nil { if err != nil {
return nil, 0, fmt.Errorf("%s [%s] is invalid", TopKKey, topKStr) return nil, 0, fmt.Errorf("%s [%s] is invalid", TopKKey, topKStr)
} }
if err := validateTopKLimit(topK); err != nil { if err := validateLimit(topK); err != nil {
return nil, 0, fmt.Errorf("%s [%d] is invalid, %w", TopKKey, topK, err) return nil, 0, fmt.Errorf("%s [%d] is invalid, %w", TopKKey, topK, err)
} }
@ -51,7 +51,7 @@ func parseSearchInfo(searchParamsPair []*commonpb.KeyValuePair, schema *schemapb
} }
if offset != 0 { if offset != 0 {
if err := validateTopKLimit(offset); err != nil { if err := validateLimit(offset); err != nil {
return nil, 0, fmt.Errorf("%s [%d] is invalid, %w", OffsetKey, offset, err) return nil, 0, fmt.Errorf("%s [%d] is invalid, %w", OffsetKey, offset, err)
} }
} }
@ -59,7 +59,7 @@ func parseSearchInfo(searchParamsPair []*commonpb.KeyValuePair, schema *schemapb
} }
queryTopK := topK + offset queryTopK := topK + offset
if err := validateTopKLimit(queryTopK); err != nil { if err := validateLimit(queryTopK); err != nil {
return nil, 0, fmt.Errorf("%s+%s [%d] is invalid, %w", OffsetKey, TopKKey, queryTopK, err) return nil, 0, fmt.Errorf("%s+%s [%d] is invalid, %w", OffsetKey, TopKKey, queryTopK, err)
} }

6
internal/proxy/util.go
View File

@ -109,10 +109,10 @@ func validateMaxQueryResultWindow(offset int64, limit int64) error {
return nil return nil
} }
func validateTopKLimit(topK int64) error { func validateLimit(limit int64) error {
topKLimit := Params.QuotaConfig.TopKLimit.GetAsInt64() topKLimit := Params.QuotaConfig.TopKLimit.GetAsInt64()
if topK <= 0 || topK > topKLimit { if limit <= 0 || limit > topKLimit {
return fmt.Errorf("top k should be in range [1, %d], but got %d", topKLimit, topK) return fmt.Errorf("it should be in range [1, %d], but got %d", topKLimit, limit)
} }
return nil return nil
} }

8
internal/proxy/util_test.go
View File

@ -2000,10 +2000,10 @@ func Test_NQLimit(t *testing.T) {
func Test_TopKLimit(t *testing.T) { func Test_TopKLimit(t *testing.T) {
paramtable.Init() paramtable.Init()
assert.Nil(t, validateTopKLimit(16384)) assert.Nil(t, validateLimit(16384))
assert.Nil(t, validateTopKLimit(1)) assert.Nil(t, validateLimit(1))
assert.Error(t, validateTopKLimit(16385)) assert.Error(t, validateLimit(16385))
assert.Error(t, validateTopKLimit(0)) assert.Error(t, validateLimit(0))
} }
func Test_MaxQueryResultWindow(t *testing.T) { func Test_MaxQueryResultWindow(t *testing.T) {