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

Remove factory in querycoord (#21659)

Browse Source 
Signed-off-by: Enwei Jiao <enwei.jiao@zilliz.com>
This commit is contained in:
Enwei Jiao 2023-01-12 15:59:39 +08:00 committed by GitHub
parent ae435768f2
commit 9fccbbb92b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/distributed/querycoord/service.go
View File

@ -72,7 +72,7 @@ type Server struct {
// NewServer create a new QueryCoord grpc server. // NewServer create a new QueryCoord grpc server.
func NewServer(ctx context.Context, factory dependency.Factory) (*Server, error) { func NewServer(ctx context.Context, factory dependency.Factory) (*Server, error) {
ctx1, cancel := context.WithCancel(ctx) ctx1, cancel := context.WithCancel(ctx)
svr, err := qc.NewQueryCoord(ctx1, factory) svr, err := qc.NewQueryCoord(ctx1)
if err != nil { if err != nil {
cancel() cancel()
return nil, err return nil, err

10
internal/querycoordv2/server.go
View File

@ -47,7 +47,6 @@ import (
"github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/session"
"github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/task"
"github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/types"
"github.com/milvus-io/milvus/internal/util/dependency"
"github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/metricsinfo"
"github.com/milvus-io/milvus/internal/util/sessionutil" "github.com/milvus-io/milvus/internal/util/sessionutil"
"github.com/milvus-io/milvus/internal/util/tsoutil" "github.com/milvus-io/milvus/internal/util/tsoutil"
@ -72,7 +71,6 @@ type Server struct {
session *sessionutil.Session session *sessionutil.Session
kv kv.MetaKv kv kv.MetaKv
idAllocator func() (int64, error) idAllocator func() (int64, error)
factory dependency.Factory
metricsCacheManager *metricsinfo.MetricsCacheManager metricsCacheManager *metricsinfo.MetricsCacheManager
// Coordinators // Coordinators
@ -112,12 +110,11 @@ type Server struct {
activateFunc func() activateFunc func()
} }
func NewQueryCoord(ctx context.Context, factory dependency.Factory) (*Server, error) { func NewQueryCoord(ctx context.Context) (*Server, error) {
ctx, cancel := context.WithCancel(ctx) ctx, cancel := context.WithCancel(ctx)
server := &Server{ server := &Server{
ctx: ctx, ctx: ctx,
cancel: cancel, cancel: cancel,
factory: factory,
} }
server.UpdateStateCode(commonpb.StateCode_Abnormal) server.UpdateStateCode(commonpb.StateCode_Abnormal)
return server, nil return server, nil
@ -156,7 +153,6 @@ func (s *Server) Init() error {
s.session.Init(typeutil.QueryCoordRole, s.address, true, true) s.session.Init(typeutil.QueryCoordRole, s.address, true, true)
s.enableActiveStandBy = Params.QueryCoordCfg.EnableActiveStandby.GetAsBool() s.enableActiveStandBy = Params.QueryCoordCfg.EnableActiveStandby.GetAsBool()
s.session.SetEnableActiveStandBy(s.enableActiveStandBy) s.session.SetEnableActiveStandBy(s.enableActiveStandBy)
s.factory.Init(Params)
// Init KV // Init KV
etcdKV := etcdkv.NewEtcdKV(s.etcdCli, Params.EtcdCfg.MetaRootPath.GetValue()) etcdKV := etcdkv.NewEtcdKV(s.etcdCli, Params.EtcdCfg.MetaRootPath.GetValue())

3
internal/querycoordv2/server_test.go
View File

@ -37,7 +37,6 @@ import (
"github.com/milvus-io/milvus/internal/querycoordv2/mocks" "github.com/milvus-io/milvus/internal/querycoordv2/mocks"
"github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/params"
"github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/task"
"github.com/milvus-io/milvus/internal/util/dependency"
"github.com/milvus-io/milvus/internal/util/etcd" "github.com/milvus-io/milvus/internal/util/etcd"
"github.com/milvus-io/milvus/internal/util/paramtable" "github.com/milvus-io/milvus/internal/util/paramtable"
) )
@ -413,7 +412,7 @@ func (suite *ServerSuite) hackServer() {
} }
func newQueryCoord() (*Server, error) { func newQueryCoord() (*Server, error) {
server, err := NewQueryCoord(context.Background(), dependency.NewDefaultFactory(true)) server, err := NewQueryCoord(context.Background())
if err != nil { if err != nil {
return nil, err return nil, err
} }