diff --git a/internal/proxy/database_interceptor.go b/internal/proxy/database_interceptor.go index 2b12a9fe6b..6e0d19de8d 100644 --- a/internal/proxy/database_interceptor.go +++ b/internal/proxy/database_interceptor.go @@ -275,6 +275,11 @@ func fillDatabase(ctx context.Context, req interface{}) (context.Context, interf r.DbName = GetCurDBNameFromContextOrDefault(ctx) } return ctx, r + case *milvuspb.RunAnalyzerRequest: + if r.DbName == "" { + r.DbName = GetCurDBNameFromContextOrDefault(ctx) + } + return ctx, r default: } return ctx, req diff --git a/internal/proxy/database_interceptor_test.go b/internal/proxy/database_interceptor_test.go index e80203d000..08a6c328e3 100644 --- a/internal/proxy/database_interceptor_test.go +++ b/internal/proxy/database_interceptor_test.go @@ -96,6 +96,7 @@ func TestDatabaseInterceptor(t *testing.T) { &milvuspb.OperatePrivilegeRequest{Entity: &milvuspb.GrantEntity{}}, &milvuspb.SelectGrantRequest{Entity: &milvuspb.GrantEntity{}}, &milvuspb.ManualCompactionRequest{}, + &milvuspb.RunAnalyzerRequest{}, } md := metadata.Pairs(util.HeaderDBName, "db") diff --git a/internal/proxy/impl_test.go b/internal/proxy/impl_test.go index 5a10a985cd..811f3817e0 100644 --- a/internal/proxy/impl_test.go +++ b/internal/proxy/impl_test.go @@ -2248,8 +2248,8 @@ func TestRunAnalyzer(t *testing.T) { fieldMap := &typeutil.ConcurrentMap[string, int64]{} fieldMap.Insert("test_text", 100) - mockCache.EXPECT().GetCollectionID(mock.Anything, "default", "test_collection").Return(1, nil) - mockCache.EXPECT().GetCollectionSchema(mock.Anything, "default", "test_collection").Return(&schemaInfo{ + mockCache.EXPECT().GetCollectionID(mock.Anything, mock.Anything, "test_collection").Return(1, nil) + mockCache.EXPECT().GetCollectionSchema(mock.Anything, mock.Anything, "test_collection").Return(&schemaInfo{ CollectionSchema: &schemapb.CollectionSchema{ Fields: []*schemapb.FieldSchema{{ FieldID: 100, diff --git a/internal/proxy/task.go b/internal/proxy/task.go index ab23ee0c2e..73c8c6a6a8 100644 --- a/internal/proxy/task.go +++ b/internal/proxy/task.go @@ -2858,20 +2858,16 @@ func (t *RunAnalyzerTask) OnEnqueue() error { } func (t *RunAnalyzerTask) PreExecute(ctx context.Context) error { - dbName := t.GetDbName() - if dbName == "" { - dbName = "default" - } - t.dbName = dbName + t.dbName = t.GetDbName() - collID, err := globalMetaCache.GetCollectionID(ctx, dbName, t.GetCollectionName()) + collID, err := globalMetaCache.GetCollectionID(ctx, t.dbName, t.GetCollectionName()) if err != nil { // err is not nil if collection not exists return merr.WrapErrAsInputErrorWhen(err, merr.ErrCollectionNotFound, merr.ErrDatabaseNotFound) } t.collectionID = collID - schema, err := globalMetaCache.GetCollectionSchema(ctx, dbName, t.GetCollectionName()) + schema, err := globalMetaCache.GetCollectionSchema(ctx, t.dbName, t.GetCollectionName()) if err != nil { // err is not nil if collection not exists return merr.WrapErrAsInputErrorWhen(err, merr.ErrCollectionNotFound, merr.ErrDatabaseNotFound) }