mirror of
https://gitee.com/milvus-io/milvus.git
synced 2024-12-03 12:29:36 +08:00
fix: [restful]use default search parameter nq: 0
(#32355)
issue: #32225 #31978 #32360 1. v1 can only accept one vector, but v2 accept list of vectors #32225 2. cannot get dbName from AliasReq #31978 3. enhance: [restful v2]support config DB-Name in the http header #32360 --------- Signed-off-by: PowderLi <min.li@zilliz.com>
This commit is contained in:
parent
e2c38750c7
commit
a0a23d0666
@ -81,6 +81,7 @@ const (
|
|||||||
DefaultAliasName = "the_alias"
|
DefaultAliasName = "the_alias"
|
||||||
DefaultOutputFields = "*"
|
DefaultOutputFields = "*"
|
||||||
HTTPHeaderAllowInt64 = "Accept-Type-Allow-Int64"
|
HTTPHeaderAllowInt64 = "Accept-Type-Allow-Int64"
|
||||||
|
HTTPHeaderDBName = "DB-Name"
|
||||||
HTTPHeaderRequestTimeout = "Request-Timeout"
|
HTTPHeaderRequestTimeout = "Request-Timeout"
|
||||||
HTTPDefaultTimeout = 30 * time.Second
|
HTTPDefaultTimeout = 30 * time.Second
|
||||||
HTTPReturnCode = "code"
|
HTTPReturnCode = "code"
|
||||||
|
@ -175,7 +175,10 @@ func wrapperPost(newReq newReqFunc, v2 handlerFuncV2) gin.HandlerFunc {
|
|||||||
dbName = getter.GetDbName()
|
dbName = getter.GetDbName()
|
||||||
}
|
}
|
||||||
if dbName == "" {
|
if dbName == "" {
|
||||||
dbName = DefaultDbName
|
dbName = c.Request.Header.Get(HTTPHeaderDBName)
|
||||||
|
if dbName == "" {
|
||||||
|
dbName = DefaultDbName
|
||||||
|
}
|
||||||
}
|
}
|
||||||
username, _ := c.Get(ContextUsername)
|
username, _ := c.Get(ContextUsername)
|
||||||
ctx, span := otel.Tracer(typeutil.ProxyRole).Start(context.Background(), c.Request.URL.Path)
|
ctx, span := otel.Tracer(typeutil.ProxyRole).Start(context.Background(), c.Request.URL.Path)
|
||||||
@ -885,7 +888,6 @@ func (h *HandlersV2) search(ctx context.Context, c *gin.Context, anyReq any, dbN
|
|||||||
PartitionNames: httpReq.PartitionNames,
|
PartitionNames: httpReq.PartitionNames,
|
||||||
SearchParams: searchParams,
|
SearchParams: searchParams,
|
||||||
GuaranteeTimestamp: BoundedTimestamp,
|
GuaranteeTimestamp: BoundedTimestamp,
|
||||||
Nq: int64(1),
|
|
||||||
}
|
}
|
||||||
resp, err := wrapperProxy(ctx, c, req, h.checkAuth, false, func(reqCtx context.Context, req any) (interface{}, error) {
|
resp, err := wrapperProxy(ctx, c, req, h.checkAuth, false, func(reqCtx context.Context, req any) (interface{}, error) {
|
||||||
return h.proxy.Search(reqCtx, req.(*milvuspb.SearchRequest))
|
return h.proxy.Search(reqCtx, req.(*milvuspb.SearchRequest))
|
||||||
@ -954,7 +956,6 @@ func (h *HandlersV2) advancedSearch(ctx context.Context, c *gin.Context, anyReq
|
|||||||
PartitionNames: httpReq.PartitionNames,
|
PartitionNames: httpReq.PartitionNames,
|
||||||
SearchParams: searchParams,
|
SearchParams: searchParams,
|
||||||
GuaranteeTimestamp: BoundedTimestamp,
|
GuaranteeTimestamp: BoundedTimestamp,
|
||||||
Nq: int64(1),
|
|
||||||
}
|
}
|
||||||
req.Requests = append(req.Requests, searchReq)
|
req.Requests = append(req.Requests, searchReq)
|
||||||
}
|
}
|
||||||
|
@ -428,6 +428,44 @@ func TestDatabaseWrapper(t *testing.T) {
|
|||||||
}
|
}
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
mp.EXPECT().ListDatabases(mock.Anything, mock.Anything).Return(&milvuspb.ListDatabasesResponse{
|
||||||
|
Status: &StatusSuccess,
|
||||||
|
DbNames: []string{DefaultCollectionName, "default"},
|
||||||
|
}, nil).Once()
|
||||||
|
mp.EXPECT().ListDatabases(mock.Anything, mock.Anything).Return(&milvuspb.ListDatabasesResponse{
|
||||||
|
Status: &StatusSuccess,
|
||||||
|
DbNames: []string{DefaultCollectionName, "test"},
|
||||||
|
}, nil).Once()
|
||||||
|
mp.EXPECT().ListDatabases(mock.Anything, mock.Anything).Return(&milvuspb.ListDatabasesResponse{Status: commonErrorStatus}, nil).Once()
|
||||||
|
rawTestCases := []rawTestCase{
|
||||||
|
{
|
||||||
|
errMsg: "database not found, database: test",
|
||||||
|
errCode: 800, // ErrDatabaseNotFound
|
||||||
|
},
|
||||||
|
{},
|
||||||
|
{
|
||||||
|
errMsg: "",
|
||||||
|
errCode: 65535,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for _, testcase := range rawTestCases {
|
||||||
|
t.Run("post with db"+testcase.path, func(t *testing.T) {
|
||||||
|
req := httptest.NewRequest(http.MethodPost, path, bytes.NewReader([]byte(`{}`)))
|
||||||
|
req.Header.Set(HTTPHeaderDBName, "test")
|
||||||
|
w := httptest.NewRecorder()
|
||||||
|
ginHandler.ServeHTTP(w, req)
|
||||||
|
assert.Equal(t, http.StatusOK, w.Code)
|
||||||
|
fmt.Println(w.Body.String())
|
||||||
|
if testcase.errCode != 0 {
|
||||||
|
returnBody := &ReturnErrMsg{}
|
||||||
|
err := json.Unmarshal(w.Body.Bytes(), returnBody)
|
||||||
|
assert.Nil(t, err)
|
||||||
|
assert.Equal(t, testcase.errCode, returnBody.Code)
|
||||||
|
assert.Equal(t, testcase.errMsg, returnBody.Message)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestCreateCollection(t *testing.T) {
|
func TestCreateCollection(t *testing.T) {
|
||||||
|
@ -329,6 +329,8 @@ type AliasReq struct {
|
|||||||
AliasName string `json:"aliasName" binding:"required"`
|
AliasName string `json:"aliasName" binding:"required"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (req *AliasReq) GetDbName() string { return req.DbName }
|
||||||
|
|
||||||
func (req *AliasReq) GetAliasName() string {
|
func (req *AliasReq) GetAliasName() string {
|
||||||
return req.AliasName
|
return req.AliasName
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user