diff --git a/cmd/components/data_coord.go b/cmd/components/data_coord.go index 9a59b74174..7b713f94e7 100644 --- a/cmd/components/data_coord.go +++ b/cmd/components/data_coord.go @@ -21,11 +21,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/typeutil" - grpcdatacoordclient "github.com/milvus-io/milvus/internal/distributed/datacoord" + "github.com/milvus-io/milvus/internal/util/dependency" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // DataCoord implements grpc server of DataCoord server diff --git a/cmd/components/data_node.go b/cmd/components/data_node.go index 4debe237bb..7bd1df9803 100644 --- a/cmd/components/data_node.go +++ b/cmd/components/data_node.go @@ -22,9 +22,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" grpcdatanode "github.com/milvus-io/milvus/internal/distributed/datanode" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // DataNode implements DataNode grpc server diff --git a/cmd/components/index_coord.go b/cmd/components/index_coord.go index c194071e7f..16b90e293e 100644 --- a/cmd/components/index_coord.go +++ b/cmd/components/index_coord.go @@ -19,11 +19,10 @@ package components import ( "context" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // IndexCoord implements IndexCoord grpc server diff --git a/cmd/components/index_node.go b/cmd/components/index_node.go index d9bceab9a4..9a51d01bcd 100644 --- a/cmd/components/index_node.go +++ b/cmd/components/index_node.go @@ -21,12 +21,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/typeutil" - grpcindexnode "github.com/milvus-io/milvus/internal/distributed/indexnode" + "github.com/milvus-io/milvus/internal/util/dependency" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // IndexNode implements IndexNode grpc server diff --git a/cmd/components/proxy.go b/cmd/components/proxy.go index 536561a4d8..77ecc00d28 100644 --- a/cmd/components/proxy.go +++ b/cmd/components/proxy.go @@ -19,15 +19,14 @@ package components import ( "context" + "go.uber.org/zap" + "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - grpcproxy "github.com/milvus-io/milvus/internal/distributed/proxy" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/typeutil" - - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // Proxy implements Proxy grpc server diff --git a/cmd/components/query_coord.go b/cmd/components/query_coord.go index 4a723a5fc5..dc435a940d 100644 --- a/cmd/components/query_coord.go +++ b/cmd/components/query_coord.go @@ -21,10 +21,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/typeutil" + + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" grpcquerycoord "github.com/milvus-io/milvus/internal/distributed/querycoord" ) diff --git a/cmd/components/query_node.go b/cmd/components/query_node.go index 2fadda17cc..9c673a9d97 100644 --- a/cmd/components/query_node.go +++ b/cmd/components/query_node.go @@ -21,10 +21,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/typeutil" + + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" grpcquerynode "github.com/milvus-io/milvus/internal/distributed/querynode" ) diff --git a/cmd/components/root_coord.go b/cmd/components/root_coord.go index c480f39fc1..53122ac84d 100644 --- a/cmd/components/root_coord.go +++ b/cmd/components/root_coord.go @@ -22,9 +22,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" rc "github.com/milvus-io/milvus/internal/distributed/rootcoord" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" "go.uber.org/zap" ) diff --git a/pkg/embedded/embedded.go b/cmd/embedded/embedded.go similarity index 100% rename from pkg/embedded/embedded.go rename to cmd/embedded/embedded.go diff --git a/cmd/milvus/help.go b/cmd/milvus/help.go index 38687cdadc..c967b82288 100644 --- a/cmd/milvus/help.go +++ b/cmd/milvus/help.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var ( diff --git a/cmd/milvus/mck.go b/cmd/milvus/mck.go index 77ee19f2de..685a204ad9 100644 --- a/cmd/milvus/mck.go +++ b/cmd/milvus/mck.go @@ -12,26 +12,20 @@ import ( "time" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/storage" - + "github.com/golang/protobuf/proto" clientv3 "go.etcd.io/etcd/client/v3" - - "github.com/milvus-io/milvus/internal/util/logutil" - - "github.com/milvus-io/milvus/internal/util/paramtable" - - pb "github.com/milvus-io/milvus/internal/proto/etcdpb" + "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/proto/querypb" - - "github.com/golang/protobuf/proto" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/util/etcd" - "go.uber.org/zap" + pb "github.com/milvus-io/milvus/internal/proto/etcdpb" + "github.com/milvus-io/milvus/internal/proto/querypb" + "github.com/milvus-io/milvus/internal/storage" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/logutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) const ( diff --git a/cmd/milvus/run.go b/cmd/milvus/run.go index 89e625da40..99b606d27c 100644 --- a/cmd/milvus/run.go +++ b/cmd/milvus/run.go @@ -9,11 +9,11 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus/cmd/roles" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/hardware" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/cmd/milvus/stop.go b/cmd/milvus/stop.go index d67e91ccbd..66517bd21b 100644 --- a/cmd/milvus/stop.go +++ b/cmd/milvus/stop.go @@ -8,8 +8,8 @@ import ( "path" "syscall" - "github.com/milvus-io/milvus/internal/util/hardware" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/cmd/milvus/util.go b/cmd/milvus/util.go index 8a04967b54..1e40bb4048 100644 --- a/cmd/milvus/util.go +++ b/cmd/milvus/util.go @@ -10,7 +10,7 @@ import ( "github.com/gofrs/flock" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func makeRuntimeDir(dir string) error { diff --git a/cmd/roles/roles.go b/cmd/roles/roles.go index 90e1b671c2..fa931a160f 100644 --- a/cmd/roles/roles.go +++ b/cmd/roles/roles.go @@ -26,24 +26,24 @@ import ( "syscall" "time" - "github.com/milvus-io/milvus/internal/tracer" - + "github.com/prometheus/client_golang/prometheus" + "github.com/prometheus/client_golang/prometheus/promhttp" "go.uber.org/zap" "github.com/milvus-io/milvus/cmd/components" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/management" - "github.com/milvus-io/milvus/internal/management/healthz" - "github.com/milvus-io/milvus/internal/metrics" + "github.com/milvus-io/milvus/internal/http" + "github.com/milvus-io/milvus/internal/http/healthz" rocksmqimpl "github.com/milvus-io/milvus/internal/mq/mqimpl/rocksmq/server" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/logutil" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - _ "github.com/milvus-io/milvus/internal/util/symbolizer" // support symbolizer and crash dump - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/prometheus/client_golang/prometheus" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/tracer" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/logutil" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + _ "github.com/milvus-io/milvus/pkg/util/symbolizer" // support symbolizer and crash dump + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // all milvus related metrics is in a separate registry @@ -192,6 +192,18 @@ func (mr *MilvusRoles) setupLogger() { logutil.SetupLogger(&logConfig) } +// Register serves prometheus http service +func setupPrometheusHTTPServer(r *prometheus.Registry) { + http.Register(&http.Handler{ + Path: "/metrics", + Handler: promhttp.HandlerFor(r, promhttp.HandlerOpts{}), + }) + http.Register(&http.Handler{ + Path: "/metrics_default", + Handler: promhttp.Handler(), + }) +} + // Run Milvus components. func (mr *MilvusRoles) Run(local bool, alias string) { log.Info("starting running Milvus components") @@ -241,7 +253,7 @@ func (mr *MilvusRoles) Run(local bool, alias string) { paramtable.Init() } - management.ServeHTTP() + http.ServeHTTP() var rc *components.RootCoord var wg sync.WaitGroup @@ -312,7 +324,7 @@ func (mr *MilvusRoles) Run(local bool, alias string) { mr.setupLogger() tracer.Init() - metrics.Register(Registry) + setupPrometheusHTTPServer(Registry) paramtable.SetCreateTime(time.Now()) paramtable.SetUpdateTime(time.Now()) diff --git a/cmd/tools/config/generate.go b/cmd/tools/config/generate.go index a6128e8f38..5873b1e2b2 100644 --- a/cmd/tools/config/generate.go +++ b/cmd/tools/config/generate.go @@ -7,9 +7,9 @@ import ( "reflect" "strings" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/samber/lo" "go.uber.org/zap" "golang.org/x/exp/slices" diff --git a/cmd/tools/config/main.go b/cmd/tools/config/main.go index d7ac952161..73aa670c3e 100644 --- a/cmd/tools/config/main.go +++ b/cmd/tools/config/main.go @@ -4,7 +4,7 @@ import ( "fmt" "os" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" ) const ( diff --git a/cmd/tools/config/printer.go b/cmd/tools/config/printer.go index 822e59090c..54cd90b4bf 100644 --- a/cmd/tools/config/printer.go +++ b/cmd/tools/config/printer.go @@ -5,7 +5,7 @@ import ( "os" "sort" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" "github.com/spf13/viper" "go.uber.org/zap" ) diff --git a/cmd/tools/datameta/main.go b/cmd/tools/datameta/main.go index a68b574108..c5e20035f6 100644 --- a/cmd/tools/datameta/main.go +++ b/cmd/tools/datameta/main.go @@ -8,10 +8,10 @@ import ( "github.com/golang/protobuf/proto" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/tsoutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "go.uber.org/zap" ) diff --git a/cmd/tools/migration/allocator/allocator.go b/cmd/tools/migration/allocator/allocator.go index ad2a6b473d..005009f267 100644 --- a/cmd/tools/migration/allocator/allocator.go +++ b/cmd/tools/migration/allocator/allocator.go @@ -1,6 +1,6 @@ package allocator -import "github.com/milvus-io/milvus/internal/util/typeutil" +import "github.com/milvus-io/milvus/pkg/util/typeutil" type Allocator interface { AllocID() (typeutil.UniqueID, error) diff --git a/cmd/tools/migration/allocator/atomic_allocator.go b/cmd/tools/migration/allocator/atomic_allocator.go index 5a8b353c71..894747ec06 100644 --- a/cmd/tools/migration/allocator/atomic_allocator.go +++ b/cmd/tools/migration/allocator/atomic_allocator.go @@ -1,7 +1,7 @@ package allocator import ( - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" "go.uber.org/atomic" ) diff --git a/cmd/tools/migration/backend/backend.go b/cmd/tools/migration/backend/backend.go index 4b96a9620b..915477f359 100644 --- a/cmd/tools/migration/backend/backend.go +++ b/cmd/tools/migration/backend/backend.go @@ -10,7 +10,7 @@ import ( "github.com/milvus-io/milvus/cmd/tools/migration/versions" "github.com/milvus-io/milvus/cmd/tools/migration/meta" - "github.com/milvus-io/milvus/internal/util" + "github.com/milvus-io/milvus/pkg/util" ) type Backend interface { diff --git a/cmd/tools/migration/backend/etcd.go b/cmd/tools/migration/backend/etcd.go index fc9ee55e5a..b4ad68f56d 100644 --- a/cmd/tools/migration/backend/etcd.go +++ b/cmd/tools/migration/backend/etcd.go @@ -4,7 +4,7 @@ import ( "github.com/milvus-io/milvus/cmd/tools/migration/configs" "github.com/milvus-io/milvus/internal/kv" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/util/etcd" + "github.com/milvus-io/milvus/pkg/util/etcd" clientv3 "go.etcd.io/etcd/client/v3" ) diff --git a/cmd/tools/migration/backend/etcd210.go b/cmd/tools/migration/backend/etcd210.go index 994f4d6ec4..527ec44fe6 100644 --- a/cmd/tools/migration/backend/etcd210.go +++ b/cmd/tools/migration/backend/etcd210.go @@ -24,7 +24,7 @@ import ( "github.com/milvus-io/milvus/internal/metastore/model" pb "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // etcd210 implements Backend. diff --git a/cmd/tools/migration/backend/etcd220.go b/cmd/tools/migration/backend/etcd220.go index 46928fee65..4eae60d43e 100644 --- a/cmd/tools/migration/backend/etcd220.go +++ b/cmd/tools/migration/backend/etcd220.go @@ -7,7 +7,7 @@ import ( "github.com/milvus-io/milvus/cmd/tools/migration/configs" - "github.com/milvus-io/milvus/internal/util" + "github.com/milvus-io/milvus/pkg/util" "github.com/milvus-io/milvus/cmd/tools/migration/meta" "github.com/milvus-io/milvus/internal/metastore/kv/rootcoord" diff --git a/cmd/tools/migration/configs/config.go b/cmd/tools/migration/configs/config.go index a902792024..15511d8adc 100644 --- a/cmd/tools/migration/configs/config.go +++ b/cmd/tools/migration/configs/config.go @@ -5,8 +5,8 @@ import ( "strconv" "github.com/milvus-io/milvus/cmd/tools/migration/console" - "github.com/milvus-io/milvus/internal/util" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) const ( diff --git a/cmd/tools/migration/meta/210_to_220.go b/cmd/tools/migration/meta/210_to_220.go index a2b63f88d3..8fcfa76e12 100644 --- a/cmd/tools/migration/meta/210_to_220.go +++ b/cmd/tools/migration/meta/210_to_220.go @@ -12,13 +12,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus/cmd/tools/migration/versions" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" pb "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" "go.uber.org/zap" ) diff --git a/cmd/tools/migration/meta/meta.go b/cmd/tools/migration/meta/meta.go index b3cf96fc62..b2d36d4291 100644 --- a/cmd/tools/migration/meta/meta.go +++ b/cmd/tools/migration/meta/meta.go @@ -2,7 +2,7 @@ package meta import ( "github.com/blang/semver/v4" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type UniqueID = typeutil.UniqueID diff --git a/cmd/tools/migration/migration/constant.go b/cmd/tools/migration/migration/constant.go index 8463fa261c..012a333f16 100644 --- a/cmd/tools/migration/migration/constant.go +++ b/cmd/tools/migration/migration/constant.go @@ -1,6 +1,6 @@ package migration -import "github.com/milvus-io/milvus/internal/util/typeutil" +import "github.com/milvus-io/milvus/pkg/util/typeutil" const ( Role = "migration" diff --git a/cmd/tools/migration/migration/runner.go b/cmd/tools/migration/migration/runner.go index f1dd71ec75..c55a62017f 100644 --- a/cmd/tools/migration/migration/runner.go +++ b/cmd/tools/migration/migration/runner.go @@ -7,6 +7,7 @@ import ( "sync" "time" + "github.com/milvus-io/milvus/internal/util/sessionutil" "go.uber.org/atomic" "github.com/milvus-io/milvus/cmd/tools/migration/versions" @@ -20,8 +21,7 @@ import ( "github.com/milvus-io/milvus/cmd/tools/migration/backend" clientv3 "go.etcd.io/etcd/client/v3" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/sessionutil" + "github.com/milvus-io/milvus/pkg/util/etcd" ) type Runner struct { diff --git a/cmd/tools/migration/utils/util.go b/cmd/tools/migration/utils/util.go index e5feb7264a..6fa47a4f89 100644 --- a/cmd/tools/migration/utils/util.go +++ b/cmd/tools/migration/utils/util.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/milvus-io/milvus/internal/metastore/kv/rootcoord" ) diff --git a/go.mod b/go.mod index ae5fb505e2..28a78af827 100644 --- a/go.mod +++ b/go.mod @@ -3,73 +3,84 @@ module github.com/milvus-io/milvus go 1.18 require ( - github.com/99designs/keyring v1.2.1 // indirect - github.com/BurntSushi/toml v1.0.0 // indirect github.com/DATA-DOG/go-sqlmock v1.5.0 + github.com/aliyun/credentials-go v1.2.6 github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20210826220005-b48c857c3a0e github.com/antonmedv/expr v1.8.9 github.com/apache/arrow/go/v8 v8.0.0-20220322092137-778b1772fd20 github.com/apache/pulsar-client-go v0.6.1-0.20210728062540-29414db801a7 - github.com/apache/thrift v0.15.0 - github.com/benesch/cgosymbolizer v0.0.0-20190515212042-bec6fe6e597b github.com/bits-and-blooms/bloom/v3 v3.0.1 + github.com/blang/semver/v4 v4.0.0 github.com/casbin/casbin/v2 v2.44.2 github.com/casbin/json-adapter/v2 v2.0.0 + github.com/cockroachdb/errors v1.9.1 github.com/confluentinc/confluent-kafka-go v1.9.1 - github.com/containerd/cgroups v1.1.0 github.com/gin-gonic/gin v1.7.7 github.com/gofrs/flock v0.8.1 - github.com/golang/protobuf v1.5.2 - github.com/google/btree v1.0.1 - github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 - github.com/jinzhu/now v1.1.5 // indirect + github.com/golang/protobuf v1.5.3 github.com/klauspost/compress v1.14.4 - github.com/lingdor/stackerror v0.0.0-20191119040541-976d8885ed76 github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d github.com/milvus-io/milvus-proto/go-api v0.0.0-20230322065753-aa8a66130217 + github.com/milvus-io/milvus/pkg v0.0.0-00010101000000-000000000000 github.com/minio/minio-go/v7 v7.0.17 github.com/panjf2000/ants/v2 v2.7.2 - github.com/prometheus/client_golang v1.11.1 + github.com/prometheus/client_golang v1.14.0 github.com/quasilyte/go-ruleguard/dsl v0.3.21 + github.com/samber/lo v1.27.0 github.com/sbinet/npyio v0.6.0 - github.com/shirou/gopsutil/v3 v3.22.9 - github.com/spaolacci/murmur3 v1.1.0 - github.com/spf13/cast v1.3.1 github.com/spf13/viper v1.8.1 - github.com/streamnative/pulsarctl v0.5.0 github.com/stretchr/testify v1.8.1 - github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c go.etcd.io/etcd/api/v3 v3.5.5 go.etcd.io/etcd/client/v3 v3.5.5 go.etcd.io/etcd/server/v3 v3.5.5 + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.38.0 + go.opentelemetry.io/otel v1.13.0 + go.opentelemetry.io/otel/trace v1.13.0 go.uber.org/atomic v1.10.0 - go.uber.org/automaxprocs v1.4.0 + go.uber.org/multierr v1.6.0 go.uber.org/zap v1.17.0 golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 + golang.org/x/oauth2 v0.6.0 golang.org/x/sync v0.1.0 - google.golang.org/grpc v1.52.3 - google.golang.org/grpc/examples v0.0.0-20220617181431-3e7b97febc7f - google.golang.org/protobuf v1.28.1 - gopkg.in/natefinch/lumberjack.v2 v2.0.0 + golang.org/x/text v0.8.0 + google.golang.org/grpc v1.54.0 gorm.io/driver/mysql v1.3.5 gorm.io/gorm v1.23.8 stathat.com/c/consistent v1.0.0 ) require ( + github.com/BurntSushi/toml v1.2.1 // indirect + github.com/apache/thrift v0.15.0 // indirect + github.com/benesch/cgosymbolizer v0.0.0-20190515212042-bec6fe6e597b // indirect + github.com/containerd/cgroups v1.1.0 // indirect + github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c // indirect + github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect + github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 // indirect + go.uber.org/automaxprocs v1.4.0 // indirect +) + +require ( + cloud.google.com/go/compute v1.19.0 // indirect + cloud.google.com/go/compute/metadata v0.2.3 // indirect github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect + github.com/99designs/keyring v1.2.1 // indirect github.com/AthenZ/athenz v1.10.39 // indirect github.com/DataDog/zstd v1.5.0 // indirect github.com/JohnCGriffin/overflow v0.0.0-20211019200055-46fa312c352c // indirect github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect + github.com/alibabacloud-go/debug v0.0.0-20190504072949-9472017b5c68 // indirect + github.com/alibabacloud-go/tea v1.1.8 // indirect github.com/andybalholm/brotli v1.0.4 // indirect github.com/ardielle/ardielle-go v1.5.2 // indirect github.com/beorn7/perks v1.0.1 // indirect github.com/bits-and-blooms/bitset v1.2.0 // indirect - github.com/blang/semver/v4 v4.0.0 github.com/campoy/embedmd v1.0.0 // indirect - github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/cenkalti/backoff/v4 v4.2.0 // indirect + github.com/cespare/xxhash/v2 v2.2.0 // indirect + github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f // indirect + github.com/cockroachdb/redact v1.1.3 // indirect github.com/coreos/go-semver v0.3.0 // indirect github.com/coreos/go-systemd/v22 v22.3.2 // indirect github.com/danieljoos/wincred v1.1.2 // indirect @@ -77,11 +88,12 @@ require ( github.com/docker/go-units v0.4.0 // indirect github.com/dustin/go-humanize v1.0.0 // indirect github.com/dvsekhvalnov/jose2go v1.5.0 // indirect - github.com/facebookgo/ensure v0.0.0-20200202191622-63f1cf65ac4c // indirect - github.com/facebookgo/stack v0.0.0-20160209184415-751773369052 // indirect - github.com/facebookgo/subset v0.0.0-20200203212716-c811ad88dec4 // indirect + github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect + github.com/getsentry/sentry-go v0.12.0 // indirect github.com/gin-contrib/sse v0.1.0 // indirect + github.com/go-logr/logr v1.2.3 // indirect + github.com/go-logr/stdr v1.2.2 // indirect github.com/go-ole/go-ole v1.2.6 // indirect github.com/go-playground/locales v0.13.0 // indirect github.com/go-playground/universal-translator v0.17.0 // indirect @@ -91,26 +103,34 @@ require ( github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect github.com/godbus/dbus/v5 v5.0.4 // indirect github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/btree v1.0.1 github.com/google/uuid v1.3.0 // indirect github.com/gorilla/websocket v1.4.2 // indirect + github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect github.com/hashicorp/hcl v1.0.0 // indirect + github.com/ianlancetaylor/cgosymbolizer v0.0.0-20221217025313-27d3c9f66b6a // indirect github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.5 // indirect github.com/jonboulle/clockwork v0.2.2 // indirect - github.com/json-iterator/go v1.1.11 // indirect + github.com/json-iterator/go v1.1.12 // indirect github.com/klauspost/asmfmt v1.3.1 // indirect github.com/klauspost/cpuid v1.3.1 // indirect github.com/klauspost/cpuid/v2 v2.0.9 // indirect + github.com/kr/pretty v0.3.0 // indirect + github.com/kr/text v0.2.0 // indirect github.com/leodido/go-urn v1.2.0 // indirect github.com/linkedin/goavro/v2 v2.11.1 // indirect github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect github.com/magiconair/properties v1.8.5 // indirect github.com/mattn/go-colorable v0.1.11 // indirect github.com/mattn/go-isatty v0.0.14 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect github.com/minio/asm2plan9s v0.0.0-20200509001527-cdd76441f9d8 // indirect github.com/minio/c2goasm v0.0.0-20190812172519-36a3d3bbc4f3 // indirect github.com/minio/md5-simd v1.1.0 // indirect @@ -118,28 +138,35 @@ require ( github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/mitchellh/mapstructure v1.4.1 // indirect github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect - github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect github.com/mtibben/percent v0.2.1 // indirect github.com/opencontainers/runtime-spec v1.0.2 // indirect github.com/pelletier/go-toml v1.9.3 // indirect github.com/pierrec/lz4 v2.5.2+incompatible // indirect + github.com/pkg/errors v0.9.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect - github.com/prometheus/client_model v0.2.0 // indirect - github.com/prometheus/common v0.26.0 // indirect - github.com/prometheus/procfs v0.6.0 // indirect + github.com/prometheus/client_model v0.3.0 // indirect + github.com/prometheus/common v0.42.0 // indirect + github.com/prometheus/procfs v0.9.0 // indirect + github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/rs/xid v1.2.1 // indirect - github.com/samber/lo v1.27.0 + github.com/shirou/gopsutil/v3 v3.22.9 // indirect github.com/sirupsen/logrus v1.8.1 // indirect github.com/soheilhy/cmux v0.1.5 // indirect + github.com/spaolacci/murmur3 v1.1.0 // indirect github.com/spf13/afero v1.6.0 // indirect + github.com/spf13/cast v1.3.1 // indirect github.com/spf13/jwalterweatherman v1.1.0 // indirect github.com/spf13/pflag v1.0.5 // indirect + github.com/streamnative/pulsarctl v0.5.0 // indirect github.com/stretchr/objx v0.5.0 // indirect github.com/subosito/gotenv v1.2.0 // indirect + github.com/tecbot/gorocksdb v0.0.0-20191217155057-f0fad39f321c github.com/tklauser/go-sysconf v0.3.10 // indirect github.com/tklauser/numcpus v0.4.0 // indirect github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect + github.com/uber/jaeger-client-go v2.30.0+incompatible // indirect github.com/ugorji/go/codec v1.1.7 // indirect github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect github.com/yusufpapurcu/wmi v1.2.2 // indirect @@ -149,69 +176,38 @@ require ( go.etcd.io/etcd/client/v2 v2.305.5 // indirect go.etcd.io/etcd/pkg/v3 v3.5.5 // indirect go.etcd.io/etcd/raft/v3 v3.5.5 // indirect - go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.38.0 - go.opentelemetry.io/otel v1.13.0 - go.opentelemetry.io/otel/sdk v1.13.0 - go.opentelemetry.io/otel/trace v1.13.0 + go.opentelemetry.io/otel/exporters/jaeger v1.13.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.13.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.13.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.13.0 // indirect + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.13.0 // indirect + go.opentelemetry.io/otel/metric v0.35.0 // indirect + go.opentelemetry.io/otel/sdk v1.13.0 // indirect go.opentelemetry.io/proto/otlp v0.19.0 // indirect - go.uber.org/multierr v1.6.0 - golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect - golang.org/x/net v0.7.0 // indirect - golang.org/x/oauth2 v0.5.0 - golang.org/x/sys v0.5.0 // indirect - golang.org/x/term v0.5.0 // indirect - golang.org/x/text v0.7.0 + golang.org/x/mod v0.9.0 // indirect + golang.org/x/net v0.8.0 // indirect + golang.org/x/sys v0.6.0 // indirect + golang.org/x/term v0.6.0 // indirect golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect - golang.org/x/tools v0.1.12 // indirect + golang.org/x/tools v0.7.0 // indirect golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect gonum.org/v1/gonum v0.9.3 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 // indirect + google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633 // indirect + google.golang.org/grpc/examples v0.0.0-20220617181431-3e7b97febc7f + google.golang.org/protobuf v1.30.0 // indirect gopkg.in/ini.v1 v1.62.0 // indirect + gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect sigs.k8s.io/yaml v1.2.0 // indirect ) -require github.com/ianlancetaylor/cgosymbolizer v0.0.0-20221217025313-27d3c9f66b6a // indirect - -require ( - github.com/aliyun/credentials-go v1.2.6 - github.com/cockroachdb/errors v1.9.1 - github.com/uber/jaeger-client-go v2.30.0+incompatible - go.opentelemetry.io/otel/exporters/jaeger v1.13.0 - go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.13.0 - go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.13.0 -) - -require ( - cloud.google.com/go/compute v1.12.1 // indirect - cloud.google.com/go/compute/metadata v0.2.1 // indirect - github.com/alibabacloud-go/debug v0.0.0-20190504072949-9472017b5c68 // indirect - github.com/alibabacloud-go/tea v1.1.8 // indirect - github.com/cenkalti/backoff/v4 v4.2.0 // indirect - github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f // indirect - github.com/cockroachdb/redact v1.1.3 // indirect - github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect - github.com/getsentry/sentry-go v0.12.0 // indirect - github.com/go-logr/logr v1.2.3 // indirect - github.com/go-logr/stdr v1.2.2 // indirect - github.com/golang-jwt/jwt v3.2.2+incompatible // indirect - github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect - github.com/kr/pretty v0.3.0 // indirect - github.com/kr/text v0.2.0 // indirect - github.com/olekukonko/tablewriter v0.0.5 // indirect - github.com/pkg/errors v0.9.1 // indirect - github.com/rogpeppe/go-internal v1.8.1 // indirect - go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.13.0 // indirect - go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.13.0 // indirect - go.opentelemetry.io/otel/metric v0.35.0 // indirect -) - replace ( github.com/apache/pulsar-client-go => github.com/milvus-io/pulsar-client-go v0.6.10 github.com/bketelsen/crypt => github.com/bketelsen/crypt v0.0.4 // Fix security alert for core-os/etcd github.com/go-kit/kit => github.com/go-kit/kit v0.1.0 + github.com/milvus-io/milvus/pkg => ./pkg github.com/streamnative/pulsarctl => github.com/xiaofan-luan/pulsarctl v0.5.1 github.com/tecbot/gorocksdb => github.com/milvus-io/gorocksdb v0.0.0-20220624081344-8c5f4212846b // indirect ) diff --git a/go.sum b/go.sum index 83185926d2..2245a2e3df 100644 --- a/go.sum +++ b/go.sum @@ -24,10 +24,10 @@ cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvf cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/compute v1.12.1 h1:gKVJMEyqV5c/UnpzjjQbo3Rjvvqpr9B1DFSbJC4OXr0= -cloud.google.com/go/compute v1.12.1/go.mod h1:e8yNOBcBONZU1vJKCvCoDw/4JQsA0dpM4x/6PIIOocU= -cloud.google.com/go/compute/metadata v0.2.1 h1:efOwf5ymceDhK6PKMnnrTHP4pppY5L22mle96M1yP48= -cloud.google.com/go/compute/metadata v0.2.1/go.mod h1:jgHgmJd2RKBGzXqF5LR2EZMGxBkeanZ9wwa75XHJgOM= +cloud.google.com/go/compute v1.19.0 h1:+9zda3WGgW1ZSTlVppLCYFIr48Pa35q1uG2N1itbCEQ= +cloud.google.com/go/compute v1.19.0/go.mod h1:rikpw2y+UMidAe9tISo04EHNOIf42RLYF/q8Bs93scU= +cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= +cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= @@ -51,8 +51,8 @@ github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOv github.com/AthenZ/athenz v1.10.39 h1:mtwHTF/v62ewY2Z5KWhuZgVXftBej1/Tn80zx4DcawY= github.com/AthenZ/athenz v1.10.39/go.mod h1:3Tg8HLsiQZp81BJY58JBeU2BR6B/H4/0MQGfCwhHNEA= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= -github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/toml v1.2.1 h1:9F2/+DoOYIOksmaJFPw1tGFy1eDnIJXg+UHjuD8lTak= +github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo= @@ -134,8 +134,9 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= -github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= +github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= @@ -163,8 +164,6 @@ github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZ github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= github.com/confluentinc/confluent-kafka-go v1.9.1 h1:L3aW6KvTyrq/+BOMnDm9xJylhAEoAgqhoaJbMPe3GQI= github.com/confluentinc/confluent-kafka-go v1.9.1/go.mod h1:ptXNqsuDfYbAE/LBW6pnwWZElUoWxHoV8E43DCrliyo= -github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= -github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA= github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= @@ -343,8 +342,9 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= -github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= +github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= @@ -477,8 +477,9 @@ github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= @@ -531,7 +532,6 @@ github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/lingdor/stackerror v0.0.0-20191119040541-976d8885ed76 h1:IVlcvV0CjvfBYYod5ePe89l+3LBAl//6n9kJ9Vr2i0k= -github.com/lingdor/stackerror v0.0.0-20191119040541-976d8885ed76/go.mod h1:Iu9BHUvTh8/KpbuSoKx/CaJEdJvFxSverxIy7I+nq7s= github.com/linkedin/goavro v2.1.0+incompatible/go.mod h1:bBCwI2eGYpUI/4820s67MElg9tdeLbINjLjiM2xZFYM= github.com/linkedin/goavro/v2 v2.9.8/go.mod h1:UgQUb2N/pmueQYH9bfqFioWxzYCZXSfF8Jw03O5sjqA= github.com/linkedin/goavro/v2 v2.10.0/go.mod h1:UgQUb2N/pmueQYH9bfqFioWxzYCZXSfF8Jw03O5sjqA= @@ -559,12 +559,12 @@ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Ky github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-runewidth v0.0.4/go.mod h1:LwmH8dsx7+W8Uxz3IHJYH5QSwggIsqBzpuz5H//U1FU= +github.com/mattn/go-runewidth v0.0.8 h1:3tS41NlGYSmhhe/8fhGRzc+z3AYCw1Fe1WAyLuujKs0= github.com/mattn/go-runewidth v0.0.8/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= -github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= -github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/matttproud/golang_protobuf_extensions v1.0.4 h1:mmDVorXM7PCGKw94cs5zkfA9PSy5pEvNWRP0ET0TIVo= +github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfrANrmjBb36TMTDstsz7MSK+HVaYKv4= github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d h1:5PJl274Y63IEHC+7izoQE9x6ikvDFZS2mDVS3drnohI= github.com/mgutz/ansi v0.0.0-20200706080929-d51e80ef957d/go.mod h1:01TrycV0kFyexm33Z7vhZRXopbI8J3TDReVlkTgMUxE= @@ -601,8 +601,9 @@ github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= -github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns= @@ -612,7 +613,6 @@ github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5Vgl github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= -github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nrwiersma/avro-benchmarks v0.0.0-20210913175520-21aec48c8f76/go.mod h1:iKyFMidsk/sVYONJRE372sJuX/QTRPacU7imPqqsu7g= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= @@ -620,7 +620,6 @@ github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= -github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= @@ -668,25 +667,29 @@ github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.1 h1:+4eQaD7vAZ6DsfsxB15hbE0odUjGI5ARs9yskGu1v4s= github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_golang v1.14.0 h1:nJdhIvne2eSX/XRAFV9PcvFFRbrjbcTUj0VP62TMhnw= +github.com/prometheus/client_golang v1.14.0/go.mod h1:8vpkKitgIVNcqrRBWh1C4TIUQgYNtG/XQE4E/Zae36Y= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.3.0 h1:UBgGFHqYdG/TPFD1B1ogZywDqEkwp3fBMvqdiQ7Xew4= +github.com/prometheus/client_model v0.3.0/go.mod h1:LDGWKZIo7rky3hgvBe+caln+Dr3dPggB5dvjtD7w9+w= github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.26.0 h1:iMAkS2TDoNWnKM+Kopnx/8tnEStIfpYA0ur0xQzzhMQ= github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/common v0.42.0 h1:EKsfXEYo4JpWMHH5cg+KOUWeuJSov1Id8zGR8eeI1YM= +github.com/prometheus/common v0.42.0/go.mod h1:xBwqVerjNdUDjgODMpudtOMwlOwf2SaTr1yjz4b7Zbc= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4= github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJfhI= +github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= github.com/quasilyte/go-ruleguard/dsl v0.3.21 h1:vNkC6fC6qMLzCOGbnIHOd5ixUGgTbp3Z4fGnUgULlDA= github.com/quasilyte/go-ruleguard/dsl v0.3.21/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= @@ -970,8 +973,8 @@ golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.5.1/go.mod h1:5OXOZSfqPIIbmVBIIKWRFfZjPR0E5r58TLhUjH0a2Ro= golang.org/x/mod v0.6.0-dev.0.20211013180041-c96bc1413d57/go.mod h1:3p9vT2HGsQu2K1YbXdKPJLVgG5VJdoTa1poYQBtP1AY= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s= -golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= +golang.org/x/mod v0.9.0 h1:KENHtAZL2y3NLMYZeHY9DW8HW8V+kQyJsY/V9JlKvCs= +golang.org/x/mod v0.9.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= @@ -1024,8 +1027,8 @@ golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qx golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= -golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g= -golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/net v0.8.0 h1:Zrh2ngAOFYneWTAIAPethzeaQLuHwhuBkuV6ZiRnUaQ= +golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1039,8 +1042,8 @@ golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.5.0 h1:HuArIo48skDwlrvM3sEdHXElYslAMsf3KwRkkW4MC4s= -golang.org/x/oauth2 v0.5.0/go.mod h1:9/XBHVqLaWO3/BRHs5jbpYCnOZVjj5V0ndyaAM7KB4I= +golang.org/x/oauth2 v0.6.0 h1:Lh8GPgSKBfWSwFvtuWOfeI3aAAnbXTSutYxJiOJFgIw= +golang.org/x/oauth2 v0.6.0/go.mod h1:ycmewcwgD4Rpr3eZJLSB4Kyyljb3qDh40vJ8STE5HKw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1132,13 +1135,13 @@ golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= -golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.6.0 h1:MVltZSvRTcU2ljQOhs94SXPftV6DCNnZViHeQps87pQ= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= -golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/term v0.6.0 h1:clScbb1cHjoCkyRbWwBEUZ5H/tIFu5TAXIqaZD0Gcjw= +golang.org/x/term v0.6.0/go.mod h1:m6U89DPEgQRMq3DNkDClhWw02AUbt2daBVO4cn4Hv9U= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -1148,8 +1151,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= -golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= -golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/text v0.8.0 h1:57P1ETyNKtuIjB4SRd15iJxuhj8Gc416Y78H3qgMh68= +golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= @@ -1222,8 +1225,8 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.8-0.20211029000441-d6a9af8af023/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= -golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= -golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= +golang.org/x/tools v0.7.0 h1:W4OVu8VVOaIO0yzWMNdepAulS7YfoS3Zabrm8DOXXU4= +golang.org/x/tools v0.7.0/go.mod h1:4pg6aUX35JBAogB10C9AtvVL+qowtN4pT3CGSQex14s= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= @@ -1316,8 +1319,8 @@ google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+n google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220126215142-9970aeb2e350/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= google.golang.org/genproto v0.0.0-20220503193339-ba3ae3f07e29/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= -google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 h1:a2S6M0+660BgMNl++4JPlcAO/CjkqYItDEZwkoDQK7c= -google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= +google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633 h1:0BOZf6qNozI3pkN3fJLwNubheHJYHhMh91GRFOWWK08= +google.golang.org/genproto v0.0.0-20230331144136-dcfb400f0633/go.mod h1:UUQDJDOlWu4KYeJZffbWgBkS1YFobzKbLVfK69pe0Ak= google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -1345,8 +1348,8 @@ google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzI google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.44.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= -google.golang.org/grpc v1.52.3 h1:pf7sOysg4LdgBqduXveGKrcEwbStiK2rtfghdzlUYDQ= -google.golang.org/grpc v1.52.3/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY= +google.golang.org/grpc v1.54.0 h1:EhTqbhiYeixwWQtAEZAxmV9MGqcjEU2mFx52xCzNyag= +google.golang.org/grpc v1.54.0/go.mod h1:PUSEXI6iWghWaB6lXM4knEgpJNu2qUcKfDtNci3EC2g= google.golang.org/grpc/examples v0.0.0-20220617181431-3e7b97febc7f h1:rqzndB2lIQGivcXdTuY3Y9NBvr70X+y77woofSRluec= google.golang.org/grpc/examples v0.0.0-20220617181431-3e7b97febc7f/go.mod h1:gxndsbNG1n4TZcHGgsYEfVGnTxqfEdfiDv6/DADXX9o= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= @@ -1363,16 +1366,16 @@ google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp0 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= -google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= -google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.30.0 h1:kPPoIgf3TsEvrm0PFe15JQ+570QVxYzEvvHqChK+cng= +google.golang.org/protobuf v1.30.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/avro.v0 v0.0.0-20171217001914-a730b5802183/go.mod h1:FvqrFXt+jCsyQibeRv4xxEJBL5iG2DDW5aeJwzDiq4A= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U= gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk= gopkg.in/errgo.v1 v1.0.0/go.mod h1:CxwszS/Xz1C49Ucd2i6Zil5UToP1EmyrFhKaMVbg1mk= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= diff --git a/internal/allocator/cached_allocator.go b/internal/allocator/cached_allocator.go index 40af9131eb..6308070038 100644 --- a/internal/allocator/cached_allocator.go +++ b/internal/allocator/cached_allocator.go @@ -23,8 +23,7 @@ import ( "time" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" "go.uber.org/zap" ) diff --git a/internal/allocator/global_id_allocator.go b/internal/allocator/global_id_allocator.go index 8c2a30618b..1a0dd877ed 100644 --- a/internal/allocator/global_id_allocator.go +++ b/internal/allocator/global_id_allocator.go @@ -19,7 +19,7 @@ package allocator import ( "github.com/milvus-io/milvus/internal/kv" "github.com/milvus-io/milvus/internal/tso" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // GlobalIDAllocator is the global single point TSO allocator. diff --git a/internal/allocator/global_id_allocator_test.go b/internal/allocator/global_id_allocator_test.go index 2d9be58e73..15c37f87cb 100644 --- a/internal/allocator/global_id_allocator_test.go +++ b/internal/allocator/global_id_allocator_test.go @@ -22,11 +22,12 @@ import ( "os" "testing" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/tsoutil" "github.com/stretchr/testify/assert" "go.etcd.io/etcd/server/v3/embed" "go.etcd.io/etcd/server/v3/etcdserver/api/v3client" + + "github.com/milvus-io/milvus/internal/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) var gTestIDAllocator *GlobalIDAllocator diff --git a/internal/allocator/id_allocator.go b/internal/allocator/id_allocator.go index 99dba1f560..5e4d86797b 100644 --- a/internal/allocator/id_allocator.go +++ b/internal/allocator/id_allocator.go @@ -24,17 +24,13 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" ) const ( idCountPerRPC = 200000 ) -// UniqueID is alias of typeutil.UniqueID -type UniqueID = typeutil.UniqueID - // IDAllocator allocates Unique and monotonically increasing IDs from Root Coord. // It could also batch allocate for less root coord server access type IDAllocator struct { diff --git a/internal/allocator/interface.go b/internal/allocator/interface.go index 4e6008b2ad..4742ceea86 100644 --- a/internal/allocator/interface.go +++ b/internal/allocator/interface.go @@ -16,6 +16,13 @@ package allocator +import ( + "github.com/milvus-io/milvus/pkg/util/typeutil" +) + +// UniqueID is alias of typeutil.UniqueID +type UniqueID = typeutil.UniqueID + // Allocator interface is an interface for alloc id. // Alloc allocates the id of the count number. // AllocOne allocates one id. diff --git a/internal/datacoord/allocator.go b/internal/datacoord/allocator.go index 4f9d50eab1..c989df894b 100644 --- a/internal/datacoord/allocator.go +++ b/internal/datacoord/allocator.go @@ -22,8 +22,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) // allocator is the interface that allocating `UniqueID` or `Timestamp` diff --git a/internal/datacoord/allocator_test.go b/internal/datacoord/allocator_test.go index d0a9e10659..71548f4f30 100644 --- a/internal/datacoord/allocator_test.go +++ b/internal/datacoord/allocator_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/paramtable" "github.com/stretchr/testify/assert" ) diff --git a/internal/datacoord/channel_checker.go b/internal/datacoord/channel_checker.go index d22f535b34..79622e6d57 100644 --- a/internal/datacoord/channel_checker.go +++ b/internal/datacoord/channel_checker.go @@ -24,13 +24,13 @@ import ( "time" "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus/internal/kv" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/datapb" - clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/atomic" "go.uber.org/zap" + + "github.com/milvus-io/milvus/internal/kv" + "github.com/milvus-io/milvus/internal/proto/datapb" + "github.com/milvus-io/milvus/pkg/log" ) type channelStateTimer struct { diff --git a/internal/datacoord/channel_manager.go b/internal/datacoord/channel_manager.go index 98017e8e03..40b7335321 100644 --- a/internal/datacoord/channel_manager.go +++ b/internal/datacoord/channel_manager.go @@ -22,19 +22,19 @@ import ( "sync" "time" - "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/kv" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/logutil" - v3rpc "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" "stathat.com/c/consistent" + + "github.com/milvus-io/milvus-proto/go-api/commonpb" + "github.com/milvus-io/milvus-proto/go-api/schemapb" + "github.com/milvus-io/milvus/internal/kv" + "github.com/milvus-io/milvus/internal/proto/datapb" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/logutil" ) // ChannelManager manages the allocation and the balance between channels and data nodes. diff --git a/internal/datacoord/channel_manager_factory.go b/internal/datacoord/channel_manager_factory.go index 3a8793db6c..66181ca2d8 100644 --- a/internal/datacoord/channel_manager_factory.go +++ b/internal/datacoord/channel_manager_factory.go @@ -17,8 +17,9 @@ package datacoord import ( - "github.com/milvus-io/milvus/internal/kv" "stathat.com/c/consistent" + + "github.com/milvus-io/milvus/internal/kv" ) // ChannelPolicyFactory is the abstract factory that creates policies for channel manager. diff --git a/internal/datacoord/channel_manager_test.go b/internal/datacoord/channel_manager_test.go index 046497d23f..6c0ce68be8 100644 --- a/internal/datacoord/channel_manager_test.go +++ b/internal/datacoord/channel_manager_test.go @@ -25,13 +25,12 @@ import ( "time" "github.com/golang/protobuf/proto" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" "github.com/milvus-io/milvus/internal/kv" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/util/dependency" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" ) // waitAndStore simulates DataNode's action diff --git a/internal/datacoord/channel_store.go b/internal/datacoord/channel_store.go index 8cdc92ef14..24242b5305 100644 --- a/internal/datacoord/channel_store.go +++ b/internal/datacoord/channel_store.go @@ -23,16 +23,14 @@ import ( "strings" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus/internal/kv" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/datapb" - "go.uber.org/zap" "go.uber.org/zap/zapcore" + + "github.com/milvus-io/milvus/internal/kv" + "github.com/milvus-io/milvus/internal/proto/datapb" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/timerecord" ) const ( diff --git a/internal/datacoord/cluster.go b/internal/datacoord/cluster.go index 1f751aad41..429622234e 100644 --- a/internal/datacoord/cluster.go +++ b/internal/datacoord/cluster.go @@ -21,11 +21,11 @@ import ( "fmt" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" "github.com/samber/lo" "go.uber.org/zap" ) diff --git a/internal/datacoord/cluster_test.go b/internal/datacoord/cluster_test.go index 99b5f42700..7d48fce1ba 100644 --- a/internal/datacoord/cluster_test.go +++ b/internal/datacoord/cluster_test.go @@ -22,15 +22,15 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/golang/protobuf/proto" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + "stathat.com/c/consistent" + "github.com/milvus-io/milvus/internal/kv" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/types" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" - "stathat.com/c/consistent" ) func getMetaKv(t *testing.T) kv.MetaKv { diff --git a/internal/datacoord/compaction.go b/internal/datacoord/compaction.go index 45649b7879..5680d11b02 100644 --- a/internal/datacoord/compaction.go +++ b/internal/datacoord/compaction.go @@ -23,12 +23,12 @@ import ( "time" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" ) // TODO this num should be determined by resources of datanode, for now, we set to a fixed value for simple diff --git a/internal/datacoord/compaction_test.go b/internal/datacoord/compaction_test.go index c11b26682d..9eef54f5ff 100644 --- a/internal/datacoord/compaction_test.go +++ b/internal/datacoord/compaction_test.go @@ -23,21 +23,20 @@ import ( "time" "github.com/cockroachdb/errors" - + "github.com/milvus-io/milvus/pkg/util/tsoutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/kv/datacoord" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/util/metautil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/metautil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func Test_compactionPlanHandler_execCompactionPlan(t *testing.T) { diff --git a/internal/datacoord/compaction_trigger.go b/internal/datacoord/compaction_trigger.go index e4bd72e55f..4e94844668 100644 --- a/internal/datacoord/compaction_trigger.go +++ b/internal/datacoord/compaction_trigger.go @@ -23,15 +23,15 @@ import ( "sync" "time" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "github.com/samber/lo" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/util/indexparamcheck" - "github.com/milvus-io/milvus/internal/util/logutil" - "github.com/milvus-io/milvus/internal/util/tsoutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/indexparamcheck" + "github.com/milvus-io/milvus/pkg/util/logutil" ) type compactTime struct { diff --git a/internal/datacoord/compaction_trigger_test.go b/internal/datacoord/compaction_trigger_test.go index 93ba5e3aa6..914d183613 100644 --- a/internal/datacoord/compaction_trigger_test.go +++ b/internal/datacoord/compaction_trigger_test.go @@ -21,15 +21,15 @@ import ( "testing" "time" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/tsoutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type spyCompactionHandler struct { diff --git a/internal/datacoord/errors_test.go b/internal/datacoord/errors_test.go index fc3f5cc468..581df1f412 100644 --- a/internal/datacoord/errors_test.go +++ b/internal/datacoord/errors_test.go @@ -19,8 +19,8 @@ package datacoord import ( "testing" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" "go.uber.org/zap" ) diff --git a/internal/datacoord/garbage_collector.go b/internal/datacoord/garbage_collector.go index 3dbb142327..3212bb7d8a 100644 --- a/internal/datacoord/garbage_collector.go +++ b/internal/datacoord/garbage_collector.go @@ -29,12 +29,12 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/metautil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/metautil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/datacoord/garbage_collector_test.go b/internal/datacoord/garbage_collector_test.go index 4aa88161e5..19325a5f12 100644 --- a/internal/datacoord/garbage_collector_test.go +++ b/internal/datacoord/garbage_collector_test.go @@ -47,7 +47,7 @@ import ( "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" ) type GarbageCollectorSuite struct { diff --git a/internal/datacoord/handler.go b/internal/datacoord/handler.go index 9f9b997620..3d1efeb492 100644 --- a/internal/datacoord/handler.go +++ b/internal/datacoord/handler.go @@ -19,15 +19,15 @@ package datacoord import ( "context" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // Handler handles some channel method for ChannelManager diff --git a/internal/datacoord/index_builder.go b/internal/datacoord/index_builder.go index 0e660cd635..fc9ce96c90 100644 --- a/internal/datacoord/index_builder.go +++ b/internal/datacoord/index_builder.go @@ -27,11 +27,11 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" ) type indexTaskState int32 diff --git a/internal/datacoord/index_builder_test.go b/internal/datacoord/index_builder_test.go index 56d21403d1..6e7f5a19a6 100644 --- a/internal/datacoord/index_builder_test.go +++ b/internal/datacoord/index_builder_test.go @@ -35,7 +35,7 @@ import ( "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) var ( diff --git a/internal/datacoord/index_meta.go b/internal/datacoord/index_meta.go index 8ad558638c..1a4af24f2c 100644 --- a/internal/datacoord/index_meta.go +++ b/internal/datacoord/index_meta.go @@ -25,11 +25,11 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/indexpb" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" "github.com/prometheus/client_golang/prometheus" ) diff --git a/internal/datacoord/index_meta_test.go b/internal/datacoord/index_meta_test.go index 35540b1d46..c004add070 100644 --- a/internal/datacoord/index_meta_test.go +++ b/internal/datacoord/index_meta_test.go @@ -24,7 +24,6 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/datacoord/index_service.go b/internal/datacoord/index_service.go index 921258d976..95ceb55c50 100644 --- a/internal/datacoord/index_service.go +++ b/internal/datacoord/index_service.go @@ -24,12 +24,12 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/indexpb" - "github.com/milvus-io/milvus/internal/util/metautil" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/metautil" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) func (s *Server) startIndexService(ctx context.Context) { diff --git a/internal/datacoord/index_service_test.go b/internal/datacoord/index_service_test.go index 11f7e9414b..c739c4e19c 100644 --- a/internal/datacoord/index_service_test.go +++ b/internal/datacoord/index_service_test.go @@ -22,9 +22,6 @@ import ( "time" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/proto/indexpb" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" @@ -35,6 +32,7 @@ import ( catalogmocks "github.com/milvus-io/milvus/internal/metastore/mocks" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/proto/datapb" + "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/storage" ) diff --git a/internal/datacoord/indexnode_manager.go b/internal/datacoord/indexnode_manager.go index bd329ba684..fdbf650825 100644 --- a/internal/datacoord/indexnode_manager.go +++ b/internal/datacoord/indexnode_manager.go @@ -24,11 +24,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/types" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" ) // IndexNodeManager is used to manage the client of IndexNode. diff --git a/internal/datacoord/meta.go b/internal/datacoord/meta.go index 7c975afd9c..de83d26bb9 100644 --- a/internal/datacoord/meta.go +++ b/internal/datacoord/meta.go @@ -25,6 +25,7 @@ import ( "time" "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "github.com/samber/lo" "go.uber.org/zap" "golang.org/x/exp/maps" @@ -32,18 +33,17 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/metautil" "github.com/milvus-io/milvus/internal/util/segmentutil" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/metautil" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type meta struct { diff --git a/internal/datacoord/meta_test.go b/internal/datacoord/meta_test.go index 235f730e46..c0ae45c831 100644 --- a/internal/datacoord/meta_test.go +++ b/internal/datacoord/meta_test.go @@ -22,18 +22,19 @@ import ( "github.com/cockroachdb/errors" "github.com/golang/protobuf/proto" + "github.com/samber/lo" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/mock" + "github.com/stretchr/testify/require" + "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/kv" "github.com/milvus-io/milvus/internal/metastore/kv/datacoord" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/samber/lo" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/mock" - "github.com/stretchr/testify/require" + "github.com/milvus-io/milvus/pkg/common" ) func TestMetaReloadFromKV(t *testing.T) { diff --git a/internal/datacoord/metrics_info.go b/internal/datacoord/metrics_info.go index 9a5b6a77b1..fa59a45e20 100644 --- a/internal/datacoord/metrics_info.go +++ b/internal/datacoord/metrics_info.go @@ -27,12 +27,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/hardware" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/milvus-io/milvus/internal/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/uniquegenerator" ) // getQuotaMetrics returns DataCoordQuotaMetrics. diff --git a/internal/datacoord/metrics_info_test.go b/internal/datacoord/metrics_info_test.go index 7eabf4c216..d18a5cf1a0 100644 --- a/internal/datacoord/metrics_info_test.go +++ b/internal/datacoord/metrics_info_test.go @@ -25,8 +25,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/stretchr/testify/assert" ) diff --git a/internal/datacoord/mock_test.go b/internal/datacoord/mock_test.go index 5199637f9e..e62ff96a9e 100644 --- a/internal/datacoord/mock_test.go +++ b/internal/datacoord/mock_test.go @@ -22,7 +22,7 @@ import ( "time" "github.com/cockroachdb/errors" - + "github.com/milvus-io/milvus/pkg/util/tsoutil" clientv3 "go.etcd.io/etcd/client/v3" "github.com/milvus-io/milvus-proto/go-api/commonpb" @@ -35,9 +35,8 @@ import ( "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type metaMemoryKV struct { @@ -575,6 +574,7 @@ func (m *mockRootCoordService) InvalidateCollectionMetaCache(ctx context.Context func (m *mockRootCoordService) SegmentFlushCompleted(ctx context.Context, in *datapb.SegmentFlushCompletedMsg) (*commonpb.Status, error) { return &commonpb.Status{ErrorCode: commonpb.ErrorCode_Success}, nil } + func (m *mockRootCoordService) AddNewSegment(ctx context.Context, in *datapb.SegmentMsg) (*commonpb.Status, error) { panic("not implemented") // TODO: Implement } diff --git a/internal/datacoord/policy.go b/internal/datacoord/policy.go index e0a66e6cfd..ca58340b77 100644 --- a/internal/datacoord/policy.go +++ b/internal/datacoord/policy.go @@ -23,7 +23,7 @@ import ( "strconv" "time" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" "go.uber.org/zap" "go.uber.org/zap/zapcore" "stathat.com/c/consistent" diff --git a/internal/datacoord/policy_test.go b/internal/datacoord/policy_test.go index 4dc30310b1..343b4ab0f0 100644 --- a/internal/datacoord/policy_test.go +++ b/internal/datacoord/policy_test.go @@ -20,9 +20,10 @@ import ( "testing" "time" - memkv "github.com/milvus-io/milvus/internal/kv/mem" "github.com/stretchr/testify/assert" "stathat.com/c/consistent" + + memkv "github.com/milvus-io/milvus/internal/kv/mem" ) func fillEmptyPosition(operations ChannelOpSet) { diff --git a/internal/datacoord/segment_allocation_policy.go b/internal/datacoord/segment_allocation_policy.go index 592f0f0235..fdbde3e15b 100644 --- a/internal/datacoord/segment_allocation_policy.go +++ b/internal/datacoord/segment_allocation_policy.go @@ -21,11 +21,11 @@ import ( "time" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type calUpperLimitPolicy func(schema *schemapb.CollectionSchema) (int, error) diff --git a/internal/datacoord/segment_allocation_policy_test.go b/internal/datacoord/segment_allocation_policy_test.go index fa1701fc4f..0278e73a6e 100644 --- a/internal/datacoord/segment_allocation_policy_test.go +++ b/internal/datacoord/segment_allocation_policy_test.go @@ -21,11 +21,12 @@ import ( "testing" "time" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/stretchr/testify/assert" ) func TestUpperLimitCalBySchema(t *testing.T) { diff --git a/internal/datacoord/segment_info.go b/internal/datacoord/segment_info.go index 28270b72b7..c8d3fbecd8 100644 --- a/internal/datacoord/segment_info.go +++ b/internal/datacoord/segment_info.go @@ -24,9 +24,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/proto/datapb" + "github.com/milvus-io/milvus/pkg/log" ) // SegmentsInfo wraps a map, which maintains ID to SegmentInfo relation diff --git a/internal/datacoord/segment_manager.go b/internal/datacoord/segment_manager.go index ee0a3fbc42..2ed8f9ab73 100644 --- a/internal/datacoord/segment_manager.go +++ b/internal/datacoord/segment_manager.go @@ -23,17 +23,15 @@ import ( "time" "github.com/cockroachdb/errors" - + "github.com/milvus-io/milvus/pkg/util/tsoutil" "go.opentelemetry.io/otel" + "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" - - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var ( diff --git a/internal/datacoord/segment_manager_test.go b/internal/datacoord/segment_manager_test.go index c676a399c1..b864cb533f 100644 --- a/internal/datacoord/segment_manager_test.go +++ b/internal/datacoord/segment_manager_test.go @@ -29,7 +29,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/metastore/kv/datacoord" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/util/metautil" + "github.com/milvus-io/milvus/pkg/util/metautil" ) func TestManagerOptions(t *testing.T) { diff --git a/internal/datacoord/server.go b/internal/datacoord/server.go index 0f9a368e07..7e61cd50f7 100644 --- a/internal/datacoord/server.go +++ b/internal/datacoord/server.go @@ -26,8 +26,9 @@ import ( "syscall" "time" - semver "github.com/blang/semver/v4" + "github.com/blang/semver/v4" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/pkg/util/tsoutil" clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" @@ -37,25 +38,24 @@ import ( indexnodeclient "github.com/milvus-io/milvus/internal/distributed/indexnode/client" rootcoordclient "github.com/milvus-io/milvus/internal/distributed/rootcoord/client" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/kv/datacoord" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/commonpbutil" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/logutil" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/retry" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/logutil" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/datacoord/server_test.go b/internal/datacoord/server_test.go index 1a1a2e189d..cbf8c31d4c 100644 --- a/internal/datacoord/server_test.go +++ b/internal/datacoord/server_test.go @@ -41,12 +41,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/indexnode" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" @@ -54,13 +51,16 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/metautil" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/metautil" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func TestMain(m *testing.M) { diff --git a/internal/datacoord/services.go b/internal/datacoord/services.go index 1626b43a9d..1d74c2a741 100644 --- a/internal/datacoord/services.go +++ b/internal/datacoord/services.go @@ -23,8 +23,7 @@ import ( "strconv" "sync" - "github.com/milvus-io/milvus/internal/common" - + "github.com/milvus-io/milvus/pkg/util/tsoutil" "github.com/samber/lo" "go.opentelemetry.io/otel" "go.uber.org/zap" @@ -33,17 +32,17 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/errorutil" - "github.com/milvus-io/milvus/internal/util/logutil" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/milvus-io/milvus/internal/util/segmentutil" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/errorutil" + "github.com/milvus-io/milvus/pkg/util/logutil" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // checks whether server in Healthy State diff --git a/internal/datacoord/services_test.go b/internal/datacoord/services_test.go index e112d1b261..ab0ee8d71b 100644 --- a/internal/datacoord/services_test.go +++ b/internal/datacoord/services_test.go @@ -4,12 +4,11 @@ import ( "context" "testing" - "github.com/milvus-io/milvus/internal/mocks" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus-proto/go-api/commonpb" + "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/proto/datapb" ) diff --git a/internal/datacoord/session_manager.go b/internal/datacoord/session_manager.go index a801e1db87..00183bb21b 100644 --- a/internal/datacoord/session_manager.go +++ b/internal/datacoord/session_manager.go @@ -24,11 +24,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" grpcdatanodeclient "github.com/milvus-io/milvus/internal/distributed/datanode/client" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" "go.uber.org/zap" ) diff --git a/internal/datacoord/util.go b/internal/datacoord/util.go index 2e7329a7b1..37a4ddde97 100644 --- a/internal/datacoord/util.go +++ b/internal/datacoord/util.go @@ -23,14 +23,13 @@ import ( "time" "github.com/cockroachdb/errors" - + "github.com/milvus-io/milvus/pkg/util/tsoutil" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/tsoutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" ) // Response response interface for verification diff --git a/internal/datacoord/util_test.go b/internal/datacoord/util_test.go index 9d9a63dc11..c98bf1f6ae 100644 --- a/internal/datacoord/util_test.go +++ b/internal/datacoord/util_test.go @@ -22,13 +22,13 @@ import ( "time" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/stretchr/testify/suite" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type UtilSuite struct { diff --git a/internal/datanode/allocator/allocator.go b/internal/datanode/allocator/allocator.go index 478d5238f5..0ec6a9c5a9 100644 --- a/internal/datanode/allocator/allocator.go +++ b/internal/datanode/allocator/allocator.go @@ -21,7 +21,7 @@ import ( gAllocator "github.com/milvus-io/milvus/internal/allocator" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type UniqueID = typeutil.UniqueID diff --git a/internal/datanode/binlog_io.go b/internal/datanode/binlog_io.go index db28ca4a86..ad5e67fba8 100644 --- a/internal/datanode/binlog_io.go +++ b/internal/datanode/binlog_io.go @@ -24,13 +24,13 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/datanode/allocator" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/metautil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/metautil" "go.uber.org/zap" "golang.org/x/sync/errgroup" ) diff --git a/internal/datanode/binlog_io_test.go b/internal/datanode/binlog_io_test.go index 3a5ac9e1e6..6e6a4c4cb3 100644 --- a/internal/datanode/binlog_io_test.go +++ b/internal/datanode/binlog_io_test.go @@ -23,16 +23,14 @@ import ( "testing" "time" - "github.com/milvus-io/milvus-proto/go-api/schemapb" - - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/typeutil" - - "github.com/milvus-io/milvus/internal/datanode/allocator" - "github.com/cockroachdb/errors" + + "github.com/milvus-io/milvus-proto/go-api/schemapb" + "github.com/milvus-io/milvus/internal/datanode/allocator" + "github.com/milvus-io/milvus/internal/storage" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" diff --git a/internal/datanode/buffer.go b/internal/datanode/buffer.go index be606745e6..1d77c8f2d7 100644 --- a/internal/datanode/buffer.go +++ b/internal/datanode/buffer.go @@ -28,12 +28,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // DelBufferManager is in charge of managing insertBuf and delBuf from an overall prospect diff --git a/internal/datanode/buffer_test.go b/internal/datanode/buffer_test.go index b4f1cd0a2b..07db3bd5d4 100644 --- a/internal/datanode/buffer_test.go +++ b/internal/datanode/buffer_test.go @@ -29,7 +29,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) func genTestCollectionSchema(dim int64, vectorType schemapb.DataType) *schemapb.CollectionSchema { diff --git a/internal/datanode/channel_meta.go b/internal/datanode/channel_meta.go index dc93d8dfe1..2f83eb6e30 100644 --- a/internal/datanode/channel_meta.go +++ b/internal/datanode/channel_meta.go @@ -24,6 +24,7 @@ import ( "time" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "github.com/samber/lo" "go.uber.org/atomic" "go.uber.org/zap" @@ -31,14 +32,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type ( diff --git a/internal/datanode/channel_meta_test.go b/internal/datanode/channel_meta_test.go index 0fd0b6b9a2..5b09eaa98a 100644 --- a/internal/datanode/channel_meta_test.go +++ b/internal/datanode/channel_meta_test.go @@ -32,9 +32,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/storage" + "github.com/milvus-io/milvus/pkg/common" ) var channelMetaNodeTestDir = "/tmp/milvus_test/channel_meta" diff --git a/internal/datanode/compaction_executor.go b/internal/datanode/compaction_executor.go index abec55a80d..dc2cb2d3ef 100644 --- a/internal/datanode/compaction_executor.go +++ b/internal/datanode/compaction_executor.go @@ -22,8 +22,8 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" + "github.com/milvus-io/milvus/pkg/log" ) const ( diff --git a/internal/datanode/compactor.go b/internal/datanode/compactor.go index 7d36ae30dd..5cd1a11406 100644 --- a/internal/datanode/compactor.go +++ b/internal/datanode/compactor.go @@ -27,24 +27,23 @@ import ( "time" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "go.uber.org/zap" + "golang.org/x/sync/errgroup" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/datanode/allocator" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/metautil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" - - "go.uber.org/zap" - "golang.org/x/sync/errgroup" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/metautil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var ( diff --git a/internal/datanode/compactor_test.go b/internal/datanode/compactor_test.go index 953f04281e..11f88b8e84 100644 --- a/internal/datanode/compactor_test.go +++ b/internal/datanode/compactor_test.go @@ -32,14 +32,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" + "github.com/milvus-io/milvus/internal/datanode/allocator" memkv "github.com/milvus-io/milvus/internal/kv/mem" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/paramtable" - - "github.com/milvus-io/milvus/internal/datanode/allocator" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) var compactTestDir = "/tmp/milvus_test/compact" diff --git a/internal/datanode/data_node.go b/internal/datanode/data_node.go index 7315aab96a..6220858c7f 100644 --- a/internal/datanode/data_node.go +++ b/internal/datanode/data_node.go @@ -33,31 +33,29 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/golang/protobuf/proto" v3rpc "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/datanode/allocator" "github.com/milvus-io/milvus/internal/kv" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgdispatcher" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/commonpbutil" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/logutil" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/retry" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/logutil" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/datanode/data_node_test.go b/internal/datanode/data_node_test.go index ab08505a63..d07540fd7e 100644 --- a/internal/datanode/data_node_test.go +++ b/internal/datanode/data_node_test.go @@ -32,17 +32,16 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/etcd" "github.com/milvus-io/milvus/internal/util/importutil" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/milvus-io/milvus/internal/util/sessionutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) const returnError = "ReturnError" diff --git a/internal/datanode/data_sync_service.go b/internal/datanode/data_sync_service.go index 9ed55f7348..0d306d320b 100644 --- a/internal/datanode/data_sync_service.go +++ b/internal/datanode/data_sync_service.go @@ -22,24 +22,23 @@ import ( "sync" "github.com/cockroachdb/errors" - "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus/internal/datanode/allocator" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgdispatcher" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/conc" "github.com/milvus-io/milvus/internal/util/flowgraph" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/retry" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/conc" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/retry" ) // dataSyncService controls a flowgraph for a specific collection diff --git a/internal/datanode/data_sync_service_test.go b/internal/datanode/data_sync_service_test.go index c8fdb3d6cf..f2c3350d35 100644 --- a/internal/datanode/data_sync_service_test.go +++ b/internal/datanode/data_sync_service_test.go @@ -25,6 +25,7 @@ import ( "testing" "time" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" @@ -33,17 +34,16 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/datanode/allocator" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgdispatcher" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var dataSyncServiceTestDir = "/tmp/milvus_test/data_sync_service" diff --git a/internal/datanode/event_manager.go b/internal/datanode/event_manager.go index 7d9dce1b8f..7e9f23dcf3 100644 --- a/internal/datanode/event_manager.go +++ b/internal/datanode/event_manager.go @@ -21,11 +21,12 @@ import ( "time" "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus/internal/kv" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/datapb" "go.uber.org/atomic" "go.uber.org/zap" + + "github.com/milvus-io/milvus/internal/kv" + "github.com/milvus-io/milvus/internal/proto/datapb" + "github.com/milvus-io/milvus/pkg/log" ) const retryWatchInterval = 20 * time.Second diff --git a/internal/datanode/flow_graph_dd_node.go b/internal/datanode/flow_graph_dd_node.go index fbdc4bf788..8951e49fc8 100644 --- a/internal/datanode/flow_graph_dd_node.go +++ b/internal/datanode/flow_graph_dd_node.go @@ -28,14 +28,14 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/util/flowgraph" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) // make sure ddNode implements flowgraph.Node diff --git a/internal/datanode/flow_graph_dd_node_test.go b/internal/datanode/flow_graph_dd_node_test.go index 96645aaa32..28ff35e805 100644 --- a/internal/datanode/flow_graph_dd_node_test.go +++ b/internal/datanode/flow_graph_dd_node_test.go @@ -26,9 +26,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/util/flowgraph" + "github.com/milvus-io/milvus/pkg/mq/msgstream" ) const ( diff --git a/internal/datanode/flow_graph_delete_node.go b/internal/datanode/flow_graph_delete_node.go index 399f5d19c9..442414082f 100644 --- a/internal/datanode/flow_graph_delete_node.go +++ b/internal/datanode/flow_graph_delete_node.go @@ -26,12 +26,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus/internal/datanode/allocator" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/retry" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // DeleteNode is to process delete msg, flush delete info into storage. diff --git a/internal/datanode/flow_graph_delete_node_test.go b/internal/datanode/flow_graph_delete_node_test.go index afcbdf3ef5..574d989502 100644 --- a/internal/datanode/flow_graph_delete_node_test.go +++ b/internal/datanode/flow_graph_delete_node_test.go @@ -22,19 +22,19 @@ import ( "testing" "time" - "github.com/bits-and-blooms/bloom/v3" + bloom "github.com/bits-and-blooms/bloom/v3" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/datanode/allocator" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/flowgraph" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/retry" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/retry" ) var deleteNodeTestDir = "/tmp/milvus_test/deleteNode" diff --git a/internal/datanode/flow_graph_dmstream_input_node.go b/internal/datanode/flow_graph_dmstream_input_node.go index 0473d45a99..242c14284c 100644 --- a/internal/datanode/flow_graph_dmstream_input_node.go +++ b/internal/datanode/flow_graph_dmstream_input_node.go @@ -23,15 +23,15 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/mq/msgdispatcher" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" "github.com/milvus-io/milvus/internal/util/flowgraph" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // DmInputNode receives messages from message streams, packs messages between two timeticks, and passes all diff --git a/internal/datanode/flow_graph_dmstream_input_node_test.go b/internal/datanode/flow_graph_dmstream_input_node_test.go index 85490c6832..83f7aef915 100644 --- a/internal/datanode/flow_graph_dmstream_input_node_test.go +++ b/internal/datanode/flow_graph_dmstream_input_node_test.go @@ -24,11 +24,11 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/mq/msgdispatcher" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type mockMsgStreamFactory struct { diff --git a/internal/datanode/flow_graph_insert_buffer_node.go b/internal/datanode/flow_graph_insert_buffer_node.go index 1c28955bc1..29f70905d0 100644 --- a/internal/datanode/flow_graph_insert_buffer_node.go +++ b/internal/datanode/flow_graph_insert_buffer_node.go @@ -31,17 +31,17 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus/internal/datanode/allocator" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/commonpbutil" "github.com/milvus-io/milvus/internal/util/flowgraph" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/retry" - "github.com/milvus-io/milvus/internal/util/tsoutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/util/tsoutil" ) type insertBufferNode struct { diff --git a/internal/datanode/flow_graph_insert_buffer_node_test.go b/internal/datanode/flow_graph_insert_buffer_node_test.go index b3be1732ec..c620ede6ea 100644 --- a/internal/datanode/flow_graph_insert_buffer_node_test.go +++ b/internal/datanode/flow_graph_insert_buffer_node_test.go @@ -30,24 +30,24 @@ import ( "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" + "go.uber.org/atomic" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/datanode/allocator" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/flowgraph" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/retry" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" - "go.uber.org/atomic" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var insertNodeTestDir = "/tmp/milvus_test/insert_node" diff --git a/internal/datanode/flow_graph_manager.go b/internal/datanode/flow_graph_manager.go index 9cd0184b33..41e43bf316 100644 --- a/internal/datanode/flow_graph_manager.go +++ b/internal/datanode/flow_graph_manager.go @@ -25,12 +25,12 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/util/hardware" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type flowgraphManager struct { diff --git a/internal/datanode/flow_graph_manager_test.go b/internal/datanode/flow_graph_manager_test.go index b691950e03..523bb17fb0 100644 --- a/internal/datanode/flow_graph_manager_test.go +++ b/internal/datanode/flow_graph_manager_test.go @@ -27,7 +27,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/util/etcd" + "github.com/milvus-io/milvus/pkg/util/etcd" ) func TestFlowGraphManager(t *testing.T) { diff --git a/internal/datanode/flow_graph_message.go b/internal/datanode/flow_graph_message.go index 657a724429..77b8f3a4ce 100644 --- a/internal/datanode/flow_graph_message.go +++ b/internal/datanode/flow_graph_message.go @@ -18,9 +18,9 @@ package datanode import ( "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/flowgraph" + "github.com/milvus-io/milvus/pkg/mq/msgstream" ) type ( diff --git a/internal/datanode/flow_graph_node.go b/internal/datanode/flow_graph_node.go index 526a0cc01c..2fa133cd79 100644 --- a/internal/datanode/flow_graph_node.go +++ b/internal/datanode/flow_graph_node.go @@ -20,7 +20,7 @@ import ( "sync/atomic" "github.com/milvus-io/milvus/internal/util/flowgraph" - "github.com/milvus-io/milvus/internal/util/retry" + "github.com/milvus-io/milvus/pkg/util/retry" ) type ( diff --git a/internal/datanode/flow_graph_time_tick_node.go b/internal/datanode/flow_graph_time_tick_node.go index aab71bbbd4..870de7bed6 100644 --- a/internal/datanode/flow_graph_time_tick_node.go +++ b/internal/datanode/flow_graph_time_tick_node.go @@ -25,14 +25,14 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/commonpbutil" "github.com/milvus-io/milvus/internal/util/flowgraph" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/tsoutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/tsoutil" ) const ( diff --git a/internal/datanode/flow_graph_time_ticker.go b/internal/datanode/flow_graph_time_ticker.go index 45c8239129..34dabf9958 100644 --- a/internal/datanode/flow_graph_time_ticker.go +++ b/internal/datanode/flow_graph_time_ticker.go @@ -25,7 +25,7 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" ) type sendTimeTick func(Timestamp, []int64) error diff --git a/internal/datanode/flush_manager.go b/internal/datanode/flush_manager.go index ccffded7ce..232ea3327a 100644 --- a/internal/datanode/flush_manager.go +++ b/internal/datanode/flush_manager.go @@ -30,18 +30,18 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/datanode/allocator" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/metautil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/retry" - "github.com/milvus-io/milvus/internal/util/timerecord" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/metautil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/util/timerecord" ) // flushManager defines a flush manager signature diff --git a/internal/datanode/flush_manager_test.go b/internal/datanode/flush_manager_test.go index 15195c3c7c..a1763c5c5d 100644 --- a/internal/datanode/flush_manager_test.go +++ b/internal/datanode/flush_manager_test.go @@ -34,7 +34,7 @@ import ( "github.com/milvus-io/milvus/internal/datanode/allocator" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/retry" + "github.com/milvus-io/milvus/pkg/util/retry" ) var flushTestDir = "/tmp/milvus_test/flush" diff --git a/internal/datanode/flush_task.go b/internal/datanode/flush_task.go index e9e49e0654..dc2e1bd603 100644 --- a/internal/datanode/flush_task.go +++ b/internal/datanode/flush_task.go @@ -21,14 +21,14 @@ import ( "sync" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus/internal/kv" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/util/retry" - "github.com/milvus-io/milvus/internal/util/tsoutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/retry" ) // errStart used for retry start diff --git a/internal/datanode/flush_task_test.go b/internal/datanode/flush_task_test.go index 8b9552e02e..bc4489bbe4 100644 --- a/internal/datanode/flush_task_test.go +++ b/internal/datanode/flush_task_test.go @@ -19,7 +19,7 @@ package datanode import ( "testing" - "github.com/milvus-io/milvus/internal/util/retry" + "github.com/milvus-io/milvus/pkg/util/retry" "github.com/stretchr/testify/assert" ) diff --git a/internal/datanode/io_pool.go b/internal/datanode/io_pool.go index b97f5eb2a4..fa3ac30ade 100644 --- a/internal/datanode/io_pool.go +++ b/internal/datanode/io_pool.go @@ -3,7 +3,7 @@ package datanode import ( "sync" - "github.com/milvus-io/milvus/internal/util/conc" + "github.com/milvus-io/milvus/pkg/util/conc" ) var ioPool *conc.Pool diff --git a/internal/datanode/io_pool_test.go b/internal/datanode/io_pool_test.go index 38155c3c8b..6d56c4de79 100644 --- a/internal/datanode/io_pool_test.go +++ b/internal/datanode/io_pool_test.go @@ -6,8 +6,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/util/conc" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/conc" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) func Test_getOrCreateIOPool(t *testing.T) { diff --git a/internal/datanode/meta_service.go b/internal/datanode/meta_service.go index 86c4f289eb..b6b47666c4 100644 --- a/internal/datanode/meta_service.go +++ b/internal/datanode/meta_service.go @@ -20,17 +20,17 @@ import ( "context" "reflect" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/paramtable" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" + "github.com/milvus-io/milvus/internal/types" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) // metaService initialize channel collection in data node from root coord. diff --git a/internal/datanode/meta_util.go b/internal/datanode/meta_util.go index 4db45c1d95..55dce72eb0 100644 --- a/internal/datanode/meta_util.go +++ b/internal/datanode/meta_util.go @@ -17,9 +17,9 @@ package datanode import ( - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/common" ) // reviseVChannelInfo will revise the datapb.VchannelInfo for upgrade compatibility from 2.0.2 diff --git a/internal/datanode/metrics_info.go b/internal/datanode/metrics_info.go index 33b08e0d92..54a6084f3d 100644 --- a/internal/datanode/metrics_info.go +++ b/internal/datanode/metrics_info.go @@ -21,11 +21,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/util/hardware" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/ratelimitutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // getQuotaMetrics returns DataNodeQuotaMetrics. diff --git a/internal/datanode/mock_test.go b/internal/datanode/mock_test.go index ec4e98d7a5..94a7bf5668 100644 --- a/internal/datanode/mock_test.go +++ b/internal/datanode/mock_test.go @@ -25,29 +25,29 @@ import ( "time" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/kv" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgdispatcher" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" s "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ctxTimeInMillisecond = 5000 diff --git a/internal/datanode/rate_collector.go b/internal/datanode/rate_collector.go index 1131db5ae9..bcc8a85c71 100644 --- a/internal/datanode/rate_collector.go +++ b/internal/datanode/rate_collector.go @@ -19,8 +19,8 @@ package datanode import ( "sync" - "github.com/milvus-io/milvus/internal/util/ratelimitutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // rateCollector helps to collect and calculate values (like rate, timeTick and etc...). diff --git a/internal/datanode/rate_collector_test.go b/internal/datanode/rate_collector_test.go index 67776071af..fa6cc7d201 100644 --- a/internal/datanode/rate_collector_test.go +++ b/internal/datanode/rate_collector_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func TestRateCollector(t *testing.T) { diff --git a/internal/datanode/segment.go b/internal/datanode/segment.go index dbb4c67c6c..9f22a9f60f 100644 --- a/internal/datanode/segment.go +++ b/internal/datanode/segment.go @@ -20,14 +20,14 @@ import ( "sync" "sync/atomic" - bloom "github.com/bits-and-blooms/bloom/v3" + "github.com/bits-and-blooms/bloom/v3" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/tsoutil" + "github.com/milvus-io/milvus/pkg/log" ) // Segment contains the latest segment infos from channel. diff --git a/internal/datanode/segment_sync_policy.go b/internal/datanode/segment_sync_policy.go index 36214c11b2..697386ac7a 100644 --- a/internal/datanode/segment_sync_policy.go +++ b/internal/datanode/segment_sync_policy.go @@ -21,11 +21,11 @@ import ( "sort" "time" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "go.uber.org/atomic" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/tsoutil" + "github.com/milvus-io/milvus/pkg/log" ) const minSyncSize = 0.5 * 1024 * 1024 diff --git a/internal/datanode/segment_sync_policy_test.go b/internal/datanode/segment_sync_policy_test.go index 7893aaa75f..21bbe28bee 100644 --- a/internal/datanode/segment_sync_policy_test.go +++ b/internal/datanode/segment_sync_policy_test.go @@ -21,10 +21,9 @@ import ( "testing" "time" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "github.com/stretchr/testify/assert" "go.uber.org/atomic" - - "github.com/milvus-io/milvus/internal/util/tsoutil" ) func TestSyncPeriodically(t *testing.T) { diff --git a/internal/datanode/segment_test.go b/internal/datanode/segment_test.go index 114dcb8a4c..b21130b2f3 100644 --- a/internal/datanode/segment_test.go +++ b/internal/datanode/segment_test.go @@ -20,8 +20,8 @@ import ( "math/rand" "testing" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/storage" + "github.com/milvus-io/milvus/pkg/common" "github.com/stretchr/testify/assert" ) diff --git a/internal/datanode/services.go b/internal/datanode/services.go index fac17c3938..6be52a81ef 100644 --- a/internal/datanode/services.go +++ b/internal/datanode/services.go @@ -26,30 +26,30 @@ import ( "strconv" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/commonpbutil" "github.com/milvus-io/milvus/internal/util/importutil" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/metautil" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/retry" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/metautil" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // WatchDmChannels is not in use diff --git a/internal/datanode/services_test.go b/internal/datanode/services_test.go index 04f6de7d17..f88749f54b 100644 --- a/internal/datanode/services_test.go +++ b/internal/datanode/services_test.go @@ -34,20 +34,20 @@ import ( "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" allocator2 "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/datanode/allocator" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/etcd" "github.com/milvus-io/milvus/internal/util/importutil" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/milvus-io/milvus/internal/util/sessionutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type DataNodeServicesSuite struct { diff --git a/internal/datanode/util.go b/internal/datanode/util.go index db1d53ae67..072497591f 100644 --- a/internal/datanode/util.go +++ b/internal/datanode/util.go @@ -19,8 +19,8 @@ package datanode import ( "context" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/typeutil" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/trace" ) diff --git a/internal/distributed/connection_manager.go b/internal/distributed/connection_manager.go index 40508bff11..c0c8855ab0 100644 --- a/internal/distributed/connection_manager.go +++ b/internal/distributed/connection_manager.go @@ -24,18 +24,18 @@ import ( "time" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/internal/util/sessionutil" + "github.com/milvus-io/milvus/pkg/tracer" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" grpc_retry "github.com/grpc-ecosystem/go-grpc-middleware/retry" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/tracer" - "github.com/milvus-io/milvus/internal/util/retry" - "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/util/typeutil" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/internal/distributed/connection_manager_test.go b/internal/distributed/connection_manager_test.go index 70346e80b6..bc2366081d 100644 --- a/internal/distributed/connection_manager_test.go +++ b/internal/distributed/connection_manager_test.go @@ -27,15 +27,15 @@ import ( "testing" "time" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/stretchr/testify/assert" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/internal/distributed/datacoord/client/client.go b/internal/distributed/datacoord/client/client.go index ff3ecec53e..371df6e396 100644 --- a/internal/distributed/datacoord/client/client.go +++ b/internal/distributed/datacoord/client/client.go @@ -21,23 +21,23 @@ import ( "fmt" "time" + "github.com/milvus-io/milvus/internal/util/grpcclient" + "github.com/milvus-io/milvus/internal/util/sessionutil" clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" "google.golang.org/grpc" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/grpcclient" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var Params *paramtable.ComponentParam = paramtable.Get() diff --git a/internal/distributed/datacoord/client/client_test.go b/internal/distributed/datacoord/client/client_test.go index 780781b2ae..641cd51688 100644 --- a/internal/distributed/datacoord/client/client_test.go +++ b/internal/distributed/datacoord/client/client_test.go @@ -25,13 +25,13 @@ import ( "time" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/internal/util/mock" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proxy" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/mock" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/paramtable" "github.com/stretchr/testify/assert" "google.golang.org/grpc" ) diff --git a/internal/distributed/datacoord/service.go b/internal/distributed/datacoord/service.go index 560b13b922..23be5b10fa 100644 --- a/internal/distributed/datacoord/service.go +++ b/internal/distributed/datacoord/service.go @@ -25,9 +25,10 @@ import ( "time" "github.com/milvus-io/milvus/internal/proto/indexpb" + "github.com/milvus-io/milvus/internal/util/dependency" + "github.com/milvus-io/milvus/pkg/tracer" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" - "github.com/milvus-io/milvus/internal/tracer" clientv3 "go.etcd.io/etcd/client/v3" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "go.uber.org/zap" @@ -37,15 +38,14 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/datacoord" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/logutil" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/logutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) // Server is the grpc server of datacoord diff --git a/internal/distributed/datacoord/service_test.go b/internal/distributed/datacoord/service_test.go index 6de9e70611..02b177310f 100644 --- a/internal/distributed/datacoord/service_test.go +++ b/internal/distributed/datacoord/service_test.go @@ -28,7 +28,7 @@ import ( "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/paramtable" "github.com/stretchr/testify/assert" clientv3 "go.etcd.io/etcd/client/v3" ) diff --git a/internal/distributed/datanode/client/client.go b/internal/distributed/datanode/client/client.go index 5b95a1bb23..00d9944f11 100644 --- a/internal/distributed/datanode/client/client.go +++ b/internal/distributed/datanode/client/client.go @@ -25,11 +25,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/grpcclient" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" "google.golang.org/grpc" ) diff --git a/internal/distributed/datanode/client/client_test.go b/internal/distributed/datanode/client/client_test.go index 83ed6501d6..9364c3fd3a 100644 --- a/internal/distributed/datanode/client/client_test.go +++ b/internal/distributed/datanode/client/client_test.go @@ -21,9 +21,9 @@ import ( "testing" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/internal/util/mock" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/util/mock" "google.golang.org/grpc" "github.com/milvus-io/milvus/internal/proxy" diff --git a/internal/distributed/datanode/service.go b/internal/distributed/datanode/service.go index 1d343c6d94..be96ec8b8b 100644 --- a/internal/distributed/datanode/service.go +++ b/internal/distributed/datanode/service.go @@ -25,6 +25,9 @@ import ( "time" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/internal/util/componentutil" + "github.com/milvus-io/milvus/internal/util/dependency" + "github.com/milvus-io/milvus/pkg/tracer" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" clientv3 "go.etcd.io/etcd/client/v3" @@ -38,18 +41,15 @@ import ( dn "github.com/milvus-io/milvus/internal/datanode" dcc "github.com/milvus-io/milvus/internal/distributed/datacoord/client" rcc "github.com/milvus-io/milvus/internal/distributed/rootcoord/client" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/tracer" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/componentutil" - "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/logutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/retry" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/logutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/retry" ) type Server struct { diff --git a/internal/distributed/datanode/service_test.go b/internal/distributed/datanode/service_test.go index 450778a72f..173f8b2c9f 100644 --- a/internal/distributed/datanode/service_test.go +++ b/internal/distributed/datanode/service_test.go @@ -28,8 +28,8 @@ import ( "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/stretchr/testify/assert" clientv3 "go.etcd.io/etcd/client/v3" ) diff --git a/internal/distributed/indexnode/client/client.go b/internal/distributed/indexnode/client/client.go index b6391ca9ef..142023f30f 100644 --- a/internal/distributed/indexnode/client/client.go +++ b/internal/distributed/indexnode/client/client.go @@ -21,17 +21,17 @@ import ( "fmt" "time" + "github.com/milvus-io/milvus/internal/util/grpcclient" "google.golang.org/grpc" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/grpcclient" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var Params *paramtable.ComponentParam = paramtable.Get() diff --git a/internal/distributed/indexnode/client/client_test.go b/internal/distributed/indexnode/client/client_test.go index ae7a965648..6de7731802 100644 --- a/internal/distributed/indexnode/client/client_test.go +++ b/internal/distributed/indexnode/client/client_test.go @@ -21,6 +21,8 @@ import ( "testing" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/internal/util/dependency" + "github.com/milvus-io/milvus/internal/util/mock" "github.com/stretchr/testify/assert" "google.golang.org/grpc" @@ -30,11 +32,9 @@ import ( "github.com/milvus-io/milvus/internal/indexnode" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/mock" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) func Test_NewClient(t *testing.T) { diff --git a/internal/distributed/indexnode/service.go b/internal/distributed/indexnode/service.go index 06880b7b77..8ef23c4967 100644 --- a/internal/distributed/indexnode/service.go +++ b/internal/distributed/indexnode/service.go @@ -25,6 +25,8 @@ import ( "time" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" + "github.com/milvus-io/milvus/internal/util/dependency" + "github.com/milvus-io/milvus/pkg/tracer" clientv3 "go.etcd.io/etcd/client/v3" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "go.uber.org/zap" @@ -34,16 +36,14 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/indexnode" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/tracer" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/logutil" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/logutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) // Server is the grpc wrapper of IndexNode. diff --git a/internal/distributed/indexnode/service_test.go b/internal/distributed/indexnode/service_test.go index 39cb9adf02..bfab723c0b 100644 --- a/internal/distributed/indexnode/service_test.go +++ b/internal/distributed/indexnode/service_test.go @@ -20,6 +20,7 @@ import ( "context" "testing" + "github.com/milvus-io/milvus/internal/util/dependency" "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/commonpb" @@ -27,10 +28,9 @@ import ( "github.com/milvus-io/milvus/internal/indexnode" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) var ParamsGlobal paramtable.ComponentParam diff --git a/internal/distributed/proxy/client/client.go b/internal/distributed/proxy/client/client.go index 96a2955e35..a8648c4ce1 100644 --- a/internal/distributed/proxy/client/client.go +++ b/internal/distributed/proxy/client/client.go @@ -25,11 +25,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/proxypb" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/grpcclient" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" "google.golang.org/grpc" ) diff --git a/internal/distributed/proxy/client/client_test.go b/internal/distributed/proxy/client/client_test.go index 4dd8d21db4..0677fcaa22 100644 --- a/internal/distributed/proxy/client/client_test.go +++ b/internal/distributed/proxy/client/client_test.go @@ -22,10 +22,10 @@ import ( "time" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/internal/util/mock" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proxy" - "github.com/milvus-io/milvus/internal/util/mock" "github.com/stretchr/testify/assert" "google.golang.org/grpc" ) diff --git a/internal/distributed/proxy/service.go b/internal/distributed/proxy/service.go index f672b44ee3..6dd6b50c73 100644 --- a/internal/distributed/proxy/service.go +++ b/internal/distributed/proxy/service.go @@ -31,8 +31,10 @@ import ( "time" "github.com/milvus-io/milvus/internal/proxy/accesslog" - "github.com/milvus-io/milvus/internal/tracer" - "github.com/milvus-io/milvus/internal/util/metricsinfo" + "github.com/milvus-io/milvus/internal/util/componentutil" + "github.com/milvus-io/milvus/internal/util/dependency" + "github.com/milvus-io/milvus/pkg/tracer" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "github.com/gin-gonic/gin" @@ -45,17 +47,15 @@ import ( "github.com/milvus-io/milvus/internal/distributed/proxy/httpserver" qcc "github.com/milvus-io/milvus/internal/distributed/querycoord/client" rcc "github.com/milvus-io/milvus/internal/distributed/rootcoord/client" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proxy" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/componentutil" - "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/logutil" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/logutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/internal/distributed/proxy/service_test.go b/internal/distributed/proxy/service_test.go index b9875d21cf..758b65083a 100644 --- a/internal/distributed/proxy/service_test.go +++ b/internal/distributed/proxy/service_test.go @@ -28,6 +28,7 @@ import ( "time" "github.com/cockroachdb/errors" + milvusmock "github.com/milvus-io/milvus/internal/util/mock" "github.com/milvus-io/milvus/internal/proto/indexpb" @@ -41,17 +42,16 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/proxy" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - milvusmock "github.com/milvus-io/milvus/internal/util/mock" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/uniquegenerator" ) func TestMain(m *testing.M) { diff --git a/internal/distributed/querycoord/client/client.go b/internal/distributed/querycoord/client/client.go index 33261797e3..8cff06bc04 100644 --- a/internal/distributed/querycoord/client/client.go +++ b/internal/distributed/querycoord/client/client.go @@ -23,15 +23,15 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/grpcclient" - "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/internal/distributed/querycoord/client/client_test.go b/internal/distributed/querycoord/client/client_test.go index 4a381c8b04..ad37c4795a 100644 --- a/internal/distributed/querycoord/client/client_test.go +++ b/internal/distributed/querycoord/client/client_test.go @@ -25,15 +25,15 @@ import ( "time" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/util/mock" - "github.com/milvus-io/milvus/internal/util/paramtable" + + "github.com/milvus-io/milvus/internal/proto/querypb" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/paramtable" "google.golang.org/grpc" "github.com/milvus-io/milvus/internal/proxy" - "github.com/milvus-io/milvus/internal/util/etcd" + "github.com/milvus-io/milvus/pkg/util/etcd" "github.com/stretchr/testify/assert" ) diff --git a/internal/distributed/querycoord/service.go b/internal/distributed/querycoord/service.go index f771203ec9..d7d2b906cf 100644 --- a/internal/distributed/querycoord/service.go +++ b/internal/distributed/querycoord/service.go @@ -24,6 +24,9 @@ import ( "time" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" + "github.com/milvus-io/milvus/internal/util/componentutil" + "github.com/milvus-io/milvus/internal/util/dependency" + "github.com/milvus-io/milvus/pkg/tracer" clientv3 "go.etcd.io/etcd/client/v3" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "go.uber.org/zap" @@ -34,18 +37,15 @@ import ( "github.com/milvus-io/milvus-proto/go-api/milvuspb" dcc "github.com/milvus-io/milvus/internal/distributed/datacoord/client" rcc "github.com/milvus-io/milvus/internal/distributed/rootcoord/client" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" qc "github.com/milvus-io/milvus/internal/querycoordv2" - "github.com/milvus-io/milvus/internal/tracer" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/componentutil" - "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/logutil" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/logutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) // Server is the grpc server of QueryCoord. diff --git a/internal/distributed/querycoord/service_test.go b/internal/distributed/querycoord/service_test.go index 9ba345b86e..70a9a9c962 100644 --- a/internal/distributed/querycoord/service_test.go +++ b/internal/distributed/querycoord/service_test.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/paramtable" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" diff --git a/internal/distributed/querynode/client/client.go b/internal/distributed/querynode/client/client.go index 905ebdedfa..8f074cf0ce 100644 --- a/internal/distributed/querynode/client/client.go +++ b/internal/distributed/querynode/client/client.go @@ -21,17 +21,17 @@ import ( "fmt" "time" + "github.com/milvus-io/milvus/internal/util/grpcclient" "google.golang.org/grpc" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/grpcclient" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var Params *paramtable.ComponentParam = paramtable.Get() diff --git a/internal/distributed/querynode/client/client_test.go b/internal/distributed/querynode/client/client_test.go index fe544f1478..dae773f270 100644 --- a/internal/distributed/querynode/client/client_test.go +++ b/internal/distributed/querynode/client/client_test.go @@ -21,10 +21,10 @@ import ( "testing" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/internal/util/mock" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/mock" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/paramtable" "github.com/stretchr/testify/assert" "google.golang.org/grpc" ) diff --git a/internal/distributed/querynode/service.go b/internal/distributed/querynode/service.go index d6141c67e4..bd7b1f4650 100644 --- a/internal/distributed/querynode/service.go +++ b/internal/distributed/querynode/service.go @@ -25,6 +25,8 @@ import ( "time" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" + "github.com/milvus-io/milvus/internal/util/dependency" + "github.com/milvus-io/milvus/pkg/tracer" clientv3 "go.etcd.io/etcd/client/v3" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "go.uber.org/zap" @@ -33,19 +35,17 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" qn "github.com/milvus-io/milvus/internal/querynodev2" - "github.com/milvus-io/milvus/internal/tracer" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/logutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/retry" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/logutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // UniqueID is an alias for type typeutil.UniqueID, used as a unique identifier for the request. diff --git a/internal/distributed/querynode/service_test.go b/internal/distributed/querynode/service_test.go index 444de79b73..1c45382aff 100644 --- a/internal/distributed/querynode/service_test.go +++ b/internal/distributed/querynode/service_test.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/paramtable" "github.com/stretchr/testify/assert" clientv3 "go.etcd.io/etcd/client/v3" diff --git a/internal/distributed/rootcoord/client/client.go b/internal/distributed/rootcoord/client/client.go index 7e60e87932..3d580a1e59 100644 --- a/internal/distributed/rootcoord/client/client.go +++ b/internal/distributed/rootcoord/client/client.go @@ -23,16 +23,16 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/grpcclient" - "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/internal/distributed/rootcoord/client/client_test.go b/internal/distributed/rootcoord/client/client_test.go index 8a86942936..9ff6fb161e 100644 --- a/internal/distributed/rootcoord/client/client_test.go +++ b/internal/distributed/rootcoord/client/client_test.go @@ -25,15 +25,15 @@ import ( "time" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/util/mock" - "github.com/milvus-io/milvus/internal/util/paramtable" + + "github.com/milvus-io/milvus/internal/proto/rootcoordpb" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/paramtable" "google.golang.org/grpc" "github.com/milvus-io/milvus/internal/proxy" - "github.com/milvus-io/milvus/internal/util/etcd" + "github.com/milvus-io/milvus/pkg/util/etcd" "github.com/stretchr/testify/assert" ) diff --git a/internal/distributed/rootcoord/service.go b/internal/distributed/rootcoord/service.go index 63b53d8068..c7d999ab8c 100644 --- a/internal/distributed/rootcoord/service.go +++ b/internal/distributed/rootcoord/service.go @@ -24,6 +24,8 @@ import ( "time" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" + "github.com/milvus-io/milvus/internal/util/dependency" + "github.com/milvus-io/milvus/pkg/tracer" clientv3 "go.etcd.io/etcd/client/v3" "go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc" "go.uber.org/zap" @@ -32,18 +34,16 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/rootcoord" - "github.com/milvus-io/milvus/internal/tracer" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/logutil" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/logutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" dcc "github.com/milvus-io/milvus/internal/distributed/datacoord/client" qcc "github.com/milvus-io/milvus/internal/distributed/querycoord/client" diff --git a/internal/distributed/rootcoord/service_test.go b/internal/distributed/rootcoord/service_test.go index 062752e95b..e4ad3e425d 100644 --- a/internal/distributed/rootcoord/service_test.go +++ b/internal/distributed/rootcoord/service_test.go @@ -25,6 +25,7 @@ import ( "time" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/internal/util/sessionutil" clientv3 "go.etcd.io/etcd/client/v3" @@ -34,9 +35,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/rootcoord" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/sessionutil" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type mockCore struct { diff --git a/internal/management/healthz/content_type.go b/internal/http/healthz/content_type.go similarity index 100% rename from internal/management/healthz/content_type.go rename to internal/http/healthz/content_type.go diff --git a/internal/management/healthz/healthz_error_handler.go b/internal/http/healthz/healthz_error_handler.go similarity index 94% rename from internal/management/healthz/healthz_error_handler.go rename to internal/http/healthz/healthz_error_handler.go index c65451eb5d..d8790dd6f8 100644 --- a/internal/management/healthz/healthz_error_handler.go +++ b/internal/http/healthz/healthz_error_handler.go @@ -20,9 +20,10 @@ import ( "fmt" "net/http" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/milvuserrors" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/milvuserrors" ) func componentsNotServingHandler(w http.ResponseWriter, r *http.Request, msg string) { diff --git a/internal/management/healthz/healthz_handler.go b/internal/http/healthz/healthz_handler.go similarity index 98% rename from internal/management/healthz/healthz_handler.go rename to internal/http/healthz/healthz_handler.go index e9d6b5b4b9..7938e83811 100644 --- a/internal/management/healthz/healthz_handler.go +++ b/internal/http/healthz/healthz_handler.go @@ -24,8 +24,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/log" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" ) // GetComponentStatesInterface defines the interface that get states from component. @@ -54,6 +55,7 @@ type HealthHandler struct { } var _ http.Handler = (*HealthHandler)(nil) + var defaultHandler = HealthHandler{} func Register(indicator Indicator) { diff --git a/internal/management/router.go b/internal/http/router.go similarity index 98% rename from internal/management/router.go rename to internal/http/router.go index 7036cde0fb..d09a8e410b 100644 --- a/internal/management/router.go +++ b/internal/http/router.go @@ -14,7 +14,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package management +package http // HealthzRouterPath is default path for check health state. const HealthzRouterPath = "/healthz" diff --git a/internal/management/server.go b/internal/http/server.go similarity index 89% rename from internal/management/server.go rename to internal/http/server.go index f4a7166e6a..ec00595938 100644 --- a/internal/management/server.go +++ b/internal/http/server.go @@ -14,7 +14,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package management +package http import ( "fmt" @@ -22,9 +22,10 @@ import ( "os" "strconv" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/management/healthz" "go.uber.org/zap" + + "github.com/milvus-io/milvus/internal/http/healthz" + "github.com/milvus-io/milvus/pkg/log" ) const ( @@ -32,26 +33,26 @@ const ( ListenPortEnvKey = "METRICS_PORT" ) -type HTTPHandler struct { +type Handler struct { Path string HandlerFunc http.HandlerFunc Handler http.Handler } func registerDefaults() { - Register(&HTTPHandler{ + Register(&Handler{ Path: LogLevelRouterPath, HandlerFunc: func(w http.ResponseWriter, req *http.Request) { log.Level().ServeHTTP(w, req) }, }) - Register(&HTTPHandler{ + Register(&Handler{ Path: HealthzRouterPath, Handler: healthz.Handler(), }) } -func Register(h *HTTPHandler) { +func Register(h *Handler) { if h.HandlerFunc != nil { http.HandleFunc(h.Path, h.HandlerFunc) return diff --git a/internal/management/server_test.go b/internal/http/server_test.go similarity index 97% rename from internal/management/server_test.go rename to internal/http/server_test.go index a0c5578185..dc34eb05c3 100644 --- a/internal/management/server_test.go +++ b/internal/http/server_test.go @@ -14,7 +14,7 @@ // See the License for the specific language governing permissions and // limitations under the License. -package management +package http import ( "bytes" @@ -26,11 +26,12 @@ import ( "testing" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/management/healthz" + "github.com/milvus-io/milvus/internal/http/healthz" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" ) func TestGetHTTPAddr(t *testing.T) { diff --git a/internal/indexnode/chunk_mgr_factory.go b/internal/indexnode/chunk_mgr_factory.go index cba023d8cb..8d6bad3f0c 100644 --- a/internal/indexnode/chunk_mgr_factory.go +++ b/internal/indexnode/chunk_mgr_factory.go @@ -5,9 +5,9 @@ import ( "fmt" "sync" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/storage" + "github.com/milvus-io/milvus/pkg/log" ) type StorageFactory interface { diff --git a/internal/indexnode/chunkmgr_mock.go b/internal/indexnode/chunkmgr_mock.go index c6ae8f4179..e4e93c2189 100644 --- a/internal/indexnode/chunkmgr_mock.go +++ b/internal/indexnode/chunkmgr_mock.go @@ -10,12 +10,12 @@ import ( "golang.org/x/exp/mmap" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) func init() { diff --git a/internal/indexnode/errors_test.go b/internal/indexnode/errors_test.go index 0be3a09f33..a58d419149 100644 --- a/internal/indexnode/errors_test.go +++ b/internal/indexnode/errors_test.go @@ -21,8 +21,8 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func TestMsgIndexNodeIsUnhealthy(t *testing.T) { diff --git a/internal/indexnode/indexnode.go b/internal/indexnode/indexnode.go index 8d0b98fa3c..f0cbe48426 100644 --- a/internal/indexnode/indexnode.go +++ b/internal/indexnode/indexnode.go @@ -25,6 +25,7 @@ package indexnode #include "indexbuilder/init_c.h" */ import "C" + import ( "context" "math/rand" @@ -36,23 +37,23 @@ import ( "unsafe" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/internal/util/sessionutil" + clientv3 "go.etcd.io/etcd/client/v3" + "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/commonpbutil" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/hardware" "github.com/milvus-io/milvus/internal/util/initcore" - "github.com/milvus-io/milvus/internal/util/lifetime" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/typeutil" - clientv3 "go.etcd.io/etcd/client/v3" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/util/lifetime" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // TODO add comments diff --git a/internal/indexnode/indexnode_mock.go b/internal/indexnode/indexnode_mock.go index 7d889a5dad..d21b1c7516 100644 --- a/internal/indexnode/indexnode_mock.go +++ b/internal/indexnode/indexnode_mock.go @@ -26,10 +26,10 @@ import ( "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/hardware" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // Mock is an alternative to IndexNode, it will return specific results based on specific parameters. diff --git a/internal/indexnode/indexnode_service.go b/internal/indexnode/indexnode_service.go index e7af4dbeb0..e5ce84588f 100644 --- a/internal/indexnode/indexnode_service.go +++ b/internal/indexnode/indexnode_service.go @@ -29,15 +29,15 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/indexpb" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func (i *IndexNode) CreateJob(ctx context.Context, req *indexpb.CreateJobRequest) (*commonpb.Status, error) { diff --git a/internal/indexnode/indexnode_service_test.go b/internal/indexnode/indexnode_service_test.go index a0273a54f7..dab05273a0 100644 --- a/internal/indexnode/indexnode_service_test.go +++ b/internal/indexnode/indexnode_service_test.go @@ -28,8 +28,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/util/metautil" - "github.com/milvus-io/milvus/internal/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/metautil" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" ) diff --git a/internal/indexnode/metrics_info.go b/internal/indexnode/metrics_info.go index 9bb7d8fa8b..4fe37c3c47 100644 --- a/internal/indexnode/metrics_info.go +++ b/internal/indexnode/metrics_info.go @@ -21,10 +21,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/util/hardware" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // TODO(dragondriver): maybe IndexNode should be an interface so that we can mock it in the test cases diff --git a/internal/indexnode/metrics_info_test.go b/internal/indexnode/metrics_info_test.go index f9131e0476..8bf6bb5bab 100644 --- a/internal/indexnode/metrics_info_test.go +++ b/internal/indexnode/metrics_info_test.go @@ -19,7 +19,7 @@ package indexnode import ( "testing" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" ) func TestGetSystemInfoMetrics(t *testing.T) { diff --git a/internal/indexnode/task.go b/internal/indexnode/task.go index 0ef13a74ef..5152cd3d55 100644 --- a/internal/indexnode/task.go +++ b/internal/indexnode/task.go @@ -27,23 +27,22 @@ import ( "time" "github.com/cockroachdb/errors" - "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/indexcgowrapper" - "github.com/milvus-io/milvus/internal/util/indexparamcheck" - "github.com/milvus-io/milvus/internal/util/indexparams" - "github.com/milvus-io/milvus/internal/util/metautil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/retry" - "github.com/milvus-io/milvus/internal/util/timerecord" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/indexparamcheck" + "github.com/milvus-io/milvus/pkg/util/indexparams" + "github.com/milvus-io/milvus/pkg/util/metautil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/util/timerecord" ) var ( diff --git a/internal/indexnode/task_scheduler.go b/internal/indexnode/task_scheduler.go index 1433c706f5..e1f88cbae6 100644 --- a/internal/indexnode/task_scheduler.go +++ b/internal/indexnode/task_scheduler.go @@ -27,7 +27,7 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" ) // TaskQueue is a queue used to store tasks. diff --git a/internal/indexnode/task_test.go b/internal/indexnode/task_test.go index ae083ab4a6..9aa24bc67d 100644 --- a/internal/indexnode/task_test.go +++ b/internal/indexnode/task_test.go @@ -31,8 +31,8 @@ package indexnode // "github.com/milvus-io/milvus-proto/go-api/commonpb" // "github.com/milvus-io/milvus/internal/proto/indexpb" // "github.com/milvus-io/milvus/internal/storage" -// "github.com/milvus-io/milvus/internal/util/etcd" -// "github.com/milvus-io/milvus/internal/util/timerecord" +// "github.com/milvus-io/milvus/pkg/util/etcd" +// "github.com/milvus-io/milvus/pkg/util/timerecord" // "github.com/stretchr/testify/assert" // ) diff --git a/internal/indexnode/taskinfo_ops.go b/internal/indexnode/taskinfo_ops.go index 15440a313b..c6f6fee963 100644 --- a/internal/indexnode/taskinfo_ops.go +++ b/internal/indexnode/taskinfo_ops.go @@ -6,9 +6,9 @@ import ( "github.com/golang/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/indexpb" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" "go.uber.org/zap" ) diff --git a/internal/kv/etcd/embed_etcd_config_test.go b/internal/kv/etcd/embed_etcd_config_test.go index bfd2f4ede7..bab2f0f225 100644 --- a/internal/kv/etcd/embed_etcd_config_test.go +++ b/internal/kv/etcd/embed_etcd_config_test.go @@ -20,12 +20,12 @@ import ( "os" "testing" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - - embed_etcd_kv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + embed_etcd_kv "github.com/milvus-io/milvus/internal/kv/etcd" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) func TestEtcdConfigLoad(te *testing.T) { diff --git a/internal/kv/etcd/embed_etcd_kv.go b/internal/kv/etcd/embed_etcd_kv.go index f218c0d254..1090fef55f 100644 --- a/internal/kv/etcd/embed_etcd_kv.go +++ b/internal/kv/etcd/embed_etcd_kv.go @@ -24,15 +24,14 @@ import ( "time" "github.com/cockroachdb/errors" - clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/server/v3/embed" "go.etcd.io/etcd/server/v3/etcdserver/api/v3client" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/kv" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" ) // implementation assertion diff --git a/internal/kv/etcd/embed_etcd_kv_test.go b/internal/kv/etcd/embed_etcd_kv_test.go index 5ada361309..b868eebe02 100644 --- a/internal/kv/etcd/embed_etcd_kv_test.go +++ b/internal/kv/etcd/embed_etcd_kv_test.go @@ -23,15 +23,14 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" clientv3 "go.etcd.io/etcd/client/v3" "golang.org/x/exp/maps" embed_etcd_kv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) func TestEmbedEtcd(te *testing.T) { diff --git a/internal/kv/etcd/embed_etcd_restart_test.go b/internal/kv/etcd/embed_etcd_restart_test.go index 4faa016e80..283fc109fe 100644 --- a/internal/kv/etcd/embed_etcd_restart_test.go +++ b/internal/kv/etcd/embed_etcd_restart_test.go @@ -20,12 +20,12 @@ import ( "os" "testing" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - - embed_etcd_kv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + embed_etcd_kv "github.com/milvus-io/milvus/internal/kv/etcd" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) func TestEtcdRestartLoad(te *testing.T) { diff --git a/internal/kv/etcd/etcd_kv.go b/internal/kv/etcd/etcd_kv.go index 7933964733..950318afcd 100644 --- a/internal/kv/etcd/etcd_kv.go +++ b/internal/kv/etcd/etcd_kv.go @@ -23,15 +23,12 @@ import ( "path" "time" - "github.com/milvus-io/milvus/internal/metrics" - - "github.com/milvus-io/milvus/internal/common" - clientv3 "go.etcd.io/etcd/client/v3" - - "github.com/milvus-io/milvus/internal/log" - "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" ) const ( diff --git a/internal/kv/etcd/etcd_kv_test.go b/internal/kv/etcd/etcd_kv_test.go index e354abddb2..0ccabe8f41 100644 --- a/internal/kv/etcd/etcd_kv_test.go +++ b/internal/kv/etcd/etcd_kv_test.go @@ -24,16 +24,15 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" clientv3 "go.etcd.io/etcd/client/v3" "golang.org/x/exp/maps" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) var Params paramtable.ComponentParam diff --git a/internal/kv/etcd/metakv_factory.go b/internal/kv/etcd/metakv_factory.go index bee34e05ec..c6d442dc44 100644 --- a/internal/kv/etcd/metakv_factory.go +++ b/internal/kv/etcd/metakv_factory.go @@ -17,12 +17,13 @@ package etcdkv import ( - "github.com/milvus-io/milvus/internal/kv" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/paramtable" "go.etcd.io/etcd/server/v3/embed" "go.uber.org/zap" + + "github.com/milvus-io/milvus/internal/kv" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) // NewMetaKvFactory returns an object that implements the kv.MetaKv interface using etcd. diff --git a/internal/kv/kv.go b/internal/kv/kv.go index 454415deb7..04875dd613 100644 --- a/internal/kv/kv.go +++ b/internal/kv/kv.go @@ -19,7 +19,7 @@ package kv import ( clientv3 "go.etcd.io/etcd/client/v3" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // CompareFailedError is a helper type for checking MetaKv CompareAndSwap series func error type diff --git a/internal/kv/mem/mem_kv.go b/internal/kv/mem/mem_kv.go index 91c094cc8d..f2c24b05de 100644 --- a/internal/kv/mem/mem_kv.go +++ b/internal/kv/mem/mem_kv.go @@ -22,7 +22,7 @@ import ( "github.com/google/btree" - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/common" ) // MemoryKV implements BaseKv interface and relies on underling btree.BTree. diff --git a/internal/kv/mock_snapshot_kv.go b/internal/kv/mock_snapshot_kv.go index 55cc2bb63e..35cc851853 100644 --- a/internal/kv/mock_snapshot_kv.go +++ b/internal/kv/mock_snapshot_kv.go @@ -1,7 +1,7 @@ package kv import ( - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type mockSnapshotKV struct { diff --git a/internal/kv/mock_snapshot_kv_test.go b/internal/kv/mock_snapshot_kv_test.go index 319ce6b13e..94e6f2136a 100644 --- a/internal/kv/mock_snapshot_kv_test.go +++ b/internal/kv/mock_snapshot_kv_test.go @@ -3,9 +3,9 @@ package kv import ( "testing" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/stretchr/testify/assert" + + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func Test_mockSnapshotKV_Save(t *testing.T) { diff --git a/internal/kv/rocksdb/RocksIterator.go b/internal/kv/rocksdb/RocksIterator.go index fdb89410f2..e95b04ce72 100644 --- a/internal/kv/rocksdb/RocksIterator.go +++ b/internal/kv/rocksdb/RocksIterator.go @@ -3,8 +3,9 @@ package rocksdbkv import ( "runtime" - "github.com/milvus-io/milvus/internal/log" "github.com/tecbot/gorocksdb" + + "github.com/milvus-io/milvus/pkg/log" ) /** diff --git a/internal/kv/rocksdb/rocksdb_kv.go b/internal/kv/rocksdb/rocksdb_kv.go index bbc4883c1e..7cf5fcd606 100644 --- a/internal/kv/rocksdb/rocksdb_kv.go +++ b/internal/kv/rocksdb/rocksdb_kv.go @@ -20,10 +20,10 @@ import ( "fmt" "github.com/cockroachdb/errors" + "github.com/tecbot/gorocksdb" "github.com/milvus-io/milvus/internal/kv" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/tecbot/gorocksdb" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var _ kv.BaseKV = (*RocksdbKV)(nil) diff --git a/internal/kv/rocksdb/rocksdb_kv_test.go b/internal/kv/rocksdb/rocksdb_kv_test.go index 2e5f1acc14..e5a15b370d 100644 --- a/internal/kv/rocksdb/rocksdb_kv_test.go +++ b/internal/kv/rocksdb/rocksdb_kv_test.go @@ -22,8 +22,9 @@ import ( "sync" "testing" - rocksdbkv "github.com/milvus-io/milvus/internal/kv/rocksdb" "github.com/stretchr/testify/assert" + + rocksdbkv "github.com/milvus-io/milvus/internal/kv/rocksdb" ) func TestRocksdbKV(t *testing.T) { diff --git a/internal/metastore/catalog.go b/internal/metastore/catalog.go index 3fde11b412..a477d118ad 100644 --- a/internal/metastore/catalog.go +++ b/internal/metastore/catalog.go @@ -8,7 +8,7 @@ import ( "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) //go:generate mockery --name=RootCoordCatalog diff --git a/internal/metastore/db/dao/collection.go b/internal/metastore/db/dao/collection.go index 6bd01c69f9..e1004ba3d8 100644 --- a/internal/metastore/db/dao/collection.go +++ b/internal/metastore/db/dao/collection.go @@ -4,13 +4,13 @@ import ( "fmt" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" - "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/zap" "gorm.io/gorm" "gorm.io/gorm/clause" + + "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type collectionDb struct { diff --git a/internal/metastore/db/dao/collection_alias.go b/internal/metastore/db/dao/collection_alias.go index 2c87ab3b24..2e6e6439f8 100644 --- a/internal/metastore/db/dao/collection_alias.go +++ b/internal/metastore/db/dao/collection_alias.go @@ -4,13 +4,13 @@ import ( "fmt" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" - "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/zap" "gorm.io/gorm" "gorm.io/gorm/clause" + + "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type collAliasDb struct { diff --git a/internal/metastore/db/dao/collection_alias_test.go b/internal/metastore/db/dao/collection_alias_test.go index 45a63fc2c6..d82d233038 100644 --- a/internal/metastore/db/dao/collection_alias_test.go +++ b/internal/metastore/db/dao/collection_alias_test.go @@ -8,7 +8,7 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/stretchr/testify/assert" "gorm.io/gorm" ) diff --git a/internal/metastore/db/dao/collection_channel.go b/internal/metastore/db/dao/collection_channel.go index 15fafb1dea..56b622c9d4 100644 --- a/internal/metastore/db/dao/collection_channel.go +++ b/internal/metastore/db/dao/collection_channel.go @@ -1,11 +1,12 @@ package dao import ( - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" - "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/zap" "gorm.io/gorm" + + "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type collChannelDb struct { diff --git a/internal/metastore/db/dao/collection_test.go b/internal/metastore/db/dao/collection_test.go index 8f8bd60aed..c7779d4ccb 100644 --- a/internal/metastore/db/dao/collection_test.go +++ b/internal/metastore/db/dao/collection_test.go @@ -10,13 +10,13 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/common" "github.com/DATA-DOG/go-sqlmock" commonpb "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus/internal/metastore/db/dbcore" "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/stretchr/testify/assert" "gorm.io/driver/mysql" "gorm.io/gorm" diff --git a/internal/metastore/db/dao/field.go b/internal/metastore/db/dao/field.go index 93a1534cd8..e1780cb0da 100644 --- a/internal/metastore/db/dao/field.go +++ b/internal/metastore/db/dao/field.go @@ -1,11 +1,12 @@ package dao import ( - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" - "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/zap" "gorm.io/gorm" + + "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type fieldDb struct { diff --git a/internal/metastore/db/dao/gran_id.go b/internal/metastore/db/dao/gran_id.go index c3509174dc..1704083e81 100644 --- a/internal/metastore/db/dao/gran_id.go +++ b/internal/metastore/db/dao/gran_id.go @@ -1,10 +1,11 @@ package dao import ( - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" "go.uber.org/zap" "gorm.io/gorm" + + "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" + "github.com/milvus-io/milvus/pkg/log" ) type grantIDDb struct { diff --git a/internal/metastore/db/dao/grant.go b/internal/metastore/db/dao/grant.go index 1233f021c6..106bce10db 100644 --- a/internal/metastore/db/dao/grant.go +++ b/internal/metastore/db/dao/grant.go @@ -1,10 +1,11 @@ package dao import ( - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" "go.uber.org/zap" "gorm.io/gorm" + + "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" + "github.com/milvus-io/milvus/pkg/log" ) type grantDb struct { diff --git a/internal/metastore/db/dao/index.go b/internal/metastore/db/dao/index.go index aff6d13217..0d75bedfa3 100644 --- a/internal/metastore/db/dao/index.go +++ b/internal/metastore/db/dao/index.go @@ -1,11 +1,12 @@ package dao import ( - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" - "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/zap" "gorm.io/gorm" + + "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type indexDb struct { diff --git a/internal/metastore/db/dao/partition.go b/internal/metastore/db/dao/partition.go index 38f0bc05b8..fcfd5c257f 100644 --- a/internal/metastore/db/dao/partition.go +++ b/internal/metastore/db/dao/partition.go @@ -1,11 +1,12 @@ package dao import ( - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" - "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/zap" "gorm.io/gorm" + + "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type partitionDb struct { diff --git a/internal/metastore/db/dao/partition_test.go b/internal/metastore/db/dao/partition_test.go index 1329667ca0..c97654c1fe 100644 --- a/internal/metastore/db/dao/partition_test.go +++ b/internal/metastore/db/dao/partition_test.go @@ -8,7 +8,7 @@ import ( "github.com/DATA-DOG/go-sqlmock" "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/stretchr/testify/assert" ) diff --git a/internal/metastore/db/dao/role.go b/internal/metastore/db/dao/role.go index 32023d77d5..564f2911f9 100644 --- a/internal/metastore/db/dao/role.go +++ b/internal/metastore/db/dao/role.go @@ -1,10 +1,11 @@ package dao import ( - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" "go.uber.org/zap" "gorm.io/gorm" + + "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" + "github.com/milvus-io/milvus/pkg/log" ) type roleDb struct { diff --git a/internal/metastore/db/dao/segment_index.go b/internal/metastore/db/dao/segment_index.go index eec8a0dd7e..8fd88e9658 100644 --- a/internal/metastore/db/dao/segment_index.go +++ b/internal/metastore/db/dao/segment_index.go @@ -1,12 +1,13 @@ package dao import ( - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" - "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/zap" "gorm.io/gorm" "gorm.io/gorm/clause" + + "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type segmentIndexDb struct { diff --git a/internal/metastore/db/dao/user.go b/internal/metastore/db/dao/user.go index 6cee3df76f..bfe2babae3 100644 --- a/internal/metastore/db/dao/user.go +++ b/internal/metastore/db/dao/user.go @@ -4,13 +4,12 @@ import ( "fmt" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/common" - - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" "go.uber.org/zap" "gorm.io/gorm" + + "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" ) type userDb struct { diff --git a/internal/metastore/db/dao/user_role.go b/internal/metastore/db/dao/user_role.go index e5d1c16426..03f9a47ef9 100644 --- a/internal/metastore/db/dao/user_role.go +++ b/internal/metastore/db/dao/user_role.go @@ -1,10 +1,11 @@ package dao import ( - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" "go.uber.org/zap" "gorm.io/gorm" + + "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" + "github.com/milvus-io/milvus/pkg/log" ) type userRoleDb struct { diff --git a/internal/metastore/db/dbcore/core.go b/internal/metastore/db/dbcore/core.go index 91fe621dcd..19ce122d48 100644 --- a/internal/metastore/db/dbcore/core.go +++ b/internal/metastore/db/dbcore/core.go @@ -5,12 +5,13 @@ import ( "fmt" "reflect" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/paramtable" "go.uber.org/zap" "gorm.io/driver/mysql" "gorm.io/gorm" "gorm.io/gorm/logger" + + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) var ( diff --git a/internal/metastore/db/dbmodel/collection.go b/internal/metastore/db/dbmodel/collection.go index b5a85be60a..b251a7724b 100644 --- a/internal/metastore/db/dbmodel/collection.go +++ b/internal/metastore/db/dbmodel/collection.go @@ -5,11 +5,12 @@ import ( "fmt" "time" - "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/zap" + + "github.com/milvus-io/milvus-proto/go-api/commonpb" + "github.com/milvus-io/milvus/internal/metastore/model" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type Collection struct { diff --git a/internal/metastore/db/dbmodel/collection_alias.go b/internal/metastore/db/dbmodel/collection_alias.go index 023dcf65ac..bd6327835d 100644 --- a/internal/metastore/db/dbmodel/collection_alias.go +++ b/internal/metastore/db/dbmodel/collection_alias.go @@ -3,7 +3,7 @@ package dbmodel import ( "time" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type CollectionAlias struct { diff --git a/internal/metastore/db/dbmodel/collection_channel.go b/internal/metastore/db/dbmodel/collection_channel.go index 78c397b33a..3318f517b4 100644 --- a/internal/metastore/db/dbmodel/collection_channel.go +++ b/internal/metastore/db/dbmodel/collection_channel.go @@ -3,7 +3,7 @@ package dbmodel import ( "time" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type CollectionChannel struct { diff --git a/internal/metastore/db/dbmodel/collection_test.go b/internal/metastore/db/dbmodel/collection_test.go index b5b815cd85..0762cde4e3 100644 --- a/internal/metastore/db/dbmodel/collection_test.go +++ b/internal/metastore/db/dbmodel/collection_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/common" ) var ( diff --git a/internal/metastore/db/dbmodel/field.go b/internal/metastore/db/dbmodel/field.go index 7db068a4fb..bf90621e94 100644 --- a/internal/metastore/db/dbmodel/field.go +++ b/internal/metastore/db/dbmodel/field.go @@ -4,13 +4,14 @@ import ( "encoding/json" "time" + "go.uber.org/zap" + "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/typeutil" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type Field struct { diff --git a/internal/metastore/db/dbmodel/index.go b/internal/metastore/db/dbmodel/index.go index d6e4890043..e7e33e0586 100644 --- a/internal/metastore/db/dbmodel/index.go +++ b/internal/metastore/db/dbmodel/index.go @@ -4,13 +4,14 @@ import ( "encoding/json" "time" - "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/zap" + + "github.com/milvus-io/milvus-proto/go-api/commonpb" + "github.com/milvus-io/milvus/internal/metastore/model" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type Index struct { diff --git a/internal/metastore/db/dbmodel/partition.go b/internal/metastore/db/dbmodel/partition.go index f67dcc94af..d20f1cee2a 100644 --- a/internal/metastore/db/dbmodel/partition.go +++ b/internal/metastore/db/dbmodel/partition.go @@ -4,7 +4,7 @@ import ( "time" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type Partition struct { diff --git a/internal/metastore/db/dbmodel/segment_index.go b/internal/metastore/db/dbmodel/segment_index.go index 303ee124f0..8fc6b796a9 100644 --- a/internal/metastore/db/dbmodel/segment_index.go +++ b/internal/metastore/db/dbmodel/segment_index.go @@ -3,7 +3,7 @@ package dbmodel import ( "time" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type SegmentIndex struct { diff --git a/internal/metastore/db/indexcoord/table_catalog.go b/internal/metastore/db/indexcoord/table_catalog.go index cc6c1fb000..06e609a0d9 100644 --- a/internal/metastore/db/indexcoord/table_catalog.go +++ b/internal/metastore/db/indexcoord/table_catalog.go @@ -7,11 +7,11 @@ package indexcoord // // "go.uber.org/zap" // -// "github.com/milvus-io/milvus/internal/log" +// "github.com/milvus-io/milvus/pkg/log" // "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" // "github.com/milvus-io/milvus/internal/metastore/model" -// "github.com/milvus-io/milvus/internal/util/contextutil" -// "github.com/milvus-io/milvus/internal/util/typeutil" +// "github.com/milvus-io/milvus/pkg/util/contextutil" +// "github.com/milvus-io/milvus/pkg/util/typeutil" //) // //type Catalog struct { diff --git a/internal/metastore/db/indexcoord/table_catalog_test.go b/internal/metastore/db/indexcoord/table_catalog_test.go index 33a0c56748..4cdd18f4dc 100644 --- a/internal/metastore/db/indexcoord/table_catalog_test.go +++ b/internal/metastore/db/indexcoord/table_catalog_test.go @@ -11,8 +11,8 @@ package indexcoord // "github.com/milvus-io/milvus/internal/metastore/db/dbmodel/mocks" // "github.com/milvus-io/milvus/internal/metastore/model" // "github.com/milvus-io/milvus-proto/go-api/commonpb" -// "github.com/milvus-io/milvus/internal/util/contextutil" -// "github.com/milvus-io/milvus/internal/util/typeutil" +// "github.com/milvus-io/milvus/pkg/util/contextutil" +// "github.com/milvus-io/milvus/pkg/util/typeutil" // "github.com/stretchr/testify/mock" // "github.com/stretchr/testify/require" //) diff --git a/internal/metastore/db/rootcoord/table_catalog.go b/internal/metastore/db/rootcoord/table_catalog.go index 7b800db8bf..063ec56051 100644 --- a/internal/metastore/db/rootcoord/table_catalog.go +++ b/internal/metastore/db/rootcoord/table_catalog.go @@ -7,22 +7,19 @@ import ( "runtime" "time" - "github.com/milvus-io/milvus/internal/util/tsoutil" - - "github.com/milvus-io/milvus/internal/metastore" - - "github.com/milvus-io/milvus/internal/util" - - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/util/contextutil" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/typeutil" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/util/contextutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type Catalog struct { diff --git a/internal/metastore/db/rootcoord/table_catalog_test.go b/internal/metastore/db/rootcoord/table_catalog_test.go index e513159105..826c668dee 100644 --- a/internal/metastore/db/rootcoord/table_catalog_test.go +++ b/internal/metastore/db/rootcoord/table_catalog_test.go @@ -8,23 +8,21 @@ import ( "time" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/metastore" - - pb "github.com/milvus-io/milvus/internal/proto/etcdpb" + "github.com/stretchr/testify/mock" + "github.com/stretchr/testify/require" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/metastore/db/dbmodel" "github.com/milvus-io/milvus/internal/metastore/db/dbmodel/mocks" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/util/contextutil" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/stretchr/testify/mock" - "github.com/stretchr/testify/require" + pb "github.com/milvus-io/milvus/internal/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/contextutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/metastore/kv/datacoord/kv_catalog.go b/internal/metastore/kv/datacoord/kv_catalog.go index 3b4db22f3c..1b1458ea21 100644 --- a/internal/metastore/kv/datacoord/kv_catalog.go +++ b/internal/metastore/kv/datacoord/kv_catalog.go @@ -31,17 +31,17 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus/internal/kv" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/metautil" "github.com/milvus-io/milvus/internal/util/segmentutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/metautil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var maxEtcdTxnNum = 128 diff --git a/internal/metastore/kv/datacoord/kv_catalog_test.go b/internal/metastore/kv/datacoord/kv_catalog_test.go index 5c96b9ebe2..9f2bc9652e 100644 --- a/internal/metastore/kv/datacoord/kv_catalog_test.go +++ b/internal/metastore/kv/datacoord/kv_catalog_test.go @@ -40,9 +40,9 @@ import ( "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/indexpb" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/metautil" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/metautil" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type MockedTxnKV struct { diff --git a/internal/metastore/kv/querycoord/kv_catalog.go b/internal/metastore/kv/querycoord/kv_catalog.go index c8d947e842..d368e2335e 100644 --- a/internal/metastore/kv/querycoord/kv_catalog.go +++ b/internal/metastore/kv/querycoord/kv_catalog.go @@ -4,7 +4,6 @@ import ( "fmt" "github.com/cockroachdb/errors" - "github.com/golang/protobuf/proto" "github.com/samber/lo" clientv3 "go.etcd.io/etcd/client/v3" @@ -12,7 +11,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/kv" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util" + "github.com/milvus-io/milvus/pkg/util" ) var ( diff --git a/internal/metastore/kv/rootcoord/kv_catalog.go b/internal/metastore/kv/rootcoord/kv_catalog.go index e3a604c452..1ce56e4f0b 100644 --- a/internal/metastore/kv/rootcoord/kv_catalog.go +++ b/internal/metastore/kv/rootcoord/kv_catalog.go @@ -5,26 +5,23 @@ import ( "encoding/json" "fmt" - "github.com/milvus-io/milvus/internal/metastore" - - "github.com/milvus-io/milvus/internal/util/crypto" - "github.com/milvus-io/milvus/internal/util/etcd" - - "github.com/milvus-io/milvus/internal/util" - "github.com/golang/protobuf/proto" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/kv" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/metastore/model" pb "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/util/crypto" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/metastore/kv/rootcoord/kv_catalog_test.go b/internal/metastore/kv/rootcoord/kv_catalog_test.go index 1a7b865e01..6dc087e9b7 100644 --- a/internal/metastore/kv/rootcoord/kv_catalog_test.go +++ b/internal/metastore/kv/rootcoord/kv_catalog_test.go @@ -9,27 +9,25 @@ import ( "testing" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus-proto/go-api/schemapb" - "go.uber.org/atomic" - "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" + "go.uber.org/atomic" - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus-proto/go-api/commonpb" + "github.com/milvus-io/milvus-proto/go-api/milvuspb" + "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/kv" "github.com/milvus-io/milvus/internal/kv/mocks" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/metastore/model" pb "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/util/crypto" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/crypto" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var ( @@ -1925,6 +1923,7 @@ func TestRBAC_Role(t *testing.T) { } }) } + func TestRBAC_Grant(t *testing.T) { var ( tenant = "default" diff --git a/internal/metastore/kv/rootcoord/suffix_snapshot.go b/internal/metastore/kv/rootcoord/suffix_snapshot.go index 6e0c13b496..635e50a0ca 100644 --- a/internal/metastore/kv/rootcoord/suffix_snapshot.go +++ b/internal/metastore/kv/rootcoord/suffix_snapshot.go @@ -28,17 +28,17 @@ import ( "time" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/kv" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/retry" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var ( diff --git a/internal/metastore/kv/rootcoord/suffix_snapshot_test.go b/internal/metastore/kv/rootcoord/suffix_snapshot_test.go index f987a0db1e..3a7f34e255 100644 --- a/internal/metastore/kv/rootcoord/suffix_snapshot_test.go +++ b/internal/metastore/kv/rootcoord/suffix_snapshot_test.go @@ -24,6 +24,7 @@ import ( "time" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" @@ -31,10 +32,9 @@ import ( etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/kv/mocks" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var ( diff --git a/internal/metastore/model/collection.go b/internal/metastore/model/collection.go index 2bd39ae7e0..53b4faecf6 100644 --- a/internal/metastore/model/collection.go +++ b/internal/metastore/model/collection.go @@ -3,8 +3,8 @@ package model import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" pb "github.com/milvus-io/milvus/internal/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/common" "github.com/samber/lo" ) diff --git a/internal/metastore/model/field.go b/internal/metastore/model/field.go index 2af08b6dee..e9bb3c63c4 100644 --- a/internal/metastore/model/field.go +++ b/internal/metastore/model/field.go @@ -1,7 +1,7 @@ package model import ( - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/common" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" diff --git a/internal/metastore/model/partition.go b/internal/metastore/model/partition.go index a9205f47ff..e23e34f19d 100644 --- a/internal/metastore/model/partition.go +++ b/internal/metastore/model/partition.go @@ -1,8 +1,8 @@ package model import ( - "github.com/milvus-io/milvus/internal/common" pb "github.com/milvus-io/milvus/internal/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/common" ) type Partition struct { diff --git a/internal/metastore/model/segment_index.go b/internal/metastore/model/segment_index.go index 94fb4d4d59..a7fe7dc93e 100644 --- a/internal/metastore/model/segment_index.go +++ b/internal/metastore/model/segment_index.go @@ -2,8 +2,8 @@ package model import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/proto/indexpb" + "github.com/milvus-io/milvus/pkg/common" ) type SegmentIndex struct { diff --git a/internal/mq/mqimpl/rocksmq/client/client_impl.go b/internal/mq/mqimpl/rocksmq/client/client_impl.go index 446161075a..78ab31b2e5 100644 --- a/internal/mq/mqimpl/rocksmq/client/client_impl.go +++ b/internal/mq/mqimpl/rocksmq/client/client_impl.go @@ -15,11 +15,11 @@ import ( "reflect" "sync" - "github.com/milvus-io/milvus/internal/mq/mqimpl/rocksmq/server" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - - "github.com/milvus-io/milvus/internal/log" "go.uber.org/zap" + + "github.com/milvus-io/milvus/internal/mq/mqimpl/rocksmq/server" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" ) type client struct { diff --git a/internal/mq/mqimpl/rocksmq/client/client_impl_test.go b/internal/mq/mqimpl/rocksmq/client/client_impl_test.go index 845590f02a..5381e1ceb0 100644 --- a/internal/mq/mqimpl/rocksmq/client/client_impl_test.go +++ b/internal/mq/mqimpl/rocksmq/client/client_impl_test.go @@ -16,9 +16,10 @@ import ( "testing" "time" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/stretchr/testify/assert" + + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) var rmqPath = "/tmp/rocksmq_client" diff --git a/internal/mq/mqimpl/rocksmq/client/consumer.go b/internal/mq/mqimpl/rocksmq/client/consumer.go index eaf769a783..b555b78bc4 100644 --- a/internal/mq/mqimpl/rocksmq/client/consumer.go +++ b/internal/mq/mqimpl/rocksmq/client/consumer.go @@ -13,7 +13,7 @@ package client import ( "github.com/milvus-io/milvus/internal/mq/mqimpl/rocksmq/server" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" ) // UniqueID is the type of message ID diff --git a/internal/mq/mqimpl/rocksmq/client/consumer_impl.go b/internal/mq/mqimpl/rocksmq/client/consumer_impl.go index 49a7375e8a..75e220bf6e 100644 --- a/internal/mq/mqimpl/rocksmq/client/consumer_impl.go +++ b/internal/mq/mqimpl/rocksmq/client/consumer_impl.go @@ -14,9 +14,9 @@ package client import ( "sync" - "github.com/milvus-io/milvus/internal/log" - "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" ) type consumer struct { diff --git a/internal/mq/mqimpl/rocksmq/client/consumer_impl_test.go b/internal/mq/mqimpl/rocksmq/client/consumer_impl_test.go index 672b47e152..dc7f798b95 100644 --- a/internal/mq/mqimpl/rocksmq/client/consumer_impl_test.go +++ b/internal/mq/mqimpl/rocksmq/client/consumer_impl_test.go @@ -15,8 +15,9 @@ import ( "os" "testing" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" "github.com/stretchr/testify/assert" + + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" ) func TestConsumer_newConsumer(t *testing.T) { diff --git a/internal/mq/mqimpl/rocksmq/client/producer_impl.go b/internal/mq/mqimpl/rocksmq/client/producer_impl.go index f68caecb51..b3b5de92c9 100644 --- a/internal/mq/mqimpl/rocksmq/client/producer_impl.go +++ b/internal/mq/mqimpl/rocksmq/client/producer_impl.go @@ -12,9 +12,10 @@ package client import ( - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/mqimpl/rocksmq/server" "go.uber.org/zap" + + "github.com/milvus-io/milvus/internal/mq/mqimpl/rocksmq/server" + "github.com/milvus-io/milvus/pkg/log" ) // assertion make sure implementation diff --git a/internal/mq/mqimpl/rocksmq/client/test_helper.go b/internal/mq/mqimpl/rocksmq/client/test_helper.go index 87a2d0ff90..6fee40a46d 100644 --- a/internal/mq/mqimpl/rocksmq/client/test_helper.go +++ b/internal/mq/mqimpl/rocksmq/client/test_helper.go @@ -17,11 +17,11 @@ import ( "testing" "time" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/mqimpl/rocksmq/server" "github.com/stretchr/testify/assert" - "go.uber.org/zap" + + server2 "github.com/milvus-io/milvus/internal/mq/mqimpl/rocksmq/server" + "github.com/milvus-io/milvus/pkg/log" ) func newTopicName() string { @@ -32,8 +32,8 @@ func newConsumerName() string { return fmt.Sprintf("my-consumer-%v", time.Now().Nanosecond()) } -func newMockRocksMQ() server.RocksMQ { - var rocksmq server.RocksMQ +func newMockRocksMQ() server2.RocksMQ { + var rocksmq server2.RocksMQ return rocksmq } @@ -44,9 +44,9 @@ func newMockClient() *client { return client } -func newRocksMQ(t *testing.T, rmqPath string) server.RocksMQ { +func newRocksMQ(t *testing.T, rmqPath string) server2.RocksMQ { rocksdbPath := rmqPath - rmq, err := server.NewRocksMQ(rocksdbPath, nil) + rmq, err := server2.NewRocksMQ(rocksdbPath, nil) assert.NoError(t, err) return rmq } diff --git a/internal/mq/mqimpl/rocksmq/server/global_rmq.go b/internal/mq/mqimpl/rocksmq/server/global_rmq.go index 287ebaa51e..291709fa9a 100644 --- a/internal/mq/mqimpl/rocksmq/server/global_rmq.go +++ b/internal/mq/mqimpl/rocksmq/server/global_rmq.go @@ -21,11 +21,10 @@ import ( "sync" "github.com/cockroachdb/errors" + "go.uber.org/zap" "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/internal/log" - - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" ) // Rmq is global rocksmq instance that will be initialized only once diff --git a/internal/mq/mqimpl/rocksmq/server/global_rmq_test.go b/internal/mq/mqimpl/rocksmq/server/global_rmq_test.go index d45497aff0..789f62cba8 100644 --- a/internal/mq/mqimpl/rocksmq/server/global_rmq_test.go +++ b/internal/mq/mqimpl/rocksmq/server/global_rmq_test.go @@ -18,12 +18,11 @@ import ( "sync" "testing" - "github.com/milvus-io/milvus/internal/allocator" - etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/util/etcd" + "github.com/milvus-io/milvus/internal/allocator" + etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" + "github.com/milvus-io/milvus/pkg/util/etcd" ) func Test_InitRmq(t *testing.T) { diff --git a/internal/mq/mqimpl/rocksmq/server/rocksmq_impl.go b/internal/mq/mqimpl/rocksmq/server/rocksmq_impl.go index f390d98151..712d7840a3 100644 --- a/internal/mq/mqimpl/rocksmq/server/rocksmq_impl.go +++ b/internal/mq/mqimpl/rocksmq/server/rocksmq_impl.go @@ -23,21 +23,20 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/tecbot/gorocksdb" "go.uber.org/zap" "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/kv" rocksdbkv "github.com/milvus-io/milvus/internal/kv/rocksdb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/internal/util/hardware" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/retry" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // UniqueID is the type of message ID @@ -50,6 +49,7 @@ type RmqState = int64 // RocksDB cache size limitation(TODO config it) var RocksDBLRUCacheMinCapacity = uint64(1 << 29) + var RocksDBLRUCacheMaxCapacity = uint64(4 << 30) // Const variable that will be used in rocksmqs diff --git a/internal/mq/mqimpl/rocksmq/server/rocksmq_impl_test.go b/internal/mq/mqimpl/rocksmq/server/rocksmq_impl_test.go index 4abac56143..8516115ee9 100644 --- a/internal/mq/mqimpl/rocksmq/server/rocksmq_impl_test.go +++ b/internal/mq/mqimpl/rocksmq/server/rocksmq_impl_test.go @@ -23,23 +23,24 @@ import ( "time" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/internal/common" - etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - rocksdbkv "github.com/milvus-io/milvus/internal/kv/rocksdb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/stretchr/testify/assert" "github.com/tecbot/gorocksdb" "go.uber.org/zap" - "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/internal/allocator" + etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" + rocksdbkv "github.com/milvus-io/milvus/internal/kv/rocksdb" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) var rmqPath = "/tmp/rocksmq" + var kvPathSuffix = "_kv" + var metaPathSuffix = "_meta" func TestMain(m *testing.M) { @@ -361,6 +362,7 @@ func TestRocksmq_MultiConsumer(t *testing.T) { assert.Equal(t, string(cMsgs[0].Payload), "message_0") } } + func TestRocksmq_Dummy(t *testing.T) { suffix := "_dummy" kvPath := rmqPath + kvPathSuffix + suffix diff --git a/internal/mq/mqimpl/rocksmq/server/rocksmq_retention.go b/internal/mq/mqimpl/rocksmq/server/rocksmq_retention.go index d915d12962..543be42c4d 100644 --- a/internal/mq/mqimpl/rocksmq/server/rocksmq_retention.go +++ b/internal/mq/mqimpl/rocksmq/server/rocksmq_retention.go @@ -18,12 +18,13 @@ import ( "sync" "time" - rocksdbkv "github.com/milvus-io/milvus/internal/kv/rocksdb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/tecbot/gorocksdb" "go.uber.org/zap" + + rocksdbkv "github.com/milvus-io/milvus/internal/kv/rocksdb" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // Const value that used to convert unit diff --git a/internal/mq/mqimpl/rocksmq/server/rocksmq_retention_test.go b/internal/mq/mqimpl/rocksmq/server/rocksmq_retention_test.go index bec1f3490a..e714f62bd2 100644 --- a/internal/mq/mqimpl/rocksmq/server/rocksmq_retention_test.go +++ b/internal/mq/mqimpl/rocksmq/server/rocksmq_retention_test.go @@ -17,10 +17,11 @@ import ( "testing" "time" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/stretchr/testify/assert" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) var retentionPath = "/tmp/rmq_retention/" diff --git a/internal/mq/msgstream/mq_factory.go b/internal/mq/msgstream/mq_factory.go index 4bdec1e2cf..96a21f47cf 100644 --- a/internal/mq/msgstream/mq_factory.go +++ b/internal/mq/msgstream/mq_factory.go @@ -18,171 +18,49 @@ package msgstream import ( "context" - "strings" - "github.com/cockroachdb/errors" - - "github.com/apache/pulsar-client-go/pulsar" - "github.com/milvus-io/milvus/internal/log" - rmqimplserver "github.com/milvus-io/milvus/internal/mq/mqimpl/rocksmq/server" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - kafkawrapper "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper/kafka" - pulsarmqwrapper "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper/pulsar" - rmqwrapper "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper/rmq" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/retry" - "github.com/streamnative/pulsarctl/pkg/cli" - "github.com/streamnative/pulsarctl/pkg/pulsar/utils" "go.uber.org/zap" + + rmqimplserver "github.com/milvus-io/milvus/internal/mq/mqimpl/rocksmq/server" + rmqwrapper "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper/rmq" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" ) -// PmsFactory is a pulsar msgstream factory that implemented Factory interface(msgstream.go) -type PmsFactory struct { - dispatcherFactory ProtoUDFactory - // the following members must be public, so that mapstructure.Decode() can access them - PulsarAddress string - PulsarWebAddress string - ReceiveBufSize int64 - PulsarBufSize int64 - PulsarAuthPlugin string - PulsarAuthParams string - PulsarTenant string - PulsarNameSpace string -} - -func NewPmsFactory(config *paramtable.PulsarConfig) *PmsFactory { - return &PmsFactory{ - PulsarBufSize: 1024, - ReceiveBufSize: 1024, - PulsarAddress: config.Address.GetValue(), - PulsarWebAddress: config.WebAddress.GetValue(), - PulsarAuthPlugin: config.AuthPlugin.GetValue(), - PulsarAuthParams: config.AuthParams.GetValue(), - PulsarTenant: config.Tenant.GetValue(), - PulsarNameSpace: config.Namespace.GetValue(), - } -} - -// NewMsgStream is used to generate a new Msgstream object -func (f *PmsFactory) NewMsgStream(ctx context.Context) (MsgStream, error) { - auth, err := f.getAuthentication() - if err != nil { - return nil, err - } - clientOpts := pulsar.ClientOptions{ - URL: f.PulsarAddress, - Authentication: auth, - } - - pulsarClient, err := pulsarmqwrapper.NewClient(f.PulsarTenant, f.PulsarNameSpace, clientOpts) - if err != nil { - return nil, err - } - return NewMqMsgStream(ctx, f.ReceiveBufSize, f.PulsarBufSize, pulsarClient, f.dispatcherFactory.NewUnmarshalDispatcher()) -} - -// NewTtMsgStream is used to generate a new TtMsgstream object -func (f *PmsFactory) NewTtMsgStream(ctx context.Context) (MsgStream, error) { - auth, err := f.getAuthentication() - if err != nil { - return nil, err - } - clientOpts := pulsar.ClientOptions{ - URL: f.PulsarAddress, - Authentication: auth, - } - - pulsarClient, err := pulsarmqwrapper.NewClient(f.PulsarTenant, f.PulsarNameSpace, clientOpts) - if err != nil { - return nil, err - } - return NewMqTtMsgStream(ctx, f.ReceiveBufSize, f.PulsarBufSize, pulsarClient, f.dispatcherFactory.NewUnmarshalDispatcher()) -} - -func (f *PmsFactory) getAuthentication() (pulsar.Authentication, error) { - auth, err := pulsar.NewAuthentication(f.PulsarAuthPlugin, f.PulsarAuthParams) - - if err != nil { - log.Error("build authencation from config failed, please check it!", - zap.String("authPlugin", f.PulsarAuthPlugin), - zap.Error(err)) - return nil, errors.New("build authencation from config failed") - } - return auth, nil -} - -// NewQueryMsgStream is used to generate a new QueryMsgstream object -func (f *PmsFactory) NewQueryMsgStream(ctx context.Context) (MsgStream, error) { - return f.NewMsgStream(ctx) -} - -func (f *PmsFactory) NewMsgStreamDisposer(ctx context.Context) func([]string, string) error { - return func(channels []string, subname string) error { - // try to delete the old subscription - admin, err := pulsarmqwrapper.NewAdminClient(f.PulsarWebAddress, f.PulsarAuthPlugin, f.PulsarAuthParams) - if err != nil { - return err - } - for _, channel := range channels { - fullTopicName, err := pulsarmqwrapper.GetFullTopicName(f.PulsarTenant, f.PulsarNameSpace, channel) - if err != nil { - return err - } - topic, err := utils.GetTopicName(fullTopicName) - if err != nil { - log.Warn("failed to get topic name", zap.Error(err)) - return retry.Unrecoverable(err) - } - err = admin.Subscriptions().Delete(*topic, subname, true) - if err != nil { - pulsarErr, ok := err.(cli.Error) - if ok { - // subscription not found, ignore error - if strings.Contains(pulsarErr.Reason, "Subscription not found") { - return nil - } - } - log.Warn("failed to clean up subscriptions", zap.String("pulsar web", f.PulsarWebAddress), - zap.String("topic", channel), zap.Any("subname", subname), zap.Error(err)) - } - } - return nil - } -} - // RmsFactory is a rocksmq msgstream factory that implemented Factory interface(msgstream.go) type RmsFactory struct { - dispatcherFactory ProtoUDFactory + dispatcherFactory msgstream.ProtoUDFactory // the following members must be public, so that mapstructure.Decode() can access them ReceiveBufSize int64 RmqBufSize int64 } // NewMsgStream is used to generate a new Msgstream object -func (f *RmsFactory) NewMsgStream(ctx context.Context) (MsgStream, error) { +func (f *RmsFactory) NewMsgStream(ctx context.Context) (msgstream.MsgStream, error) { rmqClient, err := rmqwrapper.NewClientWithDefaultOptions() if err != nil { return nil, err } - return NewMqMsgStream(ctx, f.ReceiveBufSize, f.RmqBufSize, rmqClient, f.dispatcherFactory.NewUnmarshalDispatcher()) + return msgstream.NewMqMsgStream(ctx, f.ReceiveBufSize, f.RmqBufSize, rmqClient, f.dispatcherFactory.NewUnmarshalDispatcher()) } // NewTtMsgStream is used to generate a new TtMsgstream object -func (f *RmsFactory) NewTtMsgStream(ctx context.Context) (MsgStream, error) { +func (f *RmsFactory) NewTtMsgStream(ctx context.Context) (msgstream.MsgStream, error) { rmqClient, err := rmqwrapper.NewClientWithDefaultOptions() if err != nil { return nil, err } - return NewMqTtMsgStream(ctx, f.ReceiveBufSize, f.RmqBufSize, rmqClient, f.dispatcherFactory.NewUnmarshalDispatcher()) + return msgstream.NewMqTtMsgStream(ctx, f.ReceiveBufSize, f.RmqBufSize, rmqClient, f.dispatcherFactory.NewUnmarshalDispatcher()) } // NewQueryMsgStream is used to generate a new QueryMsgstream object -func (f *RmsFactory) NewQueryMsgStream(ctx context.Context) (MsgStream, error) { +func (f *RmsFactory) NewQueryMsgStream(ctx context.Context) (msgstream.MsgStream, error) { rmqClient, err := rmqwrapper.NewClientWithDefaultOptions() if err != nil { return nil, err } - return NewMqMsgStream(ctx, f.ReceiveBufSize, f.RmqBufSize, rmqClient, f.dispatcherFactory.NewUnmarshalDispatcher()) + return msgstream.NewMqMsgStream(ctx, f.ReceiveBufSize, f.RmqBufSize, rmqClient, f.dispatcherFactory.NewUnmarshalDispatcher()) } func (f *RmsFactory) NewMsgStreamDisposer(ctx context.Context) func([]string, string) error { @@ -200,7 +78,7 @@ func (f *RmsFactory) NewMsgStreamDisposer(ctx context.Context) func([]string, st // NewRmsFactory is used to generate a new RmsFactory object func NewRmsFactory(path string) *RmsFactory { f := &RmsFactory{ - dispatcherFactory: ProtoUDFactory{}, + dispatcherFactory: msgstream.ProtoUDFactory{}, ReceiveBufSize: 1024, RmqBufSize: 1024, } @@ -211,44 +89,3 @@ func NewRmsFactory(path string) *RmsFactory { } return f } - -type KmsFactory struct { - dispatcherFactory ProtoUDFactory - config *paramtable.KafkaConfig - ReceiveBufSize int64 -} - -func (f *KmsFactory) NewMsgStream(ctx context.Context) (MsgStream, error) { - kafkaClient := kafkawrapper.NewKafkaClientInstanceWithConfig(f.config) - return NewMqMsgStream(ctx, f.ReceiveBufSize, -1, kafkaClient, f.dispatcherFactory.NewUnmarshalDispatcher()) -} - -func (f *KmsFactory) NewTtMsgStream(ctx context.Context) (MsgStream, error) { - kafkaClient := kafkawrapper.NewKafkaClientInstanceWithConfig(f.config) - return NewMqTtMsgStream(ctx, f.ReceiveBufSize, -1, kafkaClient, f.dispatcherFactory.NewUnmarshalDispatcher()) -} - -func (f *KmsFactory) NewQueryMsgStream(ctx context.Context) (MsgStream, error) { - return f.NewMsgStream(ctx) -} - -func (f *KmsFactory) NewMsgStreamDisposer(ctx context.Context) func([]string, string) error { - return func(channels []string, subname string) error { - msgstream, err := f.NewMsgStream(ctx) - if err != nil { - return err - } - msgstream.AsConsumer(channels, subname, mqwrapper.SubscriptionPositionUnknown) - msgstream.Close() - return nil - } -} - -func NewKmsFactory(config *paramtable.KafkaConfig) Factory { - f := &KmsFactory{ - dispatcherFactory: ProtoUDFactory{}, - ReceiveBufSize: 1024, - config: config, - } - return f -} diff --git a/internal/mq/msgstream/mq_factory_test.go b/internal/mq/msgstream/mq_factory_test.go index df404c17c4..64714d23ae 100644 --- a/internal/mq/msgstream/mq_factory_test.go +++ b/internal/mq/msgstream/mq_factory_test.go @@ -21,63 +21,11 @@ import ( "os" "testing" - "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/stretchr/testify/assert" + + "github.com/milvus-io/milvus/pkg/util/paramtable" ) -func TestPmsFactory(t *testing.T) { - Params.Init() - pmsFactory := NewPmsFactory(&Params.PulsarCfg) - - ctx := context.Background() - _, err := pmsFactory.NewMsgStream(ctx) - assert.Nil(t, err) - - _, err = pmsFactory.NewTtMsgStream(ctx) - assert.Nil(t, err) - - _, err = pmsFactory.NewQueryMsgStream(ctx) - assert.Nil(t, err) - - err = pmsFactory.NewMsgStreamDisposer(ctx)([]string{"hello"}, "xx") - assert.Nil(t, err) -} - -func TestPmsFactoryWithAuth(t *testing.T) { - config := &Params.PulsarCfg - Params.Save(Params.PulsarCfg.AuthPlugin.Key, "token") - Params.Save(Params.PulsarCfg.AuthParams.Key, "token:fake_token") - defer func() { - Params.Save(Params.PulsarCfg.AuthPlugin.Key, "") - Params.Save(Params.PulsarCfg.AuthParams.Key, "") - }() - pmsFactory := NewPmsFactory(config) - - ctx := context.Background() - _, err := pmsFactory.NewMsgStream(ctx) - assert.Nil(t, err) - - _, err = pmsFactory.NewTtMsgStream(ctx) - assert.Nil(t, err) - - _, err = pmsFactory.NewQueryMsgStream(ctx) - assert.Nil(t, err) - - Params.Save(Params.PulsarCfg.AuthParams.Key, "") - pmsFactory = NewPmsFactory(config) - - ctx = context.Background() - _, err = pmsFactory.NewMsgStream(ctx) - assert.Error(t, err) - - _, err = pmsFactory.NewTtMsgStream(ctx) - assert.Error(t, err) - - _, err = pmsFactory.NewQueryMsgStream(ctx) - assert.Error(t, err) - -} - func TestRmsFactory(t *testing.T) { defer os.Unsetenv("ROCKSMQ_PATH") paramtable.Init() @@ -99,20 +47,3 @@ func TestRmsFactory(t *testing.T) { err = rmsFactory.NewMsgStreamDisposer(ctx)([]string{"hello"}, "xx") assert.Nil(t, err) } - -func TestKafkaFactory(t *testing.T) { - kmsFactory := NewKmsFactory(&Params.KafkaCfg) - - ctx := context.Background() - _, err := kmsFactory.NewMsgStream(ctx) - assert.Nil(t, err) - - _, err = kmsFactory.NewTtMsgStream(ctx) - assert.Nil(t, err) - - _, err = kmsFactory.NewQueryMsgStream(ctx) - assert.Nil(t, err) - - // err = kmsFactory.NewMsgStreamDisposer(ctx)([]string{"hello"}, "xx") - // assert.Nil(t, err) -} diff --git a/internal/mq/msgstream/mqwrapper/rmq/rmq_client.go b/internal/mq/msgstream/mqwrapper/rmq/rmq_client.go index ecf6aa5195..bdbd32a2b6 100644 --- a/internal/mq/msgstream/mqwrapper/rmq/rmq_client.go +++ b/internal/mq/msgstream/mqwrapper/rmq/rmq_client.go @@ -19,13 +19,12 @@ package rmq import ( "strconv" - "github.com/milvus-io/milvus/internal/mq/mqimpl/rocksmq/server" - "github.com/milvus-io/milvus/internal/mq/mqimpl/rocksmq/client" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/internal/mq/mqimpl/rocksmq/server" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" ) // rmqClient contains a rocksmq client diff --git a/internal/mq/msgstream/mqwrapper/rmq/rmq_client_test.go b/internal/mq/msgstream/mqwrapper/rmq/rmq_client_test.go index 5018984751..e209f7b83e 100644 --- a/internal/mq/msgstream/mqwrapper/rmq/rmq_client_test.go +++ b/internal/mq/msgstream/mqwrapper/rmq/rmq_client_test.go @@ -24,17 +24,15 @@ import ( "testing" "time" + "github.com/apache/pulsar-client-go/pulsar" rocksmqimplclient "github.com/milvus-io/milvus/internal/mq/mqimpl/rocksmq/client" rocksmqimplserver "github.com/milvus-io/milvus/internal/mq/mqimpl/rocksmq/server" - - "github.com/apache/pulsar-client-go/pulsar" - - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - pulsarwrapper "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper/pulsar" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + pulsarwrapper "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper/pulsar" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) func TestMain(m *testing.M) { diff --git a/internal/mq/msgstream/mqwrapper/rmq/rmq_consumer.go b/internal/mq/msgstream/mqwrapper/rmq/rmq_consumer.go index 4aa040f9b5..d0baefc9a2 100644 --- a/internal/mq/msgstream/mqwrapper/rmq/rmq_consumer.go +++ b/internal/mq/msgstream/mqwrapper/rmq/rmq_consumer.go @@ -21,8 +21,7 @@ import ( "sync/atomic" "github.com/milvus-io/milvus/internal/mq/mqimpl/rocksmq/client" - - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" ) // Consumer is a client that used to consume messages from rocksmq diff --git a/internal/mq/msgstream/mqwrapper/rmq/rmq_id.go b/internal/mq/msgstream/mqwrapper/rmq/rmq_id.go index 79130aa1d3..cf7ed44daf 100644 --- a/internal/mq/msgstream/mqwrapper/rmq/rmq_id.go +++ b/internal/mq/msgstream/mqwrapper/rmq/rmq_id.go @@ -17,9 +17,9 @@ package rmq import ( - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/mq/mqimpl/rocksmq/server" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" ) // rmqID wraps message ID for rocksmq diff --git a/internal/mq/msgstream/mqwrapper/rmq/rmq_message.go b/internal/mq/msgstream/mqwrapper/rmq/rmq_message.go index 4d2c5ba8cd..f9d5e3f63a 100644 --- a/internal/mq/msgstream/mqwrapper/rmq/rmq_message.go +++ b/internal/mq/msgstream/mqwrapper/rmq/rmq_message.go @@ -13,7 +13,7 @@ package rmq import ( "github.com/milvus-io/milvus/internal/mq/mqimpl/rocksmq/client" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" ) // Check rmqMessage implements ConsumerMessage diff --git a/internal/mq/msgstream/mqwrapper/rmq/rmq_producer.go b/internal/mq/msgstream/mqwrapper/rmq/rmq_producer.go index a49da2db57..9227456995 100644 --- a/internal/mq/msgstream/mqwrapper/rmq/rmq_producer.go +++ b/internal/mq/msgstream/mqwrapper/rmq/rmq_producer.go @@ -15,8 +15,7 @@ import ( "context" "github.com/milvus-io/milvus/internal/mq/mqimpl/rocksmq/client" - - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" ) var _ mqwrapper.Producer = (*rmqProducer)(nil) diff --git a/internal/mq/msgstream/rocksmq_msgstream_test.go b/internal/mq/msgstream/rocksmq_msgstream_test.go new file mode 100644 index 0000000000..cdbdd9d547 --- /dev/null +++ b/internal/mq/msgstream/rocksmq_msgstream_test.go @@ -0,0 +1,911 @@ +// Licensed to the LF AI & Data foundation under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package msgstream + +import ( + "context" + "fmt" + "log" + "os" + "strings" + "sync" + "testing" + + "github.com/apache/pulsar-client-go/pulsar" + "github.com/confluentinc/confluent-kafka-go/kafka" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/require" + + "github.com/milvus-io/milvus-proto/go-api/commonpb" + "github.com/milvus-io/milvus-proto/go-api/msgpb" + "github.com/milvus-io/milvus/internal/allocator" + etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" + "github.com/milvus-io/milvus/internal/mq/mqimpl/rocksmq/server" + "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper/rmq" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + pulsarwrapper "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper/pulsar" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" +) + +const ( + DefaultPulsarTenant = "public" + DefaultPulsarNamespace = "default" +) + +var Params paramtable.ComponentParam + +func TestMain(m *testing.M) { + Params.Init() + mockKafkaCluster, err := kafka.NewMockCluster(1) + defer mockKafkaCluster.Close() + if err != nil { + // nolint + fmt.Printf("Failed to create MockCluster: %s\n", err) + os.Exit(1) + } + broker := mockKafkaCluster.BootstrapServers() + Params.Save("kafka.brokerList", broker) + + exitCode := m.Run() + os.Exit(exitCode) +} + +func getPulsarAddress() string { + pulsarHost := Params.GetWithDefault("pulsar.address", "") + port := Params.GetWithDefault("pulsar.port", "") + if len(pulsarHost) != 0 && len(port) != 0 { + return "pulsar://" + pulsarHost + ":" + port + } + panic("invalid pulsar address") +} + +type fixture struct { + t *testing.T + etcdKV *etcdkv.EtcdKV +} + +type parameters struct { + client mqwrapper.Client +} + +func (f *fixture) setup() []parameters { + pulsarAddress := getPulsarAddress() + pulsarClient, err := pulsarwrapper.NewClient(DefaultPulsarTenant, DefaultPulsarNamespace, pulsar.ClientOptions{URL: pulsarAddress}) + assert.Nil(f.t, err) + + rocksdbName := "/tmp/rocksmq_unittest_" + f.t.Name() + endpoints := os.Getenv("ETCD_ENDPOINTS") + if endpoints == "" { + endpoints = "localhost:2379" + } + etcdEndpoints := strings.Split(endpoints, ",") + etcdCli, err := etcd.GetRemoteEtcdClient(etcdEndpoints) + defer etcdCli.Close() + if err != nil { + log.Fatalf("New clientv3 error = %v", err) + } + f.etcdKV = etcdkv.NewEtcdKV(etcdCli, "/etcd/test/root") + idAllocator := allocator.NewGlobalIDAllocator("dummy", f.etcdKV) + _ = idAllocator.Initialize() + err = server.InitRmq(rocksdbName, idAllocator) + if err != nil { + log.Fatalf("InitRmq error = %v", err) + } + + rmqClient, _ := rmq.NewClientWithDefaultOptions() + + parameters := []parameters{ + {pulsarClient}, + {rmqClient}, + } + return parameters +} + +func (f *fixture) teardown() { + rocksdbName := "/tmp/rocksmq_unittest_" + f.t.Name() + + server.CloseRocksMQ() + f.etcdKV.Close() + _ = os.RemoveAll(rocksdbName) + _ = os.RemoveAll(rocksdbName + "_meta_kv") +} + +func Test_NewMqMsgStream(t *testing.T) { + f := &fixture{t: t} + parameters := f.setup() + defer f.teardown() + + factory := &msgstream.ProtoUDFactory{} + for i := range parameters { + func(client mqwrapper.Client) { + _, err := msgstream.NewMqMsgStream(context.Background(), 100, 100, client, factory.NewUnmarshalDispatcher()) + assert.Nil(t, err) + }(parameters[i].client) + } +} + +// TODO(wxyu): add a mock implement of mqwrapper.Client, then inject errors to improve coverage +func TestMqMsgStream_AsProducer(t *testing.T) { + f := &fixture{t: t} + parameters := f.setup() + defer f.teardown() + + factory := &msgstream.ProtoUDFactory{} + for i := range parameters { + func(client mqwrapper.Client) { + m, err := msgstream.NewMqMsgStream(context.Background(), 100, 100, client, factory.NewUnmarshalDispatcher()) + assert.Nil(t, err) + + // empty channel name + m.AsProducer([]string{""}) + }(parameters[i].client) + } +} + +// TODO(wxyu): add a mock implement of mqwrapper.Client, then inject errors to improve coverage +func TestMqMsgStream_AsConsumer(t *testing.T) { + f := &fixture{t: t} + parameters := f.setup() + defer f.teardown() + + factory := &msgstream.ProtoUDFactory{} + for i := range parameters { + func(client mqwrapper.Client) { + m, err := msgstream.NewMqMsgStream(context.Background(), 100, 100, client, factory.NewUnmarshalDispatcher()) + assert.Nil(t, err) + + // repeat calling AsConsumer + m.AsConsumer([]string{"a"}, "b", mqwrapper.SubscriptionPositionUnknown) + m.AsConsumer([]string{"a"}, "b", mqwrapper.SubscriptionPositionUnknown) + }(parameters[i].client) + } +} + +func TestMqMsgStream_ComputeProduceChannelIndexes(t *testing.T) { + f := &fixture{t: t} + parameters := f.setup() + defer f.teardown() + + factory := &msgstream.ProtoUDFactory{} + for i := range parameters { + func(client mqwrapper.Client) { + m, err := msgstream.NewMqMsgStream(context.Background(), 100, 100, client, factory.NewUnmarshalDispatcher()) + assert.Nil(t, err) + + // empty parameters + reBucketValues := m.ComputeProduceChannelIndexes([]msgstream.TsMsg{}) + assert.Nil(t, reBucketValues) + + // not called AsProducer yet + insertMsg := &msgstream.InsertMsg{ + BaseMsg: generateBaseMsg(), + InsertRequest: msgpb.InsertRequest{ + Base: &commonpb.MsgBase{ + MsgType: commonpb.MsgType_Insert, + MsgID: 1, + Timestamp: 2, + SourceID: 3, + }, + + DbName: "test_db", + CollectionName: "test_collection", + PartitionName: "test_partition", + DbID: 4, + CollectionID: 5, + PartitionID: 6, + SegmentID: 7, + ShardName: "test-channel", + Timestamps: []uint64{2, 1, 3}, + RowData: []*commonpb.Blob{}, + }, + } + reBucketValues = m.ComputeProduceChannelIndexes([]msgstream.TsMsg{insertMsg}) + assert.Nil(t, reBucketValues) + }(parameters[i].client) + } +} + +func TestMqMsgStream_GetProduceChannels(t *testing.T) { + f := &fixture{t: t} + parameters := f.setup() + defer f.teardown() + + factory := &msgstream.ProtoUDFactory{} + for i := range parameters { + func(client mqwrapper.Client) { + m, err := msgstream.NewMqMsgStream(context.Background(), 100, 100, client, factory.NewUnmarshalDispatcher()) + assert.Nil(t, err) + + // empty if not called AsProducer yet + chs := m.GetProduceChannels() + assert.Equal(t, 0, len(chs)) + + // not empty after AsProducer + m.AsProducer([]string{"a"}) + chs = m.GetProduceChannels() + assert.Equal(t, 1, len(chs)) + }(parameters[i].client) + } +} + +func TestMqMsgStream_Produce(t *testing.T) { + f := &fixture{t: t} + parameters := f.setup() + defer f.teardown() + + factory := &msgstream.ProtoUDFactory{} + for i := range parameters { + func(client mqwrapper.Client) { + m, err := msgstream.NewMqMsgStream(context.Background(), 100, 100, client, factory.NewUnmarshalDispatcher()) + assert.Nil(t, err) + + // Produce before called AsProducer + insertMsg := &msgstream.InsertMsg{ + BaseMsg: generateBaseMsg(), + InsertRequest: msgpb.InsertRequest{ + Base: &commonpb.MsgBase{ + MsgType: commonpb.MsgType_Insert, + MsgID: 1, + Timestamp: 2, + SourceID: 3, + }, + + DbName: "test_db", + CollectionName: "test_collection", + PartitionName: "test_partition", + DbID: 4, + CollectionID: 5, + PartitionID: 6, + SegmentID: 7, + ShardName: "test-channel", + Timestamps: []uint64{2, 1, 3}, + RowData: []*commonpb.Blob{}, + }, + } + msgPack := &msgstream.MsgPack{ + Msgs: []msgstream.TsMsg{insertMsg}, + } + err = m.Produce(msgPack) + assert.NotNil(t, err) + }(parameters[i].client) + } +} + +func TestMqMsgStream_Broadcast(t *testing.T) { + f := &fixture{t: t} + parameters := f.setup() + defer f.teardown() + + factory := &msgstream.ProtoUDFactory{} + for i := range parameters { + func(client mqwrapper.Client) { + m, err := msgstream.NewMqMsgStream(context.Background(), 100, 100, client, factory.NewUnmarshalDispatcher()) + assert.Nil(t, err) + + // Broadcast nil pointer + _, err = m.Broadcast(nil) + assert.NotNil(t, err) + }(parameters[i].client) + } +} + +func TestMqMsgStream_Consume(t *testing.T) { + f := &fixture{t: t} + parameters := f.setup() + defer f.teardown() + + factory := &msgstream.ProtoUDFactory{} + for i := range parameters { + func(client mqwrapper.Client) { + // Consume return nil when ctx canceled + var wg sync.WaitGroup + ctx, cancel := context.WithCancel(context.Background()) + m, err := msgstream.NewMqMsgStream(ctx, 100, 100, client, factory.NewUnmarshalDispatcher()) + assert.Nil(t, err) + + wg.Add(1) + go func() { + defer wg.Done() + msgPack := consumer(ctx, m) + assert.Nil(t, msgPack) + }() + + cancel() + wg.Wait() + }(parameters[i].client) + } +} + +func consumer(ctx context.Context, mq msgstream.MsgStream) *msgstream.MsgPack { + for { + select { + case msgPack, ok := <-mq.Chan(): + if !ok { + panic("Should not reach here") + } + return msgPack + case <-ctx.Done(): + return nil + } + } +} + +func TestMqMsgStream_Chan(t *testing.T) { + f := &fixture{t: t} + parameters := f.setup() + defer f.teardown() + + factory := &msgstream.ProtoUDFactory{} + for i := range parameters { + func(client mqwrapper.Client) { + m, err := msgstream.NewMqMsgStream(context.Background(), 100, 100, client, factory.NewUnmarshalDispatcher()) + assert.Nil(t, err) + + ch := m.Chan() + assert.NotNil(t, ch) + }(parameters[i].client) + } +} + +func TestMqMsgStream_SeekNotSubscribed(t *testing.T) { + f := &fixture{t: t} + parameters := f.setup() + defer f.teardown() + + factory := &msgstream.ProtoUDFactory{} + for i := range parameters { + func(client mqwrapper.Client) { + m, err := msgstream.NewMqMsgStream(context.Background(), 100, 100, client, factory.NewUnmarshalDispatcher()) + assert.Nil(t, err) + + // seek in not subscribed channel + p := []*msgpb.MsgPosition{ + { + ChannelName: "b", + }, + } + err = m.Seek(p) + assert.NotNil(t, err) + }(parameters[i].client) + } +} + +func generateBaseMsg() msgstream.BaseMsg { + ctx := context.Background() + return msgstream.BaseMsg{ + Ctx: ctx, + BeginTimestamp: msgstream.Timestamp(0), + EndTimestamp: msgstream.Timestamp(1), + HashValues: []uint32{2}, + MsgPosition: nil, + } +} + +/****************************************Rmq test******************************************/ + +func initRmq(name string) *etcdkv.EtcdKV { + endpoints := os.Getenv("ETCD_ENDPOINTS") + if endpoints == "" { + endpoints = "localhost:2379" + } + etcdEndpoints := strings.Split(endpoints, ",") + etcdCli, err := etcd.GetRemoteEtcdClient(etcdEndpoints) + if err != nil { + log.Fatalf("New clientv3 error = %v", err) + } + etcdKV := etcdkv.NewEtcdKV(etcdCli, "/etcd/test/root") + idAllocator := allocator.NewGlobalIDAllocator("dummy", etcdKV) + _ = idAllocator.Initialize() + + err = server.InitRmq(name, idAllocator) + + if err != nil { + log.Fatalf("InitRmq error = %v", err) + } + return etcdKV +} + +func Close(rocksdbName string, intputStream, outputStream msgstream.MsgStream, etcdKV *etcdkv.EtcdKV) { + server.CloseRocksMQ() + intputStream.Close() + outputStream.Close() + etcdKV.Close() + err := os.RemoveAll(rocksdbName) + _ = os.RemoveAll(rocksdbName + "_meta_kv") + log.Println(err) +} + +func initRmqStream(ctx context.Context, + producerChannels []string, + consumerChannels []string, + consumerGroupName string, + opts ...msgstream.RepackFunc) (msgstream.MsgStream, msgstream.MsgStream) { + factory := msgstream.ProtoUDFactory{} + + rmqClient, _ := rmq.NewClientWithDefaultOptions() + inputStream, _ := msgstream.NewMqMsgStream(ctx, 100, 100, rmqClient, factory.NewUnmarshalDispatcher()) + inputStream.AsProducer(producerChannels) + for _, opt := range opts { + inputStream.SetRepackFunc(opt) + } + var input msgstream.MsgStream = inputStream + + rmqClient2, _ := rmq.NewClientWithDefaultOptions() + outputStream, _ := msgstream.NewMqMsgStream(ctx, 100, 100, rmqClient2, factory.NewUnmarshalDispatcher()) + outputStream.AsConsumer(consumerChannels, consumerGroupName, mqwrapper.SubscriptionPositionEarliest) + var output msgstream.MsgStream = outputStream + + return input, output +} + +func initRmqTtStream(ctx context.Context, + producerChannels []string, + consumerChannels []string, + consumerGroupName string, + opts ...msgstream.RepackFunc) (msgstream.MsgStream, msgstream.MsgStream) { + factory := msgstream.ProtoUDFactory{} + + rmqClient, _ := rmq.NewClientWithDefaultOptions() + inputStream, _ := msgstream.NewMqMsgStream(ctx, 100, 100, rmqClient, factory.NewUnmarshalDispatcher()) + inputStream.AsProducer(producerChannels) + for _, opt := range opts { + inputStream.SetRepackFunc(opt) + } + var input msgstream.MsgStream = inputStream + + rmqClient2, _ := rmq.NewClientWithDefaultOptions() + outputStream, _ := msgstream.NewMqTtMsgStream(ctx, 100, 100, rmqClient2, factory.NewUnmarshalDispatcher()) + outputStream.AsConsumer(consumerChannels, consumerGroupName, mqwrapper.SubscriptionPositionEarliest) + var output msgstream.MsgStream = outputStream + + return input, output +} + +func TestStream_RmqMsgStream_Insert(t *testing.T) { + producerChannels := []string{"insert1", "insert2"} + consumerChannels := []string{"insert1", "insert2"} + consumerGroupName := "InsertGroup" + + msgPack := msgstream.MsgPack{} + msgPack.Msgs = append(msgPack.Msgs, getTsMsg(commonpb.MsgType_Insert, 1)) + msgPack.Msgs = append(msgPack.Msgs, getTsMsg(commonpb.MsgType_Insert, 3)) + + rocksdbName := "/tmp/rocksmq_insert" + etcdKV := initRmq(rocksdbName) + ctx := context.Background() + inputStream, outputStream := initRmqStream(ctx, producerChannels, consumerChannels, consumerGroupName) + err := inputStream.Produce(&msgPack) + require.NoErrorf(t, err, fmt.Sprintf("produce error = %v", err)) + + receiveMsg(ctx, outputStream, len(msgPack.Msgs)) + Close(rocksdbName, inputStream, outputStream, etcdKV) +} + +func TestStream_RmqTtMsgStream_Insert(t *testing.T) { + producerChannels := []string{"insert1", "insert2"} + consumerChannels := []string{"insert1", "insert2"} + consumerSubName := "subInsert" + + msgPack0 := msgstream.MsgPack{} + msgPack0.Msgs = append(msgPack0.Msgs, getTimeTickMsg(0)) + + msgPack1 := msgstream.MsgPack{} + msgPack1.Msgs = append(msgPack1.Msgs, getTsMsg(commonpb.MsgType_Insert, 1)) + msgPack1.Msgs = append(msgPack1.Msgs, getTsMsg(commonpb.MsgType_Insert, 3)) + + msgPack2 := msgstream.MsgPack{} + msgPack2.Msgs = append(msgPack2.Msgs, getTimeTickMsg(5)) + + rocksdbName := "/tmp/rocksmq_insert_tt" + etcdKV := initRmq(rocksdbName) + ctx := context.Background() + inputStream, outputStream := initRmqTtStream(ctx, producerChannels, consumerChannels, consumerSubName) + + _, err := inputStream.Broadcast(&msgPack0) + require.NoErrorf(t, err, fmt.Sprintf("broadcast error = %v", err)) + + err = inputStream.Produce(&msgPack1) + require.NoErrorf(t, err, fmt.Sprintf("produce error = %v", err)) + + _, err = inputStream.Broadcast(&msgPack2) + require.NoErrorf(t, err, fmt.Sprintf("broadcast error = %v", err)) + + receiveMsg(ctx, outputStream, len(msgPack1.Msgs)) + Close(rocksdbName, inputStream, outputStream, etcdKV) +} + +func TestStream_RmqTtMsgStream_DuplicatedIDs(t *testing.T) { + rocksdbName := "/tmp/rocksmq_tt_msg_seek" + etcdKV := initRmq(rocksdbName) + + c1 := funcutil.RandomString(8) + producerChannels := []string{c1} + consumerChannels := []string{c1} + consumerSubName := funcutil.RandomString(8) + + msgPack0 := msgstream.MsgPack{} + msgPack0.Msgs = append(msgPack0.Msgs, getTimeTickMsg(0)) + + msgPack1 := msgstream.MsgPack{} + msgPack1.Msgs = append(msgPack1.Msgs, getTsMsg(commonpb.MsgType_Insert, 1)) + msgPack1.Msgs = append(msgPack1.Msgs, getTsMsg(commonpb.MsgType_Insert, 1)) + msgPack1.Msgs = append(msgPack1.Msgs, getTsMsg(commonpb.MsgType_Insert, 1)) + + // would not dedup for non-dml messages + msgPack2 := msgstream.MsgPack{} + msgPack2.Msgs = append(msgPack2.Msgs, getTsMsg(commonpb.MsgType_CreateCollection, 2)) + msgPack2.Msgs = append(msgPack2.Msgs, getTsMsg(commonpb.MsgType_CreateCollection, 2)) + + msgPack3 := msgstream.MsgPack{} + msgPack3.Msgs = append(msgPack3.Msgs, getTimeTickMsg(15)) + + ctx := context.Background() + inputStream, outputStream := initRmqTtStream(ctx, producerChannels, consumerChannels, consumerSubName) + + _, err := inputStream.Broadcast(&msgPack0) + assert.Nil(t, err) + err = inputStream.Produce(&msgPack1) + assert.Nil(t, err) + err = inputStream.Produce(&msgPack2) + assert.Nil(t, err) + _, err = inputStream.Broadcast(&msgPack3) + assert.Nil(t, err) + + receivedMsg := consumer(ctx, outputStream) + assert.Equal(t, len(receivedMsg.Msgs), 3) + assert.Equal(t, receivedMsg.BeginTs, uint64(0)) + assert.Equal(t, receivedMsg.EndTs, uint64(15)) + + outputStream.Close() + + factory := msgstream.ProtoUDFactory{} + + rmqClient, _ := rmq.NewClientWithDefaultOptions() + outputStream, _ = msgstream.NewMqTtMsgStream(context.Background(), 100, 100, rmqClient, factory.NewUnmarshalDispatcher()) + consumerSubName = funcutil.RandomString(8) + outputStream.AsConsumer(consumerChannels, consumerSubName, mqwrapper.SubscriptionPositionUnknown) + outputStream.Seek(receivedMsg.StartPositions) + seekMsg := consumer(ctx, outputStream) + assert.Equal(t, len(seekMsg.Msgs), 1+2) + assert.EqualValues(t, seekMsg.Msgs[0].BeginTs(), 1) + assert.Equal(t, commonpb.MsgType_CreateCollection, seekMsg.Msgs[1].Type()) + assert.Equal(t, commonpb.MsgType_CreateCollection, seekMsg.Msgs[2].Type()) + + Close(rocksdbName, inputStream, outputStream, etcdKV) +} + +func TestStream_RmqTtMsgStream_Seek(t *testing.T) { + rocksdbName := "/tmp/rocksmq_tt_msg_seek" + etcdKV := initRmq(rocksdbName) + + c1 := funcutil.RandomString(8) + producerChannels := []string{c1} + consumerChannels := []string{c1} + consumerSubName := funcutil.RandomString(8) + + msgPack0 := msgstream.MsgPack{} + msgPack0.Msgs = append(msgPack0.Msgs, getTimeTickMsg(0)) + + msgPack1 := msgstream.MsgPack{} + msgPack1.Msgs = append(msgPack1.Msgs, getTsMsg(commonpb.MsgType_Insert, 1)) + msgPack1.Msgs = append(msgPack1.Msgs, getTsMsg(commonpb.MsgType_Insert, 3)) + msgPack1.Msgs = append(msgPack1.Msgs, getTsMsg(commonpb.MsgType_Insert, 19)) + + msgPack2 := msgstream.MsgPack{} + msgPack2.Msgs = append(msgPack2.Msgs, getTimeTickMsg(5)) + + msgPack3 := msgstream.MsgPack{} + msgPack3.Msgs = append(msgPack3.Msgs, getTsMsg(commonpb.MsgType_Insert, 14)) + msgPack3.Msgs = append(msgPack3.Msgs, getTsMsg(commonpb.MsgType_Insert, 9)) + + msgPack4 := msgstream.MsgPack{} + msgPack4.Msgs = append(msgPack4.Msgs, getTimeTickMsg(11)) + + msgPack5 := msgstream.MsgPack{} + msgPack5.Msgs = append(msgPack5.Msgs, getTsMsg(commonpb.MsgType_Insert, 12)) + msgPack5.Msgs = append(msgPack5.Msgs, getTsMsg(commonpb.MsgType_Insert, 13)) + + msgPack6 := msgstream.MsgPack{} + msgPack6.Msgs = append(msgPack6.Msgs, getTimeTickMsg(15)) + + msgPack7 := msgstream.MsgPack{} + msgPack7.Msgs = append(msgPack7.Msgs, getTimeTickMsg(20)) + + ctx := context.Background() + inputStream, outputStream := initRmqTtStream(ctx, producerChannels, consumerChannels, consumerSubName) + + _, err := inputStream.Broadcast(&msgPack0) + assert.Nil(t, err) + err = inputStream.Produce(&msgPack1) + assert.Nil(t, err) + _, err = inputStream.Broadcast(&msgPack2) + assert.Nil(t, err) + err = inputStream.Produce(&msgPack3) + assert.Nil(t, err) + _, err = inputStream.Broadcast(&msgPack4) + assert.Nil(t, err) + err = inputStream.Produce(&msgPack5) + assert.Nil(t, err) + _, err = inputStream.Broadcast(&msgPack6) + assert.Nil(t, err) + _, err = inputStream.Broadcast(&msgPack7) + assert.Nil(t, err) + + receivedMsg := consumer(ctx, outputStream) + assert.Equal(t, len(receivedMsg.Msgs), 2) + assert.Equal(t, receivedMsg.BeginTs, uint64(0)) + assert.Equal(t, receivedMsg.EndTs, uint64(5)) + + assert.Equal(t, receivedMsg.StartPositions[0].Timestamp, uint64(0)) + assert.Equal(t, receivedMsg.EndPositions[0].Timestamp, uint64(5)) + + receivedMsg2 := consumer(ctx, outputStream) + assert.Equal(t, len(receivedMsg2.Msgs), 1) + assert.Equal(t, receivedMsg2.BeginTs, uint64(5)) + assert.Equal(t, receivedMsg2.EndTs, uint64(11)) + assert.Equal(t, receivedMsg2.StartPositions[0].Timestamp, uint64(5)) + assert.Equal(t, receivedMsg2.EndPositions[0].Timestamp, uint64(11)) + + receivedMsg3 := consumer(ctx, outputStream) + assert.Equal(t, len(receivedMsg3.Msgs), 3) + assert.Equal(t, receivedMsg3.BeginTs, uint64(11)) + assert.Equal(t, receivedMsg3.EndTs, uint64(15)) + assert.Equal(t, receivedMsg3.StartPositions[0].Timestamp, uint64(11)) + assert.Equal(t, receivedMsg3.EndPositions[0].Timestamp, uint64(15)) + + receivedMsg4 := consumer(ctx, outputStream) + assert.Equal(t, len(receivedMsg4.Msgs), 1) + assert.Equal(t, receivedMsg4.BeginTs, uint64(15)) + assert.Equal(t, receivedMsg4.EndTs, uint64(20)) + assert.Equal(t, receivedMsg4.StartPositions[0].Timestamp, uint64(15)) + assert.Equal(t, receivedMsg4.EndPositions[0].Timestamp, uint64(20)) + + outputStream.Close() + + factory := msgstream.ProtoUDFactory{} + + rmqClient, _ := rmq.NewClientWithDefaultOptions() + outputStream, _ = msgstream.NewMqTtMsgStream(context.Background(), 100, 100, rmqClient, factory.NewUnmarshalDispatcher()) + consumerSubName = funcutil.RandomString(8) + outputStream.AsConsumer(consumerChannels, consumerSubName, mqwrapper.SubscriptionPositionUnknown) + + outputStream.Seek(receivedMsg3.StartPositions) + seekMsg := consumer(ctx, outputStream) + assert.Equal(t, len(seekMsg.Msgs), 3) + result := []uint64{14, 12, 13} + for i, msg := range seekMsg.Msgs { + assert.Equal(t, msg.BeginTs(), result[i]) + } + + seekMsg2 := consumer(ctx, outputStream) + assert.Equal(t, len(seekMsg2.Msgs), 1) + for _, msg := range seekMsg2.Msgs { + assert.Equal(t, msg.BeginTs(), uint64(19)) + } + + Close(rocksdbName, inputStream, outputStream, etcdKV) +} + +func TestStream_RMqMsgStream_SeekInvalidMessage(t *testing.T) { + rocksdbName := "/tmp/rocksmq_tt_msg_seekInvalid" + etcdKV := initRmq(rocksdbName) + c := funcutil.RandomString(8) + producerChannels := []string{c} + consumerChannels := []string{c} + consumerSubName := funcutil.RandomString(8) + ctx := context.Background() + inputStream, outputStream := initRmqStream(ctx, producerChannels, consumerChannels, consumerSubName) + + msgPack := &msgstream.MsgPack{} + for i := 0; i < 10; i++ { + insertMsg := getTsMsg(commonpb.MsgType_Insert, int64(i)) + msgPack.Msgs = append(msgPack.Msgs, insertMsg) + } + + err := inputStream.Produce(msgPack) + assert.Nil(t, err) + var seekPosition *msgpb.MsgPosition + for i := 0; i < 10; i++ { + result := consumer(ctx, outputStream) + assert.Equal(t, result.Msgs[0].ID(), int64(i)) + seekPosition = result.EndPositions[0] + } + outputStream.Close() + + factory := msgstream.ProtoUDFactory{} + rmqClient2, _ := rmq.NewClientWithDefaultOptions() + outputStream2, _ := msgstream.NewMqMsgStream(ctx, 100, 100, rmqClient2, factory.NewUnmarshalDispatcher()) + outputStream2.AsConsumer(consumerChannels, funcutil.RandomString(8), mqwrapper.SubscriptionPositionUnknown) + + id := common.Endian.Uint64(seekPosition.MsgID) + 10 + bs := make([]byte, 8) + common.Endian.PutUint64(bs, id) + p := []*msgpb.MsgPosition{ + { + ChannelName: seekPosition.ChannelName, + Timestamp: seekPosition.Timestamp, + MsgGroup: seekPosition.MsgGroup, + MsgID: bs, + }, + } + + err = outputStream2.Seek(p) + assert.Nil(t, err) + + for i := 10; i < 20; i++ { + insertMsg := getTsMsg(commonpb.MsgType_Insert, int64(i)) + msgPack.Msgs = append(msgPack.Msgs, insertMsg) + } + err = inputStream.Produce(msgPack) + assert.Nil(t, err) + + result := consumer(ctx, outputStream2) + assert.Equal(t, result.Msgs[0].ID(), int64(1)) + + Close(rocksdbName, inputStream, outputStream2, etcdKV) +} + +func TestStream_RmqTtMsgStream_AsConsumerWithPosition(t *testing.T) { + + producerChannels := []string{"insert1"} + consumerChannels := []string{"insert1"} + consumerSubName := "subInsert" + + rocksdbName := "/tmp/rocksmq_asconsumer_withpos" + etcdKV := initRmq(rocksdbName) + factory := msgstream.ProtoUDFactory{} + + rmqClient, _ := rmq.NewClientWithDefaultOptions() + + otherInputStream, _ := msgstream.NewMqMsgStream(context.Background(), 100, 100, rmqClient, factory.NewUnmarshalDispatcher()) + otherInputStream.AsProducer([]string{"root_timetick"}) + otherInputStream.Produce(getTimeTickMsgPack(999)) + + inputStream, _ := msgstream.NewMqMsgStream(context.Background(), 100, 100, rmqClient, factory.NewUnmarshalDispatcher()) + inputStream.AsProducer(producerChannels) + + for i := 0; i < 100; i++ { + inputStream.Produce(getTimeTickMsgPack(int64(i))) + } + + rmqClient2, _ := rmq.NewClientWithDefaultOptions() + outputStream, _ := msgstream.NewMqMsgStream(context.Background(), 100, 100, rmqClient2, factory.NewUnmarshalDispatcher()) + outputStream.AsConsumer(consumerChannels, consumerSubName, mqwrapper.SubscriptionPositionLatest) + + inputStream.Produce(getTimeTickMsgPack(1000)) + pack := <-outputStream.Chan() + assert.NotNil(t, pack) + assert.Equal(t, 1, len(pack.Msgs)) + assert.EqualValues(t, 1000, pack.Msgs[0].BeginTs()) + + Close(rocksdbName, inputStream, outputStream, etcdKV) +} + +func getTimeTickMsgPack(reqID msgstream.UniqueID) *msgstream.MsgPack { + msgPack := msgstream.MsgPack{} + msgPack.Msgs = append(msgPack.Msgs, getTimeTickMsg(reqID)) + return &msgPack +} + +func getTsMsg(msgType msgstream.MsgType, reqID msgstream.UniqueID) msgstream.TsMsg { + hashValue := uint32(reqID) + time := uint64(reqID) + baseMsg := msgstream.BaseMsg{ + BeginTimestamp: 0, + EndTimestamp: 0, + HashValues: []uint32{hashValue}, + } + switch msgType { + case commonpb.MsgType_Insert: + insertRequest := msgpb.InsertRequest{ + Base: &commonpb.MsgBase{ + MsgType: commonpb.MsgType_Insert, + MsgID: reqID, + Timestamp: time, + SourceID: reqID, + }, + CollectionName: "Collection", + PartitionName: "Partition", + SegmentID: 1, + ShardName: "0", + Timestamps: []msgstream.Timestamp{time}, + RowIDs: []int64{1}, + RowData: []*commonpb.Blob{{}}, + } + insertMsg := &msgstream.InsertMsg{ + BaseMsg: baseMsg, + InsertRequest: insertRequest, + } + return insertMsg + case commonpb.MsgType_CreateCollection: + createCollectionRequest := msgpb.CreateCollectionRequest{ + Base: &commonpb.MsgBase{ + MsgType: commonpb.MsgType_CreateCollection, + MsgID: reqID, + Timestamp: 11, + SourceID: reqID, + }, + DbName: "test_db", + CollectionName: "test_collection", + PartitionName: "test_partition", + DbID: 4, + CollectionID: 5, + PartitionID: 6, + Schema: []byte{}, + VirtualChannelNames: []string{}, + PhysicalChannelNames: []string{}, + } + createCollectionMsg := &msgstream.CreateCollectionMsg{ + BaseMsg: baseMsg, + CreateCollectionRequest: createCollectionRequest, + } + return createCollectionMsg + } + return nil +} + +func getTimeTickMsg(reqID msgstream.UniqueID) msgstream.TsMsg { + hashValue := uint32(reqID) + time := uint64(reqID) + baseMsg := msgstream.BaseMsg{ + BeginTimestamp: 0, + EndTimestamp: 0, + HashValues: []uint32{hashValue}, + } + timeTickResult := msgpb.TimeTickMsg{ + Base: &commonpb.MsgBase{ + MsgType: commonpb.MsgType_TimeTick, + MsgID: reqID, + Timestamp: time, + SourceID: reqID, + }, + } + timeTickMsg := &msgstream.TimeTickMsg{ + BaseMsg: baseMsg, + TimeTickMsg: timeTickResult, + } + return timeTickMsg +} + +func receiveMsg(ctx context.Context, outputStream msgstream.MsgStream, msgCount int) { + receiveCount := 0 + for { + select { + case <-ctx.Done(): + return + case result, ok := <-outputStream.Chan(): + if !ok || result == nil || len(result.Msgs) == 0 { + return + } + if len(result.Msgs) > 0 { + msgs := result.Msgs + for _, v := range msgs { + receiveCount++ + log.Println("msg type: ", v.Type(), ", msg value: ", v) + } + log.Println("================") + } + if receiveCount >= msgCount { + return + } + } + } +} diff --git a/internal/parser/planparserv2/check_identical.go b/internal/parser/planparserv2/check_identical.go index 70094d5549..a967f3b0f4 100644 --- a/internal/parser/planparserv2/check_identical.go +++ b/internal/parser/planparserv2/check_identical.go @@ -4,7 +4,7 @@ import ( "reflect" "github.com/milvus-io/milvus/internal/proto/planpb" - "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" ) // CheckPredicatesIdentical check if two exprs are identical. diff --git a/internal/parser/planparserv2/check_identical_test.go b/internal/parser/planparserv2/check_identical_test.go index a3c4a988a8..f50f3abb0a 100644 --- a/internal/parser/planparserv2/check_identical_test.go +++ b/internal/parser/planparserv2/check_identical_test.go @@ -5,7 +5,7 @@ import ( "github.com/milvus-io/milvus/internal/proto/planpb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/stretchr/testify/assert" ) diff --git a/internal/parser/planparserv2/parser_visitor.go b/internal/parser/planparserv2/parser_visitor.go index b6fd1105c8..358a7665e4 100644 --- a/internal/parser/planparserv2/parser_visitor.go +++ b/internal/parser/planparserv2/parser_visitor.go @@ -7,7 +7,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/schemapb" parser "github.com/milvus-io/milvus/internal/parser/planparserv2/generated" "github.com/milvus-io/milvus/internal/proto/planpb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type ParserVisitor struct { diff --git a/internal/parser/planparserv2/plan_parser_v2.go b/internal/parser/planparserv2/plan_parser_v2.go index a06da018b1..9bf95c4e70 100644 --- a/internal/parser/planparserv2/plan_parser_v2.go +++ b/internal/parser/planparserv2/plan_parser_v2.go @@ -5,7 +5,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/planpb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/antlr/antlr4/runtime/Go/antlr" ) diff --git a/internal/parser/planparserv2/plan_parser_v2_test.go b/internal/parser/planparserv2/plan_parser_v2_test.go index 02be4df379..d941c24fdf 100644 --- a/internal/parser/planparserv2/plan_parser_v2_test.go +++ b/internal/parser/planparserv2/plan_parser_v2_test.go @@ -9,7 +9,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func newTestSchema() *schemapb.CollectionSchema { diff --git a/internal/parser/planparserv2/show_visitor.go b/internal/parser/planparserv2/show_visitor.go index 14719f3187..6930e8fe76 100644 --- a/internal/parser/planparserv2/show_visitor.go +++ b/internal/parser/planparserv2/show_visitor.go @@ -3,9 +3,10 @@ package planparserv2 import ( "encoding/json" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/planpb" "go.uber.org/zap" + + "github.com/milvus-io/milvus/internal/proto/planpb" + "github.com/milvus-io/milvus/pkg/log" ) type ShowExprVisitor struct { diff --git a/internal/parser/planparserv2/utils.go b/internal/parser/planparserv2/utils.go index 0105ec0b6e..cf2ac5170c 100644 --- a/internal/parser/planparserv2/utils.go +++ b/internal/parser/planparserv2/utils.go @@ -3,7 +3,7 @@ package planparserv2 import ( "fmt" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/planpb" diff --git a/internal/proxy/accesslog/access_log.go b/internal/proxy/accesslog/access_log.go index c5e23022f2..8541a94d27 100644 --- a/internal/proxy/accesslog/access_log.go +++ b/internal/proxy/accesslog/access_log.go @@ -23,8 +23,8 @@ import ( "sync" "sync/atomic" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/paramtable" "go.uber.org/zap" "go.uber.org/zap/zapcore" diff --git a/internal/proxy/accesslog/access_log_test.go b/internal/proxy/accesslog/access_log_test.go index 338873a9f4..a65ad72d8e 100644 --- a/internal/proxy/accesslog/access_log_test.go +++ b/internal/proxy/accesslog/access_log_test.go @@ -25,7 +25,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/paramtable" "github.com/stretchr/testify/assert" "google.golang.org/grpc" "google.golang.org/grpc/metadata" diff --git a/internal/proxy/accesslog/log_writer.go b/internal/proxy/accesslog/log_writer.go index e22c32e62a..f49042bc29 100644 --- a/internal/proxy/accesslog/log_writer.go +++ b/internal/proxy/accesslog/log_writer.go @@ -25,8 +25,8 @@ import ( "sync" "time" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/paramtable" "go.uber.org/zap" ) diff --git a/internal/proxy/accesslog/log_writer_test.go b/internal/proxy/accesslog/log_writer_test.go index 8745de49f1..c45e90b8cf 100644 --- a/internal/proxy/accesslog/log_writer_test.go +++ b/internal/proxy/accesslog/log_writer_test.go @@ -22,8 +22,8 @@ import ( "testing" "time" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/paramtable" "github.com/stretchr/testify/assert" "go.uber.org/zap" ) diff --git a/internal/proxy/accesslog/minio_handler.go b/internal/proxy/accesslog/minio_handler.go index 465d96ccf2..2a6372d443 100644 --- a/internal/proxy/accesslog/minio_handler.go +++ b/internal/proxy/accesslog/minio_handler.go @@ -24,9 +24,9 @@ import ( "sync" "time" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/retry" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/retry" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" "go.uber.org/zap" diff --git a/internal/proxy/accesslog/minio_handler_test.go b/internal/proxy/accesslog/minio_handler_test.go index 74ff7665d8..cb947df33f 100644 --- a/internal/proxy/accesslog/minio_handler_test.go +++ b/internal/proxy/accesslog/minio_handler_test.go @@ -23,7 +23,7 @@ import ( "testing" "time" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/paramtable" "github.com/stretchr/testify/assert" ) diff --git a/internal/proxy/accesslog/util_test.go b/internal/proxy/accesslog/util_test.go index db3a3f6486..b7c9eef1d7 100644 --- a/internal/proxy/accesslog/util_test.go +++ b/internal/proxy/accesslog/util_test.go @@ -23,9 +23,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/tracer" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/tracer" + "github.com/milvus-io/milvus/pkg/util/paramtable" "github.com/stretchr/testify/assert" "go.opentelemetry.io/otel" "go.uber.org/zap" diff --git a/internal/proxy/authentication_interceptor.go b/internal/proxy/authentication_interceptor.go index 3a3a649e7d..b4b22e8852 100644 --- a/internal/proxy/authentication_interceptor.go +++ b/internal/proxy/authentication_interceptor.go @@ -5,13 +5,14 @@ import ( "fmt" "strings" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/util" - "github.com/milvus-io/milvus/internal/util/crypto" - "github.com/milvus-io/milvus/internal/util/merr" "go.uber.org/zap" "google.golang.org/grpc/metadata" + + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/util/crypto" + "github.com/milvus-io/milvus/pkg/util/merr" ) func parseMD(authorization []string) (username, password string) { diff --git a/internal/proxy/authentication_interceptor_test.go b/internal/proxy/authentication_interceptor_test.go index 16dcf7300d..003923ad6f 100644 --- a/internal/proxy/authentication_interceptor_test.go +++ b/internal/proxy/authentication_interceptor_test.go @@ -4,12 +4,13 @@ import ( "context" "testing" - "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util" - "github.com/milvus-io/milvus/internal/util/crypto" - "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/stretchr/testify/assert" "google.golang.org/grpc/metadata" + + "github.com/milvus-io/milvus/internal/types" + "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/util/crypto" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) // validAuth validates the authentication diff --git a/internal/proxy/channels_mgr.go b/internal/proxy/channels_mgr.go index 091763535d..5be3bd6318 100644 --- a/internal/proxy/channels_mgr.go +++ b/internal/proxy/channels_mgr.go @@ -27,12 +27,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" "go.uber.org/zap" ) diff --git a/internal/proxy/channels_mgr_test.go b/internal/proxy/channels_mgr_test.go index e31d8e3140..531ca6b728 100644 --- a/internal/proxy/channels_mgr_test.go +++ b/internal/proxy/channels_mgr_test.go @@ -22,8 +22,8 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/paramtable" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" diff --git a/internal/proxy/channels_time_ticker.go b/internal/proxy/channels_time_ticker.go index 9744f9e1fe..4ce450603a 100644 --- a/internal/proxy/channels_time_ticker.go +++ b/internal/proxy/channels_time_ticker.go @@ -23,8 +23,8 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // ticker can update ts only when the minTs are greater than the ts of ticker, we can use maxTs to update current later diff --git a/internal/proxy/channels_time_ticker_test.go b/internal/proxy/channels_time_ticker_test.go index 573b7e21e5..6c6d10d274 100644 --- a/internal/proxy/channels_time_ticker_test.go +++ b/internal/proxy/channels_time_ticker_test.go @@ -23,9 +23,9 @@ import ( "testing" "time" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/stretchr/testify/assert" "go.uber.org/zap" diff --git a/internal/proxy/condition_test.go b/internal/proxy/condition_test.go index 3aac7d3168..90ceea3095 100644 --- a/internal/proxy/condition_test.go +++ b/internal/proxy/condition_test.go @@ -26,7 +26,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" "go.uber.org/zap" ) diff --git a/internal/proxy/count_reducer_test.go b/internal/proxy/count_reducer_test.go index d1fec2b0ef..0295e91edd 100644 --- a/internal/proxy/count_reducer_test.go +++ b/internal/proxy/count_reducer_test.go @@ -4,7 +4,6 @@ import ( "testing" "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/schemapb" diff --git a/internal/proxy/data_coord_mock_test.go b/internal/proxy/data_coord_mock_test.go index 623329ed28..fbacc85041 100644 --- a/internal/proxy/data_coord_mock_test.go +++ b/internal/proxy/data_coord_mock_test.go @@ -25,9 +25,9 @@ import ( "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/milvus-io/milvus/internal/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/uniquegenerator" "go.uber.org/atomic" ) diff --git a/internal/proxy/default_limit_reducer.go b/internal/proxy/default_limit_reducer.go index 8987164afe..278c0e0f8a 100644 --- a/internal/proxy/default_limit_reducer.go +++ b/internal/proxy/default_limit_reducer.go @@ -6,9 +6,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type defaultLimitReducer struct { diff --git a/internal/proxy/dummyreq_test.go b/internal/proxy/dummyreq_test.go index a5d57b7290..16e4525093 100644 --- a/internal/proxy/dummyreq_test.go +++ b/internal/proxy/dummyreq_test.go @@ -20,7 +20,7 @@ import ( "encoding/json" "testing" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" "go.uber.org/zap" "github.com/stretchr/testify/assert" diff --git a/internal/proxy/error_test.go b/internal/proxy/error_test.go index 634ff328c2..f013d8fb9a 100644 --- a/internal/proxy/error_test.go +++ b/internal/proxy/error_test.go @@ -21,8 +21,9 @@ import ( "testing" "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/stretchr/testify/assert" + + "github.com/milvus-io/milvus-proto/go-api/commonpb" ) func Test_ErrInsufficientMemory(t *testing.T) { diff --git a/internal/proxy/get_max_len.go b/internal/proxy/get_max_len.go index d28822bb4a..8884a150f0 100644 --- a/internal/proxy/get_max_len.go +++ b/internal/proxy/get_max_len.go @@ -4,11 +4,9 @@ import ( "fmt" "strconv" - "github.com/milvus-io/milvus/internal/util/typeutil" - - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus-proto/go-api/schemapb" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // GetMaxLength get max length of field. Maybe also helpful outside. diff --git a/internal/proxy/hook_interceptor.go b/internal/proxy/hook_interceptor.go index acb7a674df..801ca1fc88 100644 --- a/internal/proxy/hook_interceptor.go +++ b/internal/proxy/hook_interceptor.go @@ -5,11 +5,12 @@ import ( "fmt" "plugin" - "github.com/milvus-io/milvus-proto/go-api/hook" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "go.uber.org/zap" "google.golang.org/grpc" + + "github.com/milvus-io/milvus-proto/go-api/hook" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" ) type defaultHook struct { diff --git a/internal/proxy/hook_interceptor_test.go b/internal/proxy/hook_interceptor_test.go index 2751de4745..9db55074dd 100644 --- a/internal/proxy/hook_interceptor_test.go +++ b/internal/proxy/hook_interceptor_test.go @@ -8,7 +8,7 @@ import ( "google.golang.org/grpc" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/paramtable" "github.com/stretchr/testify/assert" ) diff --git a/internal/proxy/impl.go b/internal/proxy/impl.go index 72737c0353..567c5e85b4 100644 --- a/internal/proxy/impl.go +++ b/internal/proxy/impl.go @@ -35,27 +35,27 @@ import ( "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/crypto" - "github.com/milvus-io/milvus/internal/util/errorutil" "github.com/milvus-io/milvus/internal/util/importutil" - "github.com/milvus-io/milvus/internal/util/logutil" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/ratelimitutil" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/crypto" + "github.com/milvus-io/milvus/pkg/util/errorutil" + "github.com/milvus-io/milvus/pkg/util/logutil" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const moduleName = "Proxy" diff --git a/internal/proxy/impl_test.go b/internal/proxy/impl_test.go index 8ed098e7c5..b924453186 100644 --- a/internal/proxy/impl_test.go +++ b/internal/proxy/impl_test.go @@ -26,16 +26,16 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func TestProxy_InvalidateCollectionMetaCache_remove_stream(t *testing.T) { diff --git a/internal/proxy/meta_cache.go b/internal/proxy/meta_cache.go index 81f3e90f9c..77e76f5874 100644 --- a/internal/proxy/meta_cache.go +++ b/internal/proxy/meta_cache.go @@ -28,11 +28,10 @@ import ( "github.com/samber/lo" "github.com/milvus-io/milvus/internal/querycoordv2/params" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/retry" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/paramtable" "go.uber.org/atomic" "go.uber.org/zap" @@ -40,16 +39,17 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // Cache is the interface for system meta data cache diff --git a/internal/proxy/meta_cache_test.go b/internal/proxy/meta_cache_test.go index d30a555245..d2a86bf3fa 100644 --- a/internal/proxy/meta_cache_test.go +++ b/internal/proxy/meta_cache_test.go @@ -27,8 +27,8 @@ import ( "github.com/cockroachdb/errors" uatomic "go.uber.org/atomic" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" @@ -37,13 +37,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/crypto" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/crypto" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type MockRootCoordClientInterface struct { diff --git a/internal/proxy/metrics_info.go b/internal/proxy/metrics_info.go index a9a34ed263..470c58e816 100644 --- a/internal/proxy/metrics_info.go +++ b/internal/proxy/metrics_info.go @@ -23,11 +23,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/util/hardware" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/ratelimitutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type getMetricsFuncType func(ctx context.Context, request *milvuspb.GetMetricsRequest) (*milvuspb.GetMetricsResponse, error) diff --git a/internal/proxy/metrics_info_test.go b/internal/proxy/metrics_info_test.go index d92fa6664e..70b9478700 100644 --- a/internal/proxy/metrics_info_test.go +++ b/internal/proxy/metrics_info_test.go @@ -20,19 +20,18 @@ import ( "context" "testing" - "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/sessionutil" - - "github.com/milvus-io/milvus/internal/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/uniquegenerator" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/milvus-io/milvus/internal/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" ) func TestProxy_metrics(t *testing.T) { diff --git a/internal/proxy/mock_cache_test.go b/internal/proxy/mock_cache_test.go index 5d8bcb4c02..beb9d0e1ac 100644 --- a/internal/proxy/mock_cache_test.go +++ b/internal/proxy/mock_cache_test.go @@ -4,7 +4,7 @@ import ( "context" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type getCollectionIDFunc func(ctx context.Context, collectionName string) (typeutil.UniqueID, error) diff --git a/internal/proxy/mock_msgstream_test.go b/internal/proxy/mock_msgstream_test.go index 1be801673d..6bd27204c5 100644 --- a/internal/proxy/mock_msgstream_test.go +++ b/internal/proxy/mock_msgstream_test.go @@ -5,7 +5,7 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/internal/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream" ) type mockMsgStream struct { diff --git a/internal/proxy/mock_test.go b/internal/proxy/mock_test.go index 13c3828b8c..867627d382 100644 --- a/internal/proxy/mock_test.go +++ b/internal/proxy/mock_test.go @@ -25,12 +25,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/uniquegenerator" ) type mockTimestampAllocatorInterface struct { diff --git a/internal/proxy/msg_pack.go b/internal/proxy/msg_pack.go index 2a804c02f6..415d5a096a 100644 --- a/internal/proxy/msg_pack.go +++ b/internal/proxy/msg_pack.go @@ -19,18 +19,18 @@ package proxy import ( "context" + "github.com/milvus-io/milvus/internal/allocator" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/retry" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func assignSegmentID(ctx context.Context, insertMsg *msgstream.InsertMsg, result *milvuspb.MutationResult, channelNames []string, idAllocator *allocator.IDAllocator, segIDAssigner *segIDAssigner) (*msgstream.MsgPack, error) { diff --git a/internal/proxy/multi_rate_limiter.go b/internal/proxy/multi_rate_limiter.go index f1a20e6a8a..771e1a61b4 100644 --- a/internal/proxy/multi_rate_limiter.go +++ b/internal/proxy/multi_rate_limiter.go @@ -26,13 +26,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/config" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/ratelimitutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/config" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var QuotaErrorString = map[commonpb.ErrorCode]string{ @@ -143,15 +143,32 @@ func (rl *rateLimiter) setRates(rates []*internalpb.Rate) error { for _, r := range rates { if limit, ok := rl.limiters.Get(r.GetRt()); ok { limit.SetLimit(ratelimitutil.Limit(r.GetR())) - metrics.SetRateGaugeByRateType(r.GetRt(), paramtable.GetNodeID(), r.GetR()) + setRateGaugeByRateType(r.GetRt(), paramtable.GetNodeID(), r.GetR()) } else { return fmt.Errorf("unregister rateLimiter for rateType %s", r.GetRt().String()) } } - // rl.printRates(rates) return nil } +// setRateGaugeByRateType sets ProxyLimiterRate metrics. +func setRateGaugeByRateType(rateType internalpb.RateType, nodeID int64, rate float64) { + if ratelimitutil.Limit(rate) == ratelimitutil.Inf { + return + } + nodeIDStr := strconv.FormatInt(nodeID, 10) + switch rateType { + case internalpb.RateType_DMLInsert: + metrics.ProxyLimiterRate.WithLabelValues(nodeIDStr, metrics.InsertLabel).Set(rate) + case internalpb.RateType_DMLDelete: + metrics.ProxyLimiterRate.WithLabelValues(nodeIDStr, metrics.DeleteLabel).Set(rate) + case internalpb.RateType_DQLSearch: + metrics.ProxyLimiterRate.WithLabelValues(nodeIDStr, metrics.SearchLabel).Set(rate) + case internalpb.RateType_DQLQuery: + metrics.ProxyLimiterRate.WithLabelValues(nodeIDStr, metrics.QueryLabel).Set(rate) + } +} + // printRates logs the rate info. func (rl *rateLimiter) printRates(rates []*internalpb.Rate) { //fmt.Printf("RateLimiter set rates:\n---------------------------------\n") diff --git a/internal/proxy/multi_rate_limiter_test.go b/internal/proxy/multi_rate_limiter_test.go index ef96d2b7b2..0090be4b24 100644 --- a/internal/proxy/multi_rate_limiter_test.go +++ b/internal/proxy/multi_rate_limiter_test.go @@ -26,9 +26,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/ratelimitutil" "github.com/stretchr/testify/assert" ) diff --git a/internal/proxy/plan_parser.go b/internal/proxy/plan_parser.go index 66006c1403..5b87c9d898 100644 --- a/internal/proxy/plan_parser.go +++ b/internal/proxy/plan_parser.go @@ -25,7 +25,7 @@ import ( ant_parser "github.com/antonmedv/expr/parser" "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/planpb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type parserContext struct { diff --git a/internal/proxy/plan_parser_test.go b/internal/proxy/plan_parser_test.go index 1651afb6a8..ff655411e3 100644 --- a/internal/proxy/plan_parser_test.go +++ b/internal/proxy/plan_parser_test.go @@ -30,7 +30,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/planpb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func newTestSchema() *schemapb.CollectionSchema { diff --git a/internal/proxy/privilege_interceptor.go b/internal/proxy/privilege_interceptor.go index 08f643f23d..8e062ab139 100644 --- a/internal/proxy/privilege_interceptor.go +++ b/internal/proxy/privilege_interceptor.go @@ -10,9 +10,9 @@ import ( "github.com/casbin/casbin/v2/model" jsonadapter "github.com/casbin/json-adapter/v2" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util" - "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/util/funcutil" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/codes" diff --git a/internal/proxy/privilege_interceptor_test.go b/internal/proxy/privilege_interceptor_test.go index ebd09fc218..262784b525 100644 --- a/internal/proxy/privilege_interceptor_test.go +++ b/internal/proxy/privilege_interceptor_test.go @@ -9,8 +9,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" "github.com/stretchr/testify/assert" ) diff --git a/internal/proxy/proxy.go b/internal/proxy/proxy.go index 0048532389..f79fde5634 100644 --- a/internal/proxy/proxy.go +++ b/internal/proxy/proxy.go @@ -28,26 +28,26 @@ import ( "time" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/internal/allocator" + "github.com/milvus-io/milvus/internal/util/dependency" + "github.com/milvus-io/milvus/internal/util/sessionutil" + "github.com/milvus-io/milvus/pkg/util/tsoutil" clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proxy/accesslog" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/logutil" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/ratelimitutil" - "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/logutil" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // UniqueID is alias of typeutil.UniqueID diff --git a/internal/proxy/proxy_rpc_test.go b/internal/proxy/proxy_rpc_test.go index a53431e4b2..2d68e61161 100644 --- a/internal/proxy/proxy_rpc_test.go +++ b/internal/proxy/proxy_rpc_test.go @@ -9,14 +9,14 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" grpcproxyclient "github.com/milvus-io/milvus/internal/distributed/proxy/client" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/proxypb" - "github.com/milvus-io/milvus/internal/util/commonpbutil" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/stretchr/testify/assert" ) diff --git a/internal/proxy/proxy_test.go b/internal/proxy/proxy_test.go index 384bd9ae0e..f78bd33600 100644 --- a/internal/proxy/proxy_test.go +++ b/internal/proxy/proxy_test.go @@ -27,6 +27,11 @@ import ( "time" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/internal/util/componentutil" + "github.com/milvus-io/milvus/internal/util/dependency" + "github.com/milvus-io/milvus/internal/util/importutil" + "github.com/milvus-io/milvus/internal/util/sessionutil" + "github.com/milvus-io/milvus/pkg/tracer" "github.com/golang/protobuf/proto" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" @@ -35,7 +40,6 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" grpcdatacoordclient "github.com/milvus-io/milvus/internal/distributed/datacoord" grpcdatacoordclient2 "github.com/milvus-io/milvus/internal/distributed/datacoord/client" grpcdatanode "github.com/milvus-io/milvus/internal/distributed/datanode" @@ -45,25 +49,21 @@ import ( grpcquerynode "github.com/milvus-io/milvus/internal/distributed/querynode" grpcrootcoord "github.com/milvus-io/milvus/internal/distributed/rootcoord" rcc "github.com/milvus-io/milvus/internal/distributed/rootcoord/client" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/tracer" - "github.com/milvus-io/milvus/internal/util" - "github.com/milvus-io/milvus/internal/util/componentutil" - "github.com/milvus-io/milvus/internal/util/crypto" - "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/distance" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/importutil" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/util/crypto" + "github.com/milvus-io/milvus/pkg/util/distance" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/prometheus/client_golang/prometheus" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" diff --git a/internal/proxy/query_node_mock_test.go b/internal/proxy/query_node_mock_test.go index 5dc8aa24a5..c30f0c5585 100644 --- a/internal/proxy/query_node_mock_test.go +++ b/internal/proxy/query_node_mock_test.go @@ -26,7 +26,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var _ types.QueryNode = &QueryNodeMock{} diff --git a/internal/proxy/repack_func.go b/internal/proxy/repack_func.go index 5db22bb479..618f6aa0ba 100644 --- a/internal/proxy/repack_func.go +++ b/internal/proxy/repack_func.go @@ -19,7 +19,7 @@ package proxy import ( "fmt" - "github.com/milvus-io/milvus/internal/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream" ) // insertRepackFunc deprecated, use defaultInsertRepackFunc instead. diff --git a/internal/proxy/repack_func_test.go b/internal/proxy/repack_func_test.go index 131583430f..cfe34fd7bc 100644 --- a/internal/proxy/repack_func_test.go +++ b/internal/proxy/repack_func_test.go @@ -20,7 +20,7 @@ import ( "math/rand" "testing" - "github.com/milvus-io/milvus/internal/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream" "github.com/stretchr/testify/assert" ) diff --git a/internal/proxy/rootcoord_mock_test.go b/internal/proxy/rootcoord_mock_test.go index 9cea57cbf6..1881df8f60 100644 --- a/internal/proxy/rootcoord_mock_test.go +++ b/internal/proxy/rootcoord_mock_test.go @@ -25,20 +25,20 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/types" + "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" - "github.com/milvus-io/milvus/internal/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/util/uniquegenerator" "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus/internal/util/milvuserrors" + "github.com/milvus-io/milvus/pkg/util/milvuserrors" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" diff --git a/internal/proxy/segment.go b/internal/proxy/segment.go index 80c9c75b35..38aa824702 100644 --- a/internal/proxy/segment.go +++ b/internal/proxy/segment.go @@ -23,14 +23,13 @@ import ( "time" "github.com/cockroachdb/errors" - "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/proxy/segment_test.go b/internal/proxy/segment_test.go index fe9ec10027..3501bdb0e2 100644 --- a/internal/proxy/segment_test.go +++ b/internal/proxy/segment_test.go @@ -24,9 +24,10 @@ import ( "testing" "time" + "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/stretchr/testify/assert" ) type mockDataCoord struct { @@ -123,6 +124,7 @@ func TestSegmentAllocator1(t *testing.T) { } var curLastTick2 = Timestamp(200) + var curLastTIck2Lock sync.Mutex func getLastTick2() Timestamp { diff --git a/internal/proxy/task.go b/internal/proxy/task.go index 0f520d95e3..897c928011 100644 --- a/internal/proxy/task.go +++ b/internal/proxy/task.go @@ -22,25 +22,23 @@ import ( "math" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/proto/indexpb" - + "github.com/golang/protobuf/proto" + "github.com/samber/lo" "go.uber.org/zap" - "github.com/golang/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/datapb" + "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/samber/lo" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/proxy/task_calc_distance.go b/internal/proxy/task_calc_distance.go index ff524a135c..43da342e72 100644 --- a/internal/proxy/task_calc_distance.go +++ b/internal/proxy/task_calc_distance.go @@ -5,15 +5,15 @@ import ( "fmt" "github.com/cockroachdb/errors" + "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/distance" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/typeutil" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/distance" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type calcDistanceTask struct { diff --git a/internal/proxy/task_delete.go b/internal/proxy/task_delete.go index 5a46297d7d..32c6ed64d0 100644 --- a/internal/proxy/task_delete.go +++ b/internal/proxy/task_delete.go @@ -14,15 +14,15 @@ import ( "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/planpb" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type BaseDeleteTask = msgstream.DeleteMsg diff --git a/internal/proxy/task_delete_test.go b/internal/proxy/task_delete_test.go index 21d2531276..0f04277256 100644 --- a/internal/proxy/task_delete_test.go +++ b/internal/proxy/task_delete_test.go @@ -6,7 +6,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/common" ) func Test_getPrimaryKeysFromExpr(t *testing.T) { diff --git a/internal/proxy/task_index.go b/internal/proxy/task_index.go index bec40f6239..aba26081ed 100644 --- a/internal/proxy/task_index.go +++ b/internal/proxy/task_index.go @@ -22,23 +22,21 @@ import ( "strconv" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/proto/indexpb" - "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/indexparamcheck" - "github.com/milvus-io/milvus/internal/util/indexparams" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/indexparamcheck" + "github.com/milvus-io/milvus/pkg/util/indexparams" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/proxy/task_index_test.go b/internal/proxy/task_index_test.go index 491013ca3e..0fc0ff608d 100644 --- a/internal/proxy/task_index_test.go +++ b/internal/proxy/task_index_test.go @@ -22,20 +22,18 @@ import ( "testing" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/proto/indexpb" - "github.com/milvus-io/milvus/internal/types" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" + "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/internal/types" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func TestMain(m *testing.M) { diff --git a/internal/proxy/task_insert.go b/internal/proxy/task_insert.go index 3e20dae73f..fc2851cf9a 100644 --- a/internal/proxy/task_insert.go +++ b/internal/proxy/task_insert.go @@ -5,18 +5,19 @@ import ( "fmt" "strconv" + "go.opentelemetry.io/otel" + "go.uber.org/zap" + "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/typeutil" - "go.opentelemetry.io/otel" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type insertTask struct { diff --git a/internal/proxy/task_policies.go b/internal/proxy/task_policies.go index af69f5d340..9b8ccf3830 100644 --- a/internal/proxy/task_policies.go +++ b/internal/proxy/task_policies.go @@ -4,18 +4,18 @@ import ( "context" "github.com/cockroachdb/errors" + "go.uber.org/zap" "golang.org/x/sync/errgroup" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/merr" - - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/merr" ) // type pickShardPolicy func(ctx context.Context, mgr *shardClientMgr, query func(UniqueID, types.QueryNode) error, leaders []nodeInfo) error type queryFunc func(context.Context, UniqueID, types.QueryNode, ...string) error + type pickShardPolicy func(context.Context, *shardClientMgr, queryFunc, map[string][]nodeInfo) error var ( diff --git a/internal/proxy/task_policies_test.go b/internal/proxy/task_policies_test.go index 5c83e8612e..a9d267b94e 100644 --- a/internal/proxy/task_policies_test.go +++ b/internal/proxy/task_policies_test.go @@ -8,9 +8,9 @@ import ( "sync" "testing" - "github.com/milvus-io/milvus/internal/types" - "github.com/stretchr/testify/assert" + + "github.com/milvus-io/milvus/internal/types" ) func TestRoundRobinPolicy(t *testing.T) { diff --git a/internal/proxy/task_query.go b/internal/proxy/task_query.go index 2b7eb4f239..d7fa554b50 100644 --- a/internal/proxy/task_query.go +++ b/internal/proxy/task_query.go @@ -8,21 +8,22 @@ import ( "github.com/golang/protobuf/proto" "github.com/milvus-io/milvus/internal/proto/planpb" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/parser/planparserv2" + typeutil2 "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" @@ -565,7 +566,7 @@ func reduceRetrieveResultsAndFillIfEmpty(ctx context.Context, retrieveResults [] // filter system fields. filtered := filterSystemFields(outputFieldsID) - if err := typeutil.FillRetrieveResultIfEmpty(typeutil.NewMilvusResult(result), filtered, schema); err != nil { + if err := typeutil2.FillRetrieveResultIfEmpty(typeutil2.NewMilvusResult(result), filtered, schema); err != nil { return nil, fmt.Errorf("failed to fill retrieve results: %s", err.Error()) } diff --git a/internal/proxy/task_query_test.go b/internal/proxy/task_query_test.go index 8570705920..b52cd58a46 100644 --- a/internal/proxy/task_query_test.go +++ b/internal/proxy/task_query_test.go @@ -13,19 +13,17 @@ import ( "github.com/stretchr/testify/require" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" - - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/internal/types" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func TestQueryTask_all(t *testing.T) { diff --git a/internal/proxy/task_scheduler.go b/internal/proxy/task_scheduler.go index 6ffe376e4b..4fb6942496 100644 --- a/internal/proxy/task_scheduler.go +++ b/internal/proxy/task_scheduler.go @@ -23,13 +23,12 @@ import ( "sync" "github.com/cockroachdb/errors" - "go.opentelemetry.io/otel" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type taskQueue interface { diff --git a/internal/proxy/task_scheduler_test.go b/internal/proxy/task_scheduler_test.go index 83c7b57f5b..14ce963c6f 100644 --- a/internal/proxy/task_scheduler_test.go +++ b/internal/proxy/task_scheduler_test.go @@ -24,9 +24,9 @@ import ( "testing" "time" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/stretchr/testify/assert" + + "github.com/milvus-io/milvus/pkg/util/funcutil" ) func TestBaseTaskQueue(t *testing.T) { diff --git a/internal/proxy/task_search.go b/internal/proxy/task_search.go index 4235840366..f73a873da8 100644 --- a/internal/proxy/task_search.go +++ b/internal/proxy/task_search.go @@ -2,39 +2,34 @@ package proxy import ( "context" - "fmt" "regexp" "strconv" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/parser/planparserv2" - "github.com/milvus-io/milvus/internal/querynode" - "github.com/golang/protobuf/proto" "go.opentelemetry.io/otel" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/types" - - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/distance" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" + "github.com/milvus-io/milvus/internal/parser/planparserv2" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/planpb" "github.com/milvus-io/milvus/internal/proto/querypb" + "github.com/milvus-io/milvus/internal/querynode" + "github.com/milvus-io/milvus/internal/types" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/distance" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/proxy/task_search_test.go b/internal/proxy/task_search_test.go index 01d389a2b5..69cc78ff83 100644 --- a/internal/proxy/task_search_test.go +++ b/internal/proxy/task_search_test.go @@ -9,26 +9,23 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" - - "github.com/milvus-io/milvus/internal/util/distance" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/timerecord" + "github.com/milvus-io/milvus/internal/types" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/distance" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/proxy/task_statistic.go b/internal/proxy/task_statistic.go index 6a6d5651d8..715d9a28fe 100644 --- a/internal/proxy/task_statistic.go +++ b/internal/proxy/task_statistic.go @@ -6,25 +6,24 @@ import ( "strconv" "github.com/cockroachdb/errors" - "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/proto/datapb" "go.opentelemetry.io/otel" + "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus-proto/go-api/milvuspb" + "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/grpcclient" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/proxy/task_statistic_test.go b/internal/proxy/task_statistic_test.go index 826eea088d..beabc0382c 100644 --- a/internal/proxy/task_statistic_test.go +++ b/internal/proxy/task_statistic_test.go @@ -8,18 +8,19 @@ import ( "github.com/cockroachdb/errors" "github.com/golang/protobuf/proto" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/mock" + "github.com/stretchr/testify/require" + "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/mock" - "github.com/stretchr/testify/require" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func TestStatisticTask_all(t *testing.T) { diff --git a/internal/proxy/task_test.go b/internal/proxy/task_test.go index 311ddad35e..f331915864 100644 --- a/internal/proxy/task_test.go +++ b/internal/proxy/task_test.go @@ -36,18 +36,18 @@ import ( "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" - "github.com/milvus-io/milvus/internal/util/distance" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/milvus-io/milvus/internal/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/distance" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/uniquegenerator" ) // TODO(dragondriver): add more test cases diff --git a/internal/proxy/task_upsert.go b/internal/proxy/task_upsert.go index b9d848d90b..c0c9910506 100644 --- a/internal/proxy/task_upsert.go +++ b/internal/proxy/task_upsert.go @@ -29,14 +29,14 @@ import ( "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type upsertTask struct { diff --git a/internal/proxy/task_upsert_test.go b/internal/proxy/task_upsert_test.go index 7a57631a44..ffea9ee2d2 100644 --- a/internal/proxy/task_upsert_test.go +++ b/internal/proxy/task_upsert_test.go @@ -24,8 +24,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" ) func TestUpsertTask_CheckAligned(t *testing.T) { diff --git a/internal/proxy/timestamp.go b/internal/proxy/timestamp.go index 4eb2d04e6b..258f884817 100644 --- a/internal/proxy/timestamp.go +++ b/internal/proxy/timestamp.go @@ -23,11 +23,11 @@ import ( "time" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/timerecord" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/timerecord" ) // timestampAllocator implements tsoAllocator. diff --git a/internal/proxy/timestamp_test.go b/internal/proxy/timestamp_test.go index 3ca21f4a04..9e1dedc8e8 100644 --- a/internal/proxy/timestamp_test.go +++ b/internal/proxy/timestamp_test.go @@ -21,7 +21,7 @@ import ( "math/rand" "testing" - "github.com/milvus-io/milvus/internal/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/util/uniquegenerator" "github.com/stretchr/testify/assert" ) diff --git a/internal/proxy/util.go b/internal/proxy/util.go index c3463f536a..e44a3b015a 100644 --- a/internal/proxy/util.go +++ b/internal/proxy/util.go @@ -24,14 +24,6 @@ import ( "time" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/merr" - - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/types" - "go.uber.org/zap" "golang.org/x/crypto/bcrypt" "google.golang.org/grpc/metadata" @@ -39,11 +31,16 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util" - "github.com/milvus-io/milvus/internal/util/crypto" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/internal/proto/querypb" + "github.com/milvus-io/milvus/internal/types" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/crypto" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/proxy/util_test.go b/internal/proxy/util_test.go index cea8aed9e4..7f92099b94 100644 --- a/internal/proxy/util_test.go +++ b/internal/proxy/util_test.go @@ -25,6 +25,7 @@ import ( "time" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "google.golang.org/grpc/metadata" @@ -37,11 +38,10 @@ import ( "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util" - "github.com/milvus-io/milvus/internal/util/crypto" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/util/crypto" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func TestValidateCollectionName(t *testing.T) { diff --git a/internal/proxy/validate_util.go b/internal/proxy/validate_util.go index 53f856c317..7096682872 100644 --- a/internal/proxy/validate_util.go +++ b/internal/proxy/validate_util.go @@ -3,11 +3,10 @@ package proxy import ( "fmt" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type validateUtil struct { diff --git a/internal/proxy/validate_util_test.go b/internal/proxy/validate_util_test.go index 4f7ca5927f..be1a54d92c 100644 --- a/internal/proxy/validate_util_test.go +++ b/internal/proxy/validate_util_test.go @@ -4,13 +4,11 @@ import ( "math" "testing" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus-proto/go-api/schemapb" - - "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func Test_verifyLengthPerRow(t *testing.T) { diff --git a/internal/querycoordv2/balance/rowcount_based_balancer.go b/internal/querycoordv2/balance/rowcount_based_balancer.go index b0fe8cbc2c..c79b56e68e 100644 --- a/internal/querycoordv2/balance/rowcount_based_balancer.go +++ b/internal/querycoordv2/balance/rowcount_based_balancer.go @@ -23,11 +23,11 @@ import ( "github.com/samber/lo" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" + "github.com/milvus-io/milvus/pkg/log" ) type RowCountBasedBalancer struct { diff --git a/internal/querycoordv2/balance/rowcount_based_balancer_test.go b/internal/querycoordv2/balance/rowcount_based_balancer_test.go index 29a06d0a04..449ec6af32 100644 --- a/internal/querycoordv2/balance/rowcount_based_balancer_test.go +++ b/internal/querycoordv2/balance/rowcount_based_balancer_test.go @@ -19,7 +19,8 @@ package balance import ( "testing" - "github.com/milvus-io/milvus/internal/querycoordv2/task" + mock "github.com/stretchr/testify/mock" + "github.com/stretchr/testify/suite" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/proto/datapb" @@ -27,10 +28,9 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/meta" . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" + "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/internal/util/etcd" - mock "github.com/stretchr/testify/mock" - "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/pkg/util/etcd" ) type RowCountBasedBalancerTestSuite struct { diff --git a/internal/querycoordv2/balance/score_based_balancer.go b/internal/querycoordv2/balance/score_based_balancer.go index 3f8121dd68..ab010aceae 100644 --- a/internal/querycoordv2/balance/score_based_balancer.go +++ b/internal/querycoordv2/balance/score_based_balancer.go @@ -23,13 +23,13 @@ import ( "go.uber.org/zap" "golang.org/x/exp/maps" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type ScoreBasedBalancer struct { diff --git a/internal/querycoordv2/balance/score_based_balancer_test.go b/internal/querycoordv2/balance/score_based_balancer_test.go index ae083b298f..e133e2ab66 100644 --- a/internal/querycoordv2/balance/score_based_balancer_test.go +++ b/internal/querycoordv2/balance/score_based_balancer_test.go @@ -18,6 +18,9 @@ package balance import ( "testing" + "github.com/stretchr/testify/mock" + "github.com/stretchr/testify/suite" + etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" @@ -26,9 +29,7 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/stretchr/testify/mock" - "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/pkg/util/etcd" ) type ScoreBasedBalancerTestSuite struct { diff --git a/internal/querycoordv2/balance/utils.go b/internal/querycoordv2/balance/utils.go index cf94d6bdab..46eda0e7fc 100644 --- a/internal/querycoordv2/balance/utils.go +++ b/internal/querycoordv2/balance/utils.go @@ -21,10 +21,11 @@ import ( "fmt" "time" - "github.com/milvus-io/milvus/internal/log" + "go.uber.org/zap" + "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/task" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" ) const ( diff --git a/internal/querycoordv2/checkers/channel_checker.go b/internal/querycoordv2/checkers/channel_checker.go index 31a4d4485c..f84673c23c 100644 --- a/internal/querycoordv2/checkers/channel_checker.go +++ b/internal/querycoordv2/checkers/channel_checker.go @@ -20,15 +20,16 @@ import ( "context" "time" - "github.com/milvus-io/milvus/internal/log" + "github.com/samber/lo" + "go.uber.org/zap" + "github.com/milvus-io/milvus/internal/querycoordv2/balance" "github.com/milvus-io/milvus/internal/querycoordv2/meta" . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/samber/lo" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // TODO(sunby): have too much similar codes with SegmentChecker diff --git a/internal/querycoordv2/checkers/channel_checker_test.go b/internal/querycoordv2/checkers/channel_checker_test.go index b95eedf9dc..b1b26dff6a 100644 --- a/internal/querycoordv2/checkers/channel_checker_test.go +++ b/internal/querycoordv2/checkers/channel_checker_test.go @@ -31,7 +31,7 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/internal/util/etcd" + "github.com/milvus-io/milvus/pkg/util/etcd" ) type ChannelCheckerTestSuite struct { diff --git a/internal/querycoordv2/checkers/controller.go b/internal/querycoordv2/checkers/controller.go index 404ef8ccef..90addbf1b9 100644 --- a/internal/querycoordv2/checkers/controller.go +++ b/internal/querycoordv2/checkers/controller.go @@ -21,12 +21,12 @@ import ( "sync" "time" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/querycoordv2/balance" "github.com/milvus-io/milvus/internal/querycoordv2/meta" . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" + "github.com/milvus-io/milvus/pkg/log" ) var ( diff --git a/internal/querycoordv2/checkers/segment_checker.go b/internal/querycoordv2/checkers/segment_checker.go index 3b5423c272..f6772f0b20 100644 --- a/internal/querycoordv2/checkers/segment_checker.go +++ b/internal/querycoordv2/checkers/segment_checker.go @@ -20,7 +20,9 @@ import ( "context" "time" - "github.com/milvus-io/milvus/internal/log" + "github.com/samber/lo" + "go.uber.org/zap" + "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/balance" @@ -29,10 +31,8 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/internal/util/typeutil" - - "github.com/samber/lo" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type SegmentChecker struct { diff --git a/internal/querycoordv2/checkers/segment_checker_test.go b/internal/querycoordv2/checkers/segment_checker_test.go index 1bfea5bdb1..1435f47f24 100644 --- a/internal/querycoordv2/checkers/segment_checker_test.go +++ b/internal/querycoordv2/checkers/segment_checker_test.go @@ -33,7 +33,7 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/internal/util/etcd" + "github.com/milvus-io/milvus/pkg/util/etcd" ) type SegmentCheckerTestSuite struct { diff --git a/internal/querycoordv2/dist/dist_controller.go b/internal/querycoordv2/dist/dist_controller.go index 100f36937b..017ca3c1d2 100644 --- a/internal/querycoordv2/dist/dist_controller.go +++ b/internal/querycoordv2/dist/dist_controller.go @@ -20,11 +20,12 @@ import ( "context" "sync" - "github.com/milvus-io/milvus/internal/log" + "go.uber.org/zap" + "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" ) type Controller interface { diff --git a/internal/querycoordv2/dist/dist_controller_test.go b/internal/querycoordv2/dist/dist_controller_test.go index c948349918..21f4cb241c 100644 --- a/internal/querycoordv2/dist/dist_controller_test.go +++ b/internal/querycoordv2/dist/dist_controller_test.go @@ -31,9 +31,9 @@ import ( . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type DistControllerTestSuite struct { diff --git a/internal/querycoordv2/dist/dist_handler.go b/internal/querycoordv2/dist/dist_handler.go index 2a3e0c3572..21bfcd3683 100644 --- a/internal/querycoordv2/dist/dist_handler.go +++ b/internal/querycoordv2/dist/dist_handler.go @@ -22,18 +22,19 @@ import ( "time" "github.com/golang/protobuf/proto" + "go.uber.org/zap" + "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/merr" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/merr" ) const ( diff --git a/internal/querycoordv2/dist/mock_controller.go b/internal/querycoordv2/dist/mock_controller.go index 981b01f9cc..358ce22166 100644 --- a/internal/querycoordv2/dist/mock_controller.go +++ b/internal/querycoordv2/dist/mock_controller.go @@ -32,7 +32,7 @@ type MockController_Remove_Call struct { } // Remove is a helper method to define mock.On call -// - nodeID int64 +// - nodeID int64 func (_e *MockController_Expecter) Remove(nodeID interface{}) *MockController_Remove_Call { return &MockController_Remove_Call{Call: _e.mock.On("Remove", nodeID)} } @@ -60,8 +60,8 @@ type MockController_StartDistInstance_Call struct { } // StartDistInstance is a helper method to define mock.On call -// - ctx context.Context -// - nodeID int64 +// - ctx context.Context +// - nodeID int64 func (_e *MockController_Expecter) StartDistInstance(ctx interface{}, nodeID interface{}) *MockController_StartDistInstance_Call { return &MockController_StartDistInstance_Call{Call: _e.mock.On("StartDistInstance", ctx, nodeID)} } @@ -116,7 +116,7 @@ type MockController_SyncAll_Call struct { } // SyncAll is a helper method to define mock.On call -// - ctx context.Context +// - ctx context.Context func (_e *MockController_Expecter) SyncAll(ctx interface{}) *MockController_SyncAll_Call { return &MockController_SyncAll_Call{Call: _e.mock.On("SyncAll", ctx)} } diff --git a/internal/querycoordv2/handlers.go b/internal/querycoordv2/handlers.go index 34501d6709..1991fa2117 100644 --- a/internal/querycoordv2/handlers.go +++ b/internal/querycoordv2/handlers.go @@ -23,25 +23,24 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/samber/lo" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/job" "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/internal/util/hardware" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/milvus-io/milvus/internal/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/uniquegenerator" ) // checkAnyReplicaAvailable checks if the collection has enough distinct available shards. These shards diff --git a/internal/querycoordv2/job/job_load.go b/internal/querycoordv2/job/job_load.go index 0ed3a8895c..fbd487f14b 100644 --- a/internal/querycoordv2/job/job_load.go +++ b/internal/querycoordv2/job/job_load.go @@ -25,14 +25,14 @@ import ( "github.com/samber/lo" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/observers" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type LoadCollectionJob struct { diff --git a/internal/querycoordv2/job/job_release.go b/internal/querycoordv2/job/job_release.go index ee0191fcee..adb8bdd5b7 100644 --- a/internal/querycoordv2/job/job_release.go +++ b/internal/querycoordv2/job/job_release.go @@ -22,13 +22,13 @@ import ( "github.com/samber/lo" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/observers" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/utils" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" ) type ReleaseCollectionJob struct { diff --git a/internal/querycoordv2/job/job_sync.go b/internal/querycoordv2/job/job_sync.go index 9e653ea681..5b8e376055 100644 --- a/internal/querycoordv2/job/job_sync.go +++ b/internal/querycoordv2/job/job_sync.go @@ -23,11 +23,11 @@ import ( "github.com/cockroachdb/errors" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/utils" + "github.com/milvus-io/milvus/pkg/log" ) type SyncNewCreatedPartitionJob struct { diff --git a/internal/querycoordv2/job/job_test.go b/internal/querycoordv2/job/job_test.go index 097eddc7f9..f820fba49f 100644 --- a/internal/querycoordv2/job/job_test.go +++ b/internal/querycoordv2/job/job_test.go @@ -35,7 +35,7 @@ import ( . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/internal/util/etcd" + "github.com/milvus-io/milvus/pkg/util/etcd" ) const ( diff --git a/internal/querycoordv2/job/scheduler.go b/internal/querycoordv2/job/scheduler.go index 64c8a1ced4..18e8f20a5f 100644 --- a/internal/querycoordv2/job/scheduler.go +++ b/internal/querycoordv2/job/scheduler.go @@ -21,9 +21,10 @@ import ( "sync" "time" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // JobScheduler schedules jobs, diff --git a/internal/querycoordv2/job/utils.go b/internal/querycoordv2/job/utils.go index b3cfc17455..fc84cb1bf7 100644 --- a/internal/querycoordv2/job/utils.go +++ b/internal/querycoordv2/job/utils.go @@ -27,7 +27,7 @@ import ( "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/session" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // waitCollectionReleased blocks until diff --git a/internal/querycoordv2/meta/channel_dist_manager.go b/internal/querycoordv2/meta/channel_dist_manager.go index babef21935..72525ed72d 100644 --- a/internal/querycoordv2/meta/channel_dist_manager.go +++ b/internal/querycoordv2/meta/channel_dist_manager.go @@ -22,7 +22,7 @@ import ( "github.com/golang/protobuf/proto" "github.com/milvus-io/milvus/internal/proto/datapb" - . "github.com/milvus-io/milvus/internal/util/typeutil" + . "github.com/milvus-io/milvus/pkg/util/typeutil" ) type DmChannel struct { diff --git a/internal/querycoordv2/meta/channel_dist_manager_test.go b/internal/querycoordv2/meta/channel_dist_manager_test.go index 6a108584d9..3d322cae89 100644 --- a/internal/querycoordv2/meta/channel_dist_manager_test.go +++ b/internal/querycoordv2/meta/channel_dist_manager_test.go @@ -19,10 +19,11 @@ package meta import ( "testing" + "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type ChannelDistManagerSuite struct { diff --git a/internal/querycoordv2/meta/collection_manager.go b/internal/querycoordv2/meta/collection_manager.go index 04950936df..98a095b675 100644 --- a/internal/querycoordv2/meta/collection_manager.go +++ b/internal/querycoordv2/meta/collection_manager.go @@ -25,12 +25,12 @@ import ( "github.com/samber/lo" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/typeutil" - . "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/typeutil" + . "github.com/milvus-io/milvus/pkg/util/typeutil" ) type Collection struct { diff --git a/internal/querycoordv2/meta/collection_manager_test.go b/internal/querycoordv2/meta/collection_manager_test.go index 24989cf206..3208e40b0e 100644 --- a/internal/querycoordv2/meta/collection_manager_test.go +++ b/internal/querycoordv2/meta/collection_manager_test.go @@ -29,7 +29,7 @@ import ( etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/proto/querypb" . "github.com/milvus-io/milvus/internal/querycoordv2/params" - "github.com/milvus-io/milvus/internal/util/etcd" + "github.com/milvus-io/milvus/pkg/util/etcd" ) type CollectionManagerSuite struct { diff --git a/internal/querycoordv2/meta/coordinator_broker.go b/internal/querycoordv2/meta/coordinator_broker.go index fe9e6af24c..1663325de5 100644 --- a/internal/querycoordv2/meta/coordinator_broker.go +++ b/internal/querycoordv2/meta/coordinator_broker.go @@ -22,22 +22,19 @@ import ( "time" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/proto/indexpb" + "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" + "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/types" - - "go.uber.org/zap" - - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/merr" - . "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/merr" + . "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/querycoordv2/meta/coordinator_broker_test.go b/internal/querycoordv2/meta/coordinator_broker_test.go index 7f07e442e8..c61559ecdc 100644 --- a/internal/querycoordv2/meta/coordinator_broker_test.go +++ b/internal/querycoordv2/meta/coordinator_broker_test.go @@ -21,16 +21,12 @@ import ( "testing" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus-proto/go-api/schemapb" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/mock" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - - "github.com/stretchr/testify/assert" - - "github.com/stretchr/testify/mock" - + "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/mocks" ) diff --git a/internal/querycoordv2/meta/failed_load_cache.go b/internal/querycoordv2/meta/failed_load_cache.go index 4acb2cd9ec..9b06264950 100644 --- a/internal/querycoordv2/meta/failed_load_cache.go +++ b/internal/querycoordv2/meta/failed_load_cache.go @@ -22,8 +22,8 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/merr" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/merr" ) const expireTime = 24 * time.Hour diff --git a/internal/querycoordv2/meta/failed_load_cache_test.go b/internal/querycoordv2/meta/failed_load_cache_test.go index 15eb4145a5..8859125e36 100644 --- a/internal/querycoordv2/meta/failed_load_cache_test.go +++ b/internal/querycoordv2/meta/failed_load_cache_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/util/merr" + "github.com/milvus-io/milvus/pkg/util/merr" ) func TestFailedLoadCache(t *testing.T) { diff --git a/internal/querycoordv2/meta/leader_view_manager.go b/internal/querycoordv2/meta/leader_view_manager.go index f0f7085ee1..5fcb28f71e 100644 --- a/internal/querycoordv2/meta/leader_view_manager.go +++ b/internal/querycoordv2/meta/leader_view_manager.go @@ -19,8 +19,9 @@ package meta import ( "sync" - "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/samber/lo" + + "github.com/milvus-io/milvus/internal/proto/querypb" ) type LeaderView struct { diff --git a/internal/querycoordv2/meta/leader_view_manager_test.go b/internal/querycoordv2/meta/leader_view_manager_test.go index 8e5e3a8cbe..1eb7acffe0 100644 --- a/internal/querycoordv2/meta/leader_view_manager_test.go +++ b/internal/querycoordv2/meta/leader_view_manager_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/suite" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type LeaderViewManagerSuite struct { diff --git a/internal/querycoordv2/meta/replica_manager.go b/internal/querycoordv2/meta/replica_manager.go index 688d85317b..7dd81d4d12 100644 --- a/internal/querycoordv2/meta/replica_manager.go +++ b/internal/querycoordv2/meta/replica_manager.go @@ -21,12 +21,13 @@ import ( "sync" "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/typeutil" - . "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/zap" + + "github.com/milvus-io/milvus/internal/proto/querypb" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/typeutil" + . "github.com/milvus-io/milvus/pkg/util/typeutil" ) type Replica struct { diff --git a/internal/querycoordv2/meta/replica_manager_test.go b/internal/querycoordv2/meta/replica_manager_test.go index df35dbd3bb..2198b2fcdc 100644 --- a/internal/querycoordv2/meta/replica_manager_test.go +++ b/internal/querycoordv2/meta/replica_manager_test.go @@ -20,12 +20,13 @@ import ( "testing" "github.com/golang/protobuf/proto" + "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/kv" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" . "github.com/milvus-io/milvus/internal/querycoordv2/params" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/pkg/util/etcd" ) type ReplicaManagerSuite struct { diff --git a/internal/querycoordv2/meta/resource_manager.go b/internal/querycoordv2/meta/resource_manager.go index 25b11d6a47..6b31da0571 100644 --- a/internal/querycoordv2/meta/resource_manager.go +++ b/internal/querycoordv2/meta/resource_manager.go @@ -20,14 +20,14 @@ import ( "sync" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/querycoordv2/session" - "github.com/milvus-io/milvus/internal/util/typeutil" - . "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/samber/lo" "go.uber.org/zap" + + "github.com/milvus-io/milvus/internal/proto/querypb" + "github.com/milvus-io/milvus/internal/querycoordv2/session" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" + . "github.com/milvus-io/milvus/pkg/util/typeutil" ) var ( @@ -52,6 +52,7 @@ var ( ) var DefaultResourceGroupName = "__default_resource_group" + var DefaultResourceGroupCapacity = 1000000 type ResourceGroup struct { diff --git a/internal/querycoordv2/meta/resource_manager_test.go b/internal/querycoordv2/meta/resource_manager_test.go index dda7671d24..287576691f 100644 --- a/internal/querycoordv2/meta/resource_manager_test.go +++ b/internal/querycoordv2/meta/resource_manager_test.go @@ -19,14 +19,15 @@ import ( "testing" "github.com/cockroachdb/errors" + "github.com/stretchr/testify/mock" + "github.com/stretchr/testify/suite" + etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/proto/querypb" . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/stretchr/testify/mock" - "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type ResourceManagerSuite struct { diff --git a/internal/querycoordv2/meta/segment_dist_manager.go b/internal/querycoordv2/meta/segment_dist_manager.go index cb0a2123c4..2e2e63cd05 100644 --- a/internal/querycoordv2/meta/segment_dist_manager.go +++ b/internal/querycoordv2/meta/segment_dist_manager.go @@ -20,8 +20,9 @@ import ( "sync" "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/internal/proto/datapb" - . "github.com/milvus-io/milvus/internal/util/typeutil" + . "github.com/milvus-io/milvus/pkg/util/typeutil" ) type Segment struct { diff --git a/internal/querycoordv2/meta/segment_dist_manager_test.go b/internal/querycoordv2/meta/segment_dist_manager_test.go index e21e7f5791..7301cf896a 100644 --- a/internal/querycoordv2/meta/segment_dist_manager_test.go +++ b/internal/querycoordv2/meta/segment_dist_manager_test.go @@ -19,8 +19,9 @@ package meta import ( "testing" - "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/stretchr/testify/suite" + + "github.com/milvus-io/milvus/internal/proto/datapb" ) type SegmentDistManagerSuite struct { diff --git a/internal/querycoordv2/meta/store.go b/internal/querycoordv2/meta/store.go index 776b2ab293..590f44830c 100644 --- a/internal/querycoordv2/meta/store.go +++ b/internal/querycoordv2/meta/store.go @@ -20,7 +20,6 @@ import ( "fmt" "github.com/cockroachdb/errors" - "github.com/golang/protobuf/proto" "github.com/samber/lo" clientv3 "go.etcd.io/etcd/client/v3" diff --git a/internal/querycoordv2/meta/store_test.go b/internal/querycoordv2/meta/store_test.go index c509687e03..5c79de438f 100644 --- a/internal/querycoordv2/meta/store_test.go +++ b/internal/querycoordv2/meta/store_test.go @@ -20,12 +20,13 @@ import ( "sort" "testing" + "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/internal/kv" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/proto/querypb" . "github.com/milvus-io/milvus/internal/querycoordv2/params" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/pkg/util/etcd" ) type StoreTestSuite struct { diff --git a/internal/querycoordv2/meta/target_manager.go b/internal/querycoordv2/meta/target_manager.go index 874603b3b0..20cc487255 100644 --- a/internal/querycoordv2/meta/target_manager.go +++ b/internal/querycoordv2/meta/target_manager.go @@ -21,12 +21,12 @@ import ( "sync" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/samber/lo" "go.uber.org/zap" + + "github.com/milvus-io/milvus/internal/proto/datapb" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type TargetScope = int32 diff --git a/internal/querycoordv2/meta/target_manager_test.go b/internal/querycoordv2/meta/target_manager_test.go index a5f03c14d9..dc62fe09f2 100644 --- a/internal/querycoordv2/meta/target_manager_test.go +++ b/internal/querycoordv2/meta/target_manager_test.go @@ -28,8 +28,8 @@ import ( "github.com/milvus-io/milvus/internal/proto/querypb" . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type TargetManagerSuite struct { diff --git a/internal/querycoordv2/mocks/querynode.go b/internal/querycoordv2/mocks/querynode.go index 30d6f3fc98..868919c1b9 100644 --- a/internal/querycoordv2/mocks/querynode.go +++ b/internal/querycoordv2/mocks/querynode.go @@ -25,11 +25,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/log" - querypb "github.com/milvus-io/milvus/internal/proto/querypb" + "github.com/milvus-io/milvus/internal/proto/querypb" . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/stretchr/testify/mock" clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" diff --git a/internal/querycoordv2/observers/collection_observer.go b/internal/querycoordv2/observers/collection_observer.go index 9bde3bed19..edbb5c9b8f 100644 --- a/internal/querycoordv2/observers/collection_observer.go +++ b/internal/querycoordv2/observers/collection_observer.go @@ -21,12 +21,13 @@ import ( "sync" "time" - "github.com/milvus-io/milvus/internal/log" + "go.uber.org/zap" + "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" ) type CollectionObserver struct { diff --git a/internal/querycoordv2/observers/collection_observer_test.go b/internal/querycoordv2/observers/collection_observer_test.go index 5440e36e6a..65ad7503fc 100644 --- a/internal/querycoordv2/observers/collection_observer_test.go +++ b/internal/querycoordv2/observers/collection_observer_test.go @@ -28,14 +28,14 @@ import ( "github.com/milvus-io/milvus/internal/kv" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type CollectionObserverSuite struct { diff --git a/internal/querycoordv2/observers/leader_observer.go b/internal/querycoordv2/observers/leader_observer.go index 182d5cc8eb..6a0048a3e2 100644 --- a/internal/querycoordv2/observers/leader_observer.go +++ b/internal/querycoordv2/observers/leader_observer.go @@ -21,14 +21,15 @@ import ( "sync" "time" + "go.uber.org/zap" + "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" ) const ( diff --git a/internal/querycoordv2/observers/leader_observer_test.go b/internal/querycoordv2/observers/leader_observer_test.go index 39b473143b..2f87c96c00 100644 --- a/internal/querycoordv2/observers/leader_observer_test.go +++ b/internal/querycoordv2/observers/leader_observer_test.go @@ -33,7 +33,7 @@ import ( . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/internal/util/etcd" + "github.com/milvus-io/milvus/pkg/util/etcd" ) type LeaderObserverTestSuite struct { diff --git a/internal/querycoordv2/observers/replica_observer.go b/internal/querycoordv2/observers/replica_observer.go index a8c7753715..4b44005fcf 100644 --- a/internal/querycoordv2/observers/replica_observer.go +++ b/internal/querycoordv2/observers/replica_observer.go @@ -23,10 +23,10 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/utils" + "github.com/milvus-io/milvus/pkg/log" ) // check replica, find outbound nodes and remove it from replica if all segment/channel has been moved diff --git a/internal/querycoordv2/observers/replica_observer_test.go b/internal/querycoordv2/observers/replica_observer_test.go index bce316a207..c31cec3fa8 100644 --- a/internal/querycoordv2/observers/replica_observer_test.go +++ b/internal/querycoordv2/observers/replica_observer_test.go @@ -20,16 +20,17 @@ import ( "testing" "time" + "github.com/stretchr/testify/suite" + etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type ReplicaObserverSuite struct { diff --git a/internal/querycoordv2/observers/resource_observer.go b/internal/querycoordv2/observers/resource_observer.go index e11be4f566..6e802289c2 100644 --- a/internal/querycoordv2/observers/resource_observer.go +++ b/internal/querycoordv2/observers/resource_observer.go @@ -21,11 +21,12 @@ import ( "sync" "time" - "github.com/milvus-io/milvus/internal/log" + "go.uber.org/zap" + "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" ) // check whether rg lack of node, try to transfer node from default rg diff --git a/internal/querycoordv2/observers/resource_observer_test.go b/internal/querycoordv2/observers/resource_observer_test.go index 0d27ac1a10..506fc991d7 100644 --- a/internal/querycoordv2/observers/resource_observer_test.go +++ b/internal/querycoordv2/observers/resource_observer_test.go @@ -21,17 +21,18 @@ import ( "time" "github.com/cockroachdb/errors" + "github.com/stretchr/testify/mock" + "github.com/stretchr/testify/suite" + etcdKV "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/stretchr/testify/mock" - "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type ResourceObserverSuite struct { diff --git a/internal/querycoordv2/observers/target_observer.go b/internal/querycoordv2/observers/target_observer.go index cfc7ff349e..d6e9b48b20 100644 --- a/internal/querycoordv2/observers/target_observer.go +++ b/internal/querycoordv2/observers/target_observer.go @@ -23,11 +23,11 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type checkRequest struct { diff --git a/internal/querycoordv2/observers/target_observer_test.go b/internal/querycoordv2/observers/target_observer_test.go index 78aee1fb9a..9b6606c716 100644 --- a/internal/querycoordv2/observers/target_observer_test.go +++ b/internal/querycoordv2/observers/target_observer_test.go @@ -31,8 +31,8 @@ import ( . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type TargetObserverSuite struct { diff --git a/internal/querycoordv2/params/params.go b/internal/querycoordv2/params/params.go index 8da373b487..6455e50865 100644 --- a/internal/querycoordv2/params/params.go +++ b/internal/querycoordv2/params/params.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) var Params *paramtable.ComponentParam = paramtable.Get() diff --git a/internal/querycoordv2/server.go b/internal/querycoordv2/server.go index 1d43f3c043..cae1acf8e9 100644 --- a/internal/querycoordv2/server.go +++ b/internal/querycoordv2/server.go @@ -24,20 +24,17 @@ import ( "syscall" "time" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/util/timerecord" + clientv3 "go.etcd.io/etcd/client/v3" + "go.uber.org/atomic" + "go.uber.org/zap" + "golang.org/x/sync/errgroup" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/kv" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/querycoordv2/balance" "github.com/milvus-io/milvus/internal/querycoordv2/checkers" "github.com/milvus-io/milvus/internal/querycoordv2/dist" @@ -49,14 +46,15 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/sessionutil" "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" - clientv3 "go.etcd.io/etcd/client/v3" - "go.uber.org/atomic" - "go.uber.org/zap" - "golang.org/x/sync/errgroup" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var ( diff --git a/internal/querycoordv2/server_test.go b/internal/querycoordv2/server_test.go index cc705fbda1..aedda4d34e 100644 --- a/internal/querycoordv2/server_test.go +++ b/internal/querycoordv2/server_test.go @@ -29,7 +29,6 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/log" coordMocks "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" @@ -42,10 +41,11 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type ServerSuite struct { diff --git a/internal/querycoordv2/services.go b/internal/querycoordv2/services.go index 8aa054e427..8cd0d1459c 100644 --- a/internal/querycoordv2/services.go +++ b/internal/querycoordv2/services.go @@ -23,26 +23,26 @@ import ( "time" "github.com/cockroachdb/errors" + "github.com/samber/lo" + "go.uber.org/multierr" + "go.uber.org/zap" + "golang.org/x/sync/errgroup" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/job" "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/internal/util/errorutil" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/samber/lo" - "go.uber.org/multierr" - "go.uber.org/zap" - "golang.org/x/sync/errgroup" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/errorutil" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var ( diff --git a/internal/querycoordv2/services_test.go b/internal/querycoordv2/services_test.go index 24d86c8461..c19c0e8a9c 100644 --- a/internal/querycoordv2/services_test.go +++ b/internal/querycoordv2/services_test.go @@ -23,11 +23,14 @@ import ( "time" "github.com/cockroachdb/errors" + "github.com/samber/lo" + "github.com/stretchr/testify/mock" + "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/kv" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" @@ -40,14 +43,12 @@ import ( "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/task" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/samber/lo" - "github.com/stretchr/testify/mock" - "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type ServiceSuite struct { diff --git a/internal/querycoordv2/session/cluster.go b/internal/querycoordv2/session/cluster.go index cc2ba043e7..1ca5a296fc 100644 --- a/internal/querycoordv2/session/cluster.go +++ b/internal/querycoordv2/session/cluster.go @@ -28,9 +28,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" grpcquerynodeclient "github.com/milvus-io/milvus/internal/distributed/querynode/client" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/types" + "github.com/milvus-io/milvus/pkg/log" "go.uber.org/zap" ) diff --git a/internal/querycoordv2/session/cluster_test.go b/internal/querycoordv2/session/cluster_test.go index 35245f72fa..144f650abe 100644 --- a/internal/querycoordv2/session/cluster_test.go +++ b/internal/querycoordv2/session/cluster_test.go @@ -26,7 +26,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/mocks" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/paramtable" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" "google.golang.org/grpc" diff --git a/internal/querycoordv2/session/node_manager.go b/internal/querycoordv2/session/node_manager.go index 2552843fb9..bb0f51f8d4 100644 --- a/internal/querycoordv2/session/node_manager.go +++ b/internal/querycoordv2/session/node_manager.go @@ -21,7 +21,7 @@ import ( "sync" "time" - "github.com/milvus-io/milvus/internal/metrics" + "github.com/milvus-io/milvus/pkg/metrics" "go.uber.org/atomic" ) diff --git a/internal/querycoordv2/task/action.go b/internal/querycoordv2/task/action.go index b22022c001..5c899d9bb3 100644 --- a/internal/querycoordv2/task/action.go +++ b/internal/querycoordv2/task/action.go @@ -22,8 +22,8 @@ import ( "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" - "github.com/milvus-io/milvus/internal/util/funcutil" - . "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + . "github.com/milvus-io/milvus/pkg/util/typeutil" ) type ActionType = int32 diff --git a/internal/querycoordv2/task/executor.go b/internal/querycoordv2/task/executor.go index 1386472d98..f0b34974da 100644 --- a/internal/querycoordv2/task/executor.go +++ b/internal/querycoordv2/task/executor.go @@ -21,17 +21,18 @@ import ( "sync" "time" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "go.uber.org/atomic" + "go.uber.org/zap" + "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "go.uber.org/atomic" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/merr" ) type Executor struct { diff --git a/internal/querycoordv2/task/merger.go b/internal/querycoordv2/task/merger.go index 8c14731b2b..eb4158db8f 100644 --- a/internal/querycoordv2/task/merger.go +++ b/internal/querycoordv2/task/merger.go @@ -21,9 +21,10 @@ import ( "sync" "time" - "github.com/milvus-io/milvus/internal/log" - . "github.com/milvus-io/milvus/internal/querycoordv2/params" "go.uber.org/zap" + + . "github.com/milvus-io/milvus/internal/querycoordv2/params" + "github.com/milvus-io/milvus/pkg/log" ) // Merger merges tasks with the same mergeID. diff --git a/internal/querycoordv2/task/merger_test.go b/internal/querycoordv2/task/merger_test.go index 897cf570c5..2d868023c5 100644 --- a/internal/querycoordv2/task/merger_test.go +++ b/internal/querycoordv2/task/merger_test.go @@ -26,7 +26,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus/internal/proto/querypb" . "github.com/milvus-io/milvus/internal/querycoordv2/params" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type MergerSuite struct { diff --git a/internal/querycoordv2/task/scheduler.go b/internal/querycoordv2/task/scheduler.go index 0947548892..9aee83dc9e 100644 --- a/internal/querycoordv2/task/scheduler.go +++ b/internal/querycoordv2/task/scheduler.go @@ -23,18 +23,19 @@ import ( "sync" "time" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" + "go.uber.org/atomic" + "go.uber.org/zap" + "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/merr" - . "github.com/milvus-io/milvus/internal/util/typeutil" - "go.uber.org/atomic" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/merr" + . "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/querycoordv2/task/task.go b/internal/querycoordv2/task/task.go index 1f8f7a788c..a686260698 100644 --- a/internal/querycoordv2/task/task.go +++ b/internal/querycoordv2/task/task.go @@ -24,8 +24,8 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" - "github.com/milvus-io/milvus/internal/util/merr" - . "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/merr" + . "github.com/milvus-io/milvus/pkg/util/typeutil" "go.uber.org/atomic" ) diff --git a/internal/querycoordv2/task/task_test.go b/internal/querycoordv2/task/task_test.go index 649da0b0cb..2b71ad1cae 100644 --- a/internal/querycoordv2/task/task_test.go +++ b/internal/querycoordv2/task/task_test.go @@ -23,6 +23,8 @@ import ( "time" "github.com/cockroachdb/errors" + "github.com/stretchr/testify/mock" + "github.com/stretchr/testify/suite" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" @@ -34,11 +36,9 @@ import ( . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/milvus-io/milvus/internal/querycoordv2/utils" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/typeutil" - mock "github.com/stretchr/testify/mock" - "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type distribution struct { diff --git a/internal/querycoordv2/task/utils.go b/internal/querycoordv2/task/utils.go index 453d2fe167..e64c782bb8 100644 --- a/internal/querycoordv2/task/utils.go +++ b/internal/querycoordv2/task/utils.go @@ -20,18 +20,18 @@ import ( "context" "time" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func Wait(ctx context.Context, timeout time.Duration, tasks ...Task) error { diff --git a/internal/querycoordv2/task/utils_test.go b/internal/querycoordv2/task/utils_test.go index d0f8073c37..0fb8057ba2 100644 --- a/internal/querycoordv2/task/utils_test.go +++ b/internal/querycoordv2/task/utils_test.go @@ -22,12 +22,12 @@ import ( "time" "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/tsoutil" ) func Test_packLoadSegmentRequest(t *testing.T) { diff --git a/internal/querycoordv2/utils/checker.go b/internal/querycoordv2/utils/checker.go index d446278466..6dffd3d166 100644 --- a/internal/querycoordv2/utils/checker.go +++ b/internal/querycoordv2/utils/checker.go @@ -18,7 +18,7 @@ package utils import ( "github.com/milvus-io/milvus/internal/querycoordv2/meta" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func FilterReleased[E interface{ GetCollectionID() int64 }](elems []E, collections []int64) []E { diff --git a/internal/querycoordv2/utils/meta.go b/internal/querycoordv2/utils/meta.go index 2cd8e35781..a3e1e52b63 100644 --- a/internal/querycoordv2/utils/meta.go +++ b/internal/querycoordv2/utils/meta.go @@ -22,12 +22,12 @@ import ( "sort" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/querycoordv2/meta" - "github.com/milvus-io/milvus/internal/querycoordv2/session" "github.com/samber/lo" "go.uber.org/zap" + + "github.com/milvus-io/milvus/internal/querycoordv2/meta" + "github.com/milvus-io/milvus/internal/querycoordv2/session" + "github.com/milvus-io/milvus/pkg/log" ) var ( diff --git a/internal/querycoordv2/utils/meta_test.go b/internal/querycoordv2/utils/meta_test.go index 1dd682afb0..68f1d81cb3 100644 --- a/internal/querycoordv2/utils/meta_test.go +++ b/internal/querycoordv2/utils/meta_test.go @@ -20,15 +20,16 @@ import ( "testing" "github.com/cockroachdb/errors" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/mock" + etcdKV "github.com/milvus-io/milvus/internal/kv/etcd" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" . "github.com/milvus-io/milvus/internal/querycoordv2/params" "github.com/milvus-io/milvus/internal/querycoordv2/session" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/mock" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func TestSpawnReplicasWithRG(t *testing.T) { diff --git a/internal/querycoordv2/utils/test.go b/internal/querycoordv2/utils/test.go index 6a3294e007..249867e8d6 100644 --- a/internal/querycoordv2/utils/test.go +++ b/internal/querycoordv2/utils/test.go @@ -20,7 +20,7 @@ import ( "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func CreateTestLeaderView(id, collection int64, channel string, segments map[int64]int64, growings map[int64]*meta.Segment) *meta.LeaderView { diff --git a/internal/querycoordv2/utils/types.go b/internal/querycoordv2/utils/types.go index d0bc533417..9252b06592 100644 --- a/internal/querycoordv2/utils/types.go +++ b/internal/querycoordv2/utils/types.go @@ -23,7 +23,6 @@ import ( "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querycoordv2/meta" - "github.com/milvus-io/milvus/internal/util/funcutil" ) // WrapStatus wraps status with given error code, message and errors @@ -113,23 +112,32 @@ func calculateSegmentSize(segmentLoadInfo *querypb.SegmentLoadInfo) int64 { if index, ok := fieldIndex[fieldID]; ok { segmentSize += index.IndexSize } else { - segmentSize += funcutil.GetFieldSizeFromFieldBinlog(fieldBinlog) + segmentSize += getFieldSizeFromFieldBinlog(fieldBinlog) } } // Get size of state data for _, fieldBinlog := range segmentLoadInfo.Statslogs { - segmentSize += funcutil.GetFieldSizeFromFieldBinlog(fieldBinlog) + segmentSize += getFieldSizeFromFieldBinlog(fieldBinlog) } // Get size of delete data for _, fieldBinlog := range segmentLoadInfo.Deltalogs { - segmentSize += funcutil.GetFieldSizeFromFieldBinlog(fieldBinlog) + segmentSize += getFieldSizeFromFieldBinlog(fieldBinlog) } return segmentSize } +func getFieldSizeFromFieldBinlog(fieldBinlog *datapb.FieldBinlog) int64 { + fieldSize := int64(0) + for _, binlog := range fieldBinlog.Binlogs { + fieldSize += binlog.LogSize + } + + return fieldSize +} + func MergeDmChannelInfo(infos []*datapb.VchannelInfo) *meta.DmChannel { var dmChannel *meta.DmChannel diff --git a/internal/querynode/benchmark_test.go b/internal/querynode/benchmark_test.go index a02668b500..9015e4d9ac 100644 --- a/internal/querynode/benchmark_test.go +++ b/internal/querynode/benchmark_test.go @@ -29,7 +29,7 @@ import ( "go.uber.org/zap/zapcore" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" ) const ( diff --git a/internal/querynode/cgo_helper.go b/internal/querynode/cgo_helper.go index 3f889cd873..17a92c4d87 100644 --- a/internal/querynode/cgo_helper.go +++ b/internal/querynode/cgo_helper.go @@ -35,8 +35,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/cgoconverter" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/cgoconverter" ) // HandleCStatus deals with the error returned from CGO diff --git a/internal/querynode/collection.go b/internal/querynode/collection.go index 9273e629af..406106fdfe 100644 --- a/internal/querynode/collection.go +++ b/internal/querynode/collection.go @@ -23,6 +23,7 @@ package querynode #include "segcore/segment_c.h" */ import "C" + import ( "fmt" "math" @@ -30,17 +31,14 @@ import ( "sync/atomic" "unsafe" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" - - "github.com/milvus-io/milvus/internal/metrics" - + "github.com/golang/protobuf/proto" "go.uber.org/zap" - "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // Collection is a wrapper of the underlying C-structure C.CCollection diff --git a/internal/querynode/count_reducer_test.go b/internal/querynode/count_reducer_test.go index 44569612ff..4a751fa01c 100644 --- a/internal/querynode/count_reducer_test.go +++ b/internal/querynode/count_reducer_test.go @@ -4,10 +4,9 @@ import ( "testing" "github.com/milvus-io/milvus/internal/proto/segcorepb" - - "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/stretchr/testify/assert" ) diff --git a/internal/querynode/data_sync_service.go b/internal/querynode/data_sync_service.go index 6e49b96de9..3e88360f0d 100644 --- a/internal/querynode/data_sync_service.go +++ b/internal/querynode/data_sync_service.go @@ -23,12 +23,12 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/mq/msgdispatcher" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) // dataSyncService manages a lot of flow graphs diff --git a/internal/querynode/data_sync_service_test.go b/internal/querynode/data_sync_service_test.go index f1636322aa..a940dc3675 100644 --- a/internal/querynode/data_sync_service_test.go +++ b/internal/querynode/data_sync_service_test.go @@ -21,15 +21,15 @@ import ( "fmt" "testing" + "github.com/milvus-io/milvus/internal/util/dependency" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/milvus-io/milvus/internal/mq/msgdispatcher" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func init() { diff --git a/internal/querynode/errors_test.go b/internal/querynode/errors_test.go index cfacc925b8..8c48805775 100644 --- a/internal/querynode/errors_test.go +++ b/internal/querynode/errors_test.go @@ -19,7 +19,7 @@ package querynode import ( "testing" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" "go.uber.org/zap" ) diff --git a/internal/querynode/flow_graph_delete_node.go b/internal/querynode/flow_graph_delete_node.go index ec9a73a0fd..1ff5ccf040 100644 --- a/internal/querynode/flow_graph_delete_node.go +++ b/internal/querynode/flow_graph_delete_node.go @@ -27,11 +27,11 @@ import ( "go.opentelemetry.io/otel/trace" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/flowgraph" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type primaryKey = storage.PrimaryKey diff --git a/internal/querynode/flow_graph_delete_node_test.go b/internal/querynode/flow_graph_delete_node_test.go index 5ef00fa095..9ce928d795 100644 --- a/internal/querynode/flow_graph_delete_node_test.go +++ b/internal/querynode/flow_graph_delete_node_test.go @@ -24,10 +24,10 @@ import ( "github.com/stretchr/testify/require" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/flowgraph" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/mq/msgstream" ) func TestFlowGraphDeleteNode_delete(t *testing.T) { diff --git a/internal/querynode/flow_graph_filter_delete_node.go b/internal/querynode/flow_graph_filter_delete_node.go index 8a28df3259..c45ef32a15 100644 --- a/internal/querynode/flow_graph_filter_delete_node.go +++ b/internal/querynode/flow_graph_filter_delete_node.go @@ -25,10 +25,10 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/util/flowgraph" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // filterDeleteNode is one of the nodes in delta flow graph diff --git a/internal/querynode/flow_graph_filter_delete_node_test.go b/internal/querynode/flow_graph_filter_delete_node_test.go index 4c222aec38..9a3edd3a15 100644 --- a/internal/querynode/flow_graph_filter_delete_node_test.go +++ b/internal/querynode/flow_graph_filter_delete_node_test.go @@ -22,9 +22,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/flowgraph" + "github.com/milvus-io/milvus/pkg/mq/msgstream" ) func getFilterDeleteNode() (*filterDeleteNode, error) { diff --git a/internal/querynode/flow_graph_filter_dm_node.go b/internal/querynode/flow_graph_filter_dm_node.go index ea8bfc6f63..eec583d350 100644 --- a/internal/querynode/flow_graph_filter_dm_node.go +++ b/internal/querynode/flow_graph_filter_dm_node.go @@ -27,13 +27,13 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/util/flowgraph" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // filterDmNode is one of the nodes in query node flow graph diff --git a/internal/querynode/flow_graph_filter_dm_node_test.go b/internal/querynode/flow_graph_filter_dm_node_test.go index 66e4e6f6d6..7985039cde 100644 --- a/internal/querynode/flow_graph_filter_dm_node_test.go +++ b/internal/querynode/flow_graph_filter_dm_node_test.go @@ -24,10 +24,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/flowgraph" + "github.com/milvus-io/milvus/pkg/mq/msgstream" ) func getFilterDMNode() (*filterDmNode, error) { diff --git a/internal/querynode/flow_graph_insert_node.go b/internal/querynode/flow_graph_insert_node.go index de5804f2a7..be5c67e921 100644 --- a/internal/querynode/flow_graph_insert_node.go +++ b/internal/querynode/flow_graph_insert_node.go @@ -32,13 +32,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/segcorepb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/flowgraph" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // insertNode is one of the nodes in query flow graph diff --git a/internal/querynode/flow_graph_insert_node_test.go b/internal/querynode/flow_graph_insert_node_test.go index 874da7f2ec..ac6ac94e30 100644 --- a/internal/querynode/flow_graph_insert_node_test.go +++ b/internal/querynode/flow_graph_insert_node_test.go @@ -27,10 +27,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/flowgraph" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/mq/msgstream" ) func getInsertNode() (*insertNode, error) { diff --git a/internal/querynode/flow_graph_message.go b/internal/querynode/flow_graph_message.go index c1b514d851..fd2f2dfcd3 100644 --- a/internal/querynode/flow_graph_message.go +++ b/internal/querynode/flow_graph_message.go @@ -17,8 +17,8 @@ package querynode import ( - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/util/flowgraph" + "github.com/milvus-io/milvus/pkg/mq/msgstream" ) // Msg is an interface which has a function named TimeTick diff --git a/internal/querynode/flow_graph_message_test.go b/internal/querynode/flow_graph_message_test.go index 6de9bb9a54..a43960f362 100644 --- a/internal/querynode/flow_graph_message_test.go +++ b/internal/querynode/flow_graph_message_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream" ) func TestFlowGraphMsg_insertMsg(t *testing.T) { diff --git a/internal/querynode/flow_graph_query_node.go b/internal/querynode/flow_graph_query_node.go index 534dc9b13c..fa9caa989e 100644 --- a/internal/querynode/flow_graph_query_node.go +++ b/internal/querynode/flow_graph_query_node.go @@ -23,15 +23,15 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/mq/msgdispatcher" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" "github.com/milvus-io/milvus/internal/util/flowgraph" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type ( diff --git a/internal/querynode/flow_graph_service_time_node.go b/internal/querynode/flow_graph_service_time_node.go index b2409be592..877983b0f9 100644 --- a/internal/querynode/flow_graph_service_time_node.go +++ b/internal/querynode/flow_graph_service_time_node.go @@ -23,9 +23,9 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/util/flowgraph" - "github.com/milvus-io/milvus/internal/util/tsoutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/tsoutil" ) // serviceTimeNode is one of the nodes in delta flow graph diff --git a/internal/querynode/impl.go b/internal/querynode/impl.go index 18632f5224..35d1507da3 100644 --- a/internal/querynode/impl.go +++ b/internal/querynode/impl.go @@ -35,18 +35,18 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/planpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // GetComponentStates returns information about whether the node is healthy diff --git a/internal/querynode/impl_test.go b/internal/querynode/impl_test.go index 54be4d51e9..3298161441 100644 --- a/internal/querynode/impl_test.go +++ b/internal/querynode/impl_test.go @@ -31,18 +31,18 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/planpb" "github.com/milvus-io/milvus/internal/proto/querypb" queryPb "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/conc" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/conc" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func TestImpl_GetComponentStates(t *testing.T) { diff --git a/internal/querynode/impl_utils.go b/internal/querynode/impl_utils.go index 49aa720712..372c26ada7 100644 --- a/internal/querynode/impl_utils.go +++ b/internal/querynode/impl_utils.go @@ -7,8 +7,8 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/querypb" + "github.com/milvus-io/milvus/pkg/log" "github.com/samber/lo" "go.uber.org/zap" ) diff --git a/internal/querynode/impl_utils_test.go b/internal/querynode/impl_utils_test.go index e4efa36337..2a22c4b18c 100644 --- a/internal/querynode/impl_utils_test.go +++ b/internal/querynode/impl_utils_test.go @@ -20,12 +20,13 @@ import ( "context" "testing" - "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/sessionutil" "github.com/stretchr/testify/suite" clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/server/v3/etcdserver/api/v3client" + + "github.com/milvus-io/milvus-proto/go-api/commonpb" + "github.com/milvus-io/milvus/internal/proto/querypb" + "github.com/milvus-io/milvus/internal/util/sessionutil" ) type ImplUtilsSuite struct { diff --git a/internal/querynode/load_index_info.go b/internal/querynode/load_index_info.go index a63b096b88..ea74355c2c 100644 --- a/internal/querynode/load_index_info.go +++ b/internal/querynode/load_index_info.go @@ -30,9 +30,9 @@ import ( "path/filepath" "unsafe" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/indexparams" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/indexparams" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/schemapb" diff --git a/internal/querynode/load_segment_task.go b/internal/querynode/load_segment_task.go index ca508198df..8527ef7005 100644 --- a/internal/querynode/load_segment_task.go +++ b/internal/querynode/load_segment_task.go @@ -22,9 +22,9 @@ import ( "go.uber.org/zap" "golang.org/x/sync/errgroup" - "github.com/milvus-io/milvus/internal/log" queryPb "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/funcutil" "github.com/samber/lo" ) diff --git a/internal/querynode/load_segment_task_test.go b/internal/querynode/load_segment_task_test.go index 87a73fa34d..a53942b386 100644 --- a/internal/querynode/load_segment_task_test.go +++ b/internal/querynode/load_segment_task_test.go @@ -29,14 +29,14 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper/rmq" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/hardware" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func TestTask_loadSegmentsTask(t *testing.T) { diff --git a/internal/querynode/meta_replica.go b/internal/querynode/meta_replica.go index da7411d2fe..2f84560bc8 100644 --- a/internal/querynode/meta_replica.go +++ b/internal/querynode/meta_replica.go @@ -35,14 +35,14 @@ import ( "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var ( diff --git a/internal/querynode/metrics_info.go b/internal/querynode/metrics_info.go index 9fefd35481..37156e88f2 100644 --- a/internal/querynode/metrics_info.go +++ b/internal/querynode/metrics_info.go @@ -21,11 +21,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/util/hardware" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/ratelimitutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // getQuotaMetrics returns QueryNodeQuotaMetrics. diff --git a/internal/querynode/metrics_info_test.go b/internal/querynode/metrics_info_test.go index ea37985a51..88e2ee54ab 100644 --- a/internal/querynode/metrics_info_test.go +++ b/internal/querynode/metrics_info_test.go @@ -25,9 +25,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/sessionutil" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" ) func TestGetSystemInfoMetrics(t *testing.T) { diff --git a/internal/querynode/mock_test.go b/internal/querynode/mock_test.go index 2889a09d0b..aa8d5ecdb3 100644 --- a/internal/querynode/mock_test.go +++ b/internal/querynode/mock_test.go @@ -28,17 +28,13 @@ import ( "github.com/cockroachdb/errors" "github.com/golang/protobuf/proto" - ants "github.com/panjf2000/ants/v2" + "github.com/panjf2000/ants/v2" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgdispatcher" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/indexpb" @@ -46,14 +42,18 @@ import ( "github.com/milvus-io/milvus/internal/proto/planpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util" - "github.com/milvus-io/milvus/internal/util/conc" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/indexcgowrapper" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/util/conc" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // ---------- unittest util functions ---------- diff --git a/internal/querynode/partition.go b/internal/querynode/partition.go index 1ec631c5a9..cd205e7b68 100644 --- a/internal/querynode/partition.go +++ b/internal/querynode/partition.go @@ -29,7 +29,7 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" ) // Partition is a logical division of Collection and can be considered as an attribute of Segment. diff --git a/internal/querynode/plan_test.go b/internal/querynode/plan_test.go index 963c601d98..51c9a33016 100644 --- a/internal/querynode/plan_test.go +++ b/internal/querynode/plan_test.go @@ -25,9 +25,9 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/proto/planpb" "github.com/milvus-io/milvus/internal/proto/querypb" + "github.com/milvus-io/milvus/pkg/common" ) func TestPlan_Plan(t *testing.T) { diff --git a/internal/querynode/query_node.go b/internal/querynode/query_node.go index 16f8bfc831..f2089d034c 100644 --- a/internal/querynode/query_node.go +++ b/internal/querynode/query_node.go @@ -40,26 +40,27 @@ import ( "time" "unsafe" - "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/config" - etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgdispatcher" - "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/conc" - "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/gc" - "github.com/milvus-io/milvus/internal/util/hardware" - "github.com/milvus-io/milvus/internal/util/initcore" - "github.com/milvus-io/milvus/internal/util/lifetime" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/samber/lo" clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" + + "github.com/milvus-io/milvus-proto/go-api/commonpb" + etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" + "github.com/milvus-io/milvus/internal/storage" + "github.com/milvus-io/milvus/internal/types" + "github.com/milvus-io/milvus/internal/util/dependency" + "github.com/milvus-io/milvus/internal/util/initcore" + "github.com/milvus-io/milvus/internal/util/sessionutil" + "github.com/milvus-io/milvus/pkg/config" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/util/conc" + "github.com/milvus-io/milvus/pkg/util/gc" + "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/util/lifetime" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // make sure QueryNode implements types.QueryNode diff --git a/internal/querynode/query_node_test.go b/internal/querynode/query_node_test.go index de69de6190..3a5fc66b98 100644 --- a/internal/querynode/query_node_test.go +++ b/internal/querynode/query_node_test.go @@ -28,12 +28,12 @@ import ( "go.etcd.io/etcd/server/v3/embed" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgdispatcher" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var embedetcdServer *embed.Etcd diff --git a/internal/querynode/query_shard.go b/internal/querynode/query_shard.go index a37ceb4743..385f737372 100644 --- a/internal/querynode/query_shard.go +++ b/internal/querynode/query_shard.go @@ -22,9 +22,9 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/funcutil" ) type queryShard struct { diff --git a/internal/querynode/query_shard_service.go b/internal/querynode/query_shard_service.go index 085136e95d..f8d0136f5e 100644 --- a/internal/querynode/query_shard_service.go +++ b/internal/querynode/query_shard_service.go @@ -22,11 +22,11 @@ import ( "sync" "github.com/cockroachdb/errors" + "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/dependency" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" ) // TODO, remove queryShardService, it's not used any more. diff --git a/internal/querynode/rate_collector.go b/internal/querynode/rate_collector.go index 6004a4ffa0..b2b7dbe763 100644 --- a/internal/querynode/rate_collector.go +++ b/internal/querynode/rate_collector.go @@ -19,8 +19,8 @@ package querynode import ( "sync" - "github.com/milvus-io/milvus/internal/util/ratelimitutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // rateCollector helps to collect and calculate values (like rate, timeTick and etc...). diff --git a/internal/querynode/rate_collector_test.go b/internal/querynode/rate_collector_test.go index 7dc3c150b5..fa59515f4b 100644 --- a/internal/querynode/rate_collector_test.go +++ b/internal/querynode/rate_collector_test.go @@ -21,7 +21,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func TestRateCollector(t *testing.T) { diff --git a/internal/querynode/reduce_test.go b/internal/querynode/reduce_test.go index b030d5bcdd..d9cf5993f8 100644 --- a/internal/querynode/reduce_test.go +++ b/internal/querynode/reduce_test.go @@ -22,14 +22,14 @@ import ( "math" "testing" - "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/common" ) func TestReduce_parseSliceInfo(t *testing.T) { diff --git a/internal/querynode/result.go b/internal/querynode/result.go index 150c4271b4..024908672a 100644 --- a/internal/querynode/result.go +++ b/internal/querynode/result.go @@ -27,15 +27,17 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/segcorepb" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + typeutil2 "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var _ typeutil.ResultWithID = &internalpb.RetrieveResults{} + var _ typeutil.ResultWithID = &segcorepb.RetrieveResults{} func reduceStatisticResponse(results []*internalpb.GetStatisticsResponse) (*internalpb.GetStatisticsResponse, error) { @@ -293,7 +295,7 @@ func mergeInternalRetrieveResult(ctx context.Context, retrieveResults []*interna } pk := typeutil.GetPK(validRetrieveResults[sel].GetIds(), cursors[sel]) - ts := typeutil.GetTS(validRetrieveResults[sel], cursors[sel]) + ts := getTS(validRetrieveResults[sel], cursors[sel]) if _, ok := idTsMap[pk]; !ok { typeutil.AppendPKs(ret.Ids, pk) typeutil.AppendFieldData(ret.FieldsData, validRetrieveResults[sel].GetFieldsData(), cursors[sel]) @@ -317,6 +319,20 @@ func mergeInternalRetrieveResult(ctx context.Context, retrieveResults []*interna return ret, nil } +func getTS(i *internalpb.RetrieveResults, idx int64) uint64 { + if i.FieldsData == nil { + return 0 + } + for _, fieldData := range i.FieldsData { + fieldID := fieldData.FieldId + if fieldID == common.TimeStampField { + res := fieldData.GetScalars().GetLongData().Data + return uint64(res[idx]) + } + } + return 0 +} + func mergeSegcoreRetrieveResults(ctx context.Context, retrieveResults []*segcorepb.RetrieveResults, limit int64) (*segcorepb.RetrieveResults, error) { log.Ctx(ctx).Debug("mergeSegcoreRetrieveResults", zap.Int64("limit", limit), @@ -390,7 +406,7 @@ func mergeSegcoreRetrieveResultsAndFillIfEmpty( return nil, err } - if err := typeutil.FillRetrieveResultIfEmpty(typeutil.NewSegcoreResults(mergedResult), outputFieldsID, schema); err != nil { + if err := typeutil2.FillRetrieveResultIfEmpty(typeutil2.NewSegcoreResults(mergedResult), outputFieldsID, schema); err != nil { return nil, fmt.Errorf("failed to fill segcore retrieve results: %s", err.Error()) } @@ -410,7 +426,7 @@ func mergeInternalRetrieveResultsAndFillIfEmpty( return nil, err } - if err := typeutil.FillRetrieveResultIfEmpty(typeutil.NewInternalResult(mergedResult), outputFieldsID, schema); err != nil { + if err := typeutil2.FillRetrieveResultIfEmpty(typeutil2.NewInternalResult(mergedResult), outputFieldsID, schema); err != nil { return nil, fmt.Errorf("failed to fill internal retrieve results: %s", err.Error()) } diff --git a/internal/querynode/result_sorter.go b/internal/querynode/result_sorter.go index 76004771aa..eeece93e06 100644 --- a/internal/querynode/result_sorter.go +++ b/internal/querynode/result_sorter.go @@ -3,7 +3,7 @@ package querynode import ( "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/segcorepb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type byPK struct { diff --git a/internal/querynode/result_test.go b/internal/querynode/result_test.go index de598bca67..2ce02c8752 100644 --- a/internal/querynode/result_test.go +++ b/internal/querynode/result_test.go @@ -23,10 +23,10 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/segcorepb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func TestResult_mergeSegcoreRetrieveResults(t *testing.T) { diff --git a/internal/querynode/search.go b/internal/querynode/search.go index 100fb59bb8..f04d4ddefa 100644 --- a/internal/querynode/search.go +++ b/internal/querynode/search.go @@ -22,17 +22,16 @@ import ( "sync" "github.com/cockroachdb/errors" - "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // searchOnSegments performs search on listed segments diff --git a/internal/querynode/segment.go b/internal/querynode/segment.go index 4cfbe26743..7d2efcc4dc 100644 --- a/internal/querynode/segment.go +++ b/internal/querynode/segment.go @@ -44,17 +44,17 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/proto/segcorepb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type segmentType = commonpb.SegmentState diff --git a/internal/querynode/segment_loader.go b/internal/querynode/segment_loader.go index 95dc24bbbe..76df20dfee 100644 --- a/internal/querynode/segment_loader.go +++ b/internal/querynode/segment_loader.go @@ -35,26 +35,25 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - - "github.com/milvus-io/milvus/internal/common" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/conc" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/hardware" - "github.com/milvus-io/milvus/internal/util/indexparamcheck" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/conc" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/util/indexparamcheck" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( @@ -877,6 +876,15 @@ func GetStorageSizeByIndexInfo(indexInfo *querypb.FieldIndexInfo) (uint64, uint6 return uint64(indexInfo.IndexSize), 0, nil } +func getFieldSizeFromFieldBinlog(fieldBinlog *datapb.FieldBinlog) int64 { + fieldSize := int64(0) + for _, binlog := range fieldBinlog.Binlogs { + fieldSize += binlog.LogSize + } + + return fieldSize +} + func (loader *segmentLoader) checkSegmentSize(collectionID UniqueID, segmentLoadInfos []*querypb.SegmentLoadInfo, concurrency int) error { usedMem := hardware.GetUsedMemoryCount() totalMem := hardware.GetMemoryCount() @@ -920,18 +928,18 @@ func (loader *segmentLoader) checkSegmentSize(collectionID UniqueID, segmentLoad usedMemAfterLoad += neededMemSize usedLocalSizeAfterLoad += neededDiskSize } else { - usedMemAfterLoad += uint64(funcutil.GetFieldSizeFromFieldBinlog(fieldBinlog)) + usedMemAfterLoad += uint64(getFieldSizeFromFieldBinlog(fieldBinlog)) } } // get size of state data for _, fieldBinlog := range loadInfo.Statslogs { - usedMemAfterLoad += uint64(funcutil.GetFieldSizeFromFieldBinlog(fieldBinlog)) + usedMemAfterLoad += uint64(getFieldSizeFromFieldBinlog(fieldBinlog)) } // get size of delete data for _, fieldBinlog := range loadInfo.Deltalogs { - usedMemAfterLoad += uint64(funcutil.GetFieldSizeFromFieldBinlog(fieldBinlog)) + usedMemAfterLoad += uint64(getFieldSizeFromFieldBinlog(fieldBinlog)) } if usedMemAfterLoad-oldUsedMem > maxSegmentSize { diff --git a/internal/querynode/segment_loader_test.go b/internal/querynode/segment_loader_test.go index 6d80576f63..fd0c1e1937 100644 --- a/internal/querynode/segment_loader_test.go +++ b/internal/querynode/segment_loader_test.go @@ -32,15 +32,15 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/mocks" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) func TestSegmentLoader_loadSegment(t *testing.T) { diff --git a/internal/querynode/segment_test.go b/internal/querynode/segment_test.go index bd3c144c99..17af3f4166 100644 --- a/internal/querynode/segment_test.go +++ b/internal/querynode/segment_test.go @@ -27,13 +27,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/planpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/proto/segcorepb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/funcutil" ) // -------------------------------------------------------------------------------------- constructor and destructor diff --git a/internal/querynode/shard_cluster.go b/internal/querynode/shard_cluster.go index a89e1e480f..33b2e8771b 100644 --- a/internal/querynode/shard_cluster.go +++ b/internal/querynode/shard_cluster.go @@ -29,13 +29,13 @@ import ( "github.com/golang/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type shardClusterState int32 diff --git a/internal/querynode/shard_cluster_service.go b/internal/querynode/shard_cluster_service.go index 4377e26ab7..cc25d8ffbd 100644 --- a/internal/querynode/shard_cluster_service.go +++ b/internal/querynode/shard_cluster_service.go @@ -8,15 +8,15 @@ import ( "sync" "github.com/cockroachdb/errors" - - grpcquerynodeclient "github.com/milvus-io/milvus/internal/distributed/querynode/client" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util" - "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/typeutil" clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" + + grpcquerynodeclient "github.com/milvus-io/milvus/internal/distributed/querynode/client" + "github.com/milvus-io/milvus/internal/proto/querypb" + "github.com/milvus-io/milvus/internal/util/sessionutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/querynode/shard_cluster_service_test.go b/internal/querynode/shard_cluster_service_test.go index a6b900543c..362a6df768 100644 --- a/internal/querynode/shard_cluster_service_test.go +++ b/internal/querynode/shard_cluster_service_test.go @@ -4,12 +4,13 @@ import ( "context" "testing" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/sessionutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.etcd.io/etcd/server/v3/etcdserver/api/v3client" + + "github.com/milvus-io/milvus/internal/proto/querypb" + "github.com/milvus-io/milvus/internal/util/sessionutil" + "github.com/milvus-io/milvus/pkg/common" ) func TestShardClusterService(t *testing.T) { diff --git a/internal/querynode/shard_cluster_test.go b/internal/querynode/shard_cluster_test.go index aa04db765e..db0de86bd1 100644 --- a/internal/querynode/shard_cluster_test.go +++ b/internal/querynode/shard_cluster_test.go @@ -24,9 +24,9 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" + "github.com/milvus-io/milvus/pkg/common" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" diff --git a/internal/querynode/shard_cluster_version.go b/internal/querynode/shard_cluster_version.go index f63867c2c0..7bf4fff8ad 100644 --- a/internal/querynode/shard_cluster_version.go +++ b/internal/querynode/shard_cluster_version.go @@ -24,7 +24,7 @@ import ( "go.uber.org/atomic" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" ) // SegmentsStatus alias for map[int64]shardSegmentInfo. diff --git a/internal/querynode/shard_node_detector.go b/internal/querynode/shard_node_detector.go index 70d11094b2..e8f6423a4e 100644 --- a/internal/querynode/shard_node_detector.go +++ b/internal/querynode/shard_node_detector.go @@ -23,9 +23,9 @@ import ( "github.com/cockroachdb/errors" "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/paramtable" "go.etcd.io/etcd/api/v3/mvccpb" v3rpc "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" clientv3 "go.etcd.io/etcd/client/v3" diff --git a/internal/querynode/shard_node_detector_test.go b/internal/querynode/shard_node_detector_test.go index 656e990a22..5effd263ba 100644 --- a/internal/querynode/shard_node_detector_test.go +++ b/internal/querynode/shard_node_detector_test.go @@ -28,8 +28,8 @@ import ( "github.com/golang/protobuf/proto" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/querynode/shard_segment_detector.go b/internal/querynode/shard_segment_detector.go index 94d2b85542..3862a32a95 100644 --- a/internal/querynode/shard_segment_detector.go +++ b/internal/querynode/shard_segment_detector.go @@ -21,8 +21,8 @@ import ( "sync" "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/querypb" + "github.com/milvus-io/milvus/pkg/log" "go.etcd.io/etcd/api/v3/mvccpb" v3rpc "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" clientv3 "go.etcd.io/etcd/client/v3" diff --git a/internal/querynode/shard_segment_detector_test.go b/internal/querynode/shard_segment_detector_test.go index cd16bebf1d..812088e187 100644 --- a/internal/querynode/shard_segment_detector_test.go +++ b/internal/querynode/shard_segment_detector_test.go @@ -9,7 +9,7 @@ import ( "github.com/golang/protobuf/proto" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.etcd.io/etcd/server/v3/etcdserver/api/v3client" diff --git a/internal/querynode/statistics.go b/internal/querynode/statistics.go index 616a492381..ac50db1b92 100644 --- a/internal/querynode/statistics.go +++ b/internal/querynode/statistics.go @@ -7,7 +7,7 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" ) // statisticOnSegments performs statistic on listed segments diff --git a/internal/querynode/task.go b/internal/querynode/task.go index 3481e04b6a..6e083f03ac 100644 --- a/internal/querynode/task.go +++ b/internal/querynode/task.go @@ -21,12 +21,11 @@ import ( "runtime/debug" "github.com/cockroachdb/errors" - "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" queryPb "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var ErrChannelNotFound = errors.New("channel not found") diff --git a/internal/querynode/task_query.go b/internal/querynode/task_query.go index 27bc4f7cf0..b465b1d49d 100644 --- a/internal/querynode/task_query.go +++ b/internal/querynode/task_query.go @@ -26,11 +26,11 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/timerecord" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/timerecord" ) var _ readTask = (*queryTask)(nil) diff --git a/internal/querynode/task_queue.go b/internal/querynode/task_queue.go index 1792de109a..0a7e8f77e7 100644 --- a/internal/querynode/task_queue.go +++ b/internal/querynode/task_queue.go @@ -24,7 +24,7 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" ) const maxTaskNum = 1024 diff --git a/internal/querynode/task_read.go b/internal/querynode/task_read.go index 644b3cfff1..a1c4ddd634 100644 --- a/internal/querynode/task_read.go +++ b/internal/querynode/task_read.go @@ -21,12 +21,13 @@ import ( "fmt" "time" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/tsoutil" "go.uber.org/zap" + + "github.com/milvus-io/milvus/internal/proto/querypb" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/tsoutil" ) type readTask interface { diff --git a/internal/querynode/task_read_counter.go b/internal/querynode/task_read_counter.go index 44117d427f..1f424ff135 100644 --- a/internal/querynode/task_read_counter.go +++ b/internal/querynode/task_read_counter.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "github.com/milvus-io/milvus/internal/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" ) // readTaskQueueType is the queue type in taskScheduler diff --git a/internal/querynode/task_read_test.go b/internal/querynode/task_read_test.go index 877faccfad..9b0f18b302 100644 --- a/internal/querynode/task_read_test.go +++ b/internal/querynode/task_read_test.go @@ -7,8 +7,8 @@ import ( "github.com/milvus-io/milvus/internal/mocks" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" ) diff --git a/internal/querynode/task_scheduler.go b/internal/querynode/task_scheduler.go index 3aa31f1005..3098dfe8be 100644 --- a/internal/querynode/task_scheduler.go +++ b/internal/querynode/task_scheduler.go @@ -26,9 +26,9 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) const ( diff --git a/internal/querynode/task_scheduler_test.go b/internal/querynode/task_scheduler_test.go index 153f28c602..18313a9329 100644 --- a/internal/querynode/task_scheduler_test.go +++ b/internal/querynode/task_scheduler_test.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/paramtable" "github.com/stretchr/testify/assert" ) diff --git a/internal/querynode/task_search.go b/internal/querynode/task_search.go index 099babeb1e..3fdee617fd 100644 --- a/internal/querynode/task_search.go +++ b/internal/querynode/task_search.go @@ -31,13 +31,13 @@ import ( "github.com/golang/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/timerecord" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/timerecord" ) var _ readTask = (*searchTask)(nil) diff --git a/internal/querynode/task_statistics.go b/internal/querynode/task_statistics.go index 80b6dcd30e..9582d488d0 100644 --- a/internal/querynode/task_statistics.go +++ b/internal/querynode/task_statistics.go @@ -9,11 +9,11 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/timerecord" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/timerecord" ) // not implement any task diff --git a/internal/querynode/task_test.go b/internal/querynode/task_test.go index e2e69fb146..f6f074b94d 100644 --- a/internal/querynode/task_test.go +++ b/internal/querynode/task_test.go @@ -25,9 +25,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" + "github.com/milvus-io/milvus/pkg/mq/msgstream" ) func TestTask_watchDmChannelsTask(t *testing.T) { diff --git a/internal/querynode/tsafe_replica.go b/internal/querynode/tsafe_replica.go index 9806108e6f..fdcea363e2 100644 --- a/internal/querynode/tsafe_replica.go +++ b/internal/querynode/tsafe_replica.go @@ -22,8 +22,8 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // TSafeReplicaInterface is the interface wrapper of tSafeReplica diff --git a/internal/querynode/type_def.go b/internal/querynode/type_def.go index 3f817aa527..48cc26870a 100644 --- a/internal/querynode/type_def.go +++ b/internal/querynode/type_def.go @@ -18,7 +18,7 @@ package querynode import ( "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/querynode/validate.go b/internal/querynode/validate.go index 1ca2f3a5a0..ad3ab407be 100644 --- a/internal/querynode/validate.go +++ b/internal/querynode/validate.go @@ -24,7 +24,7 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" ) // TODO: merge validate? diff --git a/internal/querynode/watch_dm_channels_task.go b/internal/querynode/watch_dm_channels_task.go index 7187a7fdbc..338b2ef2ab 100644 --- a/internal/querynode/watch_dm_channels_task.go +++ b/internal/querynode/watch_dm_channels_task.go @@ -26,12 +26,12 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" queryPb "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type watchDmChannelsTask struct { diff --git a/internal/querynodev2/cluster/manager.go b/internal/querynodev2/cluster/manager.go index 6f03a31060..a202084cad 100644 --- a/internal/querynodev2/cluster/manager.go +++ b/internal/querynodev2/cluster/manager.go @@ -19,9 +19,10 @@ package cluster import ( "fmt" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // Manager is the interface for worker manager. diff --git a/internal/querynodev2/cluster/worker.go b/internal/querynodev2/cluster/worker.go index 3448caec24..03dc2ba0e4 100644 --- a/internal/querynodev2/cluster/worker.go +++ b/internal/querynodev2/cluster/worker.go @@ -21,13 +21,14 @@ import ( "context" "fmt" + "go.uber.org/zap" + "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/merr" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/merr" ) // Worker is the interface definition for querynode worker role. diff --git a/internal/querynodev2/collector/collector.go b/internal/querynodev2/collector/collector.go index 58500374f5..c2f7792820 100644 --- a/internal/querynodev2/collector/collector.go +++ b/internal/querynodev2/collector/collector.go @@ -19,13 +19,15 @@ package collector import ( "fmt" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/ratelimitutil" ) var Average *averageCollector + var Rate *ratelimitutil.RateCollector + var Counter *counter func RateMetrics() []string { diff --git a/internal/querynodev2/delegator/delegator.go b/internal/querynodev2/delegator/delegator.go index 9a6f7f9f58..2b2268768d 100644 --- a/internal/querynodev2/delegator/delegator.go +++ b/internal/querynodev2/delegator/delegator.go @@ -24,11 +24,12 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/golang/protobuf/proto" + "github.com/samber/lo" + "go.uber.org/atomic" + "go.uber.org/zap" + "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querynodev2/cluster" @@ -36,13 +37,12 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/pkoracle" "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/querynodev2/tsafe" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/samber/lo" - "go.uber.org/atomic" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/tsoutil" ) type lifetime struct { diff --git a/internal/querynodev2/delegator/delegator_data.go b/internal/querynodev2/delegator/delegator_data.go index ce75732e97..c2beef624a 100644 --- a/internal/querynodev2/delegator/delegator_data.go +++ b/internal/querynodev2/delegator/delegator_data.go @@ -22,11 +22,12 @@ import ( "math/rand" "github.com/cockroachdb/errors" + "github.com/samber/lo" + "go.uber.org/zap" + "golang.org/x/sync/errgroup" + "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/proto/segcorepb" "github.com/milvus-io/milvus/internal/querynodev2/cluster" @@ -34,16 +35,16 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/pkoracle" "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/retry" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/samber/lo" - "go.uber.org/zap" - "golang.org/x/sync/errgroup" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // delegator data related part diff --git a/internal/querynodev2/delegator/delegator_data_test.go b/internal/querynodev2/delegator/delegator_data_test.go index 93788041fc..86754f06bf 100644 --- a/internal/querynodev2/delegator/delegator_data_test.go +++ b/internal/querynodev2/delegator/delegator_data_test.go @@ -20,13 +20,15 @@ import ( "context" "testing" + bloom "github.com/bits-and-blooms/bloom/v3" "github.com/cockroachdb/errors" + "github.com/samber/lo" + "github.com/stretchr/testify/mock" + "github.com/stretchr/testify/suite" - "github.com/bits-and-blooms/bloom/v3" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/proto/segcorepb" "github.com/milvus-io/milvus/internal/querynodev2/cluster" @@ -34,11 +36,9 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/querynodev2/tsafe" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/samber/lo" - "github.com/stretchr/testify/mock" - "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type DelegatorDataSuite struct { diff --git a/internal/querynodev2/delegator/delegator_test.go b/internal/querynodev2/delegator/delegator_test.go index 67d33d20af..b3c4111f26 100644 --- a/internal/querynodev2/delegator/delegator_test.go +++ b/internal/querynodev2/delegator/delegator_test.go @@ -23,24 +23,24 @@ import ( "time" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/querynodev2/cluster" - "github.com/milvus-io/milvus/internal/querynodev2/segments" - "github.com/milvus-io/milvus/internal/querynodev2/tsafe" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/samber/lo" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" "go.uber.org/atomic" + + "github.com/milvus-io/milvus-proto/go-api/commonpb" + "github.com/milvus-io/milvus-proto/go-api/schemapb" + "github.com/milvus-io/milvus/internal/proto/internalpb" + "github.com/milvus-io/milvus/internal/proto/querypb" + "github.com/milvus-io/milvus/internal/querynodev2/cluster" + "github.com/milvus-io/milvus/internal/querynodev2/segments" + "github.com/milvus-io/milvus/internal/querynodev2/tsafe" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type DelegatorSuite struct { diff --git a/internal/querynodev2/delegator/deletebuffer/skiplist_buffer.go b/internal/querynodev2/delegator/deletebuffer/skiplist_buffer.go index e604e35ca0..94a64aef7a 100644 --- a/internal/querynodev2/delegator/deletebuffer/skiplist_buffer.go +++ b/internal/querynodev2/delegator/deletebuffer/skiplist_buffer.go @@ -1,6 +1,6 @@ package deletebuffer -import "github.com/milvus-io/milvus/internal/util/typeutil" +import "github.com/milvus-io/milvus/pkg/util/typeutil" // deleteBuffer caches L0 delete buffer for remote segments. type deleteBuffer struct { diff --git a/internal/querynodev2/delegator/distribution.go b/internal/querynodev2/delegator/distribution.go index 682a98b0b9..b8f841bbc3 100644 --- a/internal/querynodev2/delegator/distribution.go +++ b/internal/querynodev2/delegator/distribution.go @@ -19,8 +19,9 @@ package delegator import ( "sync" - "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/atomic" + + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/querynodev2/delegator/snapshot.go b/internal/querynodev2/delegator/snapshot.go index 24c73a6f96..d98e967410 100644 --- a/internal/querynodev2/delegator/snapshot.go +++ b/internal/querynodev2/delegator/snapshot.go @@ -19,9 +19,10 @@ package delegator import ( "sync" - "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/samber/lo" "go.uber.org/atomic" + + "github.com/milvus-io/milvus/pkg/util/funcutil" ) // SnapshotItem group segmentEntry slice diff --git a/internal/querynodev2/delegator/types.go b/internal/querynodev2/delegator/types.go index 01ca9e1dda..597ee6af95 100644 --- a/internal/querynodev2/delegator/types.go +++ b/internal/querynodev2/delegator/types.go @@ -7,7 +7,7 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/querynodev2/handlers.go b/internal/querynodev2/handlers.go index 259fba9b67..147c27eb4d 100644 --- a/internal/querynodev2/handlers.go +++ b/internal/querynodev2/handlers.go @@ -22,10 +22,11 @@ import ( "strconv" "github.com/golang/protobuf/proto" + "github.com/samber/lo" + "go.opentelemetry.io/otel/trace" + "go.uber.org/zap" + "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/planpb" "github.com/milvus-io/milvus/internal/proto/querypb" @@ -34,14 +35,14 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/querynodev2/tasks" "github.com/milvus-io/milvus/internal/util" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/samber/lo" - "go.opentelemetry.io/otel/trace" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/timerecord" ) func loadGrowingSegments(ctx context.Context, delegator delegator.ShardDelegator, req *querypb.WatchDmChannelsRequest) error { diff --git a/internal/querynodev2/handlers_test.go b/internal/querynodev2/handlers_test.go index 9cc7abf4f2..fc50513358 100644 --- a/internal/querynodev2/handlers_test.go +++ b/internal/querynodev2/handlers_test.go @@ -22,7 +22,10 @@ import ( "testing" "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus/internal/common" + "github.com/stretchr/testify/mock" + "github.com/stretchr/testify/suite" + clientv3 "go.etcd.io/etcd/client/v3" + "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/planpb" @@ -30,12 +33,10 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/delegator" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/stretchr/testify/mock" - "github.com/stretchr/testify/suite" - clientv3 "go.etcd.io/etcd/client/v3" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type HandlersSuite struct { diff --git a/internal/querynodev2/local_worker.go b/internal/querynodev2/local_worker.go index 14afe783d0..ddec64b1e4 100644 --- a/internal/querynodev2/local_worker.go +++ b/internal/querynodev2/local_worker.go @@ -20,14 +20,15 @@ import ( "context" "fmt" + "github.com/samber/lo" + "go.uber.org/zap" + "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querynodev2/cluster" "github.com/milvus-io/milvus/internal/querynodev2/segments" - "github.com/samber/lo" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" ) var _ cluster.Worker = &LocalWorker{} diff --git a/internal/querynodev2/local_worker_test.go b/internal/querynodev2/local_worker_test.go index 572631ab9f..e7925b1445 100644 --- a/internal/querynodev2/local_worker_test.go +++ b/internal/querynodev2/local_worker_test.go @@ -20,15 +20,16 @@ import ( "context" "testing" + "github.com/samber/lo" + "github.com/stretchr/testify/suite" + clientv3 "go.etcd.io/etcd/client/v3" + "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/samber/lo" - "github.com/stretchr/testify/suite" - clientv3 "go.etcd.io/etcd/client/v3" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type LocalWorkerTestSuite struct { diff --git a/internal/querynodev2/metrics_info.go b/internal/querynodev2/metrics_info.go index ee92b0650d..6771f1a349 100644 --- a/internal/querynodev2/metrics_info.go +++ b/internal/querynodev2/metrics_info.go @@ -23,11 +23,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/querynodev2/collector" - "github.com/milvus-io/milvus/internal/util/hardware" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/ratelimitutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func getRateMetric() ([]metricsinfo.RateMetric, error) { diff --git a/internal/querynodev2/mock_data.go b/internal/querynodev2/mock_data.go index b678aaa094..01481c7153 100644 --- a/internal/querynodev2/mock_data.go +++ b/internal/querynodev2/mock_data.go @@ -23,13 +23,13 @@ import ( "strconv" "github.com/cockroachdb/errors" - "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/proto/planpb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // ---------- unittest util functions ---------- diff --git a/internal/querynodev2/pipeline/delete_node.go b/internal/querynodev2/pipeline/delete_node.go index 60f4105027..f6cb765560 100644 --- a/internal/querynodev2/pipeline/delete_node.go +++ b/internal/querynodev2/pipeline/delete_node.go @@ -19,12 +19,13 @@ package pipeline import ( "fmt" - "github.com/milvus-io/milvus/internal/log" + "github.com/samber/lo" + "go.uber.org/zap" + "github.com/milvus-io/milvus/internal/querynodev2/delegator" "github.com/milvus-io/milvus/internal/storage" base "github.com/milvus-io/milvus/internal/util/pipeline" - "github.com/samber/lo" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" ) type deleteNode struct { diff --git a/internal/querynodev2/pipeline/filter_node.go b/internal/querynodev2/pipeline/filter_node.go index 0bc2d54ced..866d191af6 100644 --- a/internal/querynodev2/pipeline/filter_node.go +++ b/internal/querynodev2/pipeline/filter_node.go @@ -21,16 +21,17 @@ import ( "reflect" "github.com/golang/protobuf/proto" + "go.uber.org/zap" + "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/querynodev2/segments" - "github.com/milvus-io/milvus/internal/util/paramtable" base "github.com/milvus-io/milvus/internal/util/pipeline" - "github.com/milvus-io/milvus/internal/util/typeutil" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) //filterNode filter the invalid message of pipeline diff --git a/internal/querynodev2/pipeline/filter_node_test.go b/internal/querynodev2/pipeline/filter_node_test.go index 647d9387da..e6f108cc65 100644 --- a/internal/querynodev2/pipeline/filter_node_test.go +++ b/internal/querynodev2/pipeline/filter_node_test.go @@ -19,15 +19,16 @@ package pipeline import ( "testing" + "github.com/samber/lo" + "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querynodev2/segments" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/samber/lo" - "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) //test of filter node diff --git a/internal/querynodev2/pipeline/filter_policy.go b/internal/querynodev2/pipeline/filter_policy.go index d735f3056e..ce6a1ff792 100644 --- a/internal/querynodev2/pipeline/filter_policy.go +++ b/internal/querynodev2/pipeline/filter_policy.go @@ -18,6 +18,7 @@ package pipeline //MsgFilter will return error if Msg was invalid type InsertMsgFilter = func(n *filterNode, c *Collection, msg *InsertMsg) error + type DeleteMsgFilter = func(n *filterNode, c *Collection, msg *DeleteMsg) error //Chack msg is aligned -- diff --git a/internal/querynodev2/pipeline/insert_node.go b/internal/querynodev2/pipeline/insert_node.go index cfc932eafc..bbdbd35e79 100644 --- a/internal/querynodev2/pipeline/insert_node.go +++ b/internal/querynodev2/pipeline/insert_node.go @@ -20,14 +20,15 @@ import ( "fmt" "sort" + "go.uber.org/zap" + "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/querynodev2/delegator" "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/storage" base "github.com/milvus-io/milvus/internal/util/pipeline" - "github.com/milvus-io/milvus/internal/util/typeutil" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type insertNode struct { diff --git a/internal/querynodev2/pipeline/manager.go b/internal/querynodev2/pipeline/manager.go index 01ee24fa4b..30589ec544 100644 --- a/internal/querynodev2/pipeline/manager.go +++ b/internal/querynodev2/pipeline/manager.go @@ -20,14 +20,15 @@ import ( "fmt" "sync" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/mq/msgdispatcher" + "go.uber.org/zap" + "github.com/milvus-io/milvus/internal/querynodev2/delegator" "github.com/milvus-io/milvus/internal/querynodev2/segments" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) //Manager manage pipeline in querynode @@ -39,6 +40,7 @@ type Manager interface { Start(channels ...string) error Close() } + type manager struct { channel2Pipeline map[string]Pipeline dataManager *DataManager diff --git a/internal/querynodev2/pipeline/manager_test.go b/internal/querynodev2/pipeline/manager_test.go index b3449378aa..814a3d2b82 100644 --- a/internal/querynodev2/pipeline/manager_test.go +++ b/internal/querynodev2/pipeline/manager_test.go @@ -19,17 +19,18 @@ package pipeline import ( "testing" + "github.com/stretchr/testify/mock" + "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/mq/msgdispatcher" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" "github.com/milvus-io/milvus/internal/querynodev2/delegator" "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/querynodev2/tsafe" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/stretchr/testify/mock" - "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type PipelineManagerTestSuite struct { diff --git a/internal/querynodev2/pipeline/message.go b/internal/querynodev2/pipeline/message.go index 8ecd5d84a3..1e277cad8f 100644 --- a/internal/querynodev2/pipeline/message.go +++ b/internal/querynodev2/pipeline/message.go @@ -18,10 +18,11 @@ package pipeline import ( "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/querynodev2/collector" - "github.com/milvus-io/milvus/internal/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" ) type insertNodeMsg struct { diff --git a/internal/querynodev2/pipeline/mock_data.go b/internal/querynodev2/pipeline/mock_data.go index c1577bb03d..69567813ea 100644 --- a/internal/querynodev2/pipeline/mock_data.go +++ b/internal/querynodev2/pipeline/mock_data.go @@ -22,9 +22,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/querynodev2/segments" - "github.com/milvus-io/milvus/internal/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" ) const defaultDim = 128 diff --git a/internal/querynodev2/pipeline/pipeline.go b/internal/querynodev2/pipeline/pipeline.go index 8029dad870..a50e728d31 100644 --- a/internal/querynodev2/pipeline/pipeline.go +++ b/internal/querynodev2/pipeline/pipeline.go @@ -17,15 +17,16 @@ package pipeline import ( - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/mq/msgdispatcher" + "go.uber.org/zap" + "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/querynodev2/delegator" - "github.com/milvus-io/milvus/internal/util/paramtable" base "github.com/milvus-io/milvus/internal/util/pipeline" - "github.com/milvus-io/milvus/internal/util/typeutil" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) //pipeline used for querynode @@ -33,6 +34,7 @@ type Pipeline interface { base.StreamPipeline ExcludedSegments(segInfos ...*datapb.SegmentInfo) } + type pipeline struct { base.StreamPipeline diff --git a/internal/querynodev2/pipeline/pipeline_test.go b/internal/querynodev2/pipeline/pipeline_test.go index 0f130c3d43..bdde26564b 100644 --- a/internal/querynodev2/pipeline/pipeline_test.go +++ b/internal/querynodev2/pipeline/pipeline_test.go @@ -19,19 +19,20 @@ package pipeline import ( "testing" + "github.com/samber/lo" + "github.com/stretchr/testify/mock" + "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/mq/msgdispatcher" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querynodev2/delegator" "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/querynodev2/tsafe" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/samber/lo" - "github.com/stretchr/testify/mock" - "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type PipelineTestSuite struct { diff --git a/internal/querynodev2/pipeline/type.go b/internal/querynodev2/pipeline/type.go index 5582de4a1d..4bbeac2a21 100644 --- a/internal/querynodev2/pipeline/type.go +++ b/internal/querynodev2/pipeline/type.go @@ -20,13 +20,13 @@ import ( "time" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/querynodev2/tsafe" "github.com/milvus-io/milvus/internal/storage" base "github.com/milvus-io/milvus/internal/util/pipeline" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/querynodev2/pkoracle/bloom_filter.go b/internal/querynodev2/pkoracle/bloom_filter.go index 1450e8cc16..5e7d909c61 100644 --- a/internal/querynodev2/pkoracle/bloom_filter.go +++ b/internal/querynodev2/pkoracle/bloom_filter.go @@ -19,13 +19,14 @@ package pkoracle import ( "sync" - "github.com/bits-and-blooms/bloom/v3" + bloom "github.com/bits-and-blooms/bloom/v3" + "go.uber.org/zap" + "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/storage" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" ) var _ Candidate = (*BloomFilterSet)(nil) diff --git a/internal/querynodev2/pkoracle/candidate.go b/internal/querynodev2/pkoracle/candidate.go index ca62109e92..950166bfcd 100644 --- a/internal/querynodev2/pkoracle/candidate.go +++ b/internal/querynodev2/pkoracle/candidate.go @@ -18,9 +18,9 @@ package pkoracle import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // Candidate is the interface for pk oracle candidate. diff --git a/internal/querynodev2/pkoracle/pk_oracle.go b/internal/querynodev2/pkoracle/pk_oracle.go index d9359afc19..b509fc5e2d 100644 --- a/internal/querynodev2/pkoracle/pk_oracle.go +++ b/internal/querynodev2/pkoracle/pk_oracle.go @@ -21,7 +21,7 @@ import ( "fmt" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // PkOracle interface for pk oracle. diff --git a/internal/querynodev2/segments/bloom_filter_set.go b/internal/querynodev2/segments/bloom_filter_set.go index 215aa91263..e5b72f68f8 100644 --- a/internal/querynodev2/segments/bloom_filter_set.go +++ b/internal/querynodev2/segments/bloom_filter_set.go @@ -19,12 +19,13 @@ package segments import ( "sync" - "github.com/bits-and-blooms/bloom/v3" - "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - storage "github.com/milvus-io/milvus/internal/storage" + bloom "github.com/bits-and-blooms/bloom/v3" "go.uber.org/zap" + + "github.com/milvus-io/milvus-proto/go-api/schemapb" + storage "github.com/milvus-io/milvus/internal/storage" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" ) type bloomFilterSet struct { diff --git a/internal/querynodev2/segments/cgo_util.go b/internal/querynodev2/segments/cgo_util.go index bfa2434c67..04a6b7526c 100644 --- a/internal/querynodev2/segments/cgo_util.go +++ b/internal/querynodev2/segments/cgo_util.go @@ -31,12 +31,11 @@ import ( "unsafe" "github.com/cockroachdb/errors" - "github.com/golang/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/cgoconverter" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/cgoconverter" ) // HandleCStatus deals with the error returned from CGO diff --git a/internal/querynodev2/segments/collection.go b/internal/querynodev2/segments/collection.go index 849fc0da5c..1155cc02cd 100644 --- a/internal/querynodev2/segments/collection.go +++ b/internal/querynodev2/segments/collection.go @@ -23,14 +23,16 @@ package segments #include "segcore/segment_c.h" */ import "C" + import ( "sync" "unsafe" "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type CollectionManager interface { diff --git a/internal/querynodev2/segments/load_index_info.go b/internal/querynodev2/segments/load_index_info.go index 1dfb6dc838..a16ef0ff54 100644 --- a/internal/querynodev2/segments/load_index_info.go +++ b/internal/querynodev2/segments/load_index_info.go @@ -30,14 +30,14 @@ import ( "path/filepath" "unsafe" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/indexparams" - "github.com/milvus-io/milvus/internal/util/paramtable" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/querypb" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/indexparams" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) // LoadIndexInfo is a wrapper of the underlying C-structure C.CLoadIndexInfo diff --git a/internal/querynodev2/segments/manager.go b/internal/querynodev2/segments/manager.go index 1f5ab462dd..de144ebe34 100644 --- a/internal/querynodev2/segments/manager.go +++ b/internal/querynodev2/segments/manager.go @@ -23,14 +23,15 @@ package segments #include "segcore/segment_c.h" */ import "C" + import ( "fmt" "sync" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/paramtable" - . "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/paramtable" + . "github.com/milvus-io/milvus/pkg/util/typeutil" ) type SegmentFilter func(segment Segment) bool diff --git a/internal/querynodev2/segments/manager_test.go b/internal/querynodev2/segments/manager_test.go index 9aa5eacda9..7935aae28a 100644 --- a/internal/querynodev2/segments/manager_test.go +++ b/internal/querynodev2/segments/manager_test.go @@ -3,10 +3,11 @@ package segments import ( "testing" + "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type ManagerSuite struct { diff --git a/internal/querynodev2/segments/mock_data.go b/internal/querynodev2/segments/mock_data.go index e2c4a22777..7e251ccd23 100644 --- a/internal/querynodev2/segments/mock_data.go +++ b/internal/querynodev2/segments/mock_data.go @@ -27,14 +27,12 @@ import ( "strconv" "github.com/cockroachdb/errors" - "github.com/golang/protobuf/proto" + "go.uber.org/zap" + "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/indexpb" @@ -42,11 +40,13 @@ import ( "github.com/milvus-io/milvus/internal/proto/planpb" "github.com/milvus-io/milvus/internal/proto/querypb" storage "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/funcutil" "github.com/milvus-io/milvus/internal/util/indexcgowrapper" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/querynodev2/segments/plan.go b/internal/querynodev2/segments/plan.go index 780daccb57..0cc8c185f1 100644 --- a/internal/querynodev2/segments/plan.go +++ b/internal/querynodev2/segments/plan.go @@ -24,6 +24,7 @@ package segments #include "segcore/plan_c.h" */ import "C" + import ( "fmt" "unsafe" @@ -32,7 +33,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus/internal/proto/querypb" - . "github.com/milvus-io/milvus/internal/util/typeutil" + . "github.com/milvus-io/milvus/pkg/util/typeutil" ) // SearchPlan is a wrapper of the underlying C-structure C.CSearchPlan diff --git a/internal/querynodev2/segments/plan_test.go b/internal/querynodev2/segments/plan_test.go index 8daf0606ef..45f8712c85 100644 --- a/internal/querynodev2/segments/plan_test.go +++ b/internal/querynodev2/segments/plan_test.go @@ -25,9 +25,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/proto/planpb" "github.com/milvus-io/milvus/internal/proto/querypb" + "github.com/milvus-io/milvus/pkg/common" ) type PlanSuite struct { diff --git a/internal/querynodev2/segments/reduce_test.go b/internal/querynodev2/segments/reduce_test.go index bc93c3abc8..2eb18adecc 100644 --- a/internal/querynodev2/segments/reduce_test.go +++ b/internal/querynodev2/segments/reduce_test.go @@ -22,17 +22,16 @@ import ( "math" "testing" - "github.com/milvus-io/milvus/internal/proto/querypb" - storage "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/golang/protobuf/proto" "github.com/stretchr/testify/suite" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/internal/proto/querypb" + storage "github.com/milvus-io/milvus/internal/storage" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type ReduceSuite struct { diff --git a/internal/querynodev2/segments/result.go b/internal/querynodev2/segments/result.go index 66922c75e5..7adb8b871d 100644 --- a/internal/querynodev2/segments/result.go +++ b/internal/querynodev2/segments/result.go @@ -26,14 +26,16 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/segcorepb" - "github.com/milvus-io/milvus/internal/util/typeutil" + typeutil2 "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var _ typeutil.ResultWithID = &internalpb.RetrieveResults{} + var _ typeutil.ResultWithID = &segcorepb.RetrieveResults{} func ReduceSearchResults(ctx context.Context, results []*internalpb.SearchResults, nq int64, topk int64, metricType string) (*internalpb.SearchResults, error) { @@ -251,7 +253,7 @@ func MergeInternalRetrieveResult(ctx context.Context, retrieveResults []*interna } pk := typeutil.GetPK(validRetrieveResults[sel].GetIds(), cursors[sel]) - ts := typeutil.GetTS(validRetrieveResults[sel], cursors[sel]) + ts := getTS(validRetrieveResults[sel], cursors[sel]) if _, ok := idTsMap[pk]; !ok { typeutil.AppendPKs(ret.Ids, pk) typeutil.AppendFieldData(ret.FieldsData, validRetrieveResults[sel].GetFieldsData(), cursors[sel]) @@ -275,6 +277,20 @@ func MergeInternalRetrieveResult(ctx context.Context, retrieveResults []*interna return ret, nil } +func getTS(i *internalpb.RetrieveResults, idx int64) uint64 { + if i.FieldsData == nil { + return 0 + } + for _, fieldData := range i.FieldsData { + fieldID := fieldData.FieldId + if fieldID == common.TimeStampField { + res := fieldData.GetScalars().GetLongData().Data + return uint64(res[idx]) + } + } + return 0 +} + func MergeSegcoreRetrieveResults(ctx context.Context, retrieveResults []*segcorepb.RetrieveResults, limit int64) (*segcorepb.RetrieveResults, error) { log.Ctx(ctx).Debug("mergeSegcoreRetrieveResults", zap.Int64("limit", limit), @@ -349,7 +365,7 @@ func MergeInternalRetrieveResultsAndFillIfEmpty( return nil, err } - if err := typeutil.FillRetrieveResultIfEmpty(typeutil.NewInternalResult(mergedResult), outputFieldsID, schema); err != nil { + if err := typeutil2.FillRetrieveResultIfEmpty(typeutil2.NewInternalResult(mergedResult), outputFieldsID, schema); err != nil { return nil, fmt.Errorf("failed to fill internal retrieve results: %s", err.Error()) } @@ -369,7 +385,7 @@ func MergeSegcoreRetrieveResultsAndFillIfEmpty( return nil, err } - if err := typeutil.FillRetrieveResultIfEmpty(typeutil.NewSegcoreResults(mergedResult), outputFieldsID, schema); err != nil { + if err := typeutil2.FillRetrieveResultIfEmpty(typeutil2.NewSegcoreResults(mergedResult), outputFieldsID, schema); err != nil { return nil, fmt.Errorf("failed to fill segcore retrieve results: %s", err.Error()) } diff --git a/internal/querynodev2/segments/result_sorter.go b/internal/querynodev2/segments/result_sorter.go index 078a5dbabd..a6a23f727d 100644 --- a/internal/querynodev2/segments/result_sorter.go +++ b/internal/querynodev2/segments/result_sorter.go @@ -3,7 +3,7 @@ package segments import ( "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/segcorepb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type byPK struct { diff --git a/internal/querynodev2/segments/result_test.go b/internal/querynodev2/segments/result_test.go index c169f5247e..bad8b124ac 100644 --- a/internal/querynodev2/segments/result_test.go +++ b/internal/querynodev2/segments/result_test.go @@ -25,10 +25,10 @@ import ( "github.com/stretchr/testify/suite" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/segcorepb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type ResultSuite struct { diff --git a/internal/querynodev2/segments/retrieve.go b/internal/querynodev2/segments/retrieve.go index 149de42163..12310f4f53 100644 --- a/internal/querynodev2/segments/retrieve.go +++ b/internal/querynodev2/segments/retrieve.go @@ -21,7 +21,7 @@ import ( "github.com/milvus-io/milvus/internal/proto/segcorepb" "github.com/milvus-io/milvus/internal/storage" - . "github.com/milvus-io/milvus/internal/util/typeutil" + . "github.com/milvus-io/milvus/pkg/util/typeutil" ) // retrieveOnSegments performs retrieve on listed segments diff --git a/internal/querynodev2/segments/retrieve_test.go b/internal/querynodev2/segments/retrieve_test.go index 0202c80c79..f429e374c4 100644 --- a/internal/querynodev2/segments/retrieve_test.go +++ b/internal/querynodev2/segments/retrieve_test.go @@ -25,7 +25,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type RetrieveSuite struct { diff --git a/internal/querynodev2/segments/search.go b/internal/querynodev2/segments/search.go index c4fe1f615d..0158395d35 100644 --- a/internal/querynodev2/segments/search.go +++ b/internal/querynodev2/segments/search.go @@ -24,10 +24,10 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/timerecord" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/timerecord" ) // searchOnSegments performs search on listed segments diff --git a/internal/querynodev2/segments/search_test.go b/internal/querynodev2/segments/search_test.go index 68e6239902..a14eeb2246 100644 --- a/internal/querynodev2/segments/search_test.go +++ b/internal/querynodev2/segments/search_test.go @@ -20,11 +20,12 @@ import ( "context" "testing" + "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/querypb" storage "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type SearchSuite struct { diff --git a/internal/querynodev2/segments/segment.go b/internal/querynodev2/segments/segment.go index a4c9afa5da..ad3564c235 100644 --- a/internal/querynodev2/segments/segment.go +++ b/internal/querynodev2/segments/segment.go @@ -24,6 +24,7 @@ package segments #include "segcore/reduce_c.h" */ import "C" + import ( "context" "fmt" @@ -32,28 +33,25 @@ import ( "unsafe" "github.com/cockroachdb/errors" - "go.opentelemetry.io/otel/trace" - - "github.com/milvus-io/milvus-proto/go-api/msgpb" - pkoracle "github.com/milvus-io/milvus/internal/querynodev2/pkoracle" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" - - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/golang/protobuf/proto" + "go.opentelemetry.io/otel/trace" "go.uber.org/atomic" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" + "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/proto/segcorepb" + pkoracle "github.com/milvus-io/milvus/internal/querynodev2/pkoracle" "github.com/milvus-io/milvus/internal/storage" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type SegmentType = commonpb.SegmentState diff --git a/internal/querynodev2/segments/segment_loader.go b/internal/querynodev2/segments/segment_loader.go index bf9eadae54..8112571676 100644 --- a/internal/querynodev2/segments/segment_loader.go +++ b/internal/querynodev2/segments/segment_loader.go @@ -26,30 +26,29 @@ import ( "time" "github.com/cockroachdb/errors" - + ants "github.com/panjf2000/ants/v2" + "github.com/samber/lo" "go.uber.org/zap" "golang.org/x/sync/errgroup" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querynodev2/pkoracle" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/conc" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/hardware" - "github.com/milvus-io/milvus/internal/util/indexparamcheck" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/timerecord" - . "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/panjf2000/ants/v2" - "github.com/samber/lo" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/conc" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/util/indexparamcheck" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/timerecord" + . "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( @@ -807,18 +806,18 @@ func (loader *segmentLoader) checkSegmentSize(collectionID UniqueID, segmentLoad usedMemAfterLoad += neededMemSize usedLocalSizeAfterLoad += neededDiskSize } else { - usedMemAfterLoad += uint64(funcutil.GetFieldSizeFromFieldBinlog(fieldBinlog)) + usedMemAfterLoad += uint64(getFieldSizeFromFieldBinlog(fieldBinlog)) } } // get size of state data for _, fieldBinlog := range loadInfo.Statslogs { - usedMemAfterLoad += uint64(funcutil.GetFieldSizeFromFieldBinlog(fieldBinlog)) + usedMemAfterLoad += uint64(getFieldSizeFromFieldBinlog(fieldBinlog)) } // get size of delete data for _, fieldBinlog := range loadInfo.Deltalogs { - usedMemAfterLoad += uint64(funcutil.GetFieldSizeFromFieldBinlog(fieldBinlog)) + usedMemAfterLoad += uint64(getFieldSizeFromFieldBinlog(fieldBinlog)) } if usedMemAfterLoad-oldUsedMem > maxSegmentSize { @@ -861,6 +860,15 @@ func (loader *segmentLoader) checkSegmentSize(collectionID UniqueID, segmentLoad return nil } +func getFieldSizeFromFieldBinlog(fieldBinlog *datapb.FieldBinlog) int64 { + fieldSize := int64(0) + for _, binlog := range fieldBinlog.Binlogs { + fieldSize += binlog.LogSize + } + + return fieldSize +} + func NewLoader( manager CollectionManager, cm storage.ChunkManager, diff --git a/internal/querynodev2/segments/segment_loader_test.go b/internal/querynodev2/segments/segment_loader_test.go index 3ccb43dc0e..77956f0ef6 100644 --- a/internal/querynodev2/segments/segment_loader_test.go +++ b/internal/querynodev2/segments/segment_loader_test.go @@ -22,12 +22,13 @@ import ( "math/rand" "testing" + "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/conc" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/pkg/util/conc" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type SegmentLoaderSuite struct { diff --git a/internal/querynodev2/segments/segment_test.go b/internal/querynodev2/segments/segment_test.go index 5a2a16359a..068584ecf5 100644 --- a/internal/querynodev2/segments/segment_test.go +++ b/internal/querynodev2/segments/segment_test.go @@ -3,11 +3,12 @@ package segments import ( "testing" + "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/querypb" storage "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/stretchr/testify/suite" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type SegmentSuite struct { diff --git a/internal/querynodev2/segments/statistics.go b/internal/querynodev2/segments/statistics.go index 4d8e89e249..19e25b68c5 100644 --- a/internal/querynodev2/segments/statistics.go +++ b/internal/querynodev2/segments/statistics.go @@ -20,7 +20,7 @@ import ( "context" "sync" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" ) // SegmentStats struct for segment statistics. diff --git a/internal/querynodev2/segments/utils.go b/internal/querynodev2/segments/utils.go index 5d7557c152..02d3c2e2aa 100644 --- a/internal/querynodev2/segments/utils.go +++ b/internal/querynodev2/segments/utils.go @@ -9,14 +9,15 @@ import ( "strconv" "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/zap" + + "github.com/milvus-io/milvus-proto/go-api/schemapb" + "github.com/milvus-io/milvus/internal/storage" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func GetPkField(schema *schemapb.CollectionSchema) *schemapb.FieldSchema { diff --git a/internal/querynodev2/segments/validate.go b/internal/querynodev2/segments/validate.go index 9e1397384f..0074404840 100644 --- a/internal/querynodev2/segments/validate.go +++ b/internal/querynodev2/segments/validate.go @@ -21,12 +21,11 @@ import ( "fmt" "github.com/cockroachdb/errors" - "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/funcutil" ) func validate(ctx context.Context, manager *Manager, collectionID int64, partitionIDs []int64, segmentIDs []int64, segmentFilter SegmentFilter) ([]int64, []int64, error) { diff --git a/internal/querynodev2/server.go b/internal/querynodev2/server.go index 6b527645fe..112cd1a81d 100644 --- a/internal/querynodev2/server.go +++ b/internal/querynodev2/server.go @@ -39,16 +39,12 @@ import ( "time" "unsafe" - "github.com/milvus-io/milvus-proto/go-api/commonpb" - clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/config" + "github.com/milvus-io/milvus-proto/go-api/commonpb" grpcquerynodeclient "github.com/milvus-io/milvus/internal/distributed/querynode/client" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgdispatcher" "github.com/milvus-io/milvus/internal/querynodev2/cluster" "github.com/milvus-io/milvus/internal/querynodev2/delegator" "github.com/milvus-io/milvus/internal/querynodev2/pipeline" @@ -57,15 +53,18 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/tsafe" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/conc" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/gc" - "github.com/milvus-io/milvus/internal/util/hardware" "github.com/milvus-io/milvus/internal/util/initcore" - "github.com/milvus-io/milvus/internal/util/lifetime" - "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/config" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/util/conc" + "github.com/milvus-io/milvus/pkg/util/gc" + "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/util/lifetime" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // make sure QueryNode implements types.QueryNode diff --git a/internal/querynodev2/server_test.go b/internal/querynodev2/server_test.go index e6de822ecd..8e422058a7 100644 --- a/internal/querynodev2/server_test.go +++ b/internal/querynodev2/server_test.go @@ -22,15 +22,15 @@ import ( "testing" "github.com/cockroachdb/errors" + "github.com/stretchr/testify/mock" + "github.com/stretchr/testify/suite" + clientv3 "go.etcd.io/etcd/client/v3" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/stretchr/testify/mock" - "github.com/stretchr/testify/suite" - clientv3 "go.etcd.io/etcd/client/v3" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type QueryNodeSuite struct { @@ -80,6 +80,7 @@ func (suite *QueryNodeSuite) TearDownTest() { suite.etcd.Close() os.RemoveAll("/tmp/milvus-test") } + func (suite *QueryNodeSuite) TestBasic() { // mock expect suite.factory.EXPECT().Init(mock.Anything).Return() diff --git a/internal/querynodev2/services.go b/internal/querynodev2/services.go index 927e66ae98..77ed4ad829 100644 --- a/internal/querynodev2/services.go +++ b/internal/querynodev2/services.go @@ -30,9 +30,6 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" @@ -41,13 +38,16 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // GetComponentStates returns information about whether the node is healthy diff --git a/internal/querynodev2/services_test.go b/internal/querynodev2/services_test.go index 7af79914b5..c705745adc 100644 --- a/internal/querynodev2/services_test.go +++ b/internal/querynodev2/services_test.go @@ -23,12 +23,14 @@ import ( "testing" "github.com/cockroachdb/errors" + "github.com/stretchr/testify/mock" + "github.com/stretchr/testify/suite" + clientv3 "go.etcd.io/etcd/client/v3" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" @@ -36,13 +38,11 @@ import ( "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/stretchr/testify/mock" - "github.com/stretchr/testify/suite" - clientv3 "go.etcd.io/etcd/client/v3" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type ServiceSuite struct { @@ -1028,6 +1028,7 @@ func (suite *ServiceSuite) TestShowConfigurations_Normal() { suite.Equal(commonpb.ErrorCode_Success, resp.Status.ErrorCode) suite.Equal(1, len(resp.Configuations)) } + func (suite *ServiceSuite) TestShowConfigurations_Failed() { ctx := context.Background() req := &internalpb.ShowConfigurationsRequest{ diff --git a/internal/querynodev2/tasks/scheduler.go b/internal/querynodev2/tasks/scheduler.go index fabe437182..55e4a80799 100644 --- a/internal/querynodev2/tasks/scheduler.go +++ b/internal/querynodev2/tasks/scheduler.go @@ -5,12 +5,13 @@ import ( "fmt" "runtime" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/util/conc" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/panjf2000/ants/v2" + ants "github.com/panjf2000/ants/v2" "go.uber.org/atomic" + + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/conc" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/querynodev2/tasks/task.go b/internal/querynodev2/tasks/task.go index 8f2e5d6cf0..eecfb647c1 100644 --- a/internal/querynodev2/tasks/task.go +++ b/internal/querynodev2/tasks/task.go @@ -5,17 +5,18 @@ import ( "context" "fmt" + "go.uber.org/zap" + "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/querynodev2/segments" "github.com/milvus-io/milvus/internal/util" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/timerecord" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/timerecord" ) type Task interface { diff --git a/internal/querynodev2/tsafe/manager.go b/internal/querynodev2/tsafe/manager.go index 0f42399d63..569420e558 100644 --- a/internal/querynodev2/tsafe/manager.go +++ b/internal/querynodev2/tsafe/manager.go @@ -22,8 +22,8 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" - . "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + . "github.com/milvus-io/milvus/pkg/util/typeutil" ) // Manager is the interface for tsafe manager. diff --git a/internal/querynodev2/tsafe/tsafe.go b/internal/querynodev2/tsafe/tsafe.go index 10f02a2fc1..9ec40f1ed8 100644 --- a/internal/querynodev2/tsafe/tsafe.go +++ b/internal/querynodev2/tsafe/tsafe.go @@ -17,8 +17,9 @@ package tsafe import ( - . "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/atomic" + + . "github.com/milvus-io/milvus/pkg/util/typeutil" ) type tSafe struct { diff --git a/internal/querynodev2/tsafe/tsafe_test.go b/internal/querynodev2/tsafe/tsafe_test.go index fd319e7fa9..06ab59a2bd 100644 --- a/internal/querynodev2/tsafe/tsafe_test.go +++ b/internal/querynodev2/tsafe/tsafe_test.go @@ -20,8 +20,9 @@ import ( "testing" "time" - . "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/stretchr/testify/suite" + + . "github.com/milvus-io/milvus/pkg/util/typeutil" ) type TSafeTestSuite struct { diff --git a/internal/querynodev2/utils.go b/internal/querynodev2/utils.go index c1c6d9bc0a..d17bebb336 100644 --- a/internal/querynodev2/utils.go +++ b/internal/querynodev2/utils.go @@ -4,7 +4,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/util" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) func WrapRetrieveResult(code commonpb.ErrorCode, msg string, errs ...error) *internalpb.RetrieveResults { diff --git a/internal/rootcoord/alter_collection_task.go b/internal/rootcoord/alter_collection_task.go index 8f4578dd81..ae5d7e4d3a 100644 --- a/internal/rootcoord/alter_collection_task.go +++ b/internal/rootcoord/alter_collection_task.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/milvuspb" diff --git a/internal/rootcoord/alter_collection_task_test.go b/internal/rootcoord/alter_collection_task_test.go index a1b08e62b7..0a82d4f9ae 100644 --- a/internal/rootcoord/alter_collection_task_test.go +++ b/internal/rootcoord/alter_collection_task_test.go @@ -24,7 +24,7 @@ import ( "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/common" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/stretchr/testify/assert" diff --git a/internal/rootcoord/broker.go b/internal/rootcoord/broker.go index 3ea59f83fa..aa2ad11f28 100644 --- a/internal/rootcoord/broker.go +++ b/internal/rootcoord/broker.go @@ -27,13 +27,13 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/querypb" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type watchInfo struct { diff --git a/internal/rootcoord/create_collection_task.go b/internal/rootcoord/create_collection_task.go index cc5d2df1bc..4655e7801f 100644 --- a/internal/rootcoord/create_collection_task.go +++ b/internal/rootcoord/create_collection_task.go @@ -26,14 +26,14 @@ import ( "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" - ms "github.com/milvus-io/milvus/internal/mq/msgstream" pb "github.com/milvus-io/milvus/internal/proto/etcdpb" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + ms "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/typeutil" "go.uber.org/zap" ) diff --git a/internal/rootcoord/create_collection_task_test.go b/internal/rootcoord/create_collection_task_test.go index 463fd3774f..d5f447c17e 100644 --- a/internal/rootcoord/create_collection_task_test.go +++ b/internal/rootcoord/create_collection_task_test.go @@ -30,7 +30,7 @@ import ( "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" mockrootcoord "github.com/milvus-io/milvus/internal/rootcoord/mocks" - "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/rootcoord/create_partition_task.go b/internal/rootcoord/create_partition_task.go index 2a1fc0845c..f81a8cbb4f 100644 --- a/internal/rootcoord/create_partition_task.go +++ b/internal/rootcoord/create_partition_task.go @@ -24,8 +24,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" + "github.com/milvus-io/milvus/pkg/log" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/milvuspb" diff --git a/internal/rootcoord/create_partition_task_test.go b/internal/rootcoord/create_partition_task_test.go index 262d20a549..d6d3e35ba9 100644 --- a/internal/rootcoord/create_partition_task_test.go +++ b/internal/rootcoord/create_partition_task_test.go @@ -20,13 +20,15 @@ import ( "context" "testing" + "github.com/milvus-io/milvus/pkg/util/funcutil" + + "github.com/milvus-io/milvus/internal/metastore/model" + "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/proto/etcdpb" - "github.com/milvus-io/milvus/internal/util/funcutil" ) func Test_createPartitionTask_Prepare(t *testing.T) { diff --git a/internal/rootcoord/ddl_ts_lock_manager.go b/internal/rootcoord/ddl_ts_lock_manager.go index 582e14824e..3ccec0c4cc 100644 --- a/internal/rootcoord/ddl_ts_lock_manager.go +++ b/internal/rootcoord/ddl_ts_lock_manager.go @@ -19,9 +19,9 @@ package rootcoord import ( "sync" - "github.com/milvus-io/milvus/internal/tso" - "go.uber.org/atomic" + + "github.com/milvus-io/milvus/internal/tso" ) type DdlTsLockManager interface { diff --git a/internal/rootcoord/describe_collection_task_test.go b/internal/rootcoord/describe_collection_task_test.go index 09cb254282..60ec3618fb 100644 --- a/internal/rootcoord/describe_collection_task_test.go +++ b/internal/rootcoord/describe_collection_task_test.go @@ -23,7 +23,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" "github.com/stretchr/testify/assert" ) diff --git a/internal/rootcoord/dml_channels.go b/internal/rootcoord/dml_channels.go index b5cfe56cd2..5ece619be4 100644 --- a/internal/rootcoord/dml_channels.go +++ b/internal/rootcoord/dml_channels.go @@ -22,14 +22,14 @@ import ( "fmt" "sync" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/metrics" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type dmlMsgStream struct { diff --git a/internal/rootcoord/dml_channels_test.go b/internal/rootcoord/dml_channels_test.go index 66225aa904..b4b13c1b5d 100644 --- a/internal/rootcoord/dml_channels_test.go +++ b/internal/rootcoord/dml_channels_test.go @@ -24,12 +24,12 @@ import ( "testing" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" + + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" diff --git a/internal/rootcoord/drop_alias_task_test.go b/internal/rootcoord/drop_alias_task_test.go index 3395404d83..873e6ba1a9 100644 --- a/internal/rootcoord/drop_alias_task_test.go +++ b/internal/rootcoord/drop_alias_task_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" "github.com/stretchr/testify/assert" diff --git a/internal/rootcoord/drop_collection_task.go b/internal/rootcoord/drop_collection_task.go index 10b677cda3..6e1c88082c 100644 --- a/internal/rootcoord/drop_collection_task.go +++ b/internal/rootcoord/drop_collection_task.go @@ -20,14 +20,14 @@ import ( "context" "fmt" - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/common" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" "go.uber.org/zap" pb "github.com/milvus-io/milvus/internal/proto/etcdpb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/milvus-io/milvus-proto/go-api/commonpb" diff --git a/internal/rootcoord/drop_collection_task_test.go b/internal/rootcoord/drop_collection_task_test.go index c7ee2250b0..3a7304d8c2 100644 --- a/internal/rootcoord/drop_collection_task_test.go +++ b/internal/rootcoord/drop_collection_task_test.go @@ -23,14 +23,14 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/common" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/proto/etcdpb" mockrootcoord "github.com/milvus-io/milvus/internal/rootcoord/mocks" - "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" ) diff --git a/internal/rootcoord/drop_partition_task.go b/internal/rootcoord/drop_partition_task.go index c4c01b9515..3c9e41a77e 100644 --- a/internal/rootcoord/drop_partition_task.go +++ b/internal/rootcoord/drop_partition_task.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" "go.uber.org/zap" "github.com/milvus-io/milvus/internal/metastore/model" @@ -28,7 +28,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" pb "github.com/milvus-io/milvus/internal/proto/etcdpb" - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/common" "github.com/milvus-io/milvus-proto/go-api/milvuspb" ) diff --git a/internal/rootcoord/drop_partition_task_test.go b/internal/rootcoord/drop_partition_task_test.go index f3b658c457..0059d05c66 100644 --- a/internal/rootcoord/drop_partition_task_test.go +++ b/internal/rootcoord/drop_partition_task_test.go @@ -23,7 +23,7 @@ import ( "github.com/milvus-io/milvus/internal/metastore/model" "github.com/milvus-io/milvus/internal/proto/etcdpb" - "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" "github.com/stretchr/testify/assert" diff --git a/internal/rootcoord/expire_cache.go b/internal/rootcoord/expire_cache.go index 43555f0549..675460e393 100644 --- a/internal/rootcoord/expire_cache.go +++ b/internal/rootcoord/expire_cache.go @@ -21,8 +21,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus/internal/proto/proxypb" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type expireCacheConfig struct { diff --git a/internal/rootcoord/field_id.go b/internal/rootcoord/field_id.go index 35fbf7378d..1f23400d5e 100644 --- a/internal/rootcoord/field_id.go +++ b/internal/rootcoord/field_id.go @@ -16,7 +16,7 @@ package rootcoord -import "github.com/milvus-io/milvus/internal/common" +import "github.com/milvus-io/milvus/pkg/common" // system filed id: // 0: unique row id diff --git a/internal/rootcoord/garbage_collector.go b/internal/rootcoord/garbage_collector.go index 36d5b9f0d3..379804cded 100644 --- a/internal/rootcoord/garbage_collector.go +++ b/internal/rootcoord/garbage_collector.go @@ -22,8 +22,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus/internal/metastore/model" - ms "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/util/commonpbutil" + ms "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" ) //go:generate mockery --name=GarbageCollector --outpkg=mockrootcoord diff --git a/internal/rootcoord/garbage_collector_test.go b/internal/rootcoord/garbage_collector_test.go index 398a8ed7f8..2f749e2172 100644 --- a/internal/rootcoord/garbage_collector_test.go +++ b/internal/rootcoord/garbage_collector_test.go @@ -22,15 +22,12 @@ import ( "testing" "github.com/cockroachdb/errors" - - mockrootcoord "github.com/milvus-io/milvus/internal/rootcoord/mocks" - - mocktso "github.com/milvus-io/milvus/internal/tso/mocks" + "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" - "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/metastore/model" + mockrootcoord "github.com/milvus-io/milvus/internal/rootcoord/mocks" + mocktso "github.com/milvus-io/milvus/internal/tso/mocks" ) func TestGarbageCollectorCtx_ReDropCollection(t *testing.T) { diff --git a/internal/rootcoord/has_partition_task.go b/internal/rootcoord/has_partition_task.go index 808c948cb8..cd83111126 100644 --- a/internal/rootcoord/has_partition_task.go +++ b/internal/rootcoord/has_partition_task.go @@ -21,7 +21,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // hasPartitionTask has partition request task diff --git a/internal/rootcoord/import_helper.go b/internal/rootcoord/import_helper.go index 7152125f81..3e0fc24dc8 100644 --- a/internal/rootcoord/import_helper.go +++ b/internal/rootcoord/import_helper.go @@ -22,9 +22,9 @@ import ( "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" "go.uber.org/zap" ) diff --git a/internal/rootcoord/import_manager.go b/internal/rootcoord/import_manager.go index a92a0ce21a..d4370e329b 100644 --- a/internal/rootcoord/import_manager.go +++ b/internal/rootcoord/import_manager.go @@ -26,18 +26,18 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/golang/protobuf/proto" + "github.com/samber/lo" + "go.uber.org/zap" + "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/kv" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/util/importutil" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/samber/lo" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/rootcoord/import_manager_test.go b/internal/rootcoord/import_manager_test.go index 63973a3cbc..ac790110c7 100644 --- a/internal/rootcoord/import_manager_test.go +++ b/internal/rootcoord/import_manager_test.go @@ -24,19 +24,19 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/golang/protobuf/proto" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/mock" + "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" memkv "github.com/milvus-io/milvus/internal/kv/mem" "github.com/milvus-io/milvus/internal/kv/mocks" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/util/importutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/mock" + importutil2 "github.com/milvus-io/milvus/internal/util/importutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func TestImportManager_NewImportManager(t *testing.T) { @@ -672,7 +672,7 @@ func TestImportManager_AllDataNodesBusy(t *testing.T) { Files: []string{"f1.npy", "f2.npy"}, Options: []*commonpb.KeyValuePair{ { - Key: importutil.Bucket, + Key: importutil2.Bucket, Value: "mybucket", }, }, @@ -805,7 +805,7 @@ func TestImportManager_TaskState(t *testing.T) { Value: "value1", }, { - Key: importutil.FailedReason, + Key: importutil2.FailedReason, Value: "some_reason", }, }, @@ -848,7 +848,7 @@ func TestImportManager_TaskState(t *testing.T) { Value: "value1", }, { - Key: importutil.FailedReason, + Key: importutil2.FailedReason, Value: "some_reason", }, }, @@ -989,11 +989,11 @@ func TestImportManager_ListAllTasks(t *testing.T) { compareReq = rowReq2 } for _, kv := range task.GetInfos() { - if kv.GetKey() == importutil.CollectionName { + if kv.GetKey() == importutil2.CollectionName { assert.Equal(t, compareReq.GetCollectionName(), kv.GetValue()) - } else if kv.GetKey() == importutil.PartitionName { + } else if kv.GetKey() == importutil2.PartitionName { assert.Equal(t, compareReq.GetPartitionName(), kv.GetValue()) - } else if kv.GetKey() == importutil.Files { + } else if kv.GetKey() == importutil2.Files { assert.Equal(t, strings.Join(compareReq.GetFiles(), ","), kv.GetValue()) } } diff --git a/internal/rootcoord/meta_table.go b/internal/rootcoord/meta_table.go index ca639d90ff..fa39997b12 100644 --- a/internal/rootcoord/meta_table.go +++ b/internal/rootcoord/meta_table.go @@ -22,21 +22,20 @@ import ( "sync" "github.com/cockroachdb/errors" - "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/metrics" pb "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/util/contextutil" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/contextutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) //go:generate mockery --name=IMetaTable --outpkg=mockrootcoord --filename=meta_table.go --with-expecter diff --git a/internal/rootcoord/meta_table_test.go b/internal/rootcoord/meta_table_test.go index 4e62695e2d..7b8262d9cc 100644 --- a/internal/rootcoord/meta_table_test.go +++ b/internal/rootcoord/meta_table_test.go @@ -22,22 +22,21 @@ import ( "testing" "github.com/cockroachdb/errors" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/require" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/common" memkv "github.com/milvus-io/milvus/internal/kv/mem" "github.com/milvus-io/milvus/internal/metastore/kv/rootcoord" "github.com/milvus-io/milvus/internal/metastore/mocks" "github.com/milvus-io/milvus/internal/metastore/model" pb "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/util" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func generateMetaTable(t *testing.T) *MetaTable { @@ -126,6 +125,7 @@ func TestRbacDropRole(t *testing.T) { }) } } + func TestRbacOperateRole(t *testing.T) { mt := generateMetaTable(t) err := mt.CreateRole(util.DefaultTenant, &milvuspb.RoleEntity{Name: "role1"}) diff --git a/internal/rootcoord/metrics_info.go b/internal/rootcoord/metrics_info.go index 66ab780949..f4538f4d7b 100644 --- a/internal/rootcoord/metrics_info.go +++ b/internal/rootcoord/metrics_info.go @@ -23,11 +23,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/hardware" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func (c *Core) getSystemInfoMetrics(ctx context.Context, req *milvuspb.GetMetricsRequest) (*milvuspb.GetMetricsResponse, error) { diff --git a/internal/rootcoord/mock_test.go b/internal/rootcoord/mock_test.go index 863da91eb1..bc6dadaf4b 100644 --- a/internal/rootcoord/mock_test.go +++ b/internal/rootcoord/mock_test.go @@ -22,29 +22,28 @@ import ( "os" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/stretchr/testify/mock" + "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/datapb" pb "github.com/milvus-io/milvus/internal/proto/etcdpb" + "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proto/querypb" "github.com/milvus-io/milvus/internal/tso" "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/paramtable" - "github.com/milvus-io/milvus/internal/util/retry" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/typeutil" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( @@ -257,10 +256,10 @@ func newMockQueryCoord() *mockQueryCoord { func newMockIDAllocator() *allocator.MockGIDAllocator { r := allocator.NewMockGIDAllocator() - r.AllocF = func(count uint32) (allocator.UniqueID, allocator.UniqueID, error) { + r.AllocF = func(count uint32) (UniqueID, UniqueID, error) { return 0, 0, nil } - r.AllocOneF = func() (allocator.UniqueID, error) { + r.AllocOneF = func() (UniqueID, error) { return 0, nil } return r @@ -414,7 +413,7 @@ func withIDAllocator(idAllocator allocator.Interface) Opt { func withValidIDAllocator() Opt { idAllocator := newMockIDAllocator() - idAllocator.AllocOneF = func() (allocator.UniqueID, error) { + idAllocator.AllocOneF = func() (UniqueID, error) { return rand.Int63(), nil } return withIDAllocator(idAllocator) @@ -422,10 +421,10 @@ func withValidIDAllocator() Opt { func withInvalidIDAllocator() Opt { idAllocator := newMockIDAllocator() - idAllocator.AllocOneF = func() (allocator.UniqueID, error) { + idAllocator.AllocOneF = func() (UniqueID, error) { return -1, errors.New("error mock AllocOne") } - idAllocator.AllocF = func(count uint32) (allocator.UniqueID, allocator.UniqueID, error) { + idAllocator.AllocF = func(count uint32) (UniqueID, UniqueID, error) { return -1, -1, errors.New("error mock Alloc") } return withIDAllocator(idAllocator) diff --git a/internal/rootcoord/proxy_client_manager.go b/internal/rootcoord/proxy_client_manager.go index fc1718a0c8..a32b3f9449 100644 --- a/internal/rootcoord/proxy_client_manager.go +++ b/internal/rootcoord/proxy_client_manager.go @@ -22,18 +22,17 @@ import ( "sync" "github.com/cockroachdb/errors" - "go.uber.org/zap" "golang.org/x/sync/errgroup" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" grpcproxyclient "github.com/milvus-io/milvus/internal/distributed/proxy/client" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/milvus-io/milvus/internal/util/sessionutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" ) type proxyCreator func(ctx context.Context, addr string) (types.Proxy, error) diff --git a/internal/rootcoord/proxy_client_manager_test.go b/internal/rootcoord/proxy_client_manager_test.go index 6ba246ef7d..41169d9ce7 100644 --- a/internal/rootcoord/proxy_client_manager_test.go +++ b/internal/rootcoord/proxy_client_manager_test.go @@ -23,15 +23,13 @@ import ( "testing" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/etcd" "github.com/milvus-io/milvus/internal/util/sessionutil" + "github.com/milvus-io/milvus/pkg/util/etcd" ) type proxyMock struct { diff --git a/internal/rootcoord/proxy_manager.go b/internal/rootcoord/proxy_manager.go index b8eae9354d..da0e4b3ce7 100644 --- a/internal/rootcoord/proxy_manager.go +++ b/internal/rootcoord/proxy_manager.go @@ -29,10 +29,10 @@ import ( "go.uber.org/zap" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // proxyManager manages proxy connected to the rootcoord diff --git a/internal/rootcoord/proxy_manager_test.go b/internal/rootcoord/proxy_manager_test.go index 7f778e0521..47cce7b16e 100644 --- a/internal/rootcoord/proxy_manager_test.go +++ b/internal/rootcoord/proxy_manager_test.go @@ -24,11 +24,12 @@ import ( "testing" "time" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/stretchr/testify/assert" clientv3 "go.etcd.io/etcd/client/v3" + + "github.com/milvus-io/milvus/internal/util/sessionutil" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func TestProxyManager(t *testing.T) { diff --git a/internal/rootcoord/quota_center.go b/internal/rootcoord/quota_center.go index 32f5fe80ec..90d8c7fe7a 100644 --- a/internal/rootcoord/quota_center.go +++ b/internal/rootcoord/quota_center.go @@ -28,17 +28,17 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/tso" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/ratelimitutil" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/ratelimitutil" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/rootcoord/quota_center_test.go b/internal/rootcoord/quota_center_test.go index a08e85a917..e34c182344 100644 --- a/internal/rootcoord/quota_center_test.go +++ b/internal/rootcoord/quota_center_test.go @@ -30,10 +30,10 @@ import ( "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type dataCoordMockForQuota struct { diff --git a/internal/rootcoord/redo.go b/internal/rootcoord/redo.go index 277eb0aa4e..8c9b412485 100644 --- a/internal/rootcoord/redo.go +++ b/internal/rootcoord/redo.go @@ -19,7 +19,7 @@ package rootcoord import ( "context" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" "go.uber.org/zap" ) diff --git a/internal/rootcoord/root_coord.go b/internal/rootcoord/root_coord.go index 30823b39f7..68666dcff0 100644 --- a/internal/rootcoord/root_coord.go +++ b/internal/rootcoord/root_coord.go @@ -27,49 +27,48 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/samber/lo" - + clientv3 "go.etcd.io/etcd/client/v3" + "go.uber.org/zap" "golang.org/x/sync/errgroup" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/kv" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/metastore" "github.com/milvus-io/milvus/internal/metastore/db/dao" "github.com/milvus-io/milvus/internal/metastore/db/dbcore" "github.com/milvus-io/milvus/internal/metastore/db/rootcoord" kvmetestore "github.com/milvus-io/milvus/internal/metastore/kv/rootcoord" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/metrics" pb "github.com/milvus-io/milvus/internal/proto/etcdpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/tso" + tso2 "github.com/milvus-io/milvus/internal/tso" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/crypto" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/errorutil" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/logutil" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/retry" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" - clientv3 "go.etcd.io/etcd/client/v3" - "go.uber.org/zap" + tsoutil2 "github.com/milvus-io/milvus/internal/util/tsoutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/crypto" + "github.com/milvus-io/milvus/pkg/util/errorutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/logutil" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // UniqueID is an alias of typeutil.UniqueID. @@ -117,7 +116,7 @@ type Core struct { chanTimeTick *timetickSync idAllocator allocator.Interface - tsoAllocator tso.Allocator + tsoAllocator tso2.Allocator dataCoord types.DataCoord queryCoord types.QueryCoord @@ -230,7 +229,7 @@ func (c *Core) startTimeTickLoop() { func (c *Core) tsLoop() { defer c.wg.Done() - tsoTicker := time.NewTicker(tso.UpdateTimestampStep) + tsoTicker := time.NewTicker(tso2.UpdateTimestampStep) defer tsoTicker.Stop() ctx, cancel := context.WithCancel(c.ctx) defer cancel() @@ -363,7 +362,7 @@ func (c *Core) initMetaTable() error { } func (c *Core) initIDAllocator() error { - tsoKV := tsoutil.NewTSOKVBase(c.etcdCli, Params.EtcdCfg.KvRootPath.GetValue(), globalIDAllocatorSubPath) + tsoKV := tsoutil2.NewTSOKVBase(c.etcdCli, Params.EtcdCfg.KvRootPath.GetValue(), globalIDAllocatorSubPath) idAllocator := allocator.NewGlobalIDAllocator(globalIDAllocatorKey, tsoKV) if err := idAllocator.Initialize(); err != nil { return err @@ -373,8 +372,8 @@ func (c *Core) initIDAllocator() error { } func (c *Core) initTSOAllocator() error { - tsoKV := tsoutil.NewTSOKVBase(c.etcdCli, Params.EtcdCfg.KvRootPath.GetValue(), globalTSOAllocatorSubPath) - tsoAllocator := tso.NewGlobalTSOAllocator(globalTSOAllocatorKey, tsoKV) + tsoKV := tsoutil2.NewTSOKVBase(c.etcdCli, Params.EtcdCfg.KvRootPath.GetValue(), globalTSOAllocatorSubPath) + tsoAllocator := tso2.NewGlobalTSOAllocator(globalTSOAllocatorKey, tsoKV) if err := tsoAllocator.Initialize(); err != nil { return err } diff --git a/internal/rootcoord/root_coord_test.go b/internal/rootcoord/root_coord_test.go index 5332e54558..c7ab4173b1 100644 --- a/internal/rootcoord/root_coord_test.go +++ b/internal/rootcoord/root_coord_test.go @@ -26,11 +26,12 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/golang/protobuf/proto" + "github.com/stretchr/testify/assert" + "github.com/stretchr/testify/mock" + "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/allocator" memkv "github.com/milvus-io/milvus/internal/kv/mem" "github.com/milvus-io/milvus/internal/kv/mocks" "github.com/milvus-io/milvus/internal/metastore/model" @@ -40,15 +41,12 @@ import ( "github.com/milvus-io/milvus/internal/proto/proxypb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/metricsinfo" - "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/typeutil" - - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/mock" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func TestMain(m *testing.M) { @@ -612,7 +610,7 @@ func TestRootCoord_AllocID(t *testing.T) { t.Run("normal case", func(t *testing.T) { alloc := newMockIDAllocator() id := UniqueID(100) - alloc.AllocF = func(count uint32) (allocator.UniqueID, allocator.UniqueID, error) { + alloc.AllocF = func(count uint32) (UniqueID, UniqueID, error) { return id, id + int64(count), nil } count := uint32(10) diff --git a/internal/rootcoord/scheduler.go b/internal/rootcoord/scheduler.go index 6ffe39fd2d..9372b52c83 100644 --- a/internal/rootcoord/scheduler.go +++ b/internal/rootcoord/scheduler.go @@ -21,13 +21,12 @@ import ( "sync" "time" - "github.com/milvus-io/milvus/internal/log" + "go.uber.org/atomic" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/tso" - "go.uber.org/atomic" - "github.com/milvus-io/milvus/internal/allocator" + "github.com/milvus-io/milvus/internal/tso" + "github.com/milvus-io/milvus/pkg/log" ) type IScheduler interface { diff --git a/internal/rootcoord/scheduler_test.go b/internal/rootcoord/scheduler_test.go index da2b67a730..384004aa86 100644 --- a/internal/rootcoord/scheduler_test.go +++ b/internal/rootcoord/scheduler_test.go @@ -24,11 +24,10 @@ import ( "time" "github.com/cockroachdb/errors" - + "github.com/stretchr/testify/assert" "go.uber.org/atomic" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type mockFailTask struct { diff --git a/internal/rootcoord/show_collection_task.go b/internal/rootcoord/show_collection_task.go index b610cef137..a702ce7934 100644 --- a/internal/rootcoord/show_collection_task.go +++ b/internal/rootcoord/show_collection_task.go @@ -21,8 +21,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // showCollectionTask show collection request task diff --git a/internal/rootcoord/show_partition_task.go b/internal/rootcoord/show_partition_task.go index 4caeb3d7f1..6689e8babc 100644 --- a/internal/rootcoord/show_partition_task.go +++ b/internal/rootcoord/show_partition_task.go @@ -22,8 +22,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // showPartitionTask show partition request task diff --git a/internal/rootcoord/show_partition_task_test.go b/internal/rootcoord/show_partition_task_test.go index 4119b268be..a73b15d78d 100644 --- a/internal/rootcoord/show_partition_task_test.go +++ b/internal/rootcoord/show_partition_task_test.go @@ -23,7 +23,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/stretchr/testify/assert" ) diff --git a/internal/rootcoord/step_executor.go b/internal/rootcoord/step_executor.go index 9ed1adc721..03da036cec 100644 --- a/internal/rootcoord/step_executor.go +++ b/internal/rootcoord/step_executor.go @@ -22,8 +22,8 @@ import ( "sync" "time" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/retry" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/retry" "go.uber.org/zap" ) diff --git a/internal/rootcoord/step_executor_test.go b/internal/rootcoord/step_executor_test.go index 1ba9d39a6a..9d8d85c265 100644 --- a/internal/rootcoord/step_executor_test.go +++ b/internal/rootcoord/step_executor_test.go @@ -23,8 +23,8 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/internal/util/retry" + "github.com/milvus-io/milvus/pkg/util/retry" "github.com/stretchr/testify/assert" ) diff --git a/internal/rootcoord/timestamp_bench_test.go b/internal/rootcoord/timestamp_bench_test.go index 9c22861b23..21e723f105 100644 --- a/internal/rootcoord/timestamp_bench_test.go +++ b/internal/rootcoord/timestamp_bench_test.go @@ -20,19 +20,16 @@ import ( "context" "testing" - "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/stretchr/testify/assert" - - "github.com/milvus-io/milvus/internal/log" + clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/util/funcutil" - - "github.com/milvus-io/milvus/internal/util/etcd" - + "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/tso" "github.com/milvus-io/milvus/internal/util/tsoutil" - clientv3 "go.etcd.io/etcd/client/v3" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/funcutil" ) func getTestEtcdCli() *clientv3.Client { diff --git a/internal/rootcoord/timeticksync.go b/internal/rootcoord/timeticksync.go index 4fa629c146..b8ad135674 100644 --- a/internal/rootcoord/timeticksync.go +++ b/internal/rootcoord/timeticksync.go @@ -22,18 +22,19 @@ import ( "sync" "time" + "go.uber.org/zap" + "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/util/commonpbutil" "github.com/milvus-io/milvus/internal/util/sessionutil" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var ( diff --git a/internal/rootcoord/timeticksync_test.go b/internal/rootcoord/timeticksync_test.go index c580a44900..d70b70fd37 100644 --- a/internal/rootcoord/timeticksync_test.go +++ b/internal/rootcoord/timeticksync_test.go @@ -21,15 +21,14 @@ import ( "sync" "testing" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/util/dependency" "github.com/milvus-io/milvus/internal/util/sessionutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func TestTimetickSync(t *testing.T) { diff --git a/internal/rootcoord/undo.go b/internal/rootcoord/undo.go index 9481d955c2..8827f98823 100644 --- a/internal/rootcoord/undo.go +++ b/internal/rootcoord/undo.go @@ -20,7 +20,7 @@ import ( "context" "fmt" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" "go.uber.org/zap" ) diff --git a/internal/rootcoord/util.go b/internal/rootcoord/util.go index 096f27b520..3076c96c45 100644 --- a/internal/rootcoord/util.go +++ b/internal/rootcoord/util.go @@ -20,16 +20,14 @@ import ( "encoding/json" "fmt" - "github.com/milvus-io/milvus/internal/log" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/common" - - "github.com/milvus-io/milvus/internal/metastore/model" - "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/internal/metastore/model" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var logger = log.L().WithOptions(zap.Fields(zap.String("role", typeutil.RootCoordRole))) diff --git a/internal/rootcoord/util_test.go b/internal/rootcoord/util_test.go index 7fd981386a..6046f6d78b 100644 --- a/internal/rootcoord/util_test.go +++ b/internal/rootcoord/util_test.go @@ -19,15 +19,13 @@ package rootcoord import ( "testing" - "github.com/milvus-io/milvus/internal/util/typeutil" - - "github.com/milvus-io/milvus-proto/go-api/milvuspb" - - "github.com/milvus-io/milvus/internal/metastore/model" + "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus-proto/go-api/milvuspb" + "github.com/milvus-io/milvus/internal/metastore/model" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func Test_EqualKeyPairArray(t *testing.T) { diff --git a/internal/storage/aliyun/aliyun.go b/internal/storage/aliyun/aliyun.go index ca0f47e528..63e798ddfe 100644 --- a/internal/storage/aliyun/aliyun.go +++ b/internal/storage/aliyun/aliyun.go @@ -6,7 +6,7 @@ import ( "github.com/minio/minio-go/v7" minioCred "github.com/minio/minio-go/v7/pkg/credentials" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" ) const OSSDefaultAddress = "oss.aliyuncs.com" diff --git a/internal/storage/binlog_iterator.go b/internal/storage/binlog_iterator.go index ac244ca686..3db70289fd 100644 --- a/internal/storage/binlog_iterator.go +++ b/internal/storage/binlog_iterator.go @@ -22,7 +22,7 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/common" ) var ( diff --git a/internal/storage/binlog_iterator_test.go b/internal/storage/binlog_iterator_test.go index 211a65dce6..96b5024928 100644 --- a/internal/storage/binlog_iterator_test.go +++ b/internal/storage/binlog_iterator_test.go @@ -20,8 +20,8 @@ import ( "testing" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/common" "github.com/stretchr/testify/assert" ) diff --git a/internal/storage/binlog_reader.go b/internal/storage/binlog_reader.go index e983f73e00..fd02eafe74 100644 --- a/internal/storage/binlog_reader.go +++ b/internal/storage/binlog_reader.go @@ -24,7 +24,7 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/common" ) // BinlogReader is an object to read binlog file. Binlog file's format can be diff --git a/internal/storage/binlog_test.go b/internal/storage/binlog_test.go index 902805767b..d24d23d0ad 100644 --- a/internal/storage/binlog_test.go +++ b/internal/storage/binlog_test.go @@ -26,11 +26,11 @@ import ( "unsafe" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/milvus-io/milvus/internal/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/uniquegenerator" "github.com/stretchr/testify/assert" ) diff --git a/internal/storage/binlog_util.go b/internal/storage/binlog_util.go index 5a3edf7b68..b4f3aa5311 100644 --- a/internal/storage/binlog_util.go +++ b/internal/storage/binlog_util.go @@ -5,7 +5,7 @@ import ( "strconv" "strings" - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/common" ) // ParseSegmentIDByBinlog parse segment id from binlog paths diff --git a/internal/storage/binlog_writer.go b/internal/storage/binlog_writer.go index 80f9bf8e2a..bb0868b7aa 100644 --- a/internal/storage/binlog_writer.go +++ b/internal/storage/binlog_writer.go @@ -22,8 +22,8 @@ import ( "fmt" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // BinlogType is to distinguish different files saving different data. diff --git a/internal/storage/data_codec.go b/internal/storage/data_codec.go index 9165e4e99e..1248bf9702 100644 --- a/internal/storage/data_codec.go +++ b/internal/storage/data_codec.go @@ -26,9 +26,9 @@ import ( "strings" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/proto/etcdpb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/storage/data_codec_test.go b/internal/storage/data_codec_test.go index e73b2fb191..123387127f 100644 --- a/internal/storage/data_codec_test.go +++ b/internal/storage/data_codec_test.go @@ -24,8 +24,8 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/etcdpb" + "github.com/milvus-io/milvus/pkg/log" "github.com/stretchr/testify/assert" ) diff --git a/internal/storage/data_sorter.go b/internal/storage/data_sorter.go index e06580d329..e435bd4fb7 100644 --- a/internal/storage/data_sorter.go +++ b/internal/storage/data_sorter.go @@ -18,7 +18,7 @@ package storage import ( "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/common" ) // DataSorter sorts insert data diff --git a/internal/storage/event_data.go b/internal/storage/event_data.go index 6e530a76cd..c0ab581207 100644 --- a/internal/storage/event_data.go +++ b/internal/storage/event_data.go @@ -26,8 +26,8 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const originalSizeKey = "original_size" diff --git a/internal/storage/event_header.go b/internal/storage/event_header.go index dd6feabce5..20f2b99eeb 100644 --- a/internal/storage/event_header.go +++ b/internal/storage/event_header.go @@ -21,9 +21,9 @@ import ( "io" "time" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type baseEventHeader struct { diff --git a/internal/storage/event_test.go b/internal/storage/event_test.go index 331a63e764..0ab1d1a5fa 100644 --- a/internal/storage/event_test.go +++ b/internal/storage/event_test.go @@ -25,10 +25,10 @@ import ( "unsafe" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/stretchr/testify/assert" ) diff --git a/internal/storage/event_writer.go b/internal/storage/event_writer.go index 48c6fd8a52..48917c7562 100644 --- a/internal/storage/event_writer.go +++ b/internal/storage/event_writer.go @@ -25,8 +25,8 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // EventTypeCode represents event type by code diff --git a/internal/storage/event_writer_test.go b/internal/storage/event_writer_test.go index 1e2b9e15d8..d0a1304e57 100644 --- a/internal/storage/event_writer_test.go +++ b/internal/storage/event_writer_test.go @@ -22,7 +22,7 @@ import ( "testing" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/common" "github.com/stretchr/testify/assert" ) diff --git a/internal/storage/factory.go b/internal/storage/factory.go index 58e411ae85..1f53f9ae51 100644 --- a/internal/storage/factory.go +++ b/internal/storage/factory.go @@ -5,7 +5,7 @@ import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type ChunkManagerFactory struct { diff --git a/internal/storage/index_data_codec.go b/internal/storage/index_data_codec.go index cf47896014..a0510ea8ec 100644 --- a/internal/storage/index_data_codec.go +++ b/internal/storage/index_data_codec.go @@ -27,8 +27,8 @@ import ( "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type IndexFileBinlogCodec struct { diff --git a/internal/storage/index_data_codec_test.go b/internal/storage/index_data_codec_test.go index 75725f2823..c53691af1d 100644 --- a/internal/storage/index_data_codec_test.go +++ b/internal/storage/index_data_codec_test.go @@ -19,9 +19,10 @@ package storage import ( "testing" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/uniquegenerator" "github.com/stretchr/testify/assert" + + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/uniquegenerator" ) func TestIndexFileBinlogCodec(t *testing.T) { diff --git a/internal/storage/local_chunk_manager.go b/internal/storage/local_chunk_manager.go index c2918d6518..b8861c1d95 100644 --- a/internal/storage/local_chunk_manager.go +++ b/internal/storage/local_chunk_manager.go @@ -28,12 +28,11 @@ import ( "time" "github.com/cockroachdb/errors" - "go.uber.org/zap" "golang.org/x/exp/mmap" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/merr" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/merr" ) // LocalChunkManager is responsible for read and write local file. diff --git a/internal/storage/minio_chunk_manager.go b/internal/storage/minio_chunk_manager.go index f8446c0d25..5de06dafc5 100644 --- a/internal/storage/minio_chunk_manager.go +++ b/internal/storage/minio_chunk_manager.go @@ -26,16 +26,16 @@ import ( "time" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/storage/aliyun" - "github.com/milvus-io/milvus/internal/storage/gcp" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/retry" - "github.com/minio/minio-go/v7" + minio "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" "go.uber.org/zap" "golang.org/x/exp/mmap" + + "github.com/milvus-io/milvus/internal/storage/aliyun" + "github.com/milvus-io/milvus/internal/storage/gcp" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/retry" ) var ( diff --git a/internal/storage/minio_chunk_manager_test.go b/internal/storage/minio_chunk_manager_test.go index 7536aa0c77..a4710dd05a 100644 --- a/internal/storage/minio_chunk_manager_test.go +++ b/internal/storage/minio_chunk_manager_test.go @@ -26,11 +26,10 @@ import ( "testing" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + + "github.com/milvus-io/milvus/pkg/util/paramtable" ) // TODO: NewMinioChunkManager is deprecated. Rewrite this unittest. diff --git a/internal/storage/payload.go b/internal/storage/payload.go index a6c53bcb82..cfea63b60d 100644 --- a/internal/storage/payload.go +++ b/internal/storage/payload.go @@ -31,7 +31,7 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // PayloadWriterInterface abstracts PayloadWriter diff --git a/internal/storage/payload_reader_cgo.go b/internal/storage/payload_reader_cgo.go index ccc05d7a8a..f4a2fdae2c 100644 --- a/internal/storage/payload_reader_cgo.go +++ b/internal/storage/payload_reader_cgo.go @@ -15,7 +15,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" ) // PayloadReaderCgo reads data from payload diff --git a/internal/storage/pk_statistics.go b/internal/storage/pk_statistics.go index c0940e06fb..9287d322d0 100644 --- a/internal/storage/pk_statistics.go +++ b/internal/storage/pk_statistics.go @@ -23,7 +23,7 @@ import ( "github.com/bits-and-blooms/bloom/v3" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/common" ) // pkStatistics contains pk field statistic information diff --git a/internal/storage/primary_key.go b/internal/storage/primary_key.go index 2caa143fb0..4a2a509239 100644 --- a/internal/storage/primary_key.go +++ b/internal/storage/primary_key.go @@ -22,7 +22,7 @@ import ( "strings" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" ) type PrimaryKey interface { diff --git a/internal/storage/print_binlog.go b/internal/storage/print_binlog.go index 274ac957a5..dedd48a115 100644 --- a/internal/storage/print_binlog.go +++ b/internal/storage/print_binlog.go @@ -23,11 +23,11 @@ import ( "github.com/cockroachdb/errors" "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "golang.org/x/exp/mmap" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/util/tsoutil" ) // PrintBinlogFiles call printBinlogFile in turn for the file list specified by parameter fileList. diff --git a/internal/storage/print_binlog_test.go b/internal/storage/print_binlog_test.go index 7b8fa0c859..74e573d7d3 100644 --- a/internal/storage/print_binlog_test.go +++ b/internal/storage/print_binlog_test.go @@ -24,15 +24,15 @@ import ( "time" "github.com/golang/protobuf/proto" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/uniquegenerator" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/uniquegenerator" ) func TestPrintBinlogFilesInt64(t *testing.T) { diff --git a/internal/storage/stats.go b/internal/storage/stats.go index 25a5c69313..d9b86c895b 100644 --- a/internal/storage/stats.go +++ b/internal/storage/stats.go @@ -21,7 +21,7 @@ import ( "github.com/bits-and-blooms/bloom/v3" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/common" ) const ( diff --git a/internal/storage/stats_test.go b/internal/storage/stats_test.go index 2075c4b6ca..78e608937c 100644 --- a/internal/storage/stats_test.go +++ b/internal/storage/stats_test.go @@ -24,7 +24,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/common" ) func TestStatsWriter_Int64PrimaryKey(t *testing.T) { diff --git a/internal/storage/utils.go b/internal/storage/utils.go index b7133c65b8..a5bff53a37 100644 --- a/internal/storage/utils.go +++ b/internal/storage/utils.go @@ -31,11 +31,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/proto/segcorepb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) ////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/internal/storage/utils_test.go b/internal/storage/utils_test.go index cafcb74a99..1c9eb730b4 100644 --- a/internal/storage/utils_test.go +++ b/internal/storage/utils_test.go @@ -31,8 +31,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/mq/msgstream" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/mq/msgstream" ) func TestCheckTsField(t *testing.T) { diff --git a/internal/storage/vector_chunk_manager.go b/internal/storage/vector_chunk_manager.go index 4100a7db6b..259fd6d0fe 100644 --- a/internal/storage/vector_chunk_manager.go +++ b/internal/storage/vector_chunk_manager.go @@ -27,9 +27,9 @@ import ( "go.uber.org/zap" "golang.org/x/exp/mmap" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/cache" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/cache" ) var ( diff --git a/internal/storage/vector_chunk_manager_test.go b/internal/storage/vector_chunk_manager_test.go index e35cceee39..1ccccd24ca 100644 --- a/internal/storage/vector_chunk_manager_test.go +++ b/internal/storage/vector_chunk_manager_test.go @@ -28,8 +28,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/etcdpb" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func initMeta() *etcdpb.CollectionMeta { diff --git a/internal/tso/global_allocator.go b/internal/tso/global_allocator.go index 66a8c79be8..3b6424866a 100644 --- a/internal/tso/global_allocator.go +++ b/internal/tso/global_allocator.go @@ -34,12 +34,12 @@ import ( "time" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "go.uber.org/zap" "github.com/milvus-io/milvus/internal/kv" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // Allocator is a Timestamp Oracle allocator. diff --git a/internal/tso/global_allocator_test.go b/internal/tso/global_allocator_test.go index 1419383da1..f7f4568f75 100644 --- a/internal/tso/global_allocator_test.go +++ b/internal/tso/global_allocator_test.go @@ -23,9 +23,11 @@ import ( "testing" "time" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/tsoutil" "github.com/stretchr/testify/assert" + + tsoutil2 "github.com/milvus-io/milvus/internal/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/tsoutil" ) var gTestTsoAllocator *GlobalTSOAllocator @@ -40,7 +42,7 @@ func TestGlobalTSOAllocator_Initialize(t *testing.T) { assert.Nil(t, err) defer etcdCli.Close() - etcdKV := tsoutil.NewTSOKVBase(etcdCli, "/test/root/kv", "tsoTest") + etcdKV := tsoutil2.NewTSOKVBase(etcdCli, "/test/root/kv", "tsoTest") gTestTsoAllocator = NewGlobalTSOAllocator("timestamp", etcdKV) err = gTestTsoAllocator.Initialize() assert.Nil(t, err) @@ -79,7 +81,7 @@ func TestGlobalTSOAllocator_All(t *testing.T) { etcdCli, err := etcd.GetRemoteEtcdClient(etcdEndpoints) assert.NoError(t, err) defer etcdCli.Close() - etcdKV := tsoutil.NewTSOKVBase(etcdCli, "/test/root/kv", "tsoTest") + etcdKV := tsoutil2.NewTSOKVBase(etcdCli, "/test/root/kv", "tsoTest") gTestTsoAllocator = NewGlobalTSOAllocator("timestamp", etcdKV) t.Run("Initialize", func(t *testing.T) { @@ -168,7 +170,7 @@ func TestGlobalTSOAllocator_Fail(t *testing.T) { etcdCli, err := etcd.GetRemoteEtcdClient(etcdEndpoints) assert.NoError(t, err) defer etcdCli.Close() - etcdKV := tsoutil.NewTSOKVBase(etcdCli, "/test/root/kv", "tsoTest") + etcdKV := tsoutil2.NewTSOKVBase(etcdCli, "/test/root/kv", "tsoTest") assert.NoError(t, err) gTestTsoAllocator = NewGlobalTSOAllocator("timestamp", etcdKV) t.Run("Initialize", func(t *testing.T) { @@ -212,7 +214,7 @@ func TestGlobalTSOAllocator_Update(t *testing.T) { etcdCli, err := etcd.GetRemoteEtcdClient(etcdEndpoints) assert.NoError(t, err) defer etcdCli.Close() - etcdKV := tsoutil.NewTSOKVBase(etcdCli, "/test/root/kv", "tsoTest") + etcdKV := tsoutil2.NewTSOKVBase(etcdCli, "/test/root/kv", "tsoTest") assert.NoError(t, err) gTestTsoAllocator = NewGlobalTSOAllocator("timestamp", etcdKV) err = gTestTsoAllocator.Initialize() @@ -237,7 +239,7 @@ func TestGlobalTSOAllocator_load(t *testing.T) { etcdCli, err := etcd.GetRemoteEtcdClient(etcdEndpoints) assert.NoError(t, err) defer etcdCli.Close() - etcdKV := tsoutil.NewTSOKVBase(etcdCli, "/test/root/kv", "tsoTest") + etcdKV := tsoutil2.NewTSOKVBase(etcdCli, "/test/root/kv", "tsoTest") assert.NoError(t, err) gTestTsoAllocator = NewGlobalTSOAllocator("timestamp", etcdKV) err = gTestTsoAllocator.Initialize() diff --git a/internal/tso/mocks/allocator.go b/internal/tso/mocks/allocator.go index ee9fb641e4..6461b040d4 100644 --- a/internal/tso/mocks/allocator.go +++ b/internal/tso/mocks/allocator.go @@ -3,9 +3,9 @@ package mocktso import ( - time "time" + "time" - mock "github.com/stretchr/testify/mock" + "github.com/stretchr/testify/mock" ) // Allocator is an autogenerated mock type for the Allocator type diff --git a/internal/tso/tso.go b/internal/tso/tso.go index 17d7b3ba90..9d7f3f0874 100644 --- a/internal/tso/tso.go +++ b/internal/tso/tso.go @@ -35,13 +35,13 @@ import ( "time" "unsafe" + "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "go.uber.org/zap" - "github.com/cockroachdb/errors" "github.com/milvus-io/milvus/internal/kv" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/util/componentutil/componentutil.go b/internal/util/componentutil/componentutil.go index 5e5314b891..7da689a3d4 100644 --- a/internal/util/componentutil/componentutil.go +++ b/internal/util/componentutil/componentutil.go @@ -25,7 +25,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus/internal/types" - "github.com/milvus-io/milvus/internal/util/retry" + "github.com/milvus-io/milvus/pkg/util/retry" ) // WaitForComponentStates wait for component's state to be one of the specific states diff --git a/internal/util/componentutil/componentutil_test.go b/internal/util/componentutil/componentutil_test.go index 520a4d93b1..73f86ef38d 100644 --- a/internal/util/componentutil/componentutil_test.go +++ b/internal/util/componentutil/componentutil_test.go @@ -25,7 +25,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" "github.com/stretchr/testify/assert" ) diff --git a/internal/util/dependency/factory.go b/internal/util/dependency/factory.go index eee61702b2..dfa24f991f 100644 --- a/internal/util/dependency/factory.go +++ b/internal/util/dependency/factory.go @@ -3,9 +3,10 @@ package dependency import ( "context" - "github.com/milvus-io/milvus/internal/mq/msgstream" + rmqstream "github.com/milvus-io/milvus/internal/mq/msgstream" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type DefaultFactory struct { @@ -18,7 +19,7 @@ type DefaultFactory struct { func NewDefaultFactory(standAlone bool) *DefaultFactory { return &DefaultFactory{ standAlone: standAlone, - msgStreamFactory: msgstream.NewRmsFactory("/tmp/milvus/rocksmq/"), + msgStreamFactory: rmqstream.NewRmsFactory("/tmp/milvus/rocksmq/"), chunkManagerFactory: storage.NewChunkManagerFactory("local", storage.RootPath("/tmp/milvus")), } @@ -60,7 +61,7 @@ func (f *DefaultFactory) initMQLocalService(params *paramtable.ComponentParam) m if err != nil { panic(err) } - return msgstream.NewRmsFactory(path) + return rmqstream.NewRmsFactory(path) } return nil } diff --git a/internal/util/dependency/mock_factory.go b/internal/util/dependency/mock_factory.go index f528c207b7..27a2cfedaf 100644 --- a/internal/util/dependency/mock_factory.go +++ b/internal/util/dependency/mock_factory.go @@ -5,10 +5,10 @@ package dependency import ( context "context" - msgstream "github.com/milvus-io/milvus/internal/mq/msgstream" + msgstream "github.com/milvus-io/milvus/pkg/mq/msgstream" mock "github.com/stretchr/testify/mock" - paramtable "github.com/milvus-io/milvus/internal/util/paramtable" + paramtable "github.com/milvus-io/milvus/pkg/util/paramtable" storage "github.com/milvus-io/milvus/internal/storage" ) diff --git a/internal/util/flowgraph/flow_graph_test.go b/internal/util/flowgraph/flow_graph_test.go index 8b5774e12e..f79145e4b1 100644 --- a/internal/util/flowgraph/flow_graph_test.go +++ b/internal/util/flowgraph/flow_graph_test.go @@ -24,7 +24,7 @@ import ( "testing" "time" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/paramtable" "github.com/stretchr/testify/assert" ) diff --git a/internal/util/flowgraph/input_node.go b/internal/util/flowgraph/input_node.go index b7afb4cd3e..475b16f6d1 100644 --- a/internal/util/flowgraph/input_node.go +++ b/internal/util/flowgraph/input_node.go @@ -21,15 +21,15 @@ import ( "fmt" "sync" - "github.com/milvus-io/milvus/internal/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/trace" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/mq/msgstream" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/mq/msgstream" "go.uber.org/zap" ) diff --git a/internal/util/flowgraph/input_node_test.go b/internal/util/flowgraph/input_node_test.go index e8687eaa31..6d2ce6edc4 100644 --- a/internal/util/flowgraph/input_node_test.go +++ b/internal/util/flowgraph/input_node_test.go @@ -20,10 +20,10 @@ import ( "context" "testing" + "github.com/milvus-io/milvus/internal/util/dependency" "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/internal/util/dependency" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" ) func TestInputNode(t *testing.T) { diff --git a/internal/util/flowgraph/message.go b/internal/util/flowgraph/message.go index 90d144aab1..8a9d265ec7 100644 --- a/internal/util/flowgraph/message.go +++ b/internal/util/flowgraph/message.go @@ -17,7 +17,7 @@ package flowgraph import ( - "github.com/milvus-io/milvus/internal/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream" ) // Msg is an abstract class that contains a method to get the time tick of this message diff --git a/internal/util/flowgraph/message_test.go b/internal/util/flowgraph/message_test.go index 8dc3269eff..bc05153a94 100644 --- a/internal/util/flowgraph/message_test.go +++ b/internal/util/flowgraph/message_test.go @@ -20,7 +20,7 @@ import ( "context" "testing" - "github.com/milvus-io/milvus/internal/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream" "github.com/stretchr/testify/assert" ) diff --git a/internal/util/flowgraph/node.go b/internal/util/flowgraph/node.go index 1138122680..75cbe4980d 100644 --- a/internal/util/flowgraph/node.go +++ b/internal/util/flowgraph/node.go @@ -21,9 +21,9 @@ import ( "sync" "time" - "github.com/milvus-io/milvus/internal/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/timerecord" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" "go.uber.org/zap" ) diff --git a/internal/util/flowgraph/node_test.go b/internal/util/flowgraph/node_test.go index 4f37bc0ca9..3338fa72e9 100644 --- a/internal/util/flowgraph/node_test.go +++ b/internal/util/flowgraph/node_test.go @@ -27,9 +27,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" "github.com/milvus-io/milvus/internal/util/dependency" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" ) func generateMsgPack() msgstream.MsgPack { diff --git a/internal/util/flowgraph/type_def.go b/internal/util/flowgraph/type_def.go index ffe0200f22..b1a2c13358 100644 --- a/internal/util/flowgraph/type_def.go +++ b/internal/util/flowgraph/type_def.go @@ -18,7 +18,7 @@ package flowgraph import ( "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // Timestamp shortcut for typeutil.Timestamp diff --git a/internal/util/grpcclient/auth.go b/internal/util/grpcclient/auth.go index 258d51b0f9..38043880fd 100644 --- a/internal/util/grpcclient/auth.go +++ b/internal/util/grpcclient/auth.go @@ -3,7 +3,7 @@ package grpcclient import ( "context" - "github.com/milvus-io/milvus/internal/util" + "github.com/milvus-io/milvus/pkg/util" ) type Token struct { diff --git a/internal/util/grpcclient/client.go b/internal/util/grpcclient/client.go index c6f8496d23..2319ef0de3 100644 --- a/internal/util/grpcclient/client.go +++ b/internal/util/grpcclient/client.go @@ -33,13 +33,13 @@ import ( "google.golang.org/grpc/keepalive" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/tracer" - "github.com/milvus-io/milvus/internal/util" - "github.com/milvus-io/milvus/internal/util/crypto" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/generic" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/tracer" + "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/util/crypto" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/generic" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) // GrpcClient abstracts client of grpc diff --git a/internal/util/grpcclient/client_test.go b/internal/util/grpcclient/client_test.go index 04f6bf3198..7be262ab1b 100644 --- a/internal/util/grpcclient/client_test.go +++ b/internal/util/grpcclient/client_test.go @@ -34,8 +34,8 @@ import ( "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" "google.golang.org/grpc" "google.golang.org/grpc/reflection" diff --git a/internal/util/importutil/binlog_adapter.go b/internal/util/importutil/binlog_adapter.go index 13756a6de1..3e5d02cb8b 100644 --- a/internal/util/importutil/binlog_adapter.go +++ b/internal/util/importutil/binlog_adapter.go @@ -26,10 +26,10 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" "go.uber.org/zap" ) diff --git a/internal/util/importutil/binlog_adapter_test.go b/internal/util/importutil/binlog_adapter_test.go index 02dd8498ce..58de52b38b 100644 --- a/internal/util/importutil/binlog_adapter_test.go +++ b/internal/util/importutil/binlog_adapter_test.go @@ -25,8 +25,8 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/storage" + "github.com/milvus-io/milvus/pkg/common" "github.com/stretchr/testify/assert" ) diff --git a/internal/util/importutil/binlog_file.go b/internal/util/importutil/binlog_file.go index 81b990d5ee..ca9e089bb6 100644 --- a/internal/util/importutil/binlog_file.go +++ b/internal/util/importutil/binlog_file.go @@ -23,8 +23,8 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/storage" + "github.com/milvus-io/milvus/pkg/log" "go.uber.org/zap" ) diff --git a/internal/util/importutil/binlog_parser.go b/internal/util/importutil/binlog_parser.go index c7319f90a9..0b992c71a2 100644 --- a/internal/util/importutil/binlog_parser.go +++ b/internal/util/importutil/binlog_parser.go @@ -27,8 +27,8 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/storage" + "github.com/milvus-io/milvus/pkg/log" "go.uber.org/zap" ) diff --git a/internal/util/importutil/import_options.go b/internal/util/importutil/import_options.go index 951950c533..6f23d4de29 100644 --- a/internal/util/importutil/import_options.go +++ b/internal/util/importutil/import_options.go @@ -22,10 +22,10 @@ import ( "strings" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" ) // Extra option keys to pass through import API diff --git a/internal/util/importutil/import_util.go b/internal/util/importutil/import_util.go index 8b2d611282..0382414fc1 100644 --- a/internal/util/importutil/import_util.go +++ b/internal/util/importutil/import_util.go @@ -26,16 +26,15 @@ import ( "strings" "github.com/cockroachdb/errors" - "go.uber.org/zap" "go.uber.org/zap/zapcore" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func isCanceled(ctx context.Context) bool { diff --git a/internal/util/importutil/import_util_test.go b/internal/util/importutil/import_util_test.go index a518112292..914cd7bb36 100644 --- a/internal/util/importutil/import_util_test.go +++ b/internal/util/importutil/import_util_test.go @@ -26,7 +26,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/stretchr/testify/assert" ) diff --git a/internal/util/importutil/import_wrapper.go b/internal/util/importutil/import_wrapper.go index 335dafd201..cfb784b625 100644 --- a/internal/util/importutil/import_wrapper.go +++ b/internal/util/importutil/import_wrapper.go @@ -22,18 +22,18 @@ import ( "fmt" "strconv" + "github.com/milvus-io/milvus/internal/allocator" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/retry" - "github.com/milvus-io/milvus/internal/util/timerecord" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/util/timerecord" ) const ( diff --git a/internal/util/importutil/import_wrapper_test.go b/internal/util/importutil/import_wrapper_test.go index e004d7bd96..2614482cd5 100644 --- a/internal/util/importutil/import_wrapper_test.go +++ b/internal/util/importutil/import_wrapper_test.go @@ -35,11 +35,11 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/proto/rootcoordpb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/timerecord" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/timerecord" ) const ( diff --git a/internal/util/importutil/json_handler.go b/internal/util/importutil/json_handler.go index a235036099..fbcdfd3767 100644 --- a/internal/util/importutil/json_handler.go +++ b/internal/util/importutil/json_handler.go @@ -22,15 +22,15 @@ import ( "strconv" "github.com/cockroachdb/errors" + "github.com/milvus-io/milvus/internal/allocator" "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // JSONRowHandler is the interface to process rows data diff --git a/internal/util/importutil/json_parser.go b/internal/util/importutil/json_parser.go index 481427a065..4b67e11c18 100644 --- a/internal/util/importutil/json_parser.go +++ b/internal/util/importutil/json_parser.go @@ -26,10 +26,10 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" "go.uber.org/zap" ) diff --git a/internal/util/importutil/numpy_adapter.go b/internal/util/importutil/numpy_adapter.go index 197a236889..4f8f3fee8e 100644 --- a/internal/util/importutil/numpy_adapter.go +++ b/internal/util/importutil/numpy_adapter.go @@ -31,7 +31,7 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" "github.com/sbinet/npyio" "github.com/sbinet/npyio/npy" "go.uber.org/zap" diff --git a/internal/util/importutil/numpy_parser.go b/internal/util/importutil/numpy_parser.go index dc7b2feaa0..426b4f69a6 100644 --- a/internal/util/importutil/numpy_parser.go +++ b/internal/util/importutil/numpy_parser.go @@ -21,15 +21,15 @@ import ( "fmt" "github.com/cockroachdb/errors" + "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/timerecord" - "github.com/milvus-io/milvus/internal/util/typeutil" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type NumpyColumnReader struct { diff --git a/internal/util/importutil/numpy_parser_test.go b/internal/util/importutil/numpy_parser_test.go index 0d8f07866d..d8d4c940d8 100644 --- a/internal/util/importutil/numpy_parser_test.go +++ b/internal/util/importutil/numpy_parser_test.go @@ -29,7 +29,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/timerecord" + "github.com/milvus-io/milvus/pkg/util/timerecord" ) func createLocalChunkManager(t *testing.T) storage.ChunkManager { diff --git a/internal/util/indexcgowrapper/codec_index_test.go b/internal/util/indexcgowrapper/codec_index_test.go index 399408d319..84a3ea2821 100644 --- a/internal/util/indexcgowrapper/codec_index_test.go +++ b/internal/util/indexcgowrapper/codec_index_test.go @@ -10,7 +10,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/indexpb" "github.com/milvus-io/milvus/internal/storage" - "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" ) type indexTestCase struct { diff --git a/internal/util/indexcgowrapper/helper.go b/internal/util/indexcgowrapper/helper.go index f6aa460c38..2748e40933 100644 --- a/internal/util/indexcgowrapper/helper.go +++ b/internal/util/indexcgowrapper/helper.go @@ -8,6 +8,7 @@ package indexcgowrapper #include "storage/storage_c.h" */ import "C" + import ( "fmt" "unsafe" @@ -15,7 +16,7 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" ) func GetBinarySetKeys(cBinarySet C.CBinarySet) ([]string, error) { diff --git a/internal/util/indexcgowrapper/index.go b/internal/util/indexcgowrapper/index.go index 1cdf8f0ef5..063da08eab 100644 --- a/internal/util/indexcgowrapper/index.go +++ b/internal/util/indexcgowrapper/index.go @@ -20,9 +20,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/indexcgopb" "github.com/milvus-io/milvus/internal/storage" + "github.com/milvus-io/milvus/pkg/log" ) type Blob = storage.Blob diff --git a/internal/util/indexcgowrapper/index_test.go b/internal/util/indexcgowrapper/index_test.go index 0eda1f754c..c1b04f2e2c 100644 --- a/internal/util/indexcgowrapper/index_test.go +++ b/internal/util/indexcgowrapper/index_test.go @@ -7,7 +7,7 @@ import ( "github.com/stretchr/testify/assert" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) const ( diff --git a/internal/util/initcore/init_core.go b/internal/util/initcore/init_core.go index 138e270372..f1d24cf94d 100644 --- a/internal/util/initcore/init_core.go +++ b/internal/util/initcore/init_core.go @@ -24,12 +24,13 @@ package initcore #include "common/init_c.h" */ import "C" + import ( "os" "path/filepath" "unsafe" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) func InitLocalStorageConfig(params *paramtable.ComponentParam) { diff --git a/internal/util/mock/grpcclient.go b/internal/util/mock/grpcclient.go index aa90f63de3..8a36344546 100644 --- a/internal/util/mock/grpcclient.go +++ b/internal/util/mock/grpcclient.go @@ -21,14 +21,14 @@ import ( "fmt" "sync" + "github.com/milvus-io/milvus/pkg/tracer" "go.uber.org/zap" "google.golang.org/grpc" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/tracer" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/generic" - "github.com/milvus-io/milvus/internal/util/retry" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/generic" + "github.com/milvus-io/milvus/pkg/util/retry" ) type GRPCClientBase[T any] struct { diff --git a/internal/util/mock/io_fake.go b/internal/util/mock/io_fake.go deleted file mode 100644 index 86d5685ed5..0000000000 --- a/internal/util/mock/io_fake.go +++ /dev/null @@ -1,17 +0,0 @@ -package mock - -type ErrReader struct { - Err error -} - -func (r *ErrReader) Read(p []byte) (n int, err error) { - return 0, r.Err -} - -type ErrWriter struct { - Err error -} - -func (w *ErrWriter) Write(p []byte) (n int, err error) { - return 0, w.Err -} diff --git a/internal/util/pipeline/node.go b/internal/util/pipeline/node.go index ee35627b91..ef4c3d0a41 100644 --- a/internal/util/pipeline/node.go +++ b/internal/util/pipeline/node.go @@ -20,8 +20,8 @@ import ( "fmt" "sync" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/timerecord" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/timerecord" "go.uber.org/zap" ) diff --git a/internal/util/pipeline/pipeline.go b/internal/util/pipeline/pipeline.go index 93b7ef9117..17bb3eea51 100644 --- a/internal/util/pipeline/pipeline.go +++ b/internal/util/pipeline/pipeline.go @@ -19,8 +19,8 @@ package pipeline import ( "time" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/timerecord" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/timerecord" "go.uber.org/zap" ) diff --git a/internal/util/pipeline/pipeline_test.go b/internal/util/pipeline/pipeline_test.go index 3d89002dde..82793091c6 100644 --- a/internal/util/pipeline/pipeline_test.go +++ b/internal/util/pipeline/pipeline_test.go @@ -19,7 +19,7 @@ package pipeline import ( "testing" - "github.com/milvus-io/milvus/internal/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream" "github.com/stretchr/testify/suite" ) diff --git a/internal/util/pipeline/stream_pipeline.go b/internal/util/pipeline/stream_pipeline.go index b291a7b6b8..8a36055c1f 100644 --- a/internal/util/pipeline/stream_pipeline.go +++ b/internal/util/pipeline/stream_pipeline.go @@ -21,11 +21,11 @@ import ( "time" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgdispatcher" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/internal/util/tsoutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/tsoutil" "go.uber.org/zap" ) diff --git a/internal/util/pipeline/stream_pipeline_test.go b/internal/util/pipeline/stream_pipeline_test.go index 584b37a5c5..d3c2fa96ba 100644 --- a/internal/util/pipeline/stream_pipeline_test.go +++ b/internal/util/pipeline/stream_pipeline_test.go @@ -21,9 +21,9 @@ import ( "testing" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/mq/msgdispatcher" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/mq/msgdispatcher" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" "github.com/stretchr/testify/mock" "github.com/stretchr/testify/suite" ) diff --git a/internal/util/segmentutil/utils.go b/internal/util/segmentutil/utils.go index 07f3046dfa..1a976c5be4 100644 --- a/internal/util/segmentutil/utils.go +++ b/internal/util/segmentutil/utils.go @@ -1,8 +1,8 @@ package segmentutil import ( - "github.com/milvus-io/milvus/internal/log" "github.com/milvus-io/milvus/internal/proto/datapb" + "github.com/milvus-io/milvus/pkg/log" "go.uber.org/zap" ) diff --git a/internal/util/sessionutil/session_util.go b/internal/util/sessionutil/session_util.go index a0f1a194c7..dcc4c64ee5 100644 --- a/internal/util/sessionutil/session_util.go +++ b/internal/util/sessionutil/session_util.go @@ -26,17 +26,17 @@ import ( "sync/atomic" "time" - "github.com/cockroachdb/errors" - "github.com/blang/semver/v4" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/retry" + "github.com/cockroachdb/errors" "go.etcd.io/etcd/api/v3/mvccpb" v3rpc "go.etcd.io/etcd/api/v3/v3rpc/rpctypes" clientv3 "go.etcd.io/etcd/client/v3" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/retry" ) const ( diff --git a/internal/util/sessionutil/session_util_test.go b/internal/util/sessionutil/session_util_test.go index 33351e431e..fda75d5266 100644 --- a/internal/util/sessionutil/session_util_test.go +++ b/internal/util/sessionutil/session_util_test.go @@ -15,23 +15,22 @@ import ( "testing" "time" - "github.com/cockroachdb/errors" - "github.com/blang/semver/v4" - "github.com/milvus-io/milvus/internal/common" - etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/cockroachdb/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "github.com/stretchr/testify/suite" - "go.uber.org/zap" - "go.etcd.io/etcd/api/v3/mvccpb" clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/server/v3/embed" "go.etcd.io/etcd/server/v3/etcdserver/api/v3client" + "go.uber.org/zap" + + etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) func TestGetServerIDConcurrently(t *testing.T) { diff --git a/internal/util/tsoutil/tso.go b/internal/util/tsoutil/tso.go index 0873af2624..59a98fe05c 100644 --- a/internal/util/tsoutil/tso.go +++ b/internal/util/tsoutil/tso.go @@ -18,89 +18,13 @@ package tsoutil import ( "path" - "time" + + clientv3 "go.etcd.io/etcd/client/v3" etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/util/typeutil" - clientv3 "go.etcd.io/etcd/client/v3" ) -const ( - logicalBits = 18 - logicalBitsMask = (1 << logicalBits) - 1 -) - -// ComposeTS returns a timestamp composed of physical part and logical part -func ComposeTS(physical, logical int64) uint64 { - return uint64((physical << logicalBits) + logical) -} - -// ComposeTSByTime returns a timestamp composed of physical time.Time and logical time -func ComposeTSByTime(physical time.Time, logical int64) uint64 { - return ComposeTS(physical.UnixNano()/int64(time.Millisecond), logical) -} - -// GetCurrentTime returns the current timestamp -func GetCurrentTime() typeutil.Timestamp { - return ComposeTSByTime(time.Now(), 0) -} - -// ParseTS parses the ts to (physical,logical). -func ParseTS(ts uint64) (time.Time, uint64) { - logical := ts & logicalBitsMask - physical := ts >> logicalBits - physicalTime := time.Unix(int64(physical/1000), int64(physical)%1000*time.Millisecond.Nanoseconds()) - return physicalTime, logical -} - -func PhysicalTime(ts uint64) time.Time { - physicalTime, _ := ParseTS(ts) - return physicalTime -} - -// ParseHybridTs parses the ts to (physical, logical), physical part is of utc-timestamp format. -func ParseHybridTs(ts uint64) (int64, int64) { - logical := ts & logicalBitsMask - physical := ts >> logicalBits - return int64(physical), int64(logical) -} - -// ParseAndFormatHybridTs parses the ts and returns its human-readable format. -func ParseAndFormatHybridTs(ts uint64) string { - physicalTs, _ := ParseHybridTs(ts) - return time.Unix(physicalTs, 0).Format(time.RFC3339) // Convert to RFC3339 format -} - -// CalculateDuration returns the number of milliseconds obtained by subtracting ts2 from ts1. -func CalculateDuration(ts1, ts2 typeutil.Timestamp) int64 { - p1, _ := ParseHybridTs(ts1) - p2, _ := ParseHybridTs(ts2) - return p1 - p2 -} - -// Mod24H parses the ts to millisecond in one day -func Mod24H(ts uint64) uint64 { - logical := ts & logicalBitsMask - physical := ts >> logicalBits - physical = physical % (uint64(24 * 60 * 60 * 1000)) - return (physical << logicalBits) | logical -} - -// AddPhysicalDurationOnTs adds physical interval on ts -func AddPhysicalDurationOnTs(ts uint64, duration time.Duration) uint64 { - msecs := duration.Milliseconds() - physical, logical := ParseHybridTs(ts) - return ComposeTS(physical+msecs, logical) -} - // NewTSOKVBase returns a etcdkv.EtcdKV object func NewTSOKVBase(client *clientv3.Client, tsoRoot, subPath string) *etcdkv.EtcdKV { return etcdkv.NewEtcdKV(client, path.Join(tsoRoot, subPath)) } - -// SubByNow ts is a hybrid -func SubByNow(ts uint64) int64 { - utcT, _ := ParseHybridTs(ts) - now := time.Now().UnixMilli() - return now - utcT -} diff --git a/internal/util/typeutil/result_helper.go b/internal/util/typeutil/result_helper.go index dd49eeeccb..6b628f24c3 100644 --- a/internal/util/typeutil/result_helper.go +++ b/internal/util/typeutil/result_helper.go @@ -2,6 +2,7 @@ package typeutil import ( "github.com/milvus-io/milvus-proto/go-api/schemapb" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func preHandleEmptyResult(result RetrieveResults) { @@ -19,7 +20,7 @@ func FillRetrieveResultIfEmpty(result RetrieveResults, outputFieldIds []int64, s preHandleEmptyResult(result) - helper, err := CreateSchemaHelper(schema) + helper, err := typeutil.CreateSchemaHelper(schema) if err != nil { return err } @@ -29,7 +30,7 @@ func FillRetrieveResultIfEmpty(result RetrieveResults, outputFieldIds []int64, s return err } - emptyFieldData, err := GenEmptyFieldData(field) + emptyFieldData, err := typeutil.GenEmptyFieldData(field) if err != nil { return err } diff --git a/internal/util/typeutil/result_helper_test.go b/internal/util/typeutil/result_helper_test.go index f54f89fbeb..ce07704f99 100644 --- a/internal/util/typeutil/result_helper_test.go +++ b/internal/util/typeutil/result_helper_test.go @@ -4,6 +4,7 @@ import ( "testing" "github.com/milvus-io/milvus-proto/go-api/commonpb" + "github.com/milvus-io/milvus/pkg/util/typeutil" "github.com/milvus-io/milvus-proto/go-api/milvuspb" @@ -16,6 +17,35 @@ import ( "github.com/milvus-io/milvus-proto/go-api/schemapb" ) +func fieldDataEmpty(data *schemapb.FieldData) bool { + if data == nil { + return true + } + switch realData := data.Field.(type) { + case *schemapb.FieldData_Scalars: + switch realScalars := realData.Scalars.Data.(type) { + case *schemapb.ScalarField_BoolData: + return len(realScalars.BoolData.GetData()) <= 0 + case *schemapb.ScalarField_LongData: + return len(realScalars.LongData.GetData()) <= 0 + case *schemapb.ScalarField_FloatData: + return len(realScalars.FloatData.GetData()) <= 0 + case *schemapb.ScalarField_DoubleData: + return len(realScalars.DoubleData.GetData()) <= 0 + case *schemapb.ScalarField_StringData: + return len(realScalars.StringData.GetData()) <= 0 + } + case *schemapb.FieldData_Vectors: + switch realVectors := realData.Vectors.Data.(type) { + case *schemapb.VectorField_BinaryVector: + return len(realVectors.BinaryVector) <= 0 + case *schemapb.VectorField_FloatVector: + return len(realVectors.FloatVector.Data) <= 0 + } + } + return true +} + func TestGenEmptyFieldData(t *testing.T) { allTypes := []schemapb.DataType{ schemapb.DataType_Bool, @@ -39,7 +69,7 @@ func TestGenEmptyFieldData(t *testing.T) { field := &schemapb.FieldSchema{Name: "field_name", FieldID: 100} for _, dataType := range allTypes { field.DataType = dataType - fieldData, err := GenEmptyFieldData(field) + fieldData, err := typeutil.GenEmptyFieldData(field) assert.NoError(t, err) assert.Equal(t, dataType, fieldData.GetType()) assert.Equal(t, field.GetName(), fieldData.GetFieldName()) @@ -49,21 +79,21 @@ func TestGenEmptyFieldData(t *testing.T) { for _, dataType := range allUnsupportedTypes { field.DataType = dataType - _, err := GenEmptyFieldData(field) + _, err := typeutil.GenEmptyFieldData(field) assert.Error(t, err) } // dim not found for _, dataType := range vectorTypes { field.DataType = dataType - _, err := GenEmptyFieldData(field) + _, err := typeutil.GenEmptyFieldData(field) assert.Error(t, err) } field.TypeParams = []*commonpb.KeyValuePair{{Key: "dim", Value: "128"}} for _, dataType := range vectorTypes { field.DataType = dataType - fieldData, err := GenEmptyFieldData(field) + fieldData, err := typeutil.GenEmptyFieldData(field) assert.NoError(t, err) assert.Equal(t, dataType, fieldData.GetType()) assert.Equal(t, field.GetName(), fieldData.GetFieldName()) diff --git a/internal/util/typeutil/retrieve_result.go b/internal/util/typeutil/retrieve_result.go index 8b9fc78207..9fca53da8d 100644 --- a/internal/util/typeutil/retrieve_result.go +++ b/internal/util/typeutil/retrieve_result.go @@ -5,6 +5,7 @@ import ( "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/milvus-io/milvus/internal/proto/segcorepb" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type RetrieveResults interface { @@ -27,7 +28,7 @@ func (r *segcoreResults) AppendFieldData(fieldData *schemapb.FieldData) { } func (r *segcoreResults) ResultEmpty() bool { - return GetSizeOfIDs(r.result.GetIds()) <= 0 + return typeutil.GetSizeOfIDs(r.result.GetIds()) <= 0 } func NewSegcoreResults(result *segcorepb.RetrieveResults) RetrieveResults { @@ -47,7 +48,7 @@ func (r *internalResults) AppendFieldData(fieldData *schemapb.FieldData) { } func (r *internalResults) ResultEmpty() bool { - return GetSizeOfIDs(r.result.GetIds()) <= 0 + return typeutil.GetSizeOfIDs(r.result.GetIds()) <= 0 } func NewInternalResult(result *internalpb.RetrieveResults) RetrieveResults { diff --git a/internal/common/byte_slice.go b/pkg/common/byte_slice.go similarity index 100% rename from internal/common/byte_slice.go rename to pkg/common/byte_slice.go diff --git a/internal/common/byte_slice_test.go b/pkg/common/byte_slice_test.go similarity index 100% rename from internal/common/byte_slice_test.go rename to pkg/common/byte_slice_test.go diff --git a/internal/common/common.go b/pkg/common/common.go similarity index 100% rename from internal/common/common.go rename to pkg/common/common.go diff --git a/internal/common/common_test.go b/pkg/common/common_test.go similarity index 100% rename from internal/common/common_test.go rename to pkg/common/common_test.go diff --git a/internal/common/error.go b/pkg/common/error.go similarity index 99% rename from internal/common/error.go rename to pkg/common/error.go index d672d140b9..7f3c70244d 100644 --- a/internal/common/error.go +++ b/pkg/common/error.go @@ -20,7 +20,6 @@ import ( "fmt" "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus-proto/go-api/commonpb" ) diff --git a/internal/common/error_test.go b/pkg/common/error_test.go similarity index 99% rename from internal/common/error_test.go rename to pkg/common/error_test.go index bcaf43ac01..30068dce3b 100644 --- a/internal/common/error_test.go +++ b/pkg/common/error_test.go @@ -21,9 +21,7 @@ import ( "testing" "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/stretchr/testify/assert" ) diff --git a/internal/common/key_data_pairs.go b/pkg/common/key_data_pairs.go similarity index 100% rename from internal/common/key_data_pairs.go rename to pkg/common/key_data_pairs.go diff --git a/internal/common/key_data_pairs_test.go b/pkg/common/key_data_pairs_test.go similarity index 99% rename from internal/common/key_data_pairs_test.go rename to pkg/common/key_data_pairs_test.go index 0134e0cc89..4bc8cbe4ae 100644 --- a/internal/common/key_data_pairs_test.go +++ b/pkg/common/key_data_pairs_test.go @@ -4,7 +4,6 @@ import ( "testing" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/stretchr/testify/assert" ) diff --git a/internal/common/key_value_pairs.go b/pkg/common/key_value_pairs.go similarity index 100% rename from internal/common/key_value_pairs.go rename to pkg/common/key_value_pairs.go diff --git a/internal/common/key_value_pairs_test.go b/pkg/common/key_value_pairs_test.go similarity index 99% rename from internal/common/key_value_pairs_test.go rename to pkg/common/key_value_pairs_test.go index d49120cb7a..dfd64dba8a 100644 --- a/internal/common/key_value_pairs_test.go +++ b/pkg/common/key_value_pairs_test.go @@ -4,7 +4,6 @@ import ( "testing" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/stretchr/testify/assert" ) diff --git a/internal/common/map.go b/pkg/common/map.go similarity index 100% rename from internal/common/map.go rename to pkg/common/map.go diff --git a/internal/common/map_test.go b/pkg/common/map_test.go similarity index 100% rename from internal/common/map_test.go rename to pkg/common/map_test.go diff --git a/internal/common/string_list.go b/pkg/common/string_list.go similarity index 100% rename from internal/common/string_list.go rename to pkg/common/string_list.go diff --git a/internal/common/string_list_test.go b/pkg/common/string_list_test.go similarity index 100% rename from internal/common/string_list_test.go rename to pkg/common/string_list_test.go diff --git a/internal/common/tuple.go b/pkg/common/tuple.go similarity index 100% rename from internal/common/tuple.go rename to pkg/common/tuple.go diff --git a/internal/common/version.go b/pkg/common/version.go similarity index 77% rename from internal/common/version.go rename to pkg/common/version.go index 923fbc2753..4bdd72e9f9 100644 --- a/internal/common/version.go +++ b/pkg/common/version.go @@ -1,6 +1,6 @@ package common -import "github.com/blang/semver/v4" +import semver "github.com/blang/semver/v4" // Version current version for session var Version semver.Version diff --git a/internal/config/config.go b/pkg/config/config.go similarity index 100% rename from internal/config/config.go rename to pkg/config/config.go diff --git a/internal/config/config_test.go b/pkg/config/config_test.go similarity index 100% rename from internal/config/config_test.go rename to pkg/config/config_test.go diff --git a/internal/config/env_source.go b/pkg/config/env_source.go similarity index 97% rename from internal/config/env_source.go rename to pkg/config/env_source.go index 6a5e0e2258..204b64925c 100644 --- a/internal/config/env_source.go +++ b/pkg/config/env_source.go @@ -20,7 +20,7 @@ import ( "os" "strings" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type EnvSource struct { diff --git a/internal/config/etcd_source.go b/pkg/config/etcd_source.go similarity index 98% rename from internal/config/etcd_source.go rename to pkg/config/etcd_source.go index 2329f68446..6bb6c1d9bb 100644 --- a/internal/config/etcd_source.go +++ b/pkg/config/etcd_source.go @@ -23,8 +23,9 @@ import ( "sync" "time" - "github.com/milvus-io/milvus/internal/util/etcd" clientv3 "go.etcd.io/etcd/client/v3" + + "github.com/milvus-io/milvus/pkg/util/etcd" ) const ( diff --git a/internal/config/event.go b/pkg/config/event.go similarity index 100% rename from internal/config/event.go rename to pkg/config/event.go diff --git a/internal/config/event_dispatcher.go b/pkg/config/event_dispatcher.go similarity index 100% rename from internal/config/event_dispatcher.go rename to pkg/config/event_dispatcher.go diff --git a/internal/config/file_source.go b/pkg/config/file_source.go similarity index 98% rename from internal/config/file_source.go rename to pkg/config/file_source.go index 1a31424c80..4834e29db9 100644 --- a/internal/config/file_source.go +++ b/pkg/config/file_source.go @@ -22,11 +22,11 @@ import ( "sync" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/log" "github.com/spf13/cast" "github.com/spf13/viper" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" ) type FileSource struct { @@ -93,6 +93,7 @@ func (fs *FileSource) Close() { func (fs *FileSource) SetEventHandler(eh EventHandler) { fs.configRefresher.eh = eh } + func (fs *FileSource) loadFromFile() error { yamlReader := viper.New() newConfig := make(map[string]string) diff --git a/internal/config/manager.go b/pkg/config/manager.go similarity index 98% rename from internal/config/manager.go rename to pkg/config/manager.go index 0024156426..b0592ba5dc 100644 --- a/internal/config/manager.go +++ b/pkg/config/manager.go @@ -21,10 +21,10 @@ import ( "sync" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/typeutil" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/config/manager_test.go b/pkg/config/manager_test.go similarity index 99% rename from internal/config/manager_test.go rename to pkg/config/manager_test.go index ed0e9d4972..648a4766b6 100644 --- a/internal/config/manager_test.go +++ b/pkg/config/manager_test.go @@ -20,7 +20,6 @@ import ( "testing" "github.com/cockroachdb/errors" - "github.com/stretchr/testify/assert" ) diff --git a/internal/config/refresher.go b/pkg/config/refresher.go similarity index 98% rename from internal/config/refresher.go rename to pkg/config/refresher.go index eff6bac962..6b4d237e9e 100644 --- a/internal/config/refresher.go +++ b/pkg/config/refresher.go @@ -19,8 +19,9 @@ import ( "sync" "time" - "github.com/milvus-io/milvus/internal/log" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" ) type refresher struct { diff --git a/internal/config/source.go b/pkg/config/source.go similarity index 100% rename from internal/config/source.go rename to pkg/config/source.go diff --git a/internal/config/source_test.go b/pkg/config/source_test.go similarity index 100% rename from internal/config/source_test.go rename to pkg/config/source_test.go diff --git a/pkg/go.mod b/pkg/go.mod new file mode 100644 index 0000000000..36c78987ca --- /dev/null +++ b/pkg/go.mod @@ -0,0 +1,157 @@ +module github.com/milvus-io/milvus/pkg + +go 1.18 + +require ( + github.com/apache/pulsar-client-go v0.6.1-0.20210728062540-29414db801a7 + github.com/benesch/cgosymbolizer v0.0.0-20190515212042-bec6fe6e597b + github.com/blang/semver/v4 v4.0.0 + github.com/confluentinc/confluent-kafka-go v1.9.1 + github.com/containerd/cgroups v1.0.4 + github.com/golang/protobuf v1.5.2 + github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 + github.com/klauspost/compress v1.14.4 + github.com/lingdor/stackerror v0.0.0-20191119040541-976d8885ed76 + github.com/milvus-io/milvus-proto/go-api v0.0.0-20230309062747-133bf302bb11 + github.com/panjf2000/ants/v2 v2.4.8 + github.com/prometheus/client_golang v1.11.1 + github.com/samber/lo v1.27.0 + github.com/shirou/gopsutil/v3 v3.22.9 + github.com/spaolacci/murmur3 v1.1.0 + github.com/spf13/cast v1.3.1 + github.com/spf13/viper v1.8.1 + github.com/streamnative/pulsarctl v0.5.0 + github.com/stretchr/testify v1.8.1 + go.etcd.io/etcd/client/v3 v3.5.5 + go.etcd.io/etcd/server/v3 v3.5.5 + go.uber.org/atomic v1.10.0 + go.uber.org/automaxprocs v1.4.0 + go.uber.org/zap v1.17.0 + golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 + golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 + golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 + google.golang.org/grpc v1.52.3 + google.golang.org/protobuf v1.28.1 + gopkg.in/natefinch/lumberjack.v2 v2.0.0 +) + +require ( + github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 // indirect + github.com/99designs/keyring v1.2.1 // indirect + github.com/AthenZ/athenz v1.10.39 // indirect + github.com/BurntSushi/toml v1.0.0 // indirect + github.com/DataDog/zstd v1.5.0 // indirect + github.com/ardielle/ardielle-go v1.5.2 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/coreos/go-semver v0.3.0 // indirect + github.com/coreos/go-systemd/v22 v22.3.2 // indirect + github.com/danieljoos/wincred v1.1.2 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/docker/go-units v0.4.0 // indirect + github.com/dustin/go-humanize v1.0.0 // indirect + github.com/dvsekhvalnov/jose2go v1.5.0 // indirect + github.com/fsnotify/fsnotify v1.4.9 // indirect + github.com/go-ole/go-ole v1.2.6 // indirect + github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 // indirect + github.com/godbus/dbus/v5 v5.0.4 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/snappy v0.0.4 // indirect + github.com/google/btree v1.0.1 // indirect + github.com/gorilla/websocket v1.4.2 // indirect + github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect + github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect + github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c // indirect + github.com/hashicorp/hcl v1.0.0 // indirect + github.com/jonboulle/clockwork v0.2.2 // indirect + github.com/json-iterator/go v1.1.11 // indirect + github.com/linkedin/goavro/v2 v2.11.1 // indirect + github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect + github.com/magiconair/properties v1.8.5 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect + github.com/mitchellh/mapstructure v1.4.1 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/mtibben/percent v0.2.1 // indirect + github.com/opencontainers/runtime-spec v1.0.2 // indirect + github.com/pelletier/go-toml v1.9.3 // indirect + github.com/pierrec/lz4 v2.5.2+incompatible // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.26.0 // indirect + github.com/prometheus/procfs v0.6.0 // indirect + github.com/sirupsen/logrus v1.8.1 // indirect + github.com/soheilhy/cmux v0.1.5 // indirect + github.com/spf13/afero v1.6.0 // indirect + github.com/spf13/jwalterweatherman v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/stretchr/objx v0.5.0 // indirect + github.com/subosito/gotenv v1.2.0 // indirect + github.com/tklauser/go-sysconf v0.3.10 // indirect + github.com/tklauser/numcpus v0.4.0 // indirect + github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 // indirect + github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 // indirect + github.com/yusufpapurcu/wmi v1.2.2 // indirect + go.etcd.io/bbolt v1.3.6 // indirect + go.etcd.io/etcd/api/v3 v3.5.5 // indirect + go.etcd.io/etcd/client/pkg/v3 v3.5.5 // indirect + go.etcd.io/etcd/client/v2 v2.305.5 // indirect + go.etcd.io/etcd/pkg/v3 v3.5.5 // indirect + go.etcd.io/etcd/raft/v3 v3.5.5 // indirect + go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.38.0 + go.opentelemetry.io/otel v1.13.0 + go.opentelemetry.io/otel/sdk v1.13.0 + go.opentelemetry.io/otel/trace v1.13.0 + go.opentelemetry.io/proto/otlp v0.19.0 // indirect + golang.org/x/net v0.6.0 // indirect + golang.org/x/sys v0.5.0 // indirect + golang.org/x/term v0.5.0 // indirect + golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 // indirect + gopkg.in/ini.v1 v1.62.0 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect + sigs.k8s.io/yaml v1.2.0 // indirect +) + +require github.com/ianlancetaylor/cgosymbolizer v0.0.0-20221217025313-27d3c9f66b6a // indirect + +require ( + github.com/cockroachdb/errors v1.9.1 + github.com/uber/jaeger-client-go v2.30.0+incompatible + go.opentelemetry.io/otel/exporters/jaeger v1.13.0 + go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.13.0 + go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.13.0 +) + +require ( + github.com/cenkalti/backoff/v4 v4.2.0 // indirect + github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f // indirect + github.com/cockroachdb/redact v1.1.3 // indirect + github.com/form3tech-oss/jwt-go v3.2.3+incompatible // indirect + github.com/getsentry/sentry-go v0.12.0 // indirect + github.com/go-logr/logr v1.2.3 // indirect + github.com/go-logr/stdr v1.2.2 // indirect + github.com/golang-jwt/jwt v3.2.2+incompatible // indirect + github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect + github.com/kr/pretty v0.3.0 // indirect + github.com/kr/text v0.2.0 // indirect + github.com/olekukonko/tablewriter v0.0.5 // indirect + github.com/pkg/errors v0.9.1 // indirect + github.com/rogpeppe/go-internal v1.8.1 // indirect + go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.13.0 // indirect + go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.13.0 // indirect + go.opentelemetry.io/otel/metric v0.35.0 // indirect + go.uber.org/multierr v1.6.0 // indirect + golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect + golang.org/x/text v0.7.0 // indirect +) + +replace ( + github.com/apache/pulsar-client-go => github.com/milvus-io/pulsar-client-go v0.6.10 + github.com/streamnative/pulsarctl => github.com/xiaofan-luan/pulsarctl v0.5.1 +) + +exclude github.com/apache/pulsar-client-go/oauth2 v0.0.0-20211108044248-fe3b7c4e445b diff --git a/pkg/go.sum b/pkg/go.sum new file mode 100644 index 0000000000..ab70290d24 --- /dev/null +++ b/pkg/go.sum @@ -0,0 +1,1221 @@ +cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= +cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU= +cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU= +cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY= +cloud.google.com/go v0.45.1/go.mod h1:RpBamKRgapWJb87xiFSdk4g1CME7QZg3uwTez+TSTjc= +cloud.google.com/go v0.46.3/go.mod h1:a6bKKbmY7er1mI7TEI4lsAkts/mkhTSZK8w33B4RAg0= +cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6To= +cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4= +cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M= +cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc= +cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk= +cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs= +cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc= +cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY= +cloud.google.com/go v0.72.0/go.mod h1:M+5Vjvlc2wnp6tjzE102Dw08nGShTscUx2nZMufOKPI= +cloud.google.com/go v0.74.0/go.mod h1:VV1xSbzvo+9QJOxLDaJfTjx5e+MePCpCWwvftOeQmWk= +cloud.google.com/go v0.78.0/go.mod h1:QjdrLG0uq+YwhjoVOLsS1t7TW8fs36kLs4XO5R5ECHg= +cloud.google.com/go v0.79.0/go.mod h1:3bzgcEeQlzbuEAYu4mrWhKqWjmpprinYgKJLgKHnbb8= +cloud.google.com/go v0.81.0/go.mod h1:mk/AM35KwGk/Nm2YSeZbxXdrNK3KZOYHmLkOqC2V6E0= +cloud.google.com/go v0.105.0 h1:DNtEKRBAAzeS4KyIory52wWHuClNaXJ5x1F7xa4q+5Y= +cloud.google.com/go/bigquery v1.0.1/go.mod h1:i/xbL2UlR5RvWAURpBYZTtm/cXjCha9lbfbpx4poX+o= +cloud.google.com/go/bigquery v1.3.0/go.mod h1:PjpwJnslEMmckchkHFfq+HTD2DmtT67aNFKH1/VBDHE= +cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvftPBK2Dvzc= +cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= +cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= +cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= +cloud.google.com/go/compute v1.12.1 h1:gKVJMEyqV5c/UnpzjjQbo3Rjvvqpr9B1DFSbJC4OXr0= +cloud.google.com/go/compute/metadata v0.2.1 h1:efOwf5ymceDhK6PKMnnrTHP4pppY5L22mle96M1yP48= +cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= +cloud.google.com/go/datastore v1.1.0/go.mod h1:umbIZjpQpHh4hmRpGhH4tLFup+FVzqBi1b3c64qFpCk= +cloud.google.com/go/firestore v1.1.0/go.mod h1:ulACoGHTpvq5r8rxGJ4ddJZBZqakUQqClKRT5SZwBmk= +cloud.google.com/go/pubsub v1.0.1/go.mod h1:R0Gpsv3s54REJCy4fxDixWD93lHJMoZTyQ2kNxGRt3I= +cloud.google.com/go/pubsub v1.1.0/go.mod h1:EwwdRX2sKPjnvnqCa270oGRyludottCI76h+R3AArQw= +cloud.google.com/go/pubsub v1.2.0/go.mod h1:jhfEVHT8odbXTkndysNHCcx0awwzvfOlguIAii9o8iA= +cloud.google.com/go/pubsub v1.3.1/go.mod h1:i+ucay31+CNRpDW4Lu78I4xXG+O1r/MAHgjpRVR+TSU= +cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiyrjsg+URw= +cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= +cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= +cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs= +cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0= +dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4 h1:/vQbFIOMbk2FiG/kXiLl8BRyzTWDw7gX/Hz7Dd5eDMs= +github.com/99designs/go-keychain v0.0.0-20191008050251-8e49817e8af4/go.mod h1:hN7oaIRCjzsZ2dE+yG5k+rsdt3qcwykqK6HVGcKwsw4= +github.com/99designs/keyring v1.2.1 h1:tYLp1ULvO7i3fI5vE21ReQuj99QFSs7lGm0xWyJo87o= +github.com/99designs/keyring v1.2.1/go.mod h1:fc+wB5KTk9wQ9sDx0kFXB3A0MaeGHM9AwRStKOQ5vOA= +github.com/AndreasBriese/bbloom v0.0.0-20190306092124-e2d15f34fcf9/go.mod h1:bOvUY6CB00SOBii9/FifXqc0awNKxLFCL/+pkDPuyl8= +github.com/AthenZ/athenz v1.10.39 h1:mtwHTF/v62ewY2Z5KWhuZgVXftBej1/Tn80zx4DcawY= +github.com/AthenZ/athenz v1.10.39/go.mod h1:3Tg8HLsiQZp81BJY58JBeU2BR6B/H4/0MQGfCwhHNEA= +github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= +github.com/BurntSushi/toml v1.0.0 h1:dtDWrepsVPfW9H/4y7dDgFc2MBUSeJhlaDtK13CxFlU= +github.com/BurntSushi/toml v1.0.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= +github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= +github.com/CloudyKit/fastprinter v0.0.0-20200109182630-33d98a066a53/go.mod h1:+3IMCy2vIlbG1XG/0ggNQv0SvxCAIpPM5b1nCz56Xno= +github.com/CloudyKit/jet/v3 v3.0.0/go.mod h1:HKQPgSJmdK8hdoAbKUUWajkHyHo4RaU5rMdUywE7VMo= +github.com/DataDog/zstd v1.5.0 h1:+K/VEwIAaPcHiMtQvpLD4lqW7f0Gk3xdYZmI1hD+CXo= +github.com/DataDog/zstd v1.5.0/go.mod h1:g4AWEaM3yOg3HYfnJ3YIawPnVdXJh9QME85blwSAmyw= +github.com/Joker/hpp v1.0.0/go.mod h1:8x5n+M1Hp5hC0g8okX3sR3vFQwynaX/UgSOM9MeBKzY= +github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= +github.com/Shopify/goreferrer v0.0.0-20181106222321-ec9c9a553398/go.mod h1:a1uqRtAwp2Xwc6WNPJEufxJ7fx3npB4UV/JOLmbu5I0= +github.com/actgardner/gogen-avro/v10 v10.1.0/go.mod h1:o+ybmVjEa27AAr35FRqU98DJu1fXES56uXniYFv4yDA= +github.com/actgardner/gogen-avro/v10 v10.2.1/go.mod h1:QUhjeHPchheYmMDni/Nx7VB0RsT/ee8YIgGY/xpEQgQ= +github.com/actgardner/gogen-avro/v9 v9.1.0/go.mod h1:nyTj6wPqDJoxM3qdnjcLv+EnMDSDFqE0qDpva2QRmKc= +github.com/ajg/form v1.5.1/go.mod h1:uL1WgH+h2mgNtvBq0339dVnzXdBETtL2LeUXaIv25UY= +github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= +github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= +github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= +github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY= +github.com/ardielle/ardielle-go v1.5.2 h1:TilHTpHIQJ27R1Tl/iITBzMwiUGSlVfiVhwDNGM3Zj4= +github.com/ardielle/ardielle-go v1.5.2/go.mod h1:I4hy1n795cUhaVt/ojz83SNVCYIGsAFAONtv2Dr7HUI= +github.com/ardielle/ardielle-tools v1.5.4/go.mod h1:oZN+JRMnqGiIhrzkRN9l26Cej9dEx4jeNG6A+AdkShk= +github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o= +github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8= +github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY= +github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= +github.com/aws/aws-sdk-go v1.32.6/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= +github.com/aymerick/raymond v2.0.3-0.20180322193309-b565731e1464+incompatible/go.mod h1:osfaiScAUVup+UC9Nfq76eWqDhXlp+4UYaA8uhTBO6g= +github.com/benesch/cgosymbolizer v0.0.0-20190515212042-bec6fe6e597b h1:5JgaFtHFRnOPReItxvhMDXbvuBkjSWE+9glJyF466yw= +github.com/benesch/cgosymbolizer v0.0.0-20190515212042-bec6fe6e597b/go.mod h1:eMD2XUcPsHYbakFEocKrWZp47G0MRJYoC60qFblGjpA= +github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= +github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= +github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= +github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= +github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= +github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84= +github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= +github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= +github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= +github.com/bmizerany/perks v0.0.0-20141205001514-d9a9656a3a4b/go.mod h1:ac9efd0D1fsDb3EJvhqgXRbFx7bs2wqZ10HQPeU8U/Q= +github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw= +github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4= +github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE= +github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= +github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= +github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= +github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= +github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= +github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= +github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= +github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI= +github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= +github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= +github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= +github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XPnfI9Z40ddWsdw2W/uZgQLFXToKeRcDiI= +github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= +github.com/cockroachdb/datadriven v0.0.0-20200714090401-bf6692d28da5/go.mod h1:h6jFvWxBdQXxjopDMZyH2UVceIRfR84bdzbkoKrsWNo= +github.com/cockroachdb/datadriven v1.0.2 h1:H9MtNqVoVhvd9nCBwOyDjUEdZCREqbIdCJD93PBm/jA= +github.com/cockroachdb/datadriven v1.0.2/go.mod h1:a9RdTaap04u637JoCzcUoIcDmvwSUtcUFtT/C3kJlTU= +github.com/cockroachdb/errors v1.2.4/go.mod h1:rQD95gz6FARkaKkQXUksEje/d9a6wBJoCr5oaCLELYA= +github.com/cockroachdb/errors v1.9.1 h1:yFVvsI0VxmRShfawbt/laCIDy/mtTqqnvoNgiy5bEV8= +github.com/cockroachdb/errors v1.9.1/go.mod h1:2sxOtL2WIc096WSZqZ5h8fa17rdDq9HZOZLBCor4mBk= +github.com/cockroachdb/logtags v0.0.0-20190617123548-eb05cc24525f/go.mod h1:i/u985jwjWRlyHXQbwatDASoW0RMlZ/3i9yJHE2xLkI= +github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f h1:6jduT9Hfc0njg5jJ1DdKCFPdMBrp/mdZfCpa5h+WM74= +github.com/cockroachdb/logtags v0.0.0-20211118104740-dabe8e521a4f/go.mod h1:Vz9DsVWQQhf3vs21MhPMZpMGSht7O/2vFW2xusFUVOs= +github.com/cockroachdb/redact v1.1.3 h1:AKZds10rFSIj7qADf0g46UixK8NNLwWTNdCIGS5wfSQ= +github.com/cockroachdb/redact v1.1.3/go.mod h1:BVNblN9mBWFyMyqK1k3AAiSxhvhfK2oOZZ2lK+dpvRg= +github.com/codegangsta/inject v0.0.0-20150114235600-33e0aa1cb7c0/go.mod h1:4Zcjuz89kmFXt9morQgcfYZAYZ5n8WHjt81YYWIwtTM= +github.com/confluentinc/confluent-kafka-go v1.9.1 h1:L3aW6KvTyrq/+BOMnDm9xJylhAEoAgqhoaJbMPe3GQI= +github.com/confluentinc/confluent-kafka-go v1.9.1/go.mod h1:ptXNqsuDfYbAE/LBW6pnwWZElUoWxHoV8E43DCrliyo= +github.com/containerd/cgroups v1.0.4 h1:jN/mbWBEaz+T1pi5OFtnkQ+8qnmEbAr1Oo1FRm5B0dA= +github.com/containerd/cgroups v1.0.4/go.mod h1:nLNQtsF7Sl2HxNebu77i1R0oDlhiTG+kO4JTrUzo6IA= +github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= +github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= +github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= +github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= +github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= +github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= +github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI= +github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= +github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= +github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= +github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= +github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= +github.com/danieljoos/wincred v1.1.2 h1:QLdCxFs1/Yl4zduvBdcHB8goaYk9RARS2SgLLRuAyr0= +github.com/danieljoos/wincred v1.1.2/go.mod h1:GijpziifJoIBfYh+S7BbkdUTU4LfM+QnGqR5Vl2tAx0= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/dgraph-io/badger v1.6.0/go.mod h1:zwt7syl517jmP8s94KqSxTlM6IMsdhYy6psNgSztDR4= +github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ= +github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= +github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= +github.com/dimfeld/httptreemux v5.0.1+incompatible h1:Qj3gVcDNoOthBAqftuD596rm4wg/adLLz5xh5CmpiCA= +github.com/dimfeld/httptreemux v5.0.1+incompatible/go.mod h1:rbUlSV+CCpv/SuqUTP/8Bk2O3LyUV436/yaRGkhP6Z0= +github.com/docker/go-units v0.4.0 h1:3uh0PgVws3nIA0Q+MwDC8yjEPf9zjRfZZWXZYDct3Tw= +github.com/docker/go-units v0.4.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk= +github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= +github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= +github.com/dvsekhvalnov/jose2go v1.5.0 h1:3j8ya4Z4kMCwT5nXIKFSV84YS+HdqSSO0VsTQxaLAeM= +github.com/dvsekhvalnov/jose2go v1.5.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU= +github.com/eknkc/amber v0.0.0-20171010120322-cdade1c07385/go.mod h1:0vRUJqYpeSZifjYj7uP3BG/gKcuzL9xWVV/Y+cK33KM= +github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= +github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5ynNVH9qI8YYLbd1fK2po= +github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= +github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.mod h1:hliV/p42l8fGbc6Y9bQ70uLwIvmJyVE5k4iMKlh8wCQ= +github.com/envoyproxy/go-control-plane v0.9.10-0.20210907150352-cf90f659a021/go.mod h1:AFq3mo9L8Lqqiid3OhADV3RfLJnjiw63cSpi+fDTRC0= +github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE= +github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= +github.com/etcd-io/bbolt v1.3.3/go.mod h1:ZF2nL25h33cCyBtcyWeZ2/I3HQOfTP+0PIEvHjkjCrw= +github.com/fasthttp-contrib/websocket v0.0.0-20160511215533-1f3b11f56072/go.mod h1:duJ4Jxv5lDcvg4QuQr0oowTf7dz4/CR8NtyCooz9HL8= +github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= +github.com/fatih/color v1.10.0 h1:s36xzo75JdqLaaWoiEHk767eHiwo0598uUxyfiPkDsg= +github.com/fatih/structs v1.1.0/go.mod h1:9NiDSp5zOcgEDl+j00MP/WkGVPOlPRLejGD8Ga6PJ7M= +github.com/form3tech-oss/jwt-go v3.2.3+incompatible h1:7ZaBxOI7TMoYBfyA3cQHErNNyAWIKUMIwqxEtgHOs5c= +github.com/form3tech-oss/jwt-go v3.2.3+incompatible/go.mod h1:pbq4aXjuKjdthFRnoDwaVPLA+WlJuPGy+QneDUgJi2k= +github.com/frankban/quicktest v1.2.2/go.mod h1:Qh/WofXFeiAFII1aEBu529AtJo6Zg2VHscnEsbBnJ20= +github.com/frankban/quicktest v1.7.2/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o= +github.com/frankban/quicktest v1.10.0/go.mod h1:ui7WezCLWMWxVWr1GETZY3smRy0G4KWq9vcPtJmFl7Y= +github.com/frankban/quicktest v1.14.0 h1:+cqqvzZV87b4adx/5ayVOaYZ2CrvM4ejQvUdBzPPUss= +github.com/frankban/quicktest v1.14.0/go.mod h1:NeW+ay9A/U67EYXNFA1nPE8e/tnQv/09mUdL/ijj8og= +github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= +github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= +github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= +github.com/gavv/httpexpect v2.0.0+incompatible/go.mod h1:x+9tiU1YnrOvnB725RkpoLv1M62hOWzwo5OXotisrKc= +github.com/getsentry/raven-go v0.2.0/go.mod h1:KungGk8q33+aIAZUIVWZDr2OfAEBsO49PX4NzFV5kcQ= +github.com/getsentry/sentry-go v0.12.0 h1:era7g0re5iY13bHSdN/xMkyV+5zZppjRVQhZrXCaEIk= +github.com/getsentry/sentry-go v0.12.0/go.mod h1:NSap0JBYWzHND8oMbyi0+XZhUalc1TBdRL1M71JZW2c= +github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk= +github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= +github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3/go.mod h1:VJ0WA2NBN22VlZ2dKZQPAPnyWw5XTlK1KymzLKsr59s= +github.com/gin-gonic/gin v1.4.0/go.mod h1:OW2EZn3DO8Ln9oIKOvM++LBO+5UPHJJDH72/q/3rZdM= +github.com/go-check/check v0.0.0-20180628173108-788fd7840127/go.mod h1:9ES+weclKsC9YodN5RgxqK/VD9HM9JsCSh7rNhMZE98= +github.com/go-errors/errors v1.0.1 h1:LUHzmkK3GUKUrL/1gfBUxAHzcev3apQlezX/+O7ma6w= +github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= +github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= +github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= +github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= +github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= +github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= +github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= +github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= +github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag= +github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE= +github.com/go-martini/martini v0.0.0-20170121215854-22fa46961aab/go.mod h1:/P9AEU963A2AYjv4d1V5eVL1CQbEJq6aCNHDDjibzu8= +github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY= +github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= +github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= +github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= +github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= +github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee/go.mod h1:L0fX3K22YWvt/FAX9NnzrNzcI4wNYi9Yku4O0LKYflo= +github.com/gobwas/pool v0.2.0/go.mod h1:q8bcK0KcYlCgd9e7WYLm9LpyS+YeLd8JVDW6WezmKEw= +github.com/gobwas/ws v1.0.2/go.mod h1:szmBTxLgaFppYjEmNtny/v3w89xOydFnnZMcgRRu/EM= +github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2 h1:ZpnhV/YsD2/4cESfV5+Hoeu/iUR3ruzNvZ+yQfO03a0= +github.com/godbus/dbus v0.0.0-20190726142602-4481cbc300e2/go.mod h1:bBOAhwG1umN6/6ZUMtDFBMQR8jRg9O75tm9K00oMsK4= +github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA= +github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= +github.com/gogo/googleapis v0.0.0-20180223154316-0cd9801be74a/go.mod h1:gf4bu3Q80BeJ6H1S1vYPm8/ELATdvryBaNFGgqEef3s= +github.com/gogo/googleapis v1.4.1/go.mod h1:2lpHqI5OcWCtVElxXnPt+s8oJvMpySlOyM6xDCrzib4= +github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.0/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= +github.com/gogo/protobuf v1.3.1/go.mod h1:SlYgWuQ5SjCEi6WLHjHCa1yvBfUnHcTbrrZtXPKa29o= +github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= +github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/gogo/status v1.1.0/go.mod h1:BFv9nrluPLmrS0EmGVvLaPNmRosr9KapBYd5/hpY1WM= +github.com/golang-jwt/jwt v3.2.1+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= +github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= +github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= +github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= +github.com/golang/glog v1.0.0 h1:nfP3RFugxnNRyKgeWd4oI1nYvXpxrx8ck8ZrcizshdQ= +github.com/golang/glog v1.0.0/go.mod h1:EWib/APOK0SL3dFbYqvxE3UYd8E6s1ouQ7iEp/0LWV4= +github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= +github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.2.0/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= +github.com/golang/mock v1.3.1/go.mod h1:sBzyDLLjw3U8JLTeZvSv8jJB+tU5PVekmnlKIyFUx0Y= +github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= +github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3KVu8= +github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= +github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= +github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= +github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= +github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= +github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= +github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= +github.com/golang/protobuf v1.5.1/go.mod h1:DopwsBzvsk0Fs44TXzsVbJyPhcCPeIwnvohx4u74HPM= +github.com/golang/protobuf v1.5.2 h1:ROPKBNFfQgOUMifHyP+KYbvpjbdoFNs+aK7DXlji0Tw= +github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= +github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= +github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= +github.com/gomodule/redigo v1.7.1-0.20190724094224-574c33c3df38/go.mod h1:B4C85qUVwatsJoIUNIfCRsp7qO0iAmpGFZ4EELWSbC4= +github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= +github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4= +github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA= +github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= +github.com/google/go-cmp v0.2.1-0.20190312032427-6f77996f0c42/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= +github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= +github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= +github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= +github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs= +github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= +github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= +github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200212024743-f11f1df84d12/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200430221834-fc25d7d30c6d/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20200708004538-1a94d8640e99/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= +github.com/google/pprof v0.0.0-20201023163331-3e6fc7fc9c4c/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20201203190320-1bf35d6f28c2/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210122040257-d980be63207e/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210226084205-cbba55b83ad5/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE= +github.com/google/pprof v0.0.0-20211008130755-947d60d73cc0/go.mod h1:KgnwoLYCZ8IQu3XUZ8Nc/bM9CCZFOyjUNOSygVozoDg= +github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= +github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= +github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8= +github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= +github.com/gorilla/mux v1.7.4/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So= +github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= +github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= +github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs= +github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 h1:+9834+KizmvFV7pXQGSXQTsaWhq2GjuNUt0aUU0YBYw= +github.com/grpc-ecosystem/go-grpc-middleware v1.3.0/go.mod h1:z0ButlSOZa5vEBq9m2m2hlwIgKw+rp3sdCBRoJY+30Y= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 h1:Ovs26xHkKqVztRpIrF/92BcuyuQ/YW4NSIpoGtfXNho= +github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk= +github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY= +github.com/grpc-ecosystem/grpc-gateway v1.16.0 h1:gmcG1KaJ57LophUzW0Hy8NmPhnMZb4M0+kPpLofRdBo= +github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 h1:BZHcxBETFHIdVyhyEfOvn/RdU/QGdLI4y34qQGjGWO0= +github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4ZsPv9hVvWI6+ch50m39Pf2Ks= +github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c h1:6rhixN/i8ZofjG1Y75iExal34USq5p+wiN1tpie8IrU= +github.com/gsterjov/go-libsecret v0.0.0-20161001094733-a6f4afe4910c/go.mod h1:NMPJylDgVpX0MLRlPy15sqSwOFv/U1GZ2m21JhFfek0= +github.com/hamba/avro v1.5.6/go.mod h1:3vNT0RLXXpFm2Tb/5KC71ZRJlOroggq1Rcitb6k4Fr8= +github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q= +github.com/hashicorp/consul/sdk v0.1.1/go.mod h1:VKf9jXwCTEY1QZP2MOLRhb5i/I/ssyNV1vwHyQBF0x8= +github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= +github.com/hashicorp/go-cleanhttp v0.5.1/go.mod h1:JpRdi6/HCYpAwUzNwuwqhbovhLtngrth3wmdIIUrZ80= +github.com/hashicorp/go-immutable-radix v1.0.0/go.mod h1:0y9vanUI8NX6FsYoO3zeMjhV/C5i9g4Q3DwcSNZ4P60= +github.com/hashicorp/go-msgpack v0.5.3/go.mod h1:ahLV/dePpqEmjfWmKiqvPkv/twdG7iPBM1vqhUKIvfM= +github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk= +github.com/hashicorp/go-rootcerts v1.0.0/go.mod h1:K6zTfqpRlCUIjkwsN4Z+hiSfzSTQa6eBIzfwKfwNnHU= +github.com/hashicorp/go-sockaddr v1.0.0/go.mod h1:7Xibr9yA9JjQq1JpNB2Vw7kxv8xerXegt+ozgdvDeDU= +github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdvsLplgctolz4= +github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= +github.com/hashicorp/go-version v1.2.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= +github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= +github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= +github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4= +github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= +github.com/hashicorp/logutils v1.0.0/go.mod h1:QIAnNjmIWmVIIkWDTG1z5v++HQmx9WQRO+LraFDTW64= +github.com/hashicorp/mdns v1.0.0/go.mod h1:tL+uN++7HEJ6SQLQ2/p+z2pH24WQKWjBPkE0mNTz8vQ= +github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2pPBoIllUwCN7I= +github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= +github.com/heetch/avro v0.3.1/go.mod h1:4xn38Oz/+hiEUTpbVfGVLfvOg0yKLlRP7Q9+gJJILgA= +github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= +github.com/hydrogen18/memlistener v0.0.0-20200120041712-dcc25e7acd91/go.mod h1:qEIFzExnS6016fRpRfxrExeVn2gbClQA99gQhnIcdhE= +github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0/go.mod h1:N0Wam8K1arqPXNWjMo21EXnBPOPp36vB07FNRdD2geA= +github.com/ianlancetaylor/cgosymbolizer v0.0.0-20221217025313-27d3c9f66b6a h1:2pDHS5ciC7EKulVtDBD2J+9X9Eypl1K60q4EJyHvvxY= +github.com/ianlancetaylor/cgosymbolizer v0.0.0-20221217025313-27d3c9f66b6a/go.mod h1:DvXTE/K/RtHehxU8/GtDs4vFtfw64jJ3PaCnFri8CRg= +github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= +github.com/ianlancetaylor/demangle v0.0.0-20210905161508-09a460cdf81d/go.mod h1:aYm2/VgdVmcIU8iMfdMvDMsRAQjcfZSKFby6HOFvi/w= +github.com/imkira/go-interpol v1.1.0/go.mod h1:z0h2/2T3XF8kyEPpRgJ3kmNv+C43p+I/CoI+jC3w2iA= +github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= +github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= +github.com/invopop/jsonschema v0.4.0/go.mod h1:O9uiLokuu0+MGFlyiaqtWxwqJm41/+8Nj0lD7A36YH0= +github.com/iris-contrib/blackfriday v2.0.0+incompatible/go.mod h1:UzZ2bDEoaSGPbkg6SAB4att1aAwTmVIx/5gCVqeyUdI= +github.com/iris-contrib/go.uuid v2.0.0+incompatible/go.mod h1:iz2lgM/1UnEf1kP0L/+fafWORmlnuysV2EMP8MW+qe0= +github.com/iris-contrib/jade v1.1.3/go.mod h1:H/geBymxJhShH5kecoiOCSssPX7QWYH7UaeZTSWddIk= +github.com/iris-contrib/pongo2 v0.0.1/go.mod h1:Ssh+00+3GAZqSQb30AvBRNxBx7rf0GqwkjqxNd0u65g= +github.com/iris-contrib/schema v0.0.1/go.mod h1:urYA3uvUNG1TIIjOSCzHr9/LmbQo8LrOcOqfqxa4hXw= +github.com/jawher/mow.cli v1.0.4/go.mod h1:5hQj2V8g+qYmLUVWqu4Wuja1pI57M83EChYLVZ0sMKk= +github.com/jawher/mow.cli v1.2.0/go.mod h1:y+pcA3jBAdo/GIZx/0rFjw/K2bVEODP9rfZOfaiq8Ko= +github.com/jhump/gopoet v0.0.0-20190322174617-17282ff210b3/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI= +github.com/jhump/gopoet v0.1.0/go.mod h1:me9yfT6IJSlOL3FCfrg+L6yzUEZ+5jW6WHt4Sk+UPUI= +github.com/jhump/goprotoc v0.5.0/go.mod h1:VrbvcYrQOrTi3i0Vf+m+oqQWk9l72mjkJCYo7UvLHRQ= +github.com/jhump/protoreflect v1.11.0/go.mod h1:U7aMIjN0NWq9swDP7xDdoMfRHb35uiuTd3Z9nFXJf5E= +github.com/jhump/protoreflect v1.12.0/go.mod h1:JytZfP5d0r8pVNLZvai7U/MCuTWITgrI4tTg7puQFKI= +github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= +github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= +github.com/jonboulle/clockwork v0.2.2 h1:UOGuzwb1PwsrDAObMuhUnj0p5ULPj8V/xJ7Kx9qUBdQ= +github.com/jonboulle/clockwork v0.2.2/go.mod h1:Pkfl5aHPm1nk2H9h0bjmnJD/BcgbGXUBGnn1kMkgxc8= +github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= +github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= +github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ= +github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= +github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU= +github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk= +github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo= +github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU= +github.com/juju/qthttptest v0.1.1/go.mod h1:aTlAv8TYaflIiTDIQYzxnl1QdPjAg8Q8qJMErpKy6A4= +github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= +github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= +github.com/k0kubun/colorstring v0.0.0-20150214042306-9440f1994b88/go.mod h1:3w7q1U84EfirKl04SVQ/s7nPm1ZPhiXd34z40TNz36k= +github.com/kataras/golog v0.0.10/go.mod h1:yJ8YKCmyL+nWjERB90Qwn+bdyBZsaQwU3bTVFgkFIp8= +github.com/kataras/iris/v12 v12.1.8/go.mod h1:LMYy4VlP67TQ3Zgriz8RE2h2kMZV2SgMYbq3UhfoFmE= +github.com/kataras/neffos v0.0.14/go.mod h1:8lqADm8PnbeFfL7CLXh1WHw53dG27MC3pgi2R1rmoTE= +github.com/kataras/pio v0.0.2/go.mod h1:hAoW0t9UmXi4R5Oyq5Z4irTbaTsOemSrDGUtaTl7Dro= +github.com/kataras/sitemap v0.0.5/go.mod h1:KY2eugMKiPwsJgx7+U103YZehfvNGOXURubcGyk0Bz8= +github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= +github.com/kisielk/errcheck v1.2.0/go.mod h1:/BMXB+zMLi60iA8Vv6Ksmxu/1UDYcXs4uQLJ+jE2L00= +github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= +github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= +github.com/klauspost/compress v1.8.2/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/klauspost/compress v1.9.7/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= +github.com/klauspost/compress v1.14.4 h1:eijASRJcobkVtSt81Olfh7JX43osYLwy5krOJo6YEu4= +github.com/klauspost/compress v1.14.4/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= +github.com/klauspost/cpuid v1.2.1/go.mod h1:Pj4uuM528wm8OyEC2QMXAi2YiTZ96dNQPGgoMS4s3ek= +github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= +github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= +github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= +github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= +github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= +github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= +github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk= +github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= +github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= +github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= +github.com/kris-nova/logger v0.0.0-20181127235838-fd0d87064b06 h1:vN4d3jSss3ExzUn2cE0WctxztfOgiKvMKnDrydBsg00= +github.com/kris-nova/lolgopher v0.0.0-20180921204813-313b3abb0d9b h1:xYEM2oBUhBEhQjrV+KJ9lEWDWYZoNVZUaBF++Wyljq4= +github.com/labstack/echo/v4 v4.5.0/go.mod h1:czIriw4a0C1dFun+ObrXp7ok03xON0N1awStJ6ArI7Y= +github.com/labstack/gommon v0.3.0/go.mod h1:MULnywXg0yavhxWKc+lOruYdAhDwPK9wf0OL7NoOu+k= +github.com/lingdor/stackerror v0.0.0-20191119040541-976d8885ed76 h1:IVlcvV0CjvfBYYod5ePe89l+3LBAl//6n9kJ9Vr2i0k= +github.com/lingdor/stackerror v0.0.0-20191119040541-976d8885ed76/go.mod h1:Iu9BHUvTh8/KpbuSoKx/CaJEdJvFxSverxIy7I+nq7s= +github.com/linkedin/goavro v2.1.0+incompatible/go.mod h1:bBCwI2eGYpUI/4820s67MElg9tdeLbINjLjiM2xZFYM= +github.com/linkedin/goavro/v2 v2.9.8/go.mod h1:UgQUb2N/pmueQYH9bfqFioWxzYCZXSfF8Jw03O5sjqA= +github.com/linkedin/goavro/v2 v2.10.0/go.mod h1:UgQUb2N/pmueQYH9bfqFioWxzYCZXSfF8Jw03O5sjqA= +github.com/linkedin/goavro/v2 v2.10.1/go.mod h1:UgQUb2N/pmueQYH9bfqFioWxzYCZXSfF8Jw03O5sjqA= +github.com/linkedin/goavro/v2 v2.11.1 h1:4cuAtbDfqkKnBXp9E+tRkIJGa6W6iAjwonwt8O1f4U0= +github.com/linkedin/goavro/v2 v2.11.1/go.mod h1:UgQUb2N/pmueQYH9bfqFioWxzYCZXSfF8Jw03O5sjqA= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= +github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= +github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ= +github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= +github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= +github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= +github.com/mattn/go-colorable v0.1.2/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= +github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.11 h1:nQ+aFkoE2TMGc0b68U2OKSexC+eq46+XwZzWXHRmPYs= +github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= +github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4= +github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= +github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ= +github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= +github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= +github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= +github.com/mattn/goveralls v0.0.2/go.mod h1:8d1ZMHsd7fW6IRPKQh46F2WRpyib5/X4FOpevwGNQEw= +github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= +github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= +github.com/mediocregopher/radix/v3 v3.4.2/go.mod h1:8FL3F6UQRXHXIBSPUs5h0RybMF8i4n7wVopoX3x7Bv8= +github.com/microcosm-cc/bluemonday v1.0.2/go.mod h1:iVP4YcDBq+n/5fb23BhYFvIMq/leAFZyRl6bYmGDlGc= +github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= +github.com/milvus-io/milvus-proto/go-api v0.0.0-20230309062747-133bf302bb11 h1:ly7SWpwWH0ezos2xw3HPOQCqxTdTjlpUSvfpguPg91c= +github.com/milvus-io/milvus-proto/go-api v0.0.0-20230309062747-133bf302bb11/go.mod h1:148qnlmZ0Fdm1Fq+Mj/OW2uDoEP25g3mjh0vMGtkgmk= +github.com/milvus-io/pulsar-client-go v0.6.10 h1:eqpJjU+/QX0iIhEo3nhOqMNXL+TyInAs1IAHZCrCM/A= +github.com/milvus-io/pulsar-client-go v0.6.10/go.mod h1:lQqCkgwDF8YFYjKA+zOheTk1tev2B+bKj5j7+nm8M1w= +github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc= +github.com/mitchellh/go-homedir v1.0.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= +github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eIhFbs2+BFgRtFPeD/KE+zxI= +github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg= +github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY= +github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= +github.com/mitchellh/mapstructure v1.4.1 h1:CpVNEelQCZBooIPDn+AR3NpivK/TIKU8bDxdASFVQag= +github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= +github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg= +github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= +github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI= +github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= +github.com/moul/http2curl v1.0.0/go.mod h1:8UbvGypXm98wA/IqH45anm5Y2Z6ep6O31QGOAZ3H0fQ= +github.com/mtibben/percent v0.2.1 h1:5gssi8Nqo8QU/r2pynCm+hBQHpkB/uNK7BJCFogWdzs= +github.com/mtibben/percent v0.2.1/go.mod h1:KG9uO+SZkUp+VkRHsCdYQV3XSZrrSpR3O9ibNBTZrns= +github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= +github.com/nats-io/jwt v0.3.0/go.mod h1:fRYCDE99xlTsqUzISS1Bi75UBJ6ljOJQOAAu5VglpSg= +github.com/nats-io/nats.go v1.9.1/go.mod h1:ZjDU1L/7fJ09jvUSRVBR2e7+RnLiiIQyqyzEE/Zbp4w= +github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w= +github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= +github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= +github.com/nrwiersma/avro-benchmarks v0.0.0-20210913175520-21aec48c8f76/go.mod h1:iKyFMidsk/sVYONJRE372sJuX/QTRPacU7imPqqsu7g= +github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= +github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= +github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= +github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= +github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= +github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= +github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.10.3/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= +github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= +github.com/onsi/ginkgo v1.16.4/go.mod h1:dX+/inL/fNMqNlz0e9LfyB9TswhZpCVdJM/Z6Vvnwo0= +github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= +github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU= +github.com/onsi/ginkgo/v2 v2.1.3/go.mod h1:vw5CSIxN1JObi/U8gcbwft7ZxR2dgaR70JSE3/PpL4c= +github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY= +github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo= +github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= +github.com/onsi/gomega v1.19.0 h1:4ieX6qQjPP/BfC3mpsAtIGGlxTWPeA3Inl/7DtXw1tw= +github.com/onsi/gomega v1.19.0/go.mod h1:LY+I3pBVzYsTBU1AnDwOSxaYi9WoWiqgwooUqq9yPro= +github.com/opencontainers/runtime-spec v1.0.2 h1:UfAcuLBJB9Coz72x1hgl8O5RVzTdNiaglX6v2DM6FI0= +github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= +github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= +github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc= +github.com/panjf2000/ants/v2 v2.4.8 h1:JgTbolX6K6RreZ4+bfctI0Ifs+3mrE5BIHudQxUDQ9k= +github.com/panjf2000/ants/v2 v2.4.8/go.mod h1:f6F0NZVFsGCp5A7QW/Zj/m92atWwOkY0OIhFxRNFr4A= +github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= +github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= +github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ= +github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= +github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pierrec/lz4 v2.5.2+incompatible h1:WCjObylUIOlKy/+7Abdn34TLIkXiA4UWUMhxq9m9ZXI= +github.com/pierrec/lz4 v2.5.2+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= +github.com/pingcap/errors v0.11.4 h1:lFuQV/oaUMGcD2tqt+01ROSmJs75VG1ToEOkZIZ4nE4= +github.com/pingcap/errors v0.11.4/go.mod h1:Oi8TUi2kEtXXLMJk9l1cGmz20kV3TaQ0usTwv5KuLY8= +github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= +github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI= +github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= +github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE= +github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= +github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= +github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= +github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= +github.com/prometheus/client_golang v1.11.1 h1:+4eQaD7vAZ6DsfsxB15hbE0odUjGI5ARs9yskGu1v4s= +github.com/prometheus/client_golang v1.11.1/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= +github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= +github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= +github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= +github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= +github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= +github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= +github.com/prometheus/common v0.26.0 h1:iMAkS2TDoNWnKM+Kopnx/8tnEStIfpYA0ur0xQzzhMQ= +github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= +github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= +github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= +github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= +github.com/prometheus/procfs v0.6.0 h1:mxy4L2jP6qMonqmq+aTtOx1ifVWUgG/TAmntgbh3xv4= +github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= +github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= +github.com/rogpeppe/clock v0.0.0-20190514195947-2896927a307a/go.mod h1:4r5QyqhjIWCcK8DO4KMclc5Iknq5qVBAlbYYzAbUScQ= +github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= +github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= +github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= +github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= +github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= +github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= +github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= +github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= +github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= +github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= +github.com/samber/lo v1.27.0 h1:GOyDWxsblvqYobqsmUuMddPa2/mMzkKyojlXol4+LaQ= +github.com/samber/lo v1.27.0/go.mod h1:it33p9UtPMS7z72fP4gw/EIfQB2eI8ke7GR2wc6+Rhg= +github.com/santhosh-tekuri/jsonschema/v5 v5.0.0/go.mod h1:FKdcjfQW6rpZSnxxUvEA5H/cDPdvJ/SZJQLWWXWGrZ0= +github.com/schollz/closestmatch v2.1.0+incompatible/go.mod h1:RtP1ddjLong6gTkbtmuhtR2uUrrJOpYzYRvbcPAid+g= +github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= +github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= +github.com/shirou/gopsutil/v3 v3.22.9 h1:yibtJhIVEMcdw+tCTbOPiF1VcsuDeTE4utJ8Dm4c5eA= +github.com/shirou/gopsutil/v3 v3.22.9/go.mod h1:bBYl1kjgEJpWpxeHmLI+dVHWtyAwfcmSBLDsp2TNT8A= +github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc= +github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= +github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= +github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= +github.com/sirupsen/logrus v1.7.0/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= +github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= +github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= +github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s= +github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= +github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= +github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= +github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= +github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= +github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= +github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= +github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= +github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= +github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= +github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= +github.com/spf13/cobra v1.1.3/go.mod h1:pGADOWyqRD/YMrPZigI/zbliZ2wVD/23d+is3pSWzOo= +github.com/spf13/cobra v1.2.1 h1:+KmjbUw1hriSNMF55oPrkZcb27aECyrj8V2ytv7kWDw= +github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= +github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= +github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk= +github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo= +github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= +github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= +github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/viper v1.3.2/go.mod h1:ZiWeW+zYFKm7srdB9IoDzzZXaJaI5eL9QjNiN/DMA2s= +github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= +github.com/spf13/viper v1.8.1 h1:Kq1fyeebqsBfbjZj4EL7gj2IO0mMaiyjYUWcUsl2O44= +github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.2.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.3.1-0.20190311161405-34c6fa2dc709/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= +github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= +github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= +github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= +github.com/thoas/go-funk v0.9.1 h1:O549iLZqPpTUQ10ykd26sZhzD+rmR5pWhuElrhbC20M= +github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= +github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= +github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= +github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= +github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802 h1:uruHq4dN7GR16kFc5fp3d1RIYzJW5onx8Ybykw2YQFA= +github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= +github.com/uber/jaeger-client-go v2.30.0+incompatible h1:D6wyKGCecFaSRUpo8lCVbaOOb6ThwMmTEbhRwtKR97o= +github.com/uber/jaeger-client-go v2.30.0+incompatible/go.mod h1:WVhlPFC8FDjOFMMWRy2pZqQJSXxYSwNYOkTr/Z6d3Kk= +github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= +github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= +github.com/ugorji/go/codec v0.0.0-20181204163529-d75b2dcb6bc8/go.mod h1:VFNgLljTbGfSG7qAOspJ7OScBnGdDN/yBr0sguwnwf0= +github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= +github.com/urfave/negroni v1.0.0/go.mod h1:Meg73S6kFm/4PpbYdq35yYWoCZ9mS/YSx+lKnmiohz4= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasthttp v1.6.0/go.mod h1:FstJa9V+Pj9vQ7OJie2qMHdwemEDaDiSdBnvPM1Su9w= +github.com/valyala/fasttemplate v1.0.1/go.mod h1:UQGH1tvbgY+Nz5t2n7tXsz52dQxojPUpymEIMZ47gx8= +github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= +github.com/valyala/tcplisten v0.0.0-20161114210144-ceec8f93295a/go.mod h1:v3UYOV9WzVtRmSR+PDvWpU/qWl4Wa5LApYYX4ZtKbio= +github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= +github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= +github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2 h1:eY9dn8+vbi4tKz5Qo6v2eYzo7kUS51QINcR5jNpbZS8= +github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= +github.com/xiaofan-luan/pulsarctl v0.5.1 h1:2V+IWFarElzcln5WBbU3VNu3zC8Q7RS6rMpVs9oUfLg= +github.com/xiaofan-luan/pulsarctl v0.5.1/go.mod h1:kfeG1rRglz+QDSxyBB21H2Q4hMnzfirW32bs8yx/Q0Q= +github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q= +github.com/yalp/jsonpath v0.0.0-20180802001716-5cc68e5049a0/go.mod h1:/LWChgwKmvncFJFHJ7Gvn9wZArjbV5/FppcK2fKk/tI= +github.com/yudai/gojsondiff v1.0.0/go.mod h1:AY32+k2cwILAkW1fbgxQ5mUmMiZFgLIV+FBNExI05xg= +github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82/go.mod h1:lgjkn3NuSvDfVJdfcVVdX+jpBxNmX4rDAzaS45IcYoM= +github.com/yudai/pp v2.0.1+incompatible/go.mod h1:PuxR/8QJ7cyCkFp/aUDS+JY727OFEZkTdatxwunjIkc= +github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= +github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= +github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= +go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= +go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= +go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= +go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= +go.etcd.io/etcd/api/v3 v3.5.5 h1:BX4JIbQ7hl7+jL+g+2j5UAr0o1bctCm6/Ct+ArBGkf0= +go.etcd.io/etcd/api/v3 v3.5.5/go.mod h1:KFtNaxGDw4Yx/BA4iPPwevUTAuqcsPxzyX8PHydchN8= +go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= +go.etcd.io/etcd/client/pkg/v3 v3.5.5 h1:9S0JUVvmrVl7wCF39iTQthdaaNIiAaQbmK75ogO6GU8= +go.etcd.io/etcd/client/pkg/v3 v3.5.5/go.mod h1:ggrwbk069qxpKPq8/FKkQ3Xq9y39kbFR4LnKszpRXeQ= +go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= +go.etcd.io/etcd/client/v2 v2.305.5 h1:DktRP60//JJpnPC0VBymAN/7V71GHMdjDCBt4ZPXDjI= +go.etcd.io/etcd/client/v2 v2.305.5/go.mod h1:zQjKllfqfBVyVStbt4FaosoX2iYd8fV/GRy/PbowgP4= +go.etcd.io/etcd/client/v3 v3.5.5 h1:q++2WTJbUgpQu4B6hCuT7VkdwaTP7Qz6Daak3WzbrlI= +go.etcd.io/etcd/client/v3 v3.5.5/go.mod h1:aApjR4WGlSumpnJ2kloS75h6aHUmAyaPLjHMxpc7E7c= +go.etcd.io/etcd/pkg/v3 v3.5.5 h1:Ablg7T7OkR+AeeeU32kdVhw/AGDsitkKPl7aW73ssjU= +go.etcd.io/etcd/pkg/v3 v3.5.5/go.mod h1:6ksYFxttiUGzC2uxyqiyOEvhAiD0tuIqSZkX3TyPdaE= +go.etcd.io/etcd/raft/v3 v3.5.5 h1:Ibz6XyZ60OYyRopu73lLM/P+qco3YtlZMOhnXNS051I= +go.etcd.io/etcd/raft/v3 v3.5.5/go.mod h1:76TA48q03g1y1VpTue92jZLr9lIHKUNcYdZOOGyx8rI= +go.etcd.io/etcd/server/v3 v3.5.5 h1:jNjYm/9s+f9A9r6+SC4RvNaz6AqixpOvhrFdT0PvIj0= +go.etcd.io/etcd/server/v3 v3.5.5/go.mod h1:rZ95vDw/jrvsbj9XpTqPrTAB9/kzchVdhRirySPkUBc= +go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= +go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8= +go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw= +go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk= +go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.25.0/go.mod h1:E5NNboN0UqSAki0Atn9kVwaN7I+l25gGxDqBueo/74E= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.38.0 h1:g/BAN5o90Pr6D8xMRezjzGOHBpc15U+4oE53nZLiae4= +go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.38.0/go.mod h1:+F41JBSkye7aYJELRvIMF0Z66reIwIOL0St75ZVwSJs= +go.opentelemetry.io/otel v1.0.1/go.mod h1:OPEOD4jIT2SlZPMmwT6FqZz2C0ZNdQqiWcoK6M0SNFU= +go.opentelemetry.io/otel v1.13.0 h1:1ZAKnNQKwBBxFtww/GwxNUyTf0AxkZzrukO8MeXqe4Y= +go.opentelemetry.io/otel v1.13.0/go.mod h1:FH3RtdZCzRkJYFTCsAKDy9l/XYjMdNv6QrkFFB8DvVg= +go.opentelemetry.io/otel/exporters/jaeger v1.13.0 h1:VAMoGujbVV8Q0JNM/cEbhzUIWWBxnEqH45HP9iBKN04= +go.opentelemetry.io/otel/exporters/jaeger v1.13.0/go.mod h1:fHwbmle6mBFJA1p2ZIhilvffCdq/dM5UTIiCOmEjS+w= +go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.13.0 h1:pa05sNT/P8OsIQ8mPZKTIyiBuzS/xDGLVx+DCt0y6Vs= +go.opentelemetry.io/otel/exporters/otlp/internal/retry v1.13.0/go.mod h1:rqbht/LlhVBgn5+k3M5QK96K5Xb0DvXpMJ5SFQpY6uw= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.0.1/go.mod h1:Kv8liBeVNFkkkbilbgWRpV+wWuu+H5xdOT6HAgd30iw= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.13.0 h1:Any/nVxaoMq1T2w0W85d6w5COlLuCCgOYKQhJJWEMwQ= +go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.13.0/go.mod h1:46vAP6RWfNn7EKov73l5KBFlNxz8kYlxR1woU+bJ4ZY= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.0.1/go.mod h1:xOvWoTOrQjxjW61xtOmD/WKGRYb/P4NzRo3bs65U6Rk= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.13.0 h1:Wz7UQn7/eIqZVDJbuNEM6PmqeA71cWXrWcXekP5HZgU= +go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.13.0/go.mod h1:OhH1xvgA5jZW2M/S4PcvtDlFE1VULRRBsibBrKuJQGI= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.13.0 h1:rs3xmoGZsuHJxUUzX2dwYNDc7S0L68oEo2L/MvG5cyc= +go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.13.0/go.mod h1:gr0y6t58jZxp9WtIAGKXxXenDWC91hmZivlGoOag3+4= +go.opentelemetry.io/otel/metric v0.35.0 h1:aPT5jk/w7F9zW51L7WgRqNKDElBdyRLGuBtI5MX34e8= +go.opentelemetry.io/otel/metric v0.35.0/go.mod h1:qAcbhaTRFU6uG8QM7dDo7XvFsWcugziq/5YI065TokQ= +go.opentelemetry.io/otel/sdk v1.0.1/go.mod h1:HrdXne+BiwsOHYYkBE5ysIcv2bvdZstxzmCQhxTcZkI= +go.opentelemetry.io/otel/sdk v1.13.0 h1:BHib5g8MvdqS65yo2vV1s6Le42Hm6rrw08qU6yz5JaM= +go.opentelemetry.io/otel/sdk v1.13.0/go.mod h1:YLKPx5+6Vx/o1TCUYYs+bpymtkmazOMT6zoRrC7AQ7I= +go.opentelemetry.io/otel/trace v1.0.1/go.mod h1:5g4i4fKLaX2BQpSBsxw8YYcgKpMMSW3x7ZTuYBr3sUk= +go.opentelemetry.io/otel/trace v1.13.0 h1:CBgRZ6ntv+Amuj1jDsMhZtlAPT6gbyIRdaIzFhfBSdY= +go.opentelemetry.io/otel/trace v1.13.0/go.mod h1:muCvmmO9KKpvuXSf3KKAXXB2ygNYHQ+ZfI5X08d3tds= +go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI= +go.opentelemetry.io/proto/otlp v0.9.0/go.mod h1:1vKfU9rv61e9EVGthD1zNvUbiwPcimSsOPU9brfSHJg= +go.opentelemetry.io/proto/otlp v0.19.0 h1:IVN6GR+mhC4s5yfcTbmzHYODqvWAp3ZedA2SJPI1Nnw= +go.opentelemetry.io/proto/otlp v0.19.0/go.mod h1:H7XAot3MsfNsj7EXtrA2q5xSNQ10UqI405h3+duxN4U= +go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE= +go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc= +go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ= +go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0= +go.uber.org/automaxprocs v1.4.0 h1:CpDZl6aOlLhReez+8S3eEotD7Jx0Os++lemPlMULQP0= +go.uber.org/automaxprocs v1.4.0/go.mod h1:/mTEdr7LvHhs0v7mjdxDreTz1OG5zdZGqgOnhWiR/+Q= +go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk= +go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0= +go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4= +go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU= +go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= +go.uber.org/zap v1.17.0 h1:MTjgFu6ZLKvY6Pvaqk97GlxNBuMpV4Hy/3P6tRGlI2U= +go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= +golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20181203042331-505ab145d0a9/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= +golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190701094942-4def268fd1a4/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20191227163750-53104e6ec876/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= +golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2/go.mod h1:T9bdIzuCu7OtxOm1hfPfRQxPLYneinmdGuTeoZ9dtd4= +golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 h1:kUhD7nTDoI3fVd9G4ORWrbV5NY0liEs/Jg2pv5f+bBA= +golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= +golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= +golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8= +golang.org/x/exp v0.0.0-20190829153037-c13cbed26979/go.mod h1:86+5VVa7VpoJ4kLfm080zCjGlMRFzhUhsZKEZO7MGek= +golang.org/x/exp v0.0.0-20191030013958-a1ab85dbe136/go.mod h1:JXzH8nQsPlswgeRAPE3MuO9GYsAcnJvJ4vnMwN/5qkY= +golang.org/x/exp v0.0.0-20191129062945-2f5052295587/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= +golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= +golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= +golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17 h1:3MTrJm4PyNL9NBqvYDSj3DHl46qQakyfqfWo4jgfaEM= +golang.org/x/exp v0.0.0-20220303212507-bbda1eaf7a17/go.mod h1:lgLbSvA5ygNOMpwM/9anMpWVlVJ7Z+cHWq/eFuinpGE= +golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= +golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= +golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= +golang.org/x/lint v0.0.0-20190301231843-5614ed5bae6f/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= +golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190409202823-959b441ac422/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190909230951-414d861bb4ac/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= +golang.org/x/lint v0.0.0-20191125180803-fdd1cda4f05f/go.mod h1:5qLYkcX4OjUUV8bRuDixDT3tpyyb+LUpUlRWLxfhWrs= +golang.org/x/lint v0.0.0-20200130185559-910be7a94367/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20200302205851-738671d3881b/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20201208152925-83fdc39ff7b5/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY= +golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE= +golang.org/x/mobile v0.0.0-20190719004257-d2bd2a29d028/go.mod h1:E/iHnbuqvinMTCcRqshq8CkpyQDoeVncDDYHnLhea+o= +golang.org/x/mod v0.0.0-20190513183733-4bf6d317e70e/go.mod h1:mXi4GBBbnImb6dmsKGUJ2LatrhH/nqhxcFungHvyanc= +golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY= +golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg= +golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190327091125-710a502c58a2/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks= +golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190724013045-ca1201d0de80/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20190827160401-ba9fcec4b297/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20191209160850-c0dbc17a3553/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200505041828-1ed23360d12c/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= +golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20200822124328-c89045814202/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA= +golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= +golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210119194325-5f4716e94777/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLdyRGr576XBO4/greRjx4P4O3yc= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= +golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= +golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211008194852-3b03d305991f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= +golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= +golang.org/x/net v0.6.0 h1:L4ZwwTvKW9gr0ZMS1yrHD9GZhIuVjOBBnaKH+SPQK0Q= +golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= +golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= +golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= +golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20201208152858-08078c50e5b5/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= +golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 h1:nt+Q6cXKz4MosCSpnbMtqiQ8Oz0pxTef2B4Vca2lvfk= +golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783/go.mod h1:h4gKUeWbJ4rQPri7E0u6Gs4e9Ri2zaLxzw5DI5XGrYg= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw= +golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20181205085412-a5c9d58dba9a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191001151750-bb3f8db39f24/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200202164722-d101bd2416d5/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210305230114-8fe3ee5dd75b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210315160823-c6e025ad8005/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210403161142-5e06dd20ab57/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210819135213-f52c844e1c1c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220204135822-1c1b9b1eba6a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= +golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= +golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY= +golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k= +golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= +golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= +golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= +golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo= +golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8= +golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba h1:O8mE0/t419eoIwhTFpKVkHiTs/Igowgfkj25AcZrtiE= +golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181030221726-6c7e314b6563/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20181221001348-537d06c36207/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= +golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= +golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190327201419-c70d86f8b7cf/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= +golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190506145303-2d16b83fe98c/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= +golang.org/x/tools v0.0.0-20190606124116-d0a3d012864b/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= +golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191125144606-a911d9008d1f/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191130070609-6e064ea0cf2d/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= +golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200207183749-b753a1ba74fa/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200212150539-ea181f53ac56/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= +golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= +golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= +golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200505023115-26f46d2f7ef8/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= +golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= +golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= +golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= +golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= +golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= +google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= +google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= +google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg= +google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI= +google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE= +google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE= +google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM= +google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc= +google.golang.org/api v0.35.0/go.mod h1:/XrVsuzM0rZmrsbjJutiuftIzeuTQcEeaYcSk/mQ1dg= +google.golang.org/api v0.36.0/go.mod h1:+z5ficQTmoYpPn8LCUNVpK5I7hwkpjbcgqA7I34qYtE= +google.golang.org/api v0.40.0/go.mod h1:fYKFpnQN0DsDSKRVRcQSDQNtqWPfM9i+zNPxepjRCQ8= +google.golang.org/api v0.41.0/go.mod h1:RkxM5lITDfTzmyKFPt+wGrCJbVfniCr2ool8kTBzRTU= +google.golang.org/api v0.43.0/go.mod h1:nQsDGjRXMo4lvh5hP0TKqF244gqhGcr/YSIykhUk/94= +google.golang.org/api v0.44.0/go.mod h1:EBOGZqzyhtvMDoxwS97ctnh0zUmYY6CxqXsc1AvkYD8= +google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= +google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4= +google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0= +google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c= +google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc= +google.golang.org/genproto v0.0.0-20180518175338-11a468237815/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= +google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE= +google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= +google.golang.org/genproto v0.0.0-20190911173649-1774047e7e51/go.mod h1:IbNlFCBrqXvoKpeg0TB2l7cyZUmoaFKYIwrEpbDKLA8= +google.golang.org/genproto v0.0.0-20191108220845-16a3f7862a1a/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191115194625-c23dd37a84c9/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191216164720-4f79533eabd1/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20191230161307-f3c370f40bfb/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200115191322-ca5a22157cba/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200122232147-0452cf42e150/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200204135345-fa8e72b47b90/go.mod h1:GmwEX6Z4W5gMy59cAlVYjN9JhxgbQH6Gn+gFDQe2lzA= +google.golang.org/genproto v0.0.0-20200212174721-66ed5ce911ce/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200423170343-7949de9c1215/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= +google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U= +google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo= +google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA= +google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200804131852-c06518451d9c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200825200019-8632dd797987/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20200904004341-0bd0a958aa1d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201109203340-2640f1f9cdfb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201201144952-b05cb90ed32e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210222152913-aa3ee6e6a81c/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210303154014-9728d6b83eeb/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210310155132-4ce2db91004e/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210319143718-93e7006c17a6/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= +google.golang.org/genproto v0.0.0-20210402141018-6c239bbf2bb1/go.mod h1:9lPAdzaEmUacj36I+k7YKbEc5CXzPIeORRgDAUOu28A= +google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c/go.mod h1:UODoCrxHCcBojKKwX1terBiRUaqAsFqJiF615XL43r0= +google.golang.org/genproto v0.0.0-20210624195500-8bfb893ecb84/go.mod h1:SzzZ/N+nwJDaO1kznhnlzqS8ocJICar6hYhVyhi++24= +google.golang.org/genproto v0.0.0-20211118181313-81c1377c94b1/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc= +google.golang.org/genproto v0.0.0-20220503193339-ba3ae3f07e29/go.mod h1:RAyBrSAP7Fh3Nc84ghnVLDPuV51xc9agzmm4Ph6i0Q4= +google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6 h1:a2S6M0+660BgMNl++4JPlcAO/CjkqYItDEZwkoDQK7c= +google.golang.org/genproto v0.0.0-20221118155620-16455021b5e6/go.mod h1:rZS5c/ZVYMaOGBfO68GWtjOw/eLaZM1X6iVtgjZ+EWg= +google.golang.org/grpc v1.12.0/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= +google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= +google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= +google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= +google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= +google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk= +google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak= +google.golang.org/grpc v1.33.1/go.mod h1:fr5YgcSWrqhRRxogOsw7RzIpsmvOZ6IcH4kBYTpR3n0= +google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= +google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= +google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.36.1/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= +google.golang.org/grpc v1.37.1/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.38.0/go.mod h1:NREThFqKR1f3iQ6oBuvc5LadQuXVGo9rkm5ZGrQdJfM= +google.golang.org/grpc v1.40.0/go.mod h1:ogyxbiOoUXAkP+4+xa6PZSE9DZgIHtSpzjDTB9KAK34= +google.golang.org/grpc v1.41.0/go.mod h1:U3l9uK9J0sini8mHphKoXyaqDA/8VyGnDee1zzIUK6k= +google.golang.org/grpc v1.42.0/go.mod h1:k+4IHHFw41K8+bbowsex27ge2rCb65oeWqe4jJ590SU= +google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= +google.golang.org/grpc v1.52.3 h1:pf7sOysg4LdgBqduXveGKrcEwbStiK2rtfghdzlUYDQ= +google.golang.org/grpc v1.52.3/go.mod h1:pu6fVzoFb+NBYNAvQL08ic+lvB2IojljRYuun5vorUY= +google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= +google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= +google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= +google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= +google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= +google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= +google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= +google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= +google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= +google.golang.org/protobuf v1.28.0/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +google.golang.org/protobuf v1.28.1 h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w= +google.golang.org/protobuf v1.28.1/go.mod h1:HV8QOd/L58Z+nl8r43ehVNZIU/HEI6OcFqwMG9pJV4I= +gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= +gopkg.in/avro.v0 v0.0.0-20171217001914-a730b5802183/go.mod h1:FvqrFXt+jCsyQibeRv4xxEJBL5iG2DDW5aeJwzDiq4A= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b h1:QRR6H1YWRnHb4Y/HeNFCTJLFVxaq6wH4YuVdsUOr75U= +gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/errgo.v1 v1.0.0/go.mod h1:CxwszS/Xz1C49Ucd2i6Zil5UToP1EmyrFhKaMVbg1mk= +gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= +gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= +gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8bDuhia5mkpMnE= +gopkg.in/go-playground/validator.v8 v8.18.2/go.mod h1:RX2a/7Ha8BgOhfk7j780h4/u/RRjR0eouCJSH80/M2Y= +gopkg.in/httprequest.v1 v1.2.1/go.mod h1:x2Otw96yda5+8+6ZeWwHIJTFkEHWP/qP8pJOzqEtWPM= +gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.51.1/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU= +gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= +gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= +gopkg.in/mgo.v2 v2.0.0-20190816093944-a6b53ec6cb22/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA= +gopkg.in/natefinch/lumberjack.v2 v2.0.0 h1:1Lc07Kr7qY4U2YPouBjpCLxpiyxIVoxqXgkXLknAOE8= +gopkg.in/natefinch/lumberjack.v2 v2.0.0/go.mod h1:l0ndWWf7gzL7RNwBG7wST/UCcT4T24xpD6X8LsfU/+k= +gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= +gopkg.in/retry.v1 v1.0.3/go.mod h1:FJkXmWiMaAo7xB+xhvDF59zhfjDWyzmyAxiT4dB688g= +gopkg.in/square/go-jose.v2 v2.4.1/go.mod h1:M9dMgbHiYLoDGQrXy7OpJDJWiKiU//h+vD76mk0e1AI= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= +gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= +gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= +gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.5/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.7/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= +gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= +gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ= +gopkg.in/yaml.v3 v3.0.0-20191120175047-4206685974f2/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= +honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= +honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= +rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= +rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= +rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= +sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= +sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= diff --git a/internal/log/OWNERS b/pkg/log/OWNERS similarity index 100% rename from internal/log/OWNERS rename to pkg/log/OWNERS diff --git a/internal/log/config.go b/pkg/log/config.go similarity index 100% rename from internal/log/config.go rename to pkg/log/config.go diff --git a/internal/log/global.go b/pkg/log/global.go similarity index 100% rename from internal/log/global.go rename to pkg/log/global.go diff --git a/internal/log/log.go b/pkg/log/log.go similarity index 99% rename from internal/log/log.go rename to pkg/log/log.go index f6c65e204e..1a0c086949 100644 --- a/internal/log/log.go +++ b/pkg/log/log.go @@ -38,12 +38,11 @@ import ( "sync/atomic" "github.com/cockroachdb/errors" - "github.com/uber/jaeger-client-go/utils" "go.uber.org/zap" "go.uber.org/zap/zapcore" "go.uber.org/zap/zaptest" - lumberjack "gopkg.in/natefinch/lumberjack.v2" + "gopkg.in/natefinch/lumberjack.v2" ) var _globalL, _globalP, _globalS, _globalR atomic.Value diff --git a/internal/log/log_test.go b/pkg/log/log_test.go similarity index 100% rename from internal/log/log_test.go rename to pkg/log/log_test.go diff --git a/internal/log/mlogger.go b/pkg/log/mlogger.go similarity index 100% rename from internal/log/mlogger.go rename to pkg/log/mlogger.go diff --git a/internal/log/mlogger_test.go b/pkg/log/mlogger_test.go similarity index 100% rename from internal/log/mlogger_test.go rename to pkg/log/mlogger_test.go diff --git a/internal/log/zap_log_test.go b/pkg/log/zap_log_test.go similarity index 100% rename from internal/log/zap_log_test.go rename to pkg/log/zap_log_test.go diff --git a/internal/log/zap_test_logger.go b/pkg/log/zap_test_logger.go similarity index 100% rename from internal/log/zap_test_logger.go rename to pkg/log/zap_test_logger.go diff --git a/internal/log/zap_text_core.go b/pkg/log/zap_text_core.go similarity index 100% rename from internal/log/zap_text_core.go rename to pkg/log/zap_text_core.go diff --git a/internal/log/zap_text_encoder.go b/pkg/log/zap_text_encoder.go similarity index 88% rename from internal/log/zap_text_encoder.go rename to pkg/log/zap_text_encoder.go index 7fc87d6e72..6bd0bacfa7 100644 --- a/internal/log/zap_text_encoder.go +++ b/pkg/log/zap_text_encoder.go @@ -343,28 +343,50 @@ func (enc *textEncoder) AppendUint64(val uint64) { } func (enc *textEncoder) AddComplex64(k string, v complex64) { enc.AddComplex128(k, complex128(v)) } -func (enc *textEncoder) AddFloat32(k string, v float32) { enc.AddFloat64(k, float64(v)) } -func (enc *textEncoder) AddInt(k string, v int) { enc.AddInt64(k, int64(v)) } -func (enc *textEncoder) AddInt32(k string, v int32) { enc.AddInt64(k, int64(v)) } -func (enc *textEncoder) AddInt16(k string, v int16) { enc.AddInt64(k, int64(v)) } -func (enc *textEncoder) AddInt8(k string, v int8) { enc.AddInt64(k, int64(v)) } -func (enc *textEncoder) AddUint(k string, v uint) { enc.AddUint64(k, uint64(v)) } -func (enc *textEncoder) AddUint32(k string, v uint32) { enc.AddUint64(k, uint64(v)) } -func (enc *textEncoder) AddUint16(k string, v uint16) { enc.AddUint64(k, uint64(v)) } -func (enc *textEncoder) AddUint8(k string, v uint8) { enc.AddUint64(k, uint64(v)) } -func (enc *textEncoder) AddUintptr(k string, v uintptr) { enc.AddUint64(k, uint64(v)) } -func (enc *textEncoder) AppendComplex64(v complex64) { enc.AppendComplex128(complex128(v)) } -func (enc *textEncoder) AppendFloat64(v float64) { enc.appendFloat(v, 64) } -func (enc *textEncoder) AppendFloat32(v float32) { enc.appendFloat(float64(v), 32) } -func (enc *textEncoder) AppendInt(v int) { enc.AppendInt64(int64(v)) } -func (enc *textEncoder) AppendInt32(v int32) { enc.AppendInt64(int64(v)) } -func (enc *textEncoder) AppendInt16(v int16) { enc.AppendInt64(int64(v)) } -func (enc *textEncoder) AppendInt8(v int8) { enc.AppendInt64(int64(v)) } -func (enc *textEncoder) AppendUint(v uint) { enc.AppendUint64(uint64(v)) } -func (enc *textEncoder) AppendUint32(v uint32) { enc.AppendUint64(uint64(v)) } -func (enc *textEncoder) AppendUint16(v uint16) { enc.AppendUint64(uint64(v)) } -func (enc *textEncoder) AppendUint8(v uint8) { enc.AppendUint64(uint64(v)) } -func (enc *textEncoder) AppendUintptr(v uintptr) { enc.AppendUint64(uint64(v)) } + +func (enc *textEncoder) AddFloat32(k string, v float32) { enc.AddFloat64(k, float64(v)) } + +func (enc *textEncoder) AddInt(k string, v int) { enc.AddInt64(k, int64(v)) } + +func (enc *textEncoder) AddInt32(k string, v int32) { enc.AddInt64(k, int64(v)) } + +func (enc *textEncoder) AddInt16(k string, v int16) { enc.AddInt64(k, int64(v)) } + +func (enc *textEncoder) AddInt8(k string, v int8) { enc.AddInt64(k, int64(v)) } + +func (enc *textEncoder) AddUint(k string, v uint) { enc.AddUint64(k, uint64(v)) } + +func (enc *textEncoder) AddUint32(k string, v uint32) { enc.AddUint64(k, uint64(v)) } + +func (enc *textEncoder) AddUint16(k string, v uint16) { enc.AddUint64(k, uint64(v)) } + +func (enc *textEncoder) AddUint8(k string, v uint8) { enc.AddUint64(k, uint64(v)) } + +func (enc *textEncoder) AddUintptr(k string, v uintptr) { enc.AddUint64(k, uint64(v)) } + +func (enc *textEncoder) AppendComplex64(v complex64) { enc.AppendComplex128(complex128(v)) } + +func (enc *textEncoder) AppendFloat64(v float64) { enc.appendFloat(v, 64) } + +func (enc *textEncoder) AppendFloat32(v float32) { enc.appendFloat(float64(v), 32) } + +func (enc *textEncoder) AppendInt(v int) { enc.AppendInt64(int64(v)) } + +func (enc *textEncoder) AppendInt32(v int32) { enc.AppendInt64(int64(v)) } + +func (enc *textEncoder) AppendInt16(v int16) { enc.AppendInt64(int64(v)) } + +func (enc *textEncoder) AppendInt8(v int8) { enc.AppendInt64(int64(v)) } + +func (enc *textEncoder) AppendUint(v uint) { enc.AppendUint64(uint64(v)) } + +func (enc *textEncoder) AppendUint32(v uint32) { enc.AppendUint64(uint64(v)) } + +func (enc *textEncoder) AppendUint16(v uint16) { enc.AppendUint64(uint64(v)) } + +func (enc *textEncoder) AppendUint8(v uint8) { enc.AppendUint64(uint64(v)) } + +func (enc *textEncoder) AppendUintptr(v uintptr) { enc.AppendUint64(uint64(v)) } func (enc *textEncoder) Clone() zapcore.Encoder { clone := enc.cloned() diff --git a/internal/metrics/datacoord_metrics.go b/pkg/metrics/datacoord_metrics.go similarity index 99% rename from internal/metrics/datacoord_metrics.go rename to pkg/metrics/datacoord_metrics.go index 1799a1d5ae..e03be006d5 100644 --- a/internal/metrics/datacoord_metrics.go +++ b/pkg/metrics/datacoord_metrics.go @@ -21,7 +21,7 @@ import ( "github.com/prometheus/client_golang/prometheus" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/metrics/datanode_metrics.go b/pkg/metrics/datanode_metrics.go similarity index 99% rename from internal/metrics/datanode_metrics.go rename to pkg/metrics/datanode_metrics.go index 82b531f2b3..0f0b4ad013 100644 --- a/internal/metrics/datanode_metrics.go +++ b/pkg/metrics/datanode_metrics.go @@ -19,8 +19,9 @@ package metrics import ( "fmt" - "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/prometheus/client_golang/prometheus" + + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var ( diff --git a/internal/metrics/etcd_metrics.go b/pkg/metrics/etcd_metrics.go similarity index 100% rename from internal/metrics/etcd_metrics.go rename to pkg/metrics/etcd_metrics.go diff --git a/internal/metrics/indexnode_metrics.go b/pkg/metrics/indexnode_metrics.go similarity index 98% rename from internal/metrics/indexnode_metrics.go rename to pkg/metrics/indexnode_metrics.go index 985d969960..ab656c3b53 100644 --- a/internal/metrics/indexnode_metrics.go +++ b/pkg/metrics/indexnode_metrics.go @@ -17,8 +17,9 @@ package metrics import ( - "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/prometheus/client_golang/prometheus" + + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var ( diff --git a/internal/metrics/metrics.go b/pkg/metrics/metrics.go similarity index 85% rename from internal/metrics/metrics.go rename to pkg/metrics/metrics.go index 27facb4b38..7de77018e5 100644 --- a/internal/metrics/metrics.go +++ b/pkg/metrics/metrics.go @@ -17,13 +17,9 @@ package metrics import ( - // nolint:gosec _ "net/http/pprof" "github.com/prometheus/client_golang/prometheus" - "github.com/prometheus/client_golang/prometheus/promhttp" - - "github.com/milvus-io/milvus/internal/management" ) const ( @@ -90,15 +86,3 @@ var ( // [1 2 4 8 16 32 64 128 256 512 1024 2048 4096 8192 16384 32768 65536 1.31072e+05] buckets = prometheus.ExponentialBuckets(1, 2, 18) ) - -// Register serves prometheus http service -func Register(r *prometheus.Registry) { - management.Register(&management.HTTPHandler{ - Path: "/metrics", - Handler: promhttp.HandlerFor(r, promhttp.HandlerOpts{}), - }) - management.Register(&management.HTTPHandler{ - Path: "/metrics_default", - Handler: promhttp.Handler(), - }) -} diff --git a/internal/metrics/metrics_test.go b/pkg/metrics/metrics_test.go similarity index 98% rename from internal/metrics/metrics_test.go rename to pkg/metrics/metrics_test.go index d321c92586..bc5f6c039a 100644 --- a/internal/metrics/metrics_test.go +++ b/pkg/metrics/metrics_test.go @@ -34,5 +34,4 @@ func TestRegisterMetrics(t *testing.T) { RegisterQueryCoord(r) RegisterEtcdMetrics(r) RegisterMq(r) - Register(r) } diff --git a/internal/metrics/mq_metrics.go b/pkg/metrics/mq_metrics.go similarity index 100% rename from internal/metrics/mq_metrics.go rename to pkg/metrics/mq_metrics.go diff --git a/internal/metrics/proxy_metrics.go b/pkg/metrics/proxy_metrics.go similarity index 91% rename from internal/metrics/proxy_metrics.go rename to pkg/metrics/proxy_metrics.go index cd0ffaf0fc..741f18004d 100644 --- a/internal/metrics/proxy_metrics.go +++ b/pkg/metrics/proxy_metrics.go @@ -19,10 +19,9 @@ package metrics import ( "strconv" - "github.com/milvus-io/milvus/internal/proto/internalpb" - "github.com/milvus-io/milvus/internal/util/ratelimitutil" - "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/prometheus/client_golang/prometheus" + + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var ( @@ -278,27 +277,6 @@ func RegisterProxy(registry *prometheus.Registry) { registry.MustRegister(UserRPCCounter) } -// SetRateGaugeByRateType sets ProxyLimiterRate metrics. -func SetRateGaugeByRateType(rateType internalpb.RateType, nodeID int64, rate float64) { - if ratelimitutil.Limit(rate) == ratelimitutil.Inf { - return - } - nodeIDStr := strconv.FormatInt(nodeID, 10) - //log.Debug("set rates", zap.Int64("nodeID", nodeID), - // zap.String("rateType", rateType.String()), - // zap.String("rate", fmt.Sprintf("%v", rate))) - switch rateType { - case internalpb.RateType_DMLInsert: - ProxyLimiterRate.WithLabelValues(nodeIDStr, InsertLabel).Set(rate) - case internalpb.RateType_DMLDelete: - ProxyLimiterRate.WithLabelValues(nodeIDStr, DeleteLabel).Set(rate) - case internalpb.RateType_DQLSearch: - ProxyLimiterRate.WithLabelValues(nodeIDStr, SearchLabel).Set(rate) - case internalpb.RateType_DQLQuery: - ProxyLimiterRate.WithLabelValues(nodeIDStr, QueryLabel).Set(rate) - } -} - func CleanupCollectionMetrics(nodeID int64, collection string) { ProxyCollectionSQLatency.Delete(prometheus.Labels{nodeIDLabelName: strconv.FormatInt(nodeID, 10), queryTypeLabelName: SearchLabel, collectionName: collection}) diff --git a/internal/metrics/querycoord_metrics.go b/pkg/metrics/querycoord_metrics.go similarity index 98% rename from internal/metrics/querycoord_metrics.go rename to pkg/metrics/querycoord_metrics.go index 6b9e4a2274..42a35f9641 100644 --- a/internal/metrics/querycoord_metrics.go +++ b/pkg/metrics/querycoord_metrics.go @@ -19,7 +19,7 @@ package metrics import ( "github.com/prometheus/client_golang/prometheus" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var ( diff --git a/internal/metrics/querynode_metrics.go b/pkg/metrics/querynode_metrics.go similarity index 99% rename from internal/metrics/querynode_metrics.go rename to pkg/metrics/querynode_metrics.go index d6cc60f9a6..b0cf7bc0b8 100644 --- a/internal/metrics/querynode_metrics.go +++ b/pkg/metrics/querynode_metrics.go @@ -19,8 +19,9 @@ package metrics import ( "fmt" - "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/prometheus/client_golang/prometheus" + + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var ( diff --git a/internal/metrics/rootcoord_metrics.go b/pkg/metrics/rootcoord_metrics.go similarity index 99% rename from internal/metrics/rootcoord_metrics.go rename to pkg/metrics/rootcoord_metrics.go index 934d0407fa..84a7feda5f 100644 --- a/internal/metrics/rootcoord_metrics.go +++ b/pkg/metrics/rootcoord_metrics.go @@ -1,8 +1,9 @@ package metrics import ( - "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/prometheus/client_golang/prometheus" + + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var ( diff --git a/internal/mq/msgdispatcher/client.go b/pkg/mq/msgdispatcher/client.go similarity index 92% rename from internal/mq/msgdispatcher/client.go rename to pkg/mq/msgdispatcher/client.go index 04bc370053..503155e2b8 100644 --- a/internal/mq/msgdispatcher/client.go +++ b/pkg/mq/msgdispatcher/client.go @@ -19,13 +19,13 @@ package msgdispatcher import ( "sync" + "github.com/milvus-io/milvus-proto/go-api/msgpb" "go.uber.org/zap" - "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/funcutil" ) type ( diff --git a/internal/mq/msgdispatcher/client_test.go b/pkg/mq/msgdispatcher/client_test.go similarity index 94% rename from internal/mq/msgdispatcher/client_test.go rename to pkg/mq/msgdispatcher/client_test.go index d052ca7560..ec5a39761a 100644 --- a/internal/mq/msgdispatcher/client_test.go +++ b/pkg/mq/msgdispatcher/client_test.go @@ -25,8 +25,8 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/atomic" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func TestClient(t *testing.T) { diff --git a/internal/mq/msgdispatcher/dispatcher.go b/pkg/mq/msgdispatcher/dispatcher.go similarity index 94% rename from internal/mq/msgdispatcher/dispatcher.go rename to pkg/mq/msgdispatcher/dispatcher.go index 4ce5598fc3..d21d0a8334 100644 --- a/internal/mq/msgdispatcher/dispatcher.go +++ b/pkg/mq/msgdispatcher/dispatcher.go @@ -22,18 +22,18 @@ import ( "sync" "time" + "github.com/milvus-io/milvus-proto/go-api/commonpb" "go.uber.org/atomic" "go.uber.org/zap" - "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) type signal int32 diff --git a/internal/mq/msgdispatcher/dispatcher_test.go b/pkg/mq/msgdispatcher/dispatcher_test.go similarity index 96% rename from internal/mq/msgdispatcher/dispatcher_test.go rename to pkg/mq/msgdispatcher/dispatcher_test.go index 2544339175..ad642b994b 100644 --- a/internal/mq/msgdispatcher/dispatcher_test.go +++ b/pkg/mq/msgdispatcher/dispatcher_test.go @@ -23,8 +23,8 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" ) func TestDispatcher(t *testing.T) { diff --git a/internal/mq/msgdispatcher/manager.go b/pkg/mq/msgdispatcher/manager.go similarity index 95% rename from internal/mq/msgdispatcher/manager.go rename to pkg/mq/msgdispatcher/manager.go index 78cd974440..fe849eaa20 100644 --- a/internal/mq/msgdispatcher/manager.go +++ b/pkg/mq/msgdispatcher/manager.go @@ -22,16 +22,16 @@ import ( "sync" "time" + "github.com/milvus-io/milvus/pkg/util/tsoutil" + "github.com/prometheus/client_golang/prometheus" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/metrics" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/internal/util/retry" - "github.com/milvus-io/milvus/internal/util/tsoutil" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/prometheus/client_golang/prometheus" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/metrics" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var ( diff --git a/internal/mq/msgdispatcher/manager_test.go b/pkg/mq/msgdispatcher/manager_test.go similarity index 95% rename from internal/mq/msgdispatcher/manager_test.go rename to pkg/mq/msgdispatcher/manager_test.go index 2cac99330c..c882f2c586 100644 --- a/internal/mq/msgdispatcher/manager_test.go +++ b/pkg/mq/msgdispatcher/manager_test.go @@ -25,13 +25,13 @@ import ( "testing" "time" + "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" - "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func TestManager(t *testing.T) { @@ -60,7 +60,8 @@ func TestManager(t *testing.T) { }) t.Run("test merge and split", func(t *testing.T) { - c := NewDispatcherManager("mock_pchannel_0", typeutil.ProxyRole, 1, newMockFactory()) + prefix := fmt.Sprintf("mock%d", time.Now().UnixNano()) + c := NewDispatcherManager(prefix + "_pchannel_0", typeutil.ProxyRole, 1, newMockFactory()) assert.NotNil(t, c) _, err := c.Add("mock_vchannel_0", nil, mqwrapper.SubscriptionPositionUnknown) assert.NoError(t, err) @@ -83,7 +84,8 @@ func TestManager(t *testing.T) { }) t.Run("test run and close", func(t *testing.T) { - c := NewDispatcherManager("mock_pchannel_0", typeutil.ProxyRole, 1, newMockFactory()) + prefix := fmt.Sprintf("mock%d", time.Now().UnixNano()) + c := NewDispatcherManager(prefix + "_pchannel_0", typeutil.ProxyRole, 1, newMockFactory()) assert.NotNil(t, c) _, err := c.Add("mock_vchannel_0", nil, mqwrapper.SubscriptionPositionUnknown) assert.NoError(t, err) @@ -283,6 +285,7 @@ func (suite *SimulationSuite) TestMerge() { suite.vchannels = make(map[string]*vchannelHelper, vchannelNum) positions, err := getSeekPositions(suite.factory, suite.pchannel, 100) assert.NoError(suite.T(), err) + assert.NotEqual(suite.T(), 0, len(positions)) for i := 0; i < vchannelNum; i++ { vchannel := fmt.Sprintf("%s_vchannelv%d", suite.pchannel, i) diff --git a/internal/mq/msgdispatcher/mock_client.go b/pkg/mq/msgdispatcher/mock_client.go similarity index 96% rename from internal/mq/msgdispatcher/mock_client.go rename to pkg/mq/msgdispatcher/mock_client.go index 8c1ceb33ef..11d8a22782 100644 --- a/internal/mq/msgdispatcher/mock_client.go +++ b/pkg/mq/msgdispatcher/mock_client.go @@ -6,9 +6,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/msgpb" mock "github.com/stretchr/testify/mock" - mqwrapper "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" + mqwrapper "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" - msgstream "github.com/milvus-io/milvus/internal/mq/msgstream" + msgstream "github.com/milvus-io/milvus/pkg/mq/msgstream" ) // MockClient is an autogenerated mock type for the Client type diff --git a/internal/mq/msgdispatcher/mock_test.go b/pkg/mq/msgdispatcher/mock_test.go similarity index 93% rename from internal/mq/msgdispatcher/mock_test.go rename to pkg/mq/msgdispatcher/mock_test.go index e9d762eca8..1fe17d9df6 100644 --- a/internal/mq/msgdispatcher/mock_test.go +++ b/pkg/mq/msgdispatcher/mock_test.go @@ -20,24 +20,33 @@ import ( "context" "fmt" "math/rand" + "os" + "testing" "time" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/mq/msgstream" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/mq/msgstream" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( dim = 128 ) +var Params paramtable.ComponentParam + +func TestMain(m *testing.M) { + Params.Init() + exitCode := m.Run() + os.Exit(exitCode) +} + func newMockFactory() msgstream.Factory { - paramtable.Init() - return msgstream.NewRmsFactory("/tmp/milvus/rocksmq/") + return msgstream.NewPmsFactory(&Params.PulsarCfg) } func newMockProducer(factory msgstream.Factory, pchannel string) (msgstream.MsgStream, error) { @@ -58,7 +67,7 @@ func getSeekPositions(factory msgstream.Factory, pchannel string, maxNum int) ([ defer stream.Close() stream.AsConsumer([]string{pchannel}, fmt.Sprintf("%d", rand.Int()), mqwrapper.SubscriptionPositionEarliest) positions := make([]*msgstream.MsgPosition, 0) - timeoutCtx, cancel := context.WithTimeout(context.Background(), 100*time.Millisecond) + timeoutCtx, cancel := context.WithTimeout(context.Background(), 30 * time.Second) defer cancel() for { select { diff --git a/internal/mq/msgdispatcher/target.go b/pkg/mq/msgdispatcher/target.go similarity index 100% rename from internal/mq/msgdispatcher/target.go rename to pkg/mq/msgdispatcher/target.go diff --git a/internal/mq/msgstream/OWNERS b/pkg/mq/msgstream/OWNERS similarity index 100% rename from internal/mq/msgstream/OWNERS rename to pkg/mq/msgstream/OWNERS diff --git a/internal/mq/msgstream/mock_mq_factory.go b/pkg/mq/msgstream/mock_mq_factory.go similarity index 100% rename from internal/mq/msgstream/mock_mq_factory.go rename to pkg/mq/msgstream/mock_mq_factory.go diff --git a/internal/mq/msgstream/mock_msgstream.go b/pkg/mq/msgstream/mock_msgstream.go similarity index 99% rename from internal/mq/msgstream/mock_msgstream.go rename to pkg/mq/msgstream/mock_msgstream.go index 53e9e97abf..02bd0ffb79 100644 --- a/internal/mq/msgstream/mock_msgstream.go +++ b/pkg/mq/msgstream/mock_msgstream.go @@ -3,9 +3,10 @@ package msgstream import ( - msgpb "github.com/milvus-io/milvus-proto/go-api/msgpb" - mqwrapper "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus-proto/go-api/msgpb" mock "github.com/stretchr/testify/mock" + + mqwrapper "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" ) // MockMsgStream is an autogenerated mock type for the MsgStream type diff --git a/pkg/mq/msgstream/mq_factory.go b/pkg/mq/msgstream/mq_factory.go new file mode 100644 index 0000000000..a4ab173153 --- /dev/null +++ b/pkg/mq/msgstream/mq_factory.go @@ -0,0 +1,190 @@ +// Licensed to the LF AI & Data foundation under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package msgstream + +import ( + "context" + "strings" + + "github.com/apache/pulsar-client-go/pulsar" + "github.com/cockroachdb/errors" + "github.com/streamnative/pulsarctl/pkg/cli" + "github.com/streamnative/pulsarctl/pkg/pulsar/utils" + "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + kafkawrapper "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper/kafka" + pulsarmqwrapper "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper/pulsar" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/retry" +) + +// PmsFactory is a pulsar msgstream factory that implemented Factory interface(msgstream.go) +type PmsFactory struct { + dispatcherFactory ProtoUDFactory + // the following members must be public, so that mapstructure.Decode() can access them + PulsarAddress string + PulsarWebAddress string + ReceiveBufSize int64 + PulsarBufSize int64 + PulsarAuthPlugin string + PulsarAuthParams string + PulsarTenant string + PulsarNameSpace string +} + +func NewPmsFactory(config *paramtable.PulsarConfig) *PmsFactory { + return &PmsFactory{ + PulsarBufSize: 1024, + ReceiveBufSize: 1024, + PulsarAddress: config.Address.GetValue(), + PulsarWebAddress: config.WebAddress.GetValue(), + PulsarAuthPlugin: config.AuthPlugin.GetValue(), + PulsarAuthParams: config.AuthParams.GetValue(), + PulsarTenant: config.Tenant.GetValue(), + PulsarNameSpace: config.Namespace.GetValue(), + } +} + +// NewMsgStream is used to generate a new Msgstream object +func (f *PmsFactory) NewMsgStream(ctx context.Context) (MsgStream, error) { + auth, err := f.getAuthentication() + if err != nil { + return nil, err + } + clientOpts := pulsar.ClientOptions{ + URL: f.PulsarAddress, + Authentication: auth, + } + + pulsarClient, err := pulsarmqwrapper.NewClient(f.PulsarTenant, f.PulsarNameSpace, clientOpts) + if err != nil { + return nil, err + } + return NewMqMsgStream(ctx, f.ReceiveBufSize, f.PulsarBufSize, pulsarClient, f.dispatcherFactory.NewUnmarshalDispatcher()) +} + +// NewTtMsgStream is used to generate a new TtMsgstream object +func (f *PmsFactory) NewTtMsgStream(ctx context.Context) (MsgStream, error) { + auth, err := f.getAuthentication() + if err != nil { + return nil, err + } + clientOpts := pulsar.ClientOptions{ + URL: f.PulsarAddress, + Authentication: auth, + } + + pulsarClient, err := pulsarmqwrapper.NewClient(f.PulsarTenant, f.PulsarNameSpace, clientOpts) + if err != nil { + return nil, err + } + return NewMqTtMsgStream(ctx, f.ReceiveBufSize, f.PulsarBufSize, pulsarClient, f.dispatcherFactory.NewUnmarshalDispatcher()) +} + +func (f *PmsFactory) getAuthentication() (pulsar.Authentication, error) { + auth, err := pulsar.NewAuthentication(f.PulsarAuthPlugin, f.PulsarAuthParams) + + if err != nil { + log.Error("build authencation from config failed, please check it!", + zap.String("authPlugin", f.PulsarAuthPlugin), + zap.Error(err)) + return nil, errors.New("build authencation from config failed") + } + return auth, nil +} + +// NewQueryMsgStream is used to generate a new QueryMsgstream object +func (f *PmsFactory) NewQueryMsgStream(ctx context.Context) (MsgStream, error) { + return f.NewMsgStream(ctx) +} + +func (f *PmsFactory) NewMsgStreamDisposer(ctx context.Context) func([]string, string) error { + return func(channels []string, subname string) error { + // try to delete the old subscription + admin, err := pulsarmqwrapper.NewAdminClient(f.PulsarWebAddress, f.PulsarAuthPlugin, f.PulsarAuthParams) + if err != nil { + return err + } + for _, channel := range channels { + fullTopicName, err := pulsarmqwrapper.GetFullTopicName(f.PulsarTenant, f.PulsarNameSpace, channel) + if err != nil { + return err + } + topic, err := utils.GetTopicName(fullTopicName) + if err != nil { + log.Warn("failed to get topic name", zap.Error(err)) + return retry.Unrecoverable(err) + } + err = admin.Subscriptions().Delete(*topic, subname, true) + if err != nil { + pulsarErr, ok := err.(cli.Error) + if ok { + // subscription not found, ignore error + if strings.Contains(pulsarErr.Reason, "Subscription not found") { + return nil + } + } + log.Warn("failed to clean up subscriptions", zap.String("pulsar web", f.PulsarWebAddress), + zap.String("topic", channel), zap.Any("subname", subname), zap.Error(err)) + } + } + return nil + } +} + +type KmsFactory struct { + dispatcherFactory ProtoUDFactory + config *paramtable.KafkaConfig + ReceiveBufSize int64 +} + +func (f *KmsFactory) NewMsgStream(ctx context.Context) (MsgStream, error) { + kafkaClient := kafkawrapper.NewKafkaClientInstanceWithConfig(f.config) + return NewMqMsgStream(ctx, f.ReceiveBufSize, -1, kafkaClient, f.dispatcherFactory.NewUnmarshalDispatcher()) +} + +func (f *KmsFactory) NewTtMsgStream(ctx context.Context) (MsgStream, error) { + kafkaClient := kafkawrapper.NewKafkaClientInstanceWithConfig(f.config) + return NewMqTtMsgStream(ctx, f.ReceiveBufSize, -1, kafkaClient, f.dispatcherFactory.NewUnmarshalDispatcher()) +} + +func (f *KmsFactory) NewQueryMsgStream(ctx context.Context) (MsgStream, error) { + return f.NewMsgStream(ctx) +} + +func (f *KmsFactory) NewMsgStreamDisposer(ctx context.Context) func([]string, string) error { + return func(channels []string, subname string) error { + msgstream, err := f.NewMsgStream(ctx) + if err != nil { + return err + } + msgstream.AsConsumer(channels, subname, mqwrapper.SubscriptionPositionUnknown) + msgstream.Close() + return nil + } +} + +func NewKmsFactory(config *paramtable.KafkaConfig) Factory { + f := &KmsFactory{ + dispatcherFactory: ProtoUDFactory{}, + ReceiveBufSize: 1024, + config: config, + } + return f +} diff --git a/pkg/mq/msgstream/mq_factory_test.go b/pkg/mq/msgstream/mq_factory_test.go new file mode 100644 index 0000000000..7307442dc0 --- /dev/null +++ b/pkg/mq/msgstream/mq_factory_test.go @@ -0,0 +1,94 @@ +// Licensed to the LF AI & Data foundation under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package msgstream + +import ( + "context" + "testing" + + "github.com/stretchr/testify/assert" +) + +func TestPmsFactory(t *testing.T) { + Params.Init() + pmsFactory := NewPmsFactory(&Params.PulsarCfg) + + ctx := context.Background() + _, err := pmsFactory.NewMsgStream(ctx) + assert.Nil(t, err) + + _, err = pmsFactory.NewTtMsgStream(ctx) + assert.Nil(t, err) + + _, err = pmsFactory.NewQueryMsgStream(ctx) + assert.Nil(t, err) + + err = pmsFactory.NewMsgStreamDisposer(ctx)([]string{"hello"}, "xx") + assert.Nil(t, err) +} + +func TestPmsFactoryWithAuth(t *testing.T) { + config := &Params.PulsarCfg + Params.Save(Params.PulsarCfg.AuthPlugin.Key, "token") + Params.Save(Params.PulsarCfg.AuthParams.Key, "token:fake_token") + defer func() { + Params.Save(Params.PulsarCfg.AuthPlugin.Key, "") + Params.Save(Params.PulsarCfg.AuthParams.Key, "") + }() + pmsFactory := NewPmsFactory(config) + + ctx := context.Background() + _, err := pmsFactory.NewMsgStream(ctx) + assert.Nil(t, err) + + _, err = pmsFactory.NewTtMsgStream(ctx) + assert.Nil(t, err) + + _, err = pmsFactory.NewQueryMsgStream(ctx) + assert.Nil(t, err) + + Params.Save(Params.PulsarCfg.AuthParams.Key, "") + pmsFactory = NewPmsFactory(config) + + ctx = context.Background() + _, err = pmsFactory.NewMsgStream(ctx) + assert.Error(t, err) + + _, err = pmsFactory.NewTtMsgStream(ctx) + assert.Error(t, err) + + _, err = pmsFactory.NewQueryMsgStream(ctx) + assert.Error(t, err) + +} + +func TestKafkaFactory(t *testing.T) { + kmsFactory := NewKmsFactory(&Params.KafkaCfg) + + ctx := context.Background() + _, err := kmsFactory.NewMsgStream(ctx) + assert.Nil(t, err) + + _, err = kmsFactory.NewTtMsgStream(ctx) + assert.Nil(t, err) + + _, err = kmsFactory.NewQueryMsgStream(ctx) + assert.Nil(t, err) + + // err = kmsFactory.NewMsgStreamDisposer(ctx)([]string{"hello"}, "xx") + // assert.Nil(t, err) +} diff --git a/internal/mq/msgstream/mq_kafka_msgstream_test.go b/pkg/mq/msgstream/mq_kafka_msgstream_test.go similarity index 98% rename from internal/mq/msgstream/mq_kafka_msgstream_test.go rename to pkg/mq/msgstream/mq_kafka_msgstream_test.go index 005d41cb24..e3f3908d0e 100644 --- a/internal/mq/msgstream/mq_kafka_msgstream_test.go +++ b/pkg/mq/msgstream/mq_kafka_msgstream_test.go @@ -23,13 +23,13 @@ import ( "testing" "github.com/confluentinc/confluent-kafka-go/kafka" - "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - kafkawrapper "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper/kafka" - "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/stretchr/testify/assert" + + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + kafkawrapper "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper/kafka" + "github.com/milvus-io/milvus/pkg/util/funcutil" ) // Note: kafka does not support get all data when consuming from the earliest position again. diff --git a/internal/mq/msgstream/mq_msgstream.go b/pkg/mq/msgstream/mq_msgstream.go similarity index 98% rename from internal/mq/msgstream/mq_msgstream.go rename to pkg/mq/msgstream/mq_msgstream.go index ca61bedac8..ad9207dbfe 100644 --- a/internal/mq/msgstream/mq_msgstream.go +++ b/pkg/mq/msgstream/mq_msgstream.go @@ -26,14 +26,14 @@ import ( "github.com/cockroachdb/errors" "github.com/golang/protobuf/proto" - "go.uber.org/zap" - "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/internal/util/retry" - "github.com/milvus-io/milvus/internal/util/typeutil" + "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/retry" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var _ MsgStream = (*mqMsgStream)(nil) @@ -208,7 +208,7 @@ func (ms *mqMsgStream) Close() { } -func (ms *mqMsgStream) computeProduceChannelIndexes(tsMsgs []TsMsg) [][]int32 { +func (ms *mqMsgStream) ComputeProduceChannelIndexes(tsMsgs []TsMsg) [][]int32 { if len(tsMsgs) <= 0 { return nil } @@ -242,7 +242,7 @@ func (ms *mqMsgStream) Produce(msgPack *MsgPack) error { return errors.New("nil producer in msg stream") } tsMsgs := msgPack.Msgs - reBucketValues := ms.computeProduceChannelIndexes(msgPack.Msgs) + reBucketValues := ms.ComputeProduceChannelIndexes(msgPack.Msgs) var result map[int32]*MsgPack var err error if ms.repackFunc != nil { diff --git a/internal/mq/msgstream/mq_msgstream_test.go b/pkg/mq/msgstream/mq_msgstream_test.go similarity index 66% rename from internal/mq/msgstream/mq_msgstream_test.go rename to pkg/mq/msgstream/mq_msgstream_test.go index f51581bcec..cefe940c49 100644 --- a/internal/mq/msgstream/mq_msgstream_test.go +++ b/pkg/mq/msgstream/mq_msgstream_test.go @@ -22,8 +22,6 @@ import ( "log" "math/rand" "os" - "strings" - "sync" "testing" "time" "unsafe" @@ -31,22 +29,16 @@ import ( "github.com/apache/pulsar-client-go/pulsar" "github.com/cockroachdb/errors" "github.com/confluentinc/confluent-kafka-go/kafka" + "github.com/milvus-io/milvus-proto/go-api/commonpb" + "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "go.uber.org/atomic" - "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/allocator" - "github.com/milvus-io/milvus/internal/common" - etcdkv "github.com/milvus-io/milvus/internal/kv/etcd" - "github.com/milvus-io/milvus/internal/mq/mqimpl/rocksmq/server" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - pulsarwrapper "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper/pulsar" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper/rmq" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + pulsarwrapper "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper/pulsar" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) const ( @@ -87,263 +79,6 @@ func getKafkaBrokerList() string { return brokerList } -type fixture struct { - t *testing.T - etcdKV *etcdkv.EtcdKV -} - -type parameters struct { - client mqwrapper.Client -} - -func (f *fixture) setup() []parameters { - pulsarAddress := getPulsarAddress() - pulsarClient, err := pulsarwrapper.NewClient(DefaultPulsarTenant, DefaultPulsarNamespace, pulsar.ClientOptions{URL: pulsarAddress}) - assert.Nil(f.t, err) - - rocksdbName := "/tmp/rocksmq_unittest_" + f.t.Name() - endpoints := os.Getenv("ETCD_ENDPOINTS") - if endpoints == "" { - endpoints = "localhost:2379" - } - etcdEndpoints := strings.Split(endpoints, ",") - etcdCli, err := etcd.GetRemoteEtcdClient(etcdEndpoints) - defer etcdCli.Close() - if err != nil { - log.Fatalf("New clientv3 error = %v", err) - } - f.etcdKV = etcdkv.NewEtcdKV(etcdCli, "/etcd/test/root") - idAllocator := allocator.NewGlobalIDAllocator("dummy", f.etcdKV) - _ = idAllocator.Initialize() - err = server.InitRmq(rocksdbName, idAllocator) - if err != nil { - log.Fatalf("InitRmq error = %v", err) - } - - rmqClient, _ := rmq.NewClientWithDefaultOptions() - - parameters := []parameters{ - {pulsarClient}, - {rmqClient}, - } - return parameters -} - -func (f *fixture) teardown() { - rocksdbName := "/tmp/rocksmq_unittest_" + f.t.Name() - - server.CloseRocksMQ() - f.etcdKV.Close() - _ = os.RemoveAll(rocksdbName) - _ = os.RemoveAll(rocksdbName + "_meta_kv") -} - -func Test_NewMqMsgStream(t *testing.T) { - f := &fixture{t: t} - parameters := f.setup() - defer f.teardown() - - factory := &ProtoUDFactory{} - for i := range parameters { - func(client mqwrapper.Client) { - _, err := NewMqMsgStream(context.Background(), 100, 100, client, factory.NewUnmarshalDispatcher()) - assert.Nil(t, err) - }(parameters[i].client) - } -} - -// TODO(wxyu): add a mock implement of mqwrapper.Client, then inject errors to improve coverage -func TestMqMsgStream_AsProducer(t *testing.T) { - f := &fixture{t: t} - parameters := f.setup() - defer f.teardown() - - factory := &ProtoUDFactory{} - for i := range parameters { - func(client mqwrapper.Client) { - m, err := NewMqMsgStream(context.Background(), 100, 100, client, factory.NewUnmarshalDispatcher()) - assert.Nil(t, err) - - // empty channel name - m.AsProducer([]string{""}) - }(parameters[i].client) - } -} - -// TODO(wxyu): add a mock implement of mqwrapper.Client, then inject errors to improve coverage -func TestMqMsgStream_AsConsumer(t *testing.T) { - f := &fixture{t: t} - parameters := f.setup() - defer f.teardown() - - factory := &ProtoUDFactory{} - for i := range parameters { - func(client mqwrapper.Client) { - m, err := NewMqMsgStream(context.Background(), 100, 100, client, factory.NewUnmarshalDispatcher()) - assert.Nil(t, err) - - // repeat calling AsConsumer - m.AsConsumer([]string{"a"}, "b", mqwrapper.SubscriptionPositionUnknown) - m.AsConsumer([]string{"a"}, "b", mqwrapper.SubscriptionPositionUnknown) - }(parameters[i].client) - } -} - -func TestMqMsgStream_ComputeProduceChannelIndexes(t *testing.T) { - f := &fixture{t: t} - parameters := f.setup() - defer f.teardown() - - factory := &ProtoUDFactory{} - for i := range parameters { - func(client mqwrapper.Client) { - m, err := NewMqMsgStream(context.Background(), 100, 100, client, factory.NewUnmarshalDispatcher()) - assert.Nil(t, err) - - // empty parameters - reBucketValues := m.computeProduceChannelIndexes([]TsMsg{}) - assert.Nil(t, reBucketValues) - - // not called AsProducer yet - insertMsg := &InsertMsg{ - BaseMsg: generateBaseMsg(), - InsertRequest: msgpb.InsertRequest{ - Base: &commonpb.MsgBase{ - MsgType: commonpb.MsgType_Insert, - MsgID: 1, - Timestamp: 2, - SourceID: 3, - }, - - DbName: "test_db", - CollectionName: "test_collection", - PartitionName: "test_partition", - DbID: 4, - CollectionID: 5, - PartitionID: 6, - SegmentID: 7, - ShardName: "test-channel", - Timestamps: []uint64{2, 1, 3}, - RowData: []*commonpb.Blob{}, - }, - } - reBucketValues = m.computeProduceChannelIndexes([]TsMsg{insertMsg}) - assert.Nil(t, reBucketValues) - }(parameters[i].client) - } -} - -func TestMqMsgStream_GetProduceChannels(t *testing.T) { - f := &fixture{t: t} - parameters := f.setup() - defer f.teardown() - - factory := &ProtoUDFactory{} - for i := range parameters { - func(client mqwrapper.Client) { - m, err := NewMqMsgStream(context.Background(), 100, 100, client, factory.NewUnmarshalDispatcher()) - assert.Nil(t, err) - - // empty if not called AsProducer yet - chs := m.GetProduceChannels() - assert.Equal(t, 0, len(chs)) - - // not empty after AsProducer - m.AsProducer([]string{"a"}) - chs = m.GetProduceChannels() - assert.Equal(t, 1, len(chs)) - }(parameters[i].client) - } -} - -func TestMqMsgStream_Produce(t *testing.T) { - f := &fixture{t: t} - parameters := f.setup() - defer f.teardown() - - factory := &ProtoUDFactory{} - for i := range parameters { - func(client mqwrapper.Client) { - m, err := NewMqMsgStream(context.Background(), 100, 100, client, factory.NewUnmarshalDispatcher()) - assert.Nil(t, err) - - // Produce before called AsProducer - insertMsg := &InsertMsg{ - BaseMsg: generateBaseMsg(), - InsertRequest: msgpb.InsertRequest{ - Base: &commonpb.MsgBase{ - MsgType: commonpb.MsgType_Insert, - MsgID: 1, - Timestamp: 2, - SourceID: 3, - }, - - DbName: "test_db", - CollectionName: "test_collection", - PartitionName: "test_partition", - DbID: 4, - CollectionID: 5, - PartitionID: 6, - SegmentID: 7, - ShardName: "test-channel", - Timestamps: []uint64{2, 1, 3}, - RowData: []*commonpb.Blob{}, - }, - } - msgPack := &MsgPack{ - Msgs: []TsMsg{insertMsg}, - } - err = m.Produce(msgPack) - assert.NotNil(t, err) - }(parameters[i].client) - } -} - -func TestMqMsgStream_Broadcast(t *testing.T) { - f := &fixture{t: t} - parameters := f.setup() - defer f.teardown() - - factory := &ProtoUDFactory{} - for i := range parameters { - func(client mqwrapper.Client) { - m, err := NewMqMsgStream(context.Background(), 100, 100, client, factory.NewUnmarshalDispatcher()) - assert.Nil(t, err) - - // Broadcast nil pointer - _, err = m.Broadcast(nil) - assert.NotNil(t, err) - }(parameters[i].client) - } -} - -func TestMqMsgStream_Consume(t *testing.T) { - f := &fixture{t: t} - parameters := f.setup() - defer f.teardown() - - factory := &ProtoUDFactory{} - for i := range parameters { - func(client mqwrapper.Client) { - // Consume return nil when ctx canceled - var wg sync.WaitGroup - ctx, cancel := context.WithCancel(context.Background()) - m, err := NewMqMsgStream(ctx, 100, 100, client, factory.NewUnmarshalDispatcher()) - assert.Nil(t, err) - - wg.Add(1) - go func() { - defer wg.Done() - msgPack := consumer(ctx, m) - assert.Nil(t, msgPack) - }() - - cancel() - wg.Wait() - }(parameters[i].client) - } -} - func consumer(ctx context.Context, mq MsgStream) *MsgPack { for { select { @@ -358,47 +93,6 @@ func consumer(ctx context.Context, mq MsgStream) *MsgPack { } } -func TestMqMsgStream_Chan(t *testing.T) { - f := &fixture{t: t} - parameters := f.setup() - defer f.teardown() - - factory := &ProtoUDFactory{} - for i := range parameters { - func(client mqwrapper.Client) { - m, err := NewMqMsgStream(context.Background(), 100, 100, client, factory.NewUnmarshalDispatcher()) - assert.Nil(t, err) - - ch := m.Chan() - assert.NotNil(t, ch) - }(parameters[i].client) - } -} - -func TestMqMsgStream_SeekNotSubscribed(t *testing.T) { - f := &fixture{t: t} - parameters := f.setup() - defer f.teardown() - - factory := &ProtoUDFactory{} - for i := range parameters { - func(client mqwrapper.Client) { - m, err := NewMqMsgStream(context.Background(), 100, 100, client, factory.NewUnmarshalDispatcher()) - assert.Nil(t, err) - - // seek in not subscribed channel - p := []*msgpb.MsgPosition{ - { - ChannelName: "b", - }, - } - err = m.Seek(p) - assert.NotNil(t, err) - }(parameters[i].client) - } -} - -/* ========================== Pulsar & RocksMQ Tests ========================== */ func TestStream_PulsarMsgStream_Insert(t *testing.T) { pulsarAddress := getPulsarAddress() c1, c2 := funcutil.RandomString(8), funcutil.RandomString(8) @@ -1265,66 +959,6 @@ func TestStream_MqMsgStream_SeekInvalidMessage(t *testing.T) { assert.Equal(t, result.Msgs[0].ID(), int64(1)) } -func TestStream_RMqMsgStream_SeekInvalidMessage(t *testing.T) { - rocksdbName := "/tmp/rocksmq_tt_msg_seekInvalid" - etcdKV := initRmq(rocksdbName) - c := funcutil.RandomString(8) - producerChannels := []string{c} - consumerChannels := []string{c} - consumerSubName := funcutil.RandomString(8) - ctx := context.Background() - inputStream, outputStream := initRmqStream(ctx, producerChannels, consumerChannels, consumerSubName) - - msgPack := &MsgPack{} - for i := 0; i < 10; i++ { - insertMsg := getTsMsg(commonpb.MsgType_Insert, int64(i)) - msgPack.Msgs = append(msgPack.Msgs, insertMsg) - } - - err := inputStream.Produce(msgPack) - assert.Nil(t, err) - var seekPosition *msgpb.MsgPosition - for i := 0; i < 10; i++ { - result := consumer(ctx, outputStream) - assert.Equal(t, result.Msgs[0].ID(), int64(i)) - seekPosition = result.EndPositions[0] - } - outputStream.Close() - - factory := ProtoUDFactory{} - rmqClient2, _ := rmq.NewClientWithDefaultOptions() - outputStream2, _ := NewMqMsgStream(ctx, 100, 100, rmqClient2, factory.NewUnmarshalDispatcher()) - outputStream2.AsConsumer(consumerChannels, funcutil.RandomString(8), mqwrapper.SubscriptionPositionUnknown) - - id := common.Endian.Uint64(seekPosition.MsgID) + 10 - bs := make([]byte, 8) - common.Endian.PutUint64(bs, id) - p := []*msgpb.MsgPosition{ - { - ChannelName: seekPosition.ChannelName, - Timestamp: seekPosition.Timestamp, - MsgGroup: seekPosition.MsgGroup, - MsgID: bs, - }, - } - - err = outputStream2.Seek(p) - assert.Nil(t, err) - - for i := 10; i < 20; i++ { - insertMsg := getTsMsg(commonpb.MsgType_Insert, int64(i)) - msgPack.Msgs = append(msgPack.Msgs, insertMsg) - } - err = inputStream.Produce(msgPack) - assert.Nil(t, err) - - result := consumer(ctx, outputStream2) - assert.Equal(t, result.Msgs[0].ID(), int64(1)) - - Close(rocksdbName, inputStream, outputStream2, etcdKV) - -} - func TestStream_MqMsgStream_SeekLatest(t *testing.T) { pulsarAddress := getPulsarAddress() c := funcutil.RandomString(8) @@ -1366,311 +1000,6 @@ func TestStream_MqMsgStream_SeekLatest(t *testing.T) { outputStream2.Close() } -/****************************************Rmq test******************************************/ - -func initRmq(name string) *etcdkv.EtcdKV { - endpoints := os.Getenv("ETCD_ENDPOINTS") - if endpoints == "" { - endpoints = "localhost:2379" - } - etcdEndpoints := strings.Split(endpoints, ",") - etcdCli, err := etcd.GetRemoteEtcdClient(etcdEndpoints) - if err != nil { - log.Fatalf("New clientv3 error = %v", err) - } - etcdKV := etcdkv.NewEtcdKV(etcdCli, "/etcd/test/root") - idAllocator := allocator.NewGlobalIDAllocator("dummy", etcdKV) - _ = idAllocator.Initialize() - - err = server.InitRmq(name, idAllocator) - - if err != nil { - log.Fatalf("InitRmq error = %v", err) - } - return etcdKV -} - -func Close(rocksdbName string, intputStream, outputStream MsgStream, etcdKV *etcdkv.EtcdKV) { - server.CloseRocksMQ() - intputStream.Close() - outputStream.Close() - etcdKV.Close() - err := os.RemoveAll(rocksdbName) - _ = os.RemoveAll(rocksdbName + "_meta_kv") - log.Println(err) -} - -func initRmqStream(ctx context.Context, - producerChannels []string, - consumerChannels []string, - consumerGroupName string, - opts ...RepackFunc) (MsgStream, MsgStream) { - factory := ProtoUDFactory{} - - rmqClient, _ := rmq.NewClientWithDefaultOptions() - inputStream, _ := NewMqMsgStream(ctx, 100, 100, rmqClient, factory.NewUnmarshalDispatcher()) - inputStream.AsProducer(producerChannels) - for _, opt := range opts { - inputStream.SetRepackFunc(opt) - } - var input MsgStream = inputStream - - rmqClient2, _ := rmq.NewClientWithDefaultOptions() - outputStream, _ := NewMqMsgStream(ctx, 100, 100, rmqClient2, factory.NewUnmarshalDispatcher()) - outputStream.AsConsumer(consumerChannels, consumerGroupName, mqwrapper.SubscriptionPositionEarliest) - var output MsgStream = outputStream - - return input, output -} - -func initRmqTtStream(ctx context.Context, - producerChannels []string, - consumerChannels []string, - consumerGroupName string, - opts ...RepackFunc) (MsgStream, MsgStream) { - factory := ProtoUDFactory{} - - rmqClient, _ := rmq.NewClientWithDefaultOptions() - inputStream, _ := NewMqMsgStream(ctx, 100, 100, rmqClient, factory.NewUnmarshalDispatcher()) - inputStream.AsProducer(producerChannels) - for _, opt := range opts { - inputStream.SetRepackFunc(opt) - } - var input MsgStream = inputStream - - rmqClient2, _ := rmq.NewClientWithDefaultOptions() - outputStream, _ := NewMqTtMsgStream(ctx, 100, 100, rmqClient2, factory.NewUnmarshalDispatcher()) - outputStream.AsConsumer(consumerChannels, consumerGroupName, mqwrapper.SubscriptionPositionEarliest) - var output MsgStream = outputStream - - return input, output -} - -func TestStream_RmqMsgStream_Insert(t *testing.T) { - producerChannels := []string{"insert1", "insert2"} - consumerChannels := []string{"insert1", "insert2"} - consumerGroupName := "InsertGroup" - - msgPack := MsgPack{} - msgPack.Msgs = append(msgPack.Msgs, getTsMsg(commonpb.MsgType_Insert, 1)) - msgPack.Msgs = append(msgPack.Msgs, getTsMsg(commonpb.MsgType_Insert, 3)) - - rocksdbName := "/tmp/rocksmq_insert" - etcdKV := initRmq(rocksdbName) - ctx := context.Background() - inputStream, outputStream := initRmqStream(ctx, producerChannels, consumerChannels, consumerGroupName) - err := inputStream.Produce(&msgPack) - require.NoErrorf(t, err, fmt.Sprintf("produce error = %v", err)) - - receiveMsg(ctx, outputStream, len(msgPack.Msgs)) - Close(rocksdbName, inputStream, outputStream, etcdKV) -} - -func TestStream_RmqTtMsgStream_Insert(t *testing.T) { - producerChannels := []string{"insert1", "insert2"} - consumerChannels := []string{"insert1", "insert2"} - consumerSubName := "subInsert" - - msgPack0 := MsgPack{} - msgPack0.Msgs = append(msgPack0.Msgs, getTimeTickMsg(0)) - - msgPack1 := MsgPack{} - msgPack1.Msgs = append(msgPack1.Msgs, getTsMsg(commonpb.MsgType_Insert, 1)) - msgPack1.Msgs = append(msgPack1.Msgs, getTsMsg(commonpb.MsgType_Insert, 3)) - - msgPack2 := MsgPack{} - msgPack2.Msgs = append(msgPack2.Msgs, getTimeTickMsg(5)) - - rocksdbName := "/tmp/rocksmq_insert_tt" - etcdKV := initRmq(rocksdbName) - ctx := context.Background() - inputStream, outputStream := initRmqTtStream(ctx, producerChannels, consumerChannels, consumerSubName) - - _, err := inputStream.Broadcast(&msgPack0) - require.NoErrorf(t, err, fmt.Sprintf("broadcast error = %v", err)) - - err = inputStream.Produce(&msgPack1) - require.NoErrorf(t, err, fmt.Sprintf("produce error = %v", err)) - - _, err = inputStream.Broadcast(&msgPack2) - require.NoErrorf(t, err, fmt.Sprintf("broadcast error = %v", err)) - - receiveMsg(ctx, outputStream, len(msgPack1.Msgs)) - Close(rocksdbName, inputStream, outputStream, etcdKV) -} - -func TestStream_RmqTtMsgStream_DuplicatedIDs(t *testing.T) { - rocksdbName := "/tmp/rocksmq_tt_msg_seek" - etcdKV := initRmq(rocksdbName) - - c1 := funcutil.RandomString(8) - producerChannels := []string{c1} - consumerChannels := []string{c1} - consumerSubName := funcutil.RandomString(8) - - msgPack0 := MsgPack{} - msgPack0.Msgs = append(msgPack0.Msgs, getTimeTickMsg(0)) - - msgPack1 := MsgPack{} - msgPack1.Msgs = append(msgPack1.Msgs, getTsMsg(commonpb.MsgType_Insert, 1)) - msgPack1.Msgs = append(msgPack1.Msgs, getTsMsg(commonpb.MsgType_Insert, 1)) - msgPack1.Msgs = append(msgPack1.Msgs, getTsMsg(commonpb.MsgType_Insert, 1)) - - // would not dedup for non-dml messages - msgPack2 := MsgPack{} - msgPack2.Msgs = append(msgPack2.Msgs, getTsMsg(commonpb.MsgType_CreateCollection, 2)) - msgPack2.Msgs = append(msgPack2.Msgs, getTsMsg(commonpb.MsgType_CreateCollection, 2)) - - msgPack3 := MsgPack{} - msgPack3.Msgs = append(msgPack3.Msgs, getTimeTickMsg(15)) - - ctx := context.Background() - inputStream, outputStream := initRmqTtStream(ctx, producerChannels, consumerChannels, consumerSubName) - - _, err := inputStream.Broadcast(&msgPack0) - assert.Nil(t, err) - err = inputStream.Produce(&msgPack1) - assert.Nil(t, err) - err = inputStream.Produce(&msgPack2) - assert.Nil(t, err) - _, err = inputStream.Broadcast(&msgPack3) - assert.Nil(t, err) - - receivedMsg := consumer(ctx, outputStream) - assert.Equal(t, len(receivedMsg.Msgs), 3) - assert.Equal(t, receivedMsg.BeginTs, uint64(0)) - assert.Equal(t, receivedMsg.EndTs, uint64(15)) - - outputStream.Close() - - factory := ProtoUDFactory{} - - rmqClient, _ := rmq.NewClientWithDefaultOptions() - outputStream, _ = NewMqTtMsgStream(context.Background(), 100, 100, rmqClient, factory.NewUnmarshalDispatcher()) - consumerSubName = funcutil.RandomString(8) - outputStream.AsConsumer(consumerChannels, consumerSubName, mqwrapper.SubscriptionPositionUnknown) - outputStream.Seek(receivedMsg.StartPositions) - seekMsg := consumer(ctx, outputStream) - assert.Equal(t, len(seekMsg.Msgs), 1+2) - assert.EqualValues(t, seekMsg.Msgs[0].BeginTs(), 1) - assert.Equal(t, commonpb.MsgType_CreateCollection, seekMsg.Msgs[1].Type()) - assert.Equal(t, commonpb.MsgType_CreateCollection, seekMsg.Msgs[2].Type()) - - Close(rocksdbName, inputStream, outputStream, etcdKV) -} - -func TestStream_RmqTtMsgStream_Seek(t *testing.T) { - rocksdbName := "/tmp/rocksmq_tt_msg_seek" - etcdKV := initRmq(rocksdbName) - - c1 := funcutil.RandomString(8) - producerChannels := []string{c1} - consumerChannels := []string{c1} - consumerSubName := funcutil.RandomString(8) - - msgPack0 := MsgPack{} - msgPack0.Msgs = append(msgPack0.Msgs, getTimeTickMsg(0)) - - msgPack1 := MsgPack{} - msgPack1.Msgs = append(msgPack1.Msgs, getTsMsg(commonpb.MsgType_Insert, 1)) - msgPack1.Msgs = append(msgPack1.Msgs, getTsMsg(commonpb.MsgType_Insert, 3)) - msgPack1.Msgs = append(msgPack1.Msgs, getTsMsg(commonpb.MsgType_Insert, 19)) - - msgPack2 := MsgPack{} - msgPack2.Msgs = append(msgPack2.Msgs, getTimeTickMsg(5)) - - msgPack3 := MsgPack{} - msgPack3.Msgs = append(msgPack3.Msgs, getTsMsg(commonpb.MsgType_Insert, 14)) - msgPack3.Msgs = append(msgPack3.Msgs, getTsMsg(commonpb.MsgType_Insert, 9)) - - msgPack4 := MsgPack{} - msgPack4.Msgs = append(msgPack4.Msgs, getTimeTickMsg(11)) - - msgPack5 := MsgPack{} - msgPack5.Msgs = append(msgPack5.Msgs, getTsMsg(commonpb.MsgType_Insert, 12)) - msgPack5.Msgs = append(msgPack5.Msgs, getTsMsg(commonpb.MsgType_Insert, 13)) - - msgPack6 := MsgPack{} - msgPack6.Msgs = append(msgPack6.Msgs, getTimeTickMsg(15)) - - msgPack7 := MsgPack{} - msgPack7.Msgs = append(msgPack7.Msgs, getTimeTickMsg(20)) - - ctx := context.Background() - inputStream, outputStream := initRmqTtStream(ctx, producerChannels, consumerChannels, consumerSubName) - - _, err := inputStream.Broadcast(&msgPack0) - assert.Nil(t, err) - err = inputStream.Produce(&msgPack1) - assert.Nil(t, err) - _, err = inputStream.Broadcast(&msgPack2) - assert.Nil(t, err) - err = inputStream.Produce(&msgPack3) - assert.Nil(t, err) - _, err = inputStream.Broadcast(&msgPack4) - assert.Nil(t, err) - err = inputStream.Produce(&msgPack5) - assert.Nil(t, err) - _, err = inputStream.Broadcast(&msgPack6) - assert.Nil(t, err) - _, err = inputStream.Broadcast(&msgPack7) - assert.Nil(t, err) - - receivedMsg := consumer(ctx, outputStream) - assert.Equal(t, len(receivedMsg.Msgs), 2) - assert.Equal(t, receivedMsg.BeginTs, uint64(0)) - assert.Equal(t, receivedMsg.EndTs, uint64(5)) - - assert.Equal(t, receivedMsg.StartPositions[0].Timestamp, uint64(0)) - assert.Equal(t, receivedMsg.EndPositions[0].Timestamp, uint64(5)) - - receivedMsg2 := consumer(ctx, outputStream) - assert.Equal(t, len(receivedMsg2.Msgs), 1) - assert.Equal(t, receivedMsg2.BeginTs, uint64(5)) - assert.Equal(t, receivedMsg2.EndTs, uint64(11)) - assert.Equal(t, receivedMsg2.StartPositions[0].Timestamp, uint64(5)) - assert.Equal(t, receivedMsg2.EndPositions[0].Timestamp, uint64(11)) - - receivedMsg3 := consumer(ctx, outputStream) - assert.Equal(t, len(receivedMsg3.Msgs), 3) - assert.Equal(t, receivedMsg3.BeginTs, uint64(11)) - assert.Equal(t, receivedMsg3.EndTs, uint64(15)) - assert.Equal(t, receivedMsg3.StartPositions[0].Timestamp, uint64(11)) - assert.Equal(t, receivedMsg3.EndPositions[0].Timestamp, uint64(15)) - - receivedMsg4 := consumer(ctx, outputStream) - assert.Equal(t, len(receivedMsg4.Msgs), 1) - assert.Equal(t, receivedMsg4.BeginTs, uint64(15)) - assert.Equal(t, receivedMsg4.EndTs, uint64(20)) - assert.Equal(t, receivedMsg4.StartPositions[0].Timestamp, uint64(15)) - assert.Equal(t, receivedMsg4.EndPositions[0].Timestamp, uint64(20)) - - outputStream.Close() - - factory := ProtoUDFactory{} - - rmqClient, _ := rmq.NewClientWithDefaultOptions() - outputStream, _ = NewMqTtMsgStream(context.Background(), 100, 100, rmqClient, factory.NewUnmarshalDispatcher()) - consumerSubName = funcutil.RandomString(8) - outputStream.AsConsumer(consumerChannels, consumerSubName, mqwrapper.SubscriptionPositionUnknown) - - outputStream.Seek(receivedMsg3.StartPositions) - seekMsg := consumer(ctx, outputStream) - assert.Equal(t, len(seekMsg.Msgs), 3) - result := []uint64{14, 12, 13} - for i, msg := range seekMsg.Msgs { - assert.Equal(t, msg.BeginTs(), result[i]) - } - - seekMsg2 := consumer(ctx, outputStream) - assert.Equal(t, len(seekMsg2.Msgs), 1) - for _, msg := range seekMsg2.Msgs { - assert.Equal(t, msg.BeginTs(), uint64(19)) - } - - Close(rocksdbName, inputStream, outputStream, etcdKV) -} - func TestStream_BroadcastMark(t *testing.T) { pulsarAddress := getPulsarAddress() c1 := funcutil.RandomString(8) @@ -2038,42 +1367,6 @@ func printMsgPack(msgPack *MsgPack) { log.Println("================") } -func TestStream_RmqTtMsgStream_AsConsumerWithPosition(t *testing.T) { - - producerChannels := []string{"insert1"} - consumerChannels := []string{"insert1"} - consumerSubName := "subInsert" - - rocksdbName := "/tmp/rocksmq_asconsumer_withpos" - etcdKV := initRmq(rocksdbName) - factory := ProtoUDFactory{} - - rmqClient, _ := rmq.NewClientWithDefaultOptions() - - otherInputStream, _ := NewMqMsgStream(context.Background(), 100, 100, rmqClient, factory.NewUnmarshalDispatcher()) - otherInputStream.AsProducer([]string{"root_timetick"}) - otherInputStream.Produce(getTimeTickMsgPack(999)) - - inputStream, _ := NewMqMsgStream(context.Background(), 100, 100, rmqClient, factory.NewUnmarshalDispatcher()) - inputStream.AsProducer(producerChannels) - - for i := 0; i < 100; i++ { - inputStream.Produce(getTimeTickMsgPack(int64(i))) - } - - rmqClient2, _ := rmq.NewClientWithDefaultOptions() - outputStream, _ := NewMqMsgStream(context.Background(), 100, 100, rmqClient2, factory.NewUnmarshalDispatcher()) - outputStream.AsConsumer(consumerChannels, consumerSubName, mqwrapper.SubscriptionPositionLatest) - - inputStream.Produce(getTimeTickMsgPack(1000)) - pack := <-outputStream.Chan() - assert.NotNil(t, pack) - assert.Equal(t, 1, len(pack.Msgs)) - assert.EqualValues(t, 1000, pack.Msgs[0].BeginTs()) - - Close(rocksdbName, inputStream, outputStream, etcdKV) -} - func patchMessageID(mid *pulsar.MessageID, entryID int64) { // use direct unsafe conversion /* #nosec G103 */ diff --git a/internal/mq/msgstream/mqwrapper/client.go b/pkg/mq/msgstream/mqwrapper/client.go similarity index 100% rename from internal/mq/msgstream/mqwrapper/client.go rename to pkg/mq/msgstream/mqwrapper/client.go diff --git a/internal/mq/msgstream/mqwrapper/consumer.go b/pkg/mq/msgstream/mqwrapper/consumer.go similarity index 100% rename from internal/mq/msgstream/mqwrapper/consumer.go rename to pkg/mq/msgstream/mqwrapper/consumer.go diff --git a/internal/mq/msgstream/mqwrapper/errors.go b/pkg/mq/msgstream/mqwrapper/errors.go similarity index 100% rename from internal/mq/msgstream/mqwrapper/errors.go rename to pkg/mq/msgstream/mqwrapper/errors.go diff --git a/internal/mq/msgstream/mqwrapper/id.go b/pkg/mq/msgstream/mqwrapper/id.go similarity index 100% rename from internal/mq/msgstream/mqwrapper/id.go rename to pkg/mq/msgstream/mqwrapper/id.go diff --git a/internal/mq/msgstream/mqwrapper/kafka/kafka_client.go b/pkg/mq/msgstream/mqwrapper/kafka/kafka_client.go similarity index 97% rename from internal/mq/msgstream/mqwrapper/kafka/kafka_client.go rename to pkg/mq/msgstream/mqwrapper/kafka/kafka_client.go index 163bbb6317..5dfcb58312 100644 --- a/internal/mq/msgstream/mqwrapper/kafka/kafka_client.go +++ b/pkg/mq/msgstream/mqwrapper/kafka/kafka_client.go @@ -5,15 +5,16 @@ import ( "strconv" "sync" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/confluentinc/confluent-kafka-go/kafka" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) var Producer *kafka.Producer + var once sync.Once type kafkaClient struct { diff --git a/internal/mq/msgstream/mqwrapper/kafka/kafka_client_test.go b/pkg/mq/msgstream/mqwrapper/kafka/kafka_client_test.go similarity index 97% rename from internal/mq/msgstream/mqwrapper/kafka/kafka_client_test.go rename to pkg/mq/msgstream/mqwrapper/kafka/kafka_client_test.go index 17ac1fa37c..86bd19eb32 100644 --- a/internal/mq/msgstream/mqwrapper/kafka/kafka_client_test.go +++ b/pkg/mq/msgstream/mqwrapper/kafka/kafka_client_test.go @@ -10,16 +10,15 @@ import ( "testing" "time" - "github.com/milvus-io/milvus/internal/config" - "github.com/confluentinc/confluent-kafka-go/kafka" - - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/stretchr/testify/assert" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/config" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) var Params = paramtable.Get() @@ -53,6 +52,7 @@ func IntToBytes(n int) []byte { binary.Write(bytesBuffer, common.Endian, tmp) return bytesBuffer.Bytes() } + func BytesToInt(b []byte) int { bytesBuffer := bytes.NewBuffer(b) var tmp int32 diff --git a/internal/mq/msgstream/mqwrapper/kafka/kafka_consumer.go b/pkg/mq/msgstream/mqwrapper/kafka/kafka_consumer.go similarity index 98% rename from internal/mq/msgstream/mqwrapper/kafka/kafka_consumer.go rename to pkg/mq/msgstream/mqwrapper/kafka/kafka_consumer.go index 5d654676c7..762762b870 100644 --- a/internal/mq/msgstream/mqwrapper/kafka/kafka_consumer.go +++ b/pkg/mq/msgstream/mqwrapper/kafka/kafka_consumer.go @@ -6,10 +6,11 @@ import ( "github.com/cockroachdb/errors" "github.com/confluentinc/confluent-kafka-go/kafka" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/internal/util/merr" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/merr" ) type Consumer struct { diff --git a/internal/mq/msgstream/mqwrapper/kafka/kafka_consumer_test.go b/pkg/mq/msgstream/mqwrapper/kafka/kafka_consumer_test.go similarity index 98% rename from internal/mq/msgstream/mqwrapper/kafka/kafka_consumer_test.go rename to pkg/mq/msgstream/mqwrapper/kafka/kafka_consumer_test.go index 4ec6c3d907..8eaad246f7 100644 --- a/internal/mq/msgstream/mqwrapper/kafka/kafka_consumer_test.go +++ b/pkg/mq/msgstream/mqwrapper/kafka/kafka_consumer_test.go @@ -8,9 +8,10 @@ import ( "time" "github.com/confluentinc/confluent-kafka-go/kafka" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" "github.com/stretchr/testify/assert" + + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" ) func TestKafkaConsumer_Subscription(t *testing.T) { diff --git a/internal/mq/msgstream/mqwrapper/kafka/kafka_id.go b/pkg/mq/msgstream/mqwrapper/kafka/kafka_id.go similarity index 87% rename from internal/mq/msgstream/mqwrapper/kafka/kafka_id.go rename to pkg/mq/msgstream/mqwrapper/kafka/kafka_id.go index 21b66b0fb4..58af67bec9 100644 --- a/internal/mq/msgstream/mqwrapper/kafka/kafka_id.go +++ b/pkg/mq/msgstream/mqwrapper/kafka/kafka_id.go @@ -1,8 +1,8 @@ package kafka import ( - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" ) type kafkaID struct { diff --git a/internal/mq/msgstream/mqwrapper/kafka/kafka_id_test.go b/pkg/mq/msgstream/mqwrapper/kafka/kafka_id_test.go similarity index 100% rename from internal/mq/msgstream/mqwrapper/kafka/kafka_id_test.go rename to pkg/mq/msgstream/mqwrapper/kafka/kafka_id_test.go diff --git a/internal/mq/msgstream/mqwrapper/kafka/kafka_message.go b/pkg/mq/msgstream/mqwrapper/kafka/kafka_message.go similarity index 90% rename from internal/mq/msgstream/mqwrapper/kafka/kafka_message.go rename to pkg/mq/msgstream/mqwrapper/kafka/kafka_message.go index a4a498f237..d7f0958539 100644 --- a/internal/mq/msgstream/mqwrapper/kafka/kafka_message.go +++ b/pkg/mq/msgstream/mqwrapper/kafka/kafka_message.go @@ -2,7 +2,8 @@ package kafka import ( "github.com/confluentinc/confluent-kafka-go/kafka" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" + + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" ) type kafkaMessage struct { diff --git a/internal/mq/msgstream/mqwrapper/kafka/kafka_message_test.go b/pkg/mq/msgstream/mqwrapper/kafka/kafka_message_test.go similarity index 100% rename from internal/mq/msgstream/mqwrapper/kafka/kafka_message_test.go rename to pkg/mq/msgstream/mqwrapper/kafka/kafka_message_test.go diff --git a/internal/mq/msgstream/mqwrapper/kafka/kafka_producer.go b/pkg/mq/msgstream/mqwrapper/kafka/kafka_producer.go similarity index 91% rename from internal/mq/msgstream/mqwrapper/kafka/kafka_producer.go rename to pkg/mq/msgstream/mqwrapper/kafka/kafka_producer.go index 29721328d6..55397afc42 100644 --- a/internal/mq/msgstream/mqwrapper/kafka/kafka_producer.go +++ b/pkg/mq/msgstream/mqwrapper/kafka/kafka_producer.go @@ -9,9 +9,9 @@ import ( "github.com/confluentinc/confluent-kafka-go/kafka" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" ) type kafkaProducer struct { diff --git a/internal/mq/msgstream/mqwrapper/kafka/kafka_producer_test.go b/pkg/mq/msgstream/mqwrapper/kafka/kafka_producer_test.go similarity index 96% rename from internal/mq/msgstream/mqwrapper/kafka/kafka_producer_test.go rename to pkg/mq/msgstream/mqwrapper/kafka/kafka_producer_test.go index ead0e75cc6..b7f45af57e 100644 --- a/internal/mq/msgstream/mqwrapper/kafka/kafka_producer_test.go +++ b/pkg/mq/msgstream/mqwrapper/kafka/kafka_producer_test.go @@ -8,11 +8,10 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/confluentinc/confluent-kafka-go/kafka" - - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" "github.com/stretchr/testify/assert" + + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" ) func TestKafkaProducer_SendSuccess(t *testing.T) { diff --git a/internal/mq/msgstream/mqwrapper/message.go b/pkg/mq/msgstream/mqwrapper/message.go similarity index 100% rename from internal/mq/msgstream/mqwrapper/message.go rename to pkg/mq/msgstream/mqwrapper/message.go diff --git a/internal/mq/msgstream/mqwrapper/producer.go b/pkg/mq/msgstream/mqwrapper/producer.go similarity index 100% rename from internal/mq/msgstream/mqwrapper/producer.go rename to pkg/mq/msgstream/mqwrapper/producer.go diff --git a/internal/mq/msgstream/mqwrapper/pulsar/pulsar_client.go b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_client.go similarity index 97% rename from internal/mq/msgstream/mqwrapper/pulsar/pulsar_client.go rename to pkg/mq/msgstream/mqwrapper/pulsar/pulsar_client.go index 5dd47be11d..a9222724de 100644 --- a/internal/mq/msgstream/mqwrapper/pulsar/pulsar_client.go +++ b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_client.go @@ -22,15 +22,15 @@ import ( "sync" "time" - "github.com/cockroachdb/errors" - "github.com/apache/pulsar-client-go/pulsar" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/internal/util/retry" + "github.com/cockroachdb/errors" pulsarctl "github.com/streamnative/pulsarctl/pkg/pulsar" "github.com/streamnative/pulsarctl/pkg/pulsar/common" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/retry" ) type pulsarClient struct { @@ -40,6 +40,7 @@ type pulsarClient struct { } var sc *pulsarClient + var once sync.Once // NewClient creates a pulsarClient object diff --git a/internal/mq/msgstream/mqwrapper/pulsar/pulsar_client_test.go b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_client_test.go similarity index 98% rename from internal/mq/msgstream/mqwrapper/pulsar/pulsar_client_test.go rename to pkg/mq/msgstream/mqwrapper/pulsar/pulsar_client_test.go index b1914f8c1c..e07d9d0c50 100644 --- a/internal/mq/msgstream/mqwrapper/pulsar/pulsar_client_test.go +++ b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_client_test.go @@ -29,14 +29,15 @@ import ( "unsafe" "github.com/apache/pulsar-client-go/pulsar" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/retry" "github.com/streamnative/pulsarctl/pkg/pulsar/utils" "github.com/stretchr/testify/assert" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/retry" ) const ( diff --git a/internal/mq/msgstream/mqwrapper/pulsar/pulsar_consumer.go b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_consumer.go similarity index 96% rename from internal/mq/msgstream/mqwrapper/pulsar/pulsar_consumer.go rename to pkg/mq/msgstream/mqwrapper/pulsar/pulsar_consumer.go index 578f3def8f..20296c8320 100644 --- a/internal/mq/msgstream/mqwrapper/pulsar/pulsar_consumer.go +++ b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_consumer.go @@ -23,13 +23,13 @@ import ( "time" "unsafe" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/internal/util/merr" - "github.com/milvus-io/milvus/internal/util/retry" - "github.com/apache/pulsar-client-go/pulsar" - "github.com/milvus-io/milvus/internal/log" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/merr" + "github.com/milvus-io/milvus/pkg/util/retry" ) // Consumer consumes from pulsar diff --git a/internal/mq/msgstream/mqwrapper/pulsar/pulsar_consumer_test.go b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_consumer_test.go similarity index 98% rename from internal/mq/msgstream/mqwrapper/pulsar/pulsar_consumer_test.go rename to pkg/mq/msgstream/mqwrapper/pulsar/pulsar_consumer_test.go index 79ef129f70..3d9a9802be 100644 --- a/internal/mq/msgstream/mqwrapper/pulsar/pulsar_consumer_test.go +++ b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_consumer_test.go @@ -23,12 +23,12 @@ import ( "strings" "testing" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/streamnative/pulsarctl/pkg/pulsar/utils" - "github.com/apache/pulsar-client-go/pulsar" + "github.com/streamnative/pulsarctl/pkg/pulsar/utils" "github.com/stretchr/testify/assert" + + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" ) func TestPulsarConsumer_Subscription(t *testing.T) { diff --git a/internal/mq/msgstream/mqwrapper/pulsar/pulsar_id.go b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_id.go similarity index 97% rename from internal/mq/msgstream/mqwrapper/pulsar/pulsar_id.go rename to pkg/mq/msgstream/mqwrapper/pulsar/pulsar_id.go index 4840e407dd..b6215b409d 100644 --- a/internal/mq/msgstream/mqwrapper/pulsar/pulsar_id.go +++ b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_id.go @@ -19,9 +19,9 @@ package pulsar import ( "strings" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/apache/pulsar-client-go/pulsar" + + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" ) type pulsarID struct { diff --git a/internal/mq/msgstream/mqwrapper/pulsar/pulsar_id_test.go b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_id_test.go similarity index 100% rename from internal/mq/msgstream/mqwrapper/pulsar/pulsar_id_test.go rename to pkg/mq/msgstream/mqwrapper/pulsar/pulsar_id_test.go diff --git a/internal/mq/msgstream/mqwrapper/pulsar/pulsar_message.go b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_message.go similarity index 95% rename from internal/mq/msgstream/mqwrapper/pulsar/pulsar_message.go rename to pkg/mq/msgstream/mqwrapper/pulsar/pulsar_message.go index 66a1c3967f..5a6816418f 100644 --- a/internal/mq/msgstream/mqwrapper/pulsar/pulsar_message.go +++ b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_message.go @@ -18,7 +18,8 @@ package pulsar import ( "github.com/apache/pulsar-client-go/pulsar" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" + + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" ) // Check pulsarMessage implements ConsumerMessage diff --git a/internal/mq/msgstream/mqwrapper/pulsar/pulsar_producer.go b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_producer.go similarity index 95% rename from internal/mq/msgstream/mqwrapper/pulsar/pulsar_producer.go rename to pkg/mq/msgstream/mqwrapper/pulsar/pulsar_producer.go index 6a3a8217d4..b9fcbfd8c6 100644 --- a/internal/mq/msgstream/mqwrapper/pulsar/pulsar_producer.go +++ b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_producer.go @@ -19,9 +19,9 @@ package pulsar import ( "context" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/apache/pulsar-client-go/pulsar" + + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" ) // implementation assertion diff --git a/internal/mq/msgstream/mqwrapper/pulsar/pulsar_producer_test.go b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_producer_test.go similarity index 96% rename from internal/mq/msgstream/mqwrapper/pulsar/pulsar_producer_test.go rename to pkg/mq/msgstream/mqwrapper/pulsar/pulsar_producer_test.go index 6155bbdc25..4f6890393c 100644 --- a/internal/mq/msgstream/mqwrapper/pulsar/pulsar_producer_test.go +++ b/pkg/mq/msgstream/mqwrapper/pulsar/pulsar_producer_test.go @@ -20,10 +20,10 @@ import ( "context" "testing" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/apache/pulsar-client-go/pulsar" "github.com/stretchr/testify/assert" + + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" ) func TestPulsarProducer(t *testing.T) { diff --git a/internal/mq/msgstream/msg.go b/pkg/mq/msgstream/msg.go similarity index 99% rename from internal/mq/msgstream/msg.go rename to pkg/mq/msgstream/msg.go index 0dd08b771f..fd260af7eb 100644 --- a/internal/mq/msgstream/msg.go +++ b/pkg/mq/msgstream/msg.go @@ -22,13 +22,13 @@ import ( "github.com/cockroachdb/errors" "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/util/commonpbutil" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/typeutil" + + "github.com/milvus-io/milvus/pkg/util/commonpbutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // MsgType is an alias of commonpb.MsgType diff --git a/internal/mq/msgstream/msg_test.go b/pkg/mq/msgstream/msg_test.go similarity index 99% rename from internal/mq/msgstream/msg_test.go rename to pkg/mq/msgstream/msg_test.go index 07147eec12..91544bde49 100644 --- a/internal/mq/msgstream/msg_test.go +++ b/pkg/mq/msgstream/msg_test.go @@ -20,11 +20,10 @@ import ( "context" "testing" - "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" + "github.com/stretchr/testify/assert" ) func TestBaseMsg(t *testing.T) { diff --git a/internal/mq/msgstream/msgstream.go b/pkg/mq/msgstream/msgstream.go similarity index 95% rename from internal/mq/msgstream/msgstream.go rename to pkg/mq/msgstream/msgstream.go index 33be2c3e5a..12d263d4d5 100644 --- a/internal/mq/msgstream/msgstream.go +++ b/pkg/mq/msgstream/msgstream.go @@ -20,8 +20,9 @@ import ( "context" "github.com/milvus-io/milvus-proto/go-api/msgpb" - "github.com/milvus-io/milvus/internal/mq/msgstream/mqwrapper" - "github.com/milvus-io/milvus/internal/util/typeutil" + + "github.com/milvus-io/milvus/pkg/mq/msgstream/mqwrapper" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // UniqueID is an alias for short diff --git a/internal/mq/msgstream/msgstream_util.go b/pkg/mq/msgstream/msgstream_util.go similarity index 96% rename from internal/mq/msgstream/msgstream_util.go rename to pkg/mq/msgstream/msgstream_util.go index d226c33cce..9d05d4bda9 100644 --- a/internal/mq/msgstream/msgstream_util.go +++ b/pkg/mq/msgstream/msgstream_util.go @@ -19,8 +19,9 @@ package msgstream import ( "context" - "github.com/milvus-io/milvus/internal/log" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" ) // unsubscribeChannels create consumer first, and unsubscribe channel through msgStream.close() diff --git a/internal/mq/msgstream/msgstream_util_test.go b/pkg/mq/msgstream/msgstream_util_test.go similarity index 100% rename from internal/mq/msgstream/msgstream_util_test.go rename to pkg/mq/msgstream/msgstream_util_test.go diff --git a/internal/mq/msgstream/repack_func.go b/pkg/mq/msgstream/repack_func.go similarity index 99% rename from internal/mq/msgstream/repack_func.go rename to pkg/mq/msgstream/repack_func.go index 7432c5eea1..f9fedc8e25 100644 --- a/internal/mq/msgstream/repack_func.go +++ b/pkg/mq/msgstream/repack_func.go @@ -20,7 +20,6 @@ import ( "fmt" "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus-proto/go-api/commonpb" ) diff --git a/internal/mq/msgstream/trace.go b/pkg/mq/msgstream/trace.go similarity index 100% rename from internal/mq/msgstream/trace.go rename to pkg/mq/msgstream/trace.go diff --git a/internal/mq/msgstream/unmarshal.go b/pkg/mq/msgstream/unmarshal.go similarity index 99% rename from internal/mq/msgstream/unmarshal.go rename to pkg/mq/msgstream/unmarshal.go index e4ee33c396..fe065fadc0 100644 --- a/internal/mq/msgstream/unmarshal.go +++ b/pkg/mq/msgstream/unmarshal.go @@ -18,7 +18,6 @@ package msgstream import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus-proto/go-api/commonpb" ) diff --git a/internal/mq/msgstream/unmarshal_test.go b/pkg/mq/msgstream/unmarshal_test.go similarity index 99% rename from internal/mq/msgstream/unmarshal_test.go rename to pkg/mq/msgstream/unmarshal_test.go index e297d81c12..58e993d14f 100644 --- a/internal/mq/msgstream/unmarshal_test.go +++ b/pkg/mq/msgstream/unmarshal_test.go @@ -20,10 +20,9 @@ import ( "testing" "github.com/golang/protobuf/proto" - "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/msgpb" + "github.com/stretchr/testify/assert" ) func Test_ProtoUnmarshalDispatcher(t *testing.T) { diff --git a/internal/mq/msgstream/wasted_mock_msgstream.go b/pkg/mq/msgstream/wasted_mock_msgstream.go similarity index 100% rename from internal/mq/msgstream/wasted_mock_msgstream.go rename to pkg/mq/msgstream/wasted_mock_msgstream.go diff --git a/internal/tracer/interceptor_suite.go b/pkg/tracer/interceptor_suite.go similarity index 100% rename from internal/tracer/interceptor_suite.go rename to pkg/tracer/interceptor_suite.go diff --git a/internal/tracer/stack_trace.go b/pkg/tracer/stack_trace.go similarity index 100% rename from internal/tracer/stack_trace.go rename to pkg/tracer/stack_trace.go diff --git a/internal/tracer/stack_trace_test.go b/pkg/tracer/stack_trace_test.go similarity index 100% rename from internal/tracer/stack_trace_test.go rename to pkg/tracer/stack_trace_test.go diff --git a/internal/tracer/tracer.go b/pkg/tracer/tracer.go similarity index 96% rename from internal/tracer/tracer.go rename to pkg/tracer/tracer.go index 7daf3bc56f..7838661043 100644 --- a/internal/tracer/tracer.go +++ b/pkg/tracer/tracer.go @@ -20,9 +20,6 @@ import ( "context" "github.com/cockroachdb/errors" - - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/paramtable" "go.opentelemetry.io/otel" "go.opentelemetry.io/otel/attribute" "go.opentelemetry.io/otel/exporters/jaeger" @@ -33,6 +30,9 @@ import ( sdk "go.opentelemetry.io/otel/sdk/trace" semconv "go.opentelemetry.io/otel/semconv/v1.4.0" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) func Init() { diff --git a/internal/util/OWNERS b/pkg/util/OWNERS similarity index 100% rename from internal/util/OWNERS rename to pkg/util/OWNERS diff --git a/internal/util/cache/cache_interface.go b/pkg/util/cache/cache_interface.go similarity index 100% rename from internal/util/cache/cache_interface.go rename to pkg/util/cache/cache_interface.go diff --git a/internal/util/cache/hash.go b/pkg/util/cache/hash.go similarity index 100% rename from internal/util/cache/hash.go rename to pkg/util/cache/hash.go diff --git a/internal/util/cache/hash_test.go b/pkg/util/cache/hash_test.go similarity index 100% rename from internal/util/cache/hash_test.go rename to pkg/util/cache/hash_test.go diff --git a/internal/util/cache/local_cache.go b/pkg/util/cache/local_cache.go similarity index 99% rename from internal/util/cache/local_cache.go rename to pkg/util/cache/local_cache.go index bcb8e2026e..618733b70a 100644 --- a/internal/util/cache/local_cache.go +++ b/pkg/util/cache/local_cache.go @@ -23,11 +23,10 @@ import ( "time" "github.com/cockroachdb/errors" - "go.uber.org/zap" "golang.org/x/sync/singleflight" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" ) const ( diff --git a/internal/util/cache/local_cache_test.go b/pkg/util/cache/local_cache_test.go similarity index 99% rename from internal/util/cache/local_cache_test.go rename to pkg/util/cache/local_cache_test.go index ff3b1806b5..508e1495c2 100644 --- a/internal/util/cache/local_cache_test.go +++ b/pkg/util/cache/local_cache_test.go @@ -24,7 +24,6 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/stretchr/testify/assert" ) diff --git a/internal/util/cache/lru_impl.go b/pkg/util/cache/lru_impl.go similarity index 100% rename from internal/util/cache/lru_impl.go rename to pkg/util/cache/lru_impl.go diff --git a/internal/util/cache/lru_impl_test.go b/pkg/util/cache/lru_impl_test.go similarity index 100% rename from internal/util/cache/lru_impl_test.go rename to pkg/util/cache/lru_impl_test.go diff --git a/internal/util/cache/policy.go b/pkg/util/cache/policy.go similarity index 100% rename from internal/util/cache/policy.go rename to pkg/util/cache/policy.go diff --git a/internal/util/cache/policy_test.go b/pkg/util/cache/policy_test.go similarity index 100% rename from internal/util/cache/policy_test.go rename to pkg/util/cache/policy_test.go diff --git a/internal/util/cache/stats.go b/pkg/util/cache/stats.go similarity index 100% rename from internal/util/cache/stats.go rename to pkg/util/cache/stats.go diff --git a/internal/util/cache/stats_test.go b/pkg/util/cache/stats_test.go similarity index 100% rename from internal/util/cache/stats_test.go rename to pkg/util/cache/stats_test.go diff --git a/internal/util/cgoconverter/bytes_converter.go b/pkg/util/cgoconverter/bytes_converter.go similarity index 99% rename from internal/util/cgoconverter/bytes_converter.go rename to pkg/util/cgoconverter/bytes_converter.go index ac21d4120e..2d1741f7bf 100644 --- a/internal/util/cgoconverter/bytes_converter.go +++ b/pkg/util/cgoconverter/bytes_converter.go @@ -4,6 +4,7 @@ package cgoconverter #include */ import "C" + import ( "math" "sync" diff --git a/internal/util/cgoconverter/bytes_converter_test.go b/pkg/util/cgoconverter/bytes_converter_test.go similarity index 100% rename from internal/util/cgoconverter/bytes_converter_test.go rename to pkg/util/cgoconverter/bytes_converter_test.go diff --git a/internal/util/cgoconverter/test_utils.go b/pkg/util/cgoconverter/test_utils.go similarity index 99% rename from internal/util/cgoconverter/test_utils.go rename to pkg/util/cgoconverter/test_utils.go index ed7f251fc2..ae18cf84aa 100644 --- a/internal/util/cgoconverter/test_utils.go +++ b/pkg/util/cgoconverter/test_utils.go @@ -5,6 +5,7 @@ package cgoconverter #include */ import "C" + import "unsafe" func copyToCBytes(data []byte) unsafe.Pointer { diff --git a/internal/util/commonpbutil/commonpbutil.go b/pkg/util/commonpbutil/commonpbutil.go similarity index 100% rename from internal/util/commonpbutil/commonpbutil.go rename to pkg/util/commonpbutil/commonpbutil.go diff --git a/internal/util/commonpbutil/commonpbutil_test.go b/pkg/util/commonpbutil/commonpbutil_test.go similarity index 100% rename from internal/util/commonpbutil/commonpbutil_test.go rename to pkg/util/commonpbutil/commonpbutil_test.go diff --git a/internal/util/compressor/compressor.go b/pkg/util/compressor/compressor.go similarity index 100% rename from internal/util/compressor/compressor.go rename to pkg/util/compressor/compressor.go diff --git a/internal/util/compressor/compressor_test.go b/pkg/util/compressor/compressor_test.go similarity index 90% rename from internal/util/compressor/compressor_test.go rename to pkg/util/compressor/compressor_test.go index 6eeae0ca74..a027f1c9d5 100644 --- a/internal/util/compressor/compressor_test.go +++ b/pkg/util/compressor/compressor_test.go @@ -10,7 +10,6 @@ import ( "testing" "github.com/klauspost/compress/zstd" - "github.com/milvus-io/milvus/internal/util/mock" "github.com/stretchr/testify/assert" ) @@ -64,8 +63,8 @@ func testCompress(t *testing.T, data string, enc Compressor, compressed, origin assert.Equal(t, data, origin.String()) // Mock error reader/writer - errReader := &mock.ErrReader{Err: io.ErrUnexpectedEOF} - errWriter := &mock.ErrWriter{Err: io.ErrShortWrite} + errReader := &ErrReader{Err: io.ErrUnexpectedEOF} + errWriter := &ErrWriter{Err: io.ErrShortWrite} err = enc.Compress(errReader) assert.ErrorIs(t, err, errReader.Err) @@ -104,8 +103,8 @@ func TestGlobalMethods(t *testing.T) { assert.Equal(t, data, origin.String()) // Mock error reader/writer - errReader := &mock.ErrReader{Err: io.ErrUnexpectedEOF} - errWriter := &mock.ErrWriter{Err: io.ErrShortWrite} + errReader := &ErrReader{Err: io.ErrUnexpectedEOF} + errWriter := &ErrWriter{Err: io.ErrShortWrite} compressedBytes = compressed.Bytes() compressed = bytes.NewBuffer(compressedBytes) // The old compressed buffer is closed @@ -162,3 +161,19 @@ func TestCurrencyGlobalMethods(t *testing.T) { } wg.Wait() } + +type ErrReader struct { + Err error +} + +func (r *ErrReader) Read(p []byte) (n int, err error) { + return 0, r.Err +} + +type ErrWriter struct { + Err error +} + +func (w *ErrWriter) Write(p []byte) (n int, err error) { + return 0, w.Err +} diff --git a/internal/util/conc/future.go b/pkg/util/conc/future.go similarity index 100% rename from internal/util/conc/future.go rename to pkg/util/conc/future.go diff --git a/internal/util/conc/future_test.go b/pkg/util/conc/future_test.go similarity index 100% rename from internal/util/conc/future_test.go rename to pkg/util/conc/future_test.go diff --git a/internal/util/conc/pool.go b/pkg/util/conc/pool.go similarity index 98% rename from internal/util/conc/pool.go rename to pkg/util/conc/pool.go index c088fe3853..5267c903b7 100644 --- a/internal/util/conc/pool.go +++ b/pkg/util/conc/pool.go @@ -19,7 +19,7 @@ package conc import ( "runtime" - "github.com/panjf2000/ants/v2" + ants "github.com/panjf2000/ants/v2" ) // A goroutine pool diff --git a/internal/util/conc/pool_test.go b/pkg/util/conc/pool_test.go similarity index 100% rename from internal/util/conc/pool_test.go rename to pkg/util/conc/pool_test.go diff --git a/internal/util/constant.go b/pkg/util/constant.go similarity index 100% rename from internal/util/constant.go rename to pkg/util/constant.go diff --git a/internal/util/contextutil/context_util.go b/pkg/util/contextutil/context_util.go similarity index 100% rename from internal/util/contextutil/context_util.go rename to pkg/util/contextutil/context_util.go diff --git a/internal/util/crypto/crypto.go b/pkg/util/crypto/crypto.go similarity index 100% rename from internal/util/crypto/crypto.go rename to pkg/util/crypto/crypto.go diff --git a/internal/util/crypto/crypto_test.go b/pkg/util/crypto/crypto_test.go similarity index 100% rename from internal/util/crypto/crypto_test.go rename to pkg/util/crypto/crypto_test.go diff --git a/internal/util/distance/calc_distance.go b/pkg/util/distance/calc_distance.go similarity index 100% rename from internal/util/distance/calc_distance.go rename to pkg/util/distance/calc_distance.go diff --git a/internal/util/distance/calc_distance_test.go b/pkg/util/distance/calc_distance_test.go similarity index 100% rename from internal/util/distance/calc_distance_test.go rename to pkg/util/distance/calc_distance_test.go diff --git a/internal/util/distance/similarity_corelation.go b/pkg/util/distance/similarity_corelation.go similarity index 100% rename from internal/util/distance/similarity_corelation.go rename to pkg/util/distance/similarity_corelation.go diff --git a/internal/util/distance/similarity_corelation_test.go b/pkg/util/distance/similarity_corelation_test.go similarity index 100% rename from internal/util/distance/similarity_corelation_test.go rename to pkg/util/distance/similarity_corelation_test.go diff --git a/internal/util/errorutil/util.go b/pkg/util/errorutil/util.go similarity index 96% rename from internal/util/errorutil/util.go rename to pkg/util/errorutil/util.go index ce0c639747..b5b4169127 100644 --- a/internal/util/errorutil/util.go +++ b/pkg/util/errorutil/util.go @@ -4,10 +4,10 @@ import ( "fmt" "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/util/typeutil" + + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func UnhealthyStatus(code commonpb.StateCode) *commonpb.Status { diff --git a/internal/util/errorutil/util_test.go b/pkg/util/errorutil/util_test.go similarity index 100% rename from internal/util/errorutil/util_test.go rename to pkg/util/errorutil/util_test.go diff --git a/internal/util/etcd/etcd_server.go b/pkg/util/etcd/etcd_server.go similarity index 97% rename from internal/util/etcd/etcd_server.go rename to pkg/util/etcd/etcd_server.go index 75f81c43e4..7130d10f34 100644 --- a/internal/util/etcd/etcd_server.go +++ b/pkg/util/etcd/etcd_server.go @@ -3,11 +3,12 @@ package etcd import ( "sync" - "github.com/milvus-io/milvus/internal/log" clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/server/v3/embed" "go.etcd.io/etcd/server/v3/etcdserver/api/v3client" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" ) // EtcdServer is the singleton of embedded etcd server diff --git a/internal/util/etcd/etcd_util.go b/pkg/util/etcd/etcd_util.go similarity index 99% rename from internal/util/etcd/etcd_util.go rename to pkg/util/etcd/etcd_util.go index f2f840c3c3..a9f065c969 100644 --- a/internal/util/etcd/etcd_util.go +++ b/pkg/util/etcd/etcd_util.go @@ -26,7 +26,6 @@ import ( "time" "github.com/cockroachdb/errors" - clientv3 "go.etcd.io/etcd/client/v3" "go.etcd.io/etcd/server/v3/embed" ) diff --git a/internal/util/etcd/etcd_util_test.go b/pkg/util/etcd/etcd_util_test.go similarity index 99% rename from internal/util/etcd/etcd_util_test.go rename to pkg/util/etcd/etcd_util_test.go index 15769caa27..eec9d50580 100644 --- a/internal/util/etcd/etcd_util_test.go +++ b/pkg/util/etcd/etcd_util_test.go @@ -22,7 +22,6 @@ import ( "testing" "github.com/cockroachdb/errors" - "github.com/stretchr/testify/assert" ) diff --git a/internal/util/funcutil/aggregation.go b/pkg/util/funcutil/aggregation.go similarity index 100% rename from internal/util/funcutil/aggregation.go rename to pkg/util/funcutil/aggregation.go diff --git a/internal/util/funcutil/aggregation_test.go b/pkg/util/funcutil/aggregation_test.go similarity index 100% rename from internal/util/funcutil/aggregation_test.go rename to pkg/util/funcutil/aggregation_test.go diff --git a/internal/util/funcutil/func.go b/pkg/util/funcutil/func.go similarity index 97% rename from internal/util/funcutil/func.go rename to pkg/util/funcutil/func.go index e9803185d7..23e8e7d1cd 100644 --- a/internal/util/funcutil/func.go +++ b/pkg/util/funcutil/func.go @@ -29,13 +29,10 @@ import ( "time" "github.com/cockroachdb/errors" - - grpcStatus "google.golang.org/grpc/status" - "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/proto/datapb" + grpcStatus "google.golang.org/grpc/status" ) // CheckGrpcReady wait for context timeout, or wait 100ms then send nil to targetCh @@ -321,12 +318,3 @@ func DecodeUserRoleCache(cache string) (string, string, error) { role := cache[index+1:] return user, role, nil } - -func GetFieldSizeFromFieldBinlog(fieldBinlog *datapb.FieldBinlog) int64 { - fieldSize := int64(0) - for _, binlog := range fieldBinlog.Binlogs { - fieldSize += binlog.LogSize - } - - return fieldSize -} diff --git a/internal/util/funcutil/func_test.go b/pkg/util/funcutil/func_test.go similarity index 99% rename from internal/util/funcutil/func_test.go rename to pkg/util/funcutil/func_test.go index a2b68a82af..bc4279109e 100644 --- a/internal/util/funcutil/func_test.go +++ b/pkg/util/funcutil/func_test.go @@ -26,7 +26,6 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/stretchr/testify/assert" diff --git a/internal/util/funcutil/map.go b/pkg/util/funcutil/map.go similarity index 100% rename from internal/util/funcutil/map.go rename to pkg/util/funcutil/map.go diff --git a/internal/util/funcutil/math.go b/pkg/util/funcutil/math.go similarity index 100% rename from internal/util/funcutil/math.go rename to pkg/util/funcutil/math.go diff --git a/internal/util/funcutil/parallel.go b/pkg/util/funcutil/parallel.go similarity index 99% rename from internal/util/funcutil/parallel.go rename to pkg/util/funcutil/parallel.go index 3a58b8f1ed..258d603ccf 100644 --- a/internal/util/funcutil/parallel.go +++ b/pkg/util/funcutil/parallel.go @@ -22,8 +22,9 @@ import ( "sync" "time" - "github.com/milvus-io/milvus/internal/log" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" ) // GetFunctionName returns the name of input @@ -32,7 +33,9 @@ func GetFunctionName(i interface{}) string { } type TaskFunc func() error + type ProcessFunc func(idx int) error + type DataProcessFunc func(data interface{}) error // ProcessFuncParallel processes function in parallel. diff --git a/internal/util/funcutil/parallel_test.go b/pkg/util/funcutil/parallel_test.go similarity index 99% rename from internal/util/funcutil/parallel_test.go rename to pkg/util/funcutil/parallel_test.go index c8ed39ee7f..c920d1a587 100644 --- a/internal/util/funcutil/parallel_test.go +++ b/pkg/util/funcutil/parallel_test.go @@ -24,7 +24,6 @@ import ( "testing" "github.com/cockroachdb/errors" - "github.com/stretchr/testify/assert" ) diff --git a/internal/util/funcutil/policy.go b/pkg/util/funcutil/policy.go similarity index 97% rename from internal/util/funcutil/policy.go rename to pkg/util/funcutil/policy.go index 80f07d1099..06cfce4e09 100644 --- a/internal/util/funcutil/policy.go +++ b/pkg/util/funcutil/policy.go @@ -3,15 +3,15 @@ package funcutil import ( "fmt" - "github.com/milvus-io/milvus/internal/util" - "github.com/golang/protobuf/descriptor" "github.com/golang/protobuf/proto" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/log" "go.uber.org/zap" "google.golang.org/protobuf/reflect/protoreflect" + + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util" ) func GetVersion(m proto.GeneratedMessage) (string, error) { diff --git a/internal/util/funcutil/policy_test.go b/pkg/util/funcutil/policy_test.go similarity index 99% rename from internal/util/funcutil/policy_test.go rename to pkg/util/funcutil/policy_test.go index 1276019968..eacabc691f 100644 --- a/internal/util/funcutil/policy_test.go +++ b/pkg/util/funcutil/policy_test.go @@ -5,7 +5,6 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/stretchr/testify/assert" ) diff --git a/internal/util/funcutil/random.go b/pkg/util/funcutil/random.go similarity index 100% rename from internal/util/funcutil/random.go rename to pkg/util/funcutil/random.go diff --git a/internal/util/funcutil/random_test.go b/pkg/util/funcutil/random_test.go similarity index 100% rename from internal/util/funcutil/random_test.go rename to pkg/util/funcutil/random_test.go diff --git a/internal/util/funcutil/set.go b/pkg/util/funcutil/set.go similarity index 100% rename from internal/util/funcutil/set.go rename to pkg/util/funcutil/set.go diff --git a/internal/util/funcutil/set_test.go b/pkg/util/funcutil/set_test.go similarity index 100% rename from internal/util/funcutil/set_test.go rename to pkg/util/funcutil/set_test.go diff --git a/internal/util/funcutil/slice.go b/pkg/util/funcutil/slice.go similarity index 96% rename from internal/util/funcutil/slice.go rename to pkg/util/funcutil/slice.go index 087cf3fc7c..8699b65fe6 100644 --- a/internal/util/funcutil/slice.go +++ b/pkg/util/funcutil/slice.go @@ -19,7 +19,7 @@ package funcutil import ( "reflect" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // SliceContain returns true if slice s contains item. diff --git a/internal/util/funcutil/slice_test.go b/pkg/util/funcutil/slice_test.go similarity index 100% rename from internal/util/funcutil/slice_test.go rename to pkg/util/funcutil/slice_test.go diff --git a/internal/util/funcutil/verify_response.go b/pkg/util/funcutil/verify_response.go similarity index 99% rename from internal/util/funcutil/verify_response.go rename to pkg/util/funcutil/verify_response.go index 957404967c..c78523b12e 100644 --- a/internal/util/funcutil/verify_response.go +++ b/pkg/util/funcutil/verify_response.go @@ -2,13 +2,14 @@ package funcutil import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus-proto/go-api/commonpb" ) // errors for VerifyResponse var errNilResponse = errors.New("response is nil") + var errNilStatusResponse = errors.New("response has nil status") + var errUnknownResponseType = errors.New("unknown response type") // Response response interface for verification diff --git a/internal/util/gc/gc_tuner.go b/pkg/util/gc/gc_tuner.go similarity index 97% rename from internal/util/gc/gc_tuner.go rename to pkg/util/gc/gc_tuner.go index b342043841..f5231e6c2f 100644 --- a/internal/util/gc/gc_tuner.go +++ b/pkg/util/gc/gc_tuner.go @@ -23,18 +23,22 @@ import ( "strconv" "time" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/hardware" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/hardware" ) var defaultGOGC int + var previousGOGC uint32 var minGOGC uint32 + var maxGOGC uint32 var memoryThreshold uint64 + var action func(uint32) type finalizer struct { diff --git a/internal/util/generic/generic.go b/pkg/util/generic/generic.go similarity index 100% rename from internal/util/generic/generic.go rename to pkg/util/generic/generic.go diff --git a/internal/util/hardware/container_darwin.go b/pkg/util/hardware/container_darwin.go similarity index 100% rename from internal/util/hardware/container_darwin.go rename to pkg/util/hardware/container_darwin.go diff --git a/internal/util/hardware/container_linux.go b/pkg/util/hardware/container_linux.go similarity index 100% rename from internal/util/hardware/container_linux.go rename to pkg/util/hardware/container_linux.go diff --git a/internal/util/hardware/container_test_linux.go b/pkg/util/hardware/container_test_linux.go similarity index 100% rename from internal/util/hardware/container_test_linux.go rename to pkg/util/hardware/container_test_linux.go diff --git a/internal/util/hardware/container_windows.go b/pkg/util/hardware/container_windows.go similarity index 100% rename from internal/util/hardware/container_windows.go rename to pkg/util/hardware/container_windows.go diff --git a/internal/util/hardware/hardware_info.go b/pkg/util/hardware/hardware_info.go similarity index 97% rename from internal/util/hardware/hardware_info.go rename to pkg/util/hardware/hardware_info.go index a6a2902a17..4a50dc8e3f 100644 --- a/internal/util/hardware/hardware_info.go +++ b/pkg/util/hardware/hardware_info.go @@ -22,8 +22,8 @@ import ( "go.uber.org/automaxprocs/maxprocs" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) var ( diff --git a/internal/util/hardware/hardware_info_test.go b/pkg/util/hardware/hardware_info_test.go similarity index 97% rename from internal/util/hardware/hardware_info_test.go rename to pkg/util/hardware/hardware_info_test.go index 6238e61989..28113faf83 100644 --- a/internal/util/hardware/hardware_info_test.go +++ b/pkg/util/hardware/hardware_info_test.go @@ -17,7 +17,7 @@ import ( "github.com/stretchr/testify/assert" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" ) func Test_GetCPUCoreCount(t *testing.T) { diff --git a/internal/util/indexparamcheck/conf_adapter.go b/pkg/util/indexparamcheck/conf_adapter.go similarity index 99% rename from internal/util/indexparamcheck/conf_adapter.go rename to pkg/util/indexparamcheck/conf_adapter.go index ee613176a2..933a27f8bf 100644 --- a/internal/util/indexparamcheck/conf_adapter.go +++ b/pkg/util/indexparamcheck/conf_adapter.go @@ -20,7 +20,8 @@ import ( "strconv" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/util/funcutil" + + "github.com/milvus-io/milvus/pkg/util/funcutil" ) const ( diff --git a/internal/util/indexparamcheck/conf_adapter_mgr.go b/pkg/util/indexparamcheck/conf_adapter_mgr.go similarity index 99% rename from internal/util/indexparamcheck/conf_adapter_mgr.go rename to pkg/util/indexparamcheck/conf_adapter_mgr.go index 64a98809a1..2843415bbc 100644 --- a/internal/util/indexparamcheck/conf_adapter_mgr.go +++ b/pkg/util/indexparamcheck/conf_adapter_mgr.go @@ -65,6 +65,7 @@ func newConfAdapterMgrImpl() *ConfAdapterMgrImpl { } var confAdapterMgr ConfAdapterMgr + var getConfAdapterMgrOnce sync.Once // GetConfAdapterMgrInstance gets the instance of ConfAdapterMgr. diff --git a/internal/util/indexparamcheck/conf_adapter_mgr_test.go b/pkg/util/indexparamcheck/conf_adapter_mgr_test.go similarity index 100% rename from internal/util/indexparamcheck/conf_adapter_mgr_test.go rename to pkg/util/indexparamcheck/conf_adapter_mgr_test.go diff --git a/internal/util/indexparamcheck/conf_adapter_test.go b/pkg/util/indexparamcheck/conf_adapter_test.go similarity index 100% rename from internal/util/indexparamcheck/conf_adapter_test.go rename to pkg/util/indexparamcheck/conf_adapter_test.go diff --git a/internal/util/indexparamcheck/index_type.go b/pkg/util/indexparamcheck/index_type.go similarity index 100% rename from internal/util/indexparamcheck/index_type.go rename to pkg/util/indexparamcheck/index_type.go diff --git a/internal/util/indexparamcheck/scalar_index_checker.go b/pkg/util/indexparamcheck/scalar_index_checker.go similarity index 100% rename from internal/util/indexparamcheck/scalar_index_checker.go rename to pkg/util/indexparamcheck/scalar_index_checker.go diff --git a/internal/util/indexparamcheck/scalar_index_checker_test.go b/pkg/util/indexparamcheck/scalar_index_checker_test.go similarity index 100% rename from internal/util/indexparamcheck/scalar_index_checker_test.go rename to pkg/util/indexparamcheck/scalar_index_checker_test.go diff --git a/internal/util/indexparamcheck/utils.go b/pkg/util/indexparamcheck/utils.go similarity index 97% rename from internal/util/indexparamcheck/utils.go rename to pkg/util/indexparamcheck/utils.go index a0fd662182..28dc2936f9 100644 --- a/internal/util/indexparamcheck/utils.go +++ b/pkg/util/indexparamcheck/utils.go @@ -19,7 +19,7 @@ package indexparamcheck import ( "strconv" - "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/funcutil" ) // CheckIntByRange check if the data corresponding to the key is in the range of [min, max]. diff --git a/internal/util/indexparamcheck/utils_test.go b/pkg/util/indexparamcheck/utils_test.go similarity index 100% rename from internal/util/indexparamcheck/utils_test.go rename to pkg/util/indexparamcheck/utils_test.go diff --git a/internal/util/indexparams/disk_index_params.go b/pkg/util/indexparams/disk_index_params.go similarity index 98% rename from internal/util/indexparams/disk_index_params.go rename to pkg/util/indexparams/disk_index_params.go index 430e5cf26f..9a345aa638 100644 --- a/internal/util/indexparams/disk_index_params.go +++ b/pkg/util/indexparams/disk_index_params.go @@ -22,9 +22,9 @@ import ( "strconv" "unsafe" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/hardware" - "github.com/milvus-io/milvus/internal/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/hardware" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) const ( diff --git a/internal/util/indexparams/disk_index_params_test.go b/pkg/util/indexparams/disk_index_params_test.go similarity index 99% rename from internal/util/indexparams/disk_index_params_test.go rename to pkg/util/indexparams/disk_index_params_test.go index 97539192e8..928e3cd8ef 100644 --- a/internal/util/indexparams/disk_index_params_test.go +++ b/pkg/util/indexparams/disk_index_params_test.go @@ -21,8 +21,9 @@ import ( "strconv" "testing" - "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/stretchr/testify/assert" + + "github.com/milvus-io/milvus/pkg/util/paramtable" ) func TestDiskIndexParams(t *testing.T) { diff --git a/internal/util/lifetime/lifetime.go b/pkg/util/lifetime/lifetime.go similarity index 100% rename from internal/util/lifetime/lifetime.go rename to pkg/util/lifetime/lifetime.go diff --git a/internal/util/lifetime/lifetime_test.go b/pkg/util/lifetime/lifetime_test.go similarity index 100% rename from internal/util/lifetime/lifetime_test.go rename to pkg/util/lifetime/lifetime_test.go diff --git a/internal/util/lock/key_lock.go b/pkg/util/lock/key_lock.go similarity index 98% rename from internal/util/lock/key_lock.go rename to pkg/util/lock/key_lock.go index 95ef06bbb3..990d2f0d03 100644 --- a/internal/util/lock/key_lock.go +++ b/pkg/util/lock/key_lock.go @@ -19,8 +19,9 @@ package lock import ( "sync" - "github.com/milvus-io/milvus/internal/log" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" ) type RefLock struct { diff --git a/internal/util/lock/key_lock_test.go b/pkg/util/lock/key_lock_test.go similarity index 100% rename from internal/util/lock/key_lock_test.go rename to pkg/util/lock/key_lock_test.go diff --git a/internal/util/logutil/grpc_interceptor.go b/pkg/util/logutil/grpc_interceptor.go similarity index 98% rename from internal/util/logutil/grpc_interceptor.go rename to pkg/util/logutil/grpc_interceptor.go index ad1e55cbc1..67f5ff2bc8 100644 --- a/internal/util/logutil/grpc_interceptor.go +++ b/pkg/util/logutil/grpc_interceptor.go @@ -4,11 +4,12 @@ import ( "context" grpc_middleware "github.com/grpc-ecosystem/go-grpc-middleware" - "github.com/milvus-io/milvus/internal/log" "go.opentelemetry.io/otel/trace" "go.uber.org/zap/zapcore" "google.golang.org/grpc" "google.golang.org/grpc/metadata" + + "github.com/milvus-io/milvus/pkg/log" ) const ( diff --git a/internal/util/logutil/grpc_interceptor_test.go b/pkg/util/logutil/grpc_interceptor_test.go similarity index 97% rename from internal/util/logutil/grpc_interceptor_test.go rename to pkg/util/logutil/grpc_interceptor_test.go index b49afb0434..55b3544791 100644 --- a/internal/util/logutil/grpc_interceptor_test.go +++ b/pkg/util/logutil/grpc_interceptor_test.go @@ -4,10 +4,11 @@ import ( "context" "testing" - "github.com/milvus-io/milvus/internal/log" "github.com/stretchr/testify/assert" "go.uber.org/zap/zapcore" "google.golang.org/grpc/metadata" + + "github.com/milvus-io/milvus/pkg/log" ) func TestCtxWithLevelAndTrace(t *testing.T) { diff --git a/internal/util/logutil/logutil.go b/pkg/util/logutil/logutil.go similarity index 98% rename from internal/util/logutil/logutil.go rename to pkg/util/logutil/logutil.go index c3900657da..306b2e8a8e 100644 --- a/internal/util/logutil/logutil.go +++ b/pkg/util/logutil/logutil.go @@ -20,13 +20,11 @@ import ( "context" "sync" - "github.com/milvus-io/milvus/internal/log" - + "go.uber.org/zap" "go.uber.org/zap/zapcore" - "google.golang.org/grpc/grpclog" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" ) const ( diff --git a/internal/util/logutil/logutil_test.go b/pkg/util/logutil/logutil_test.go similarity index 93% rename from internal/util/logutil/logutil_test.go rename to pkg/util/logutil/logutil_test.go index 809ba3f0e8..c177d8b092 100644 --- a/internal/util/logutil/logutil_test.go +++ b/pkg/util/logutil/logutil_test.go @@ -4,11 +4,10 @@ import ( "testing" "github.com/stretchr/testify/assert" - + "go.uber.org/zap" "go.uber.org/zap/zapcore" - "github.com/milvus-io/milvus/internal/log" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" ) func TestName(t *testing.T) { diff --git a/internal/util/merr/errors.go b/pkg/util/merr/errors.go similarity index 97% rename from internal/util/merr/errors.go rename to pkg/util/merr/errors.go index 9dd09bcc33..59e6255b3a 100644 --- a/internal/util/merr/errors.go +++ b/pkg/util/merr/errors.go @@ -14,14 +14,14 @@ // See the License for the specific language governing permissions and // limitations under the License. -// errutil package provides utility for errors handling. package merr import ( "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/internal/util/paramtable" - "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/samber/lo" + + "github.com/milvus-io/milvus/pkg/util/paramtable" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const ( diff --git a/internal/util/merr/errors_test.go b/pkg/util/merr/errors_test.go similarity index 98% rename from internal/util/merr/errors_test.go rename to pkg/util/merr/errors_test.go index 16144c296b..340712320e 100644 --- a/internal/util/merr/errors_test.go +++ b/pkg/util/merr/errors_test.go @@ -22,8 +22,9 @@ import ( "github.com/cockroachdb/errors" "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus/internal/util/paramtable" "github.com/stretchr/testify/suite" + + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type ErrSuite struct { diff --git a/internal/util/merr/utils.go b/pkg/util/merr/utils.go similarity index 99% rename from internal/util/merr/utils.go rename to pkg/util/merr/utils.go index 512846af67..5e1fefcc2a 100644 --- a/internal/util/merr/utils.go +++ b/pkg/util/merr/utils.go @@ -14,7 +14,6 @@ // See the License for the specific language governing permissions and // limitations under the License. -// errutil package provides utility for errors handling. package merr import ( diff --git a/internal/util/metautil/binlog.go b/pkg/util/metautil/binlog.go similarity index 94% rename from internal/util/metautil/binlog.go rename to pkg/util/metautil/binlog.go index ac9cf20de7..2876a735f2 100644 --- a/internal/util/metautil/binlog.go +++ b/pkg/util/metautil/binlog.go @@ -5,9 +5,8 @@ import ( "strconv" "strings" - "github.com/milvus-io/milvus/internal/util/typeutil" - - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) const pathSep = "/" diff --git a/internal/util/metautil/segment_index.go b/pkg/util/metautil/segment_index.go similarity index 92% rename from internal/util/metautil/segment_index.go rename to pkg/util/metautil/segment_index.go index c1c9e5a985..0410e81e2a 100644 --- a/internal/util/metautil/segment_index.go +++ b/pkg/util/metautil/segment_index.go @@ -3,7 +3,7 @@ package metautil import ( "path" - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/common" ) func BuildSegmentIndexFilePath(rootPath string, buildID, indexVersion, partID, segID int64, fileKey string) string { diff --git a/internal/util/metricsinfo/cache.go b/pkg/util/metricsinfo/cache.go similarity index 100% rename from internal/util/metricsinfo/cache.go rename to pkg/util/metricsinfo/cache.go diff --git a/internal/util/metricsinfo/cache_test.go b/pkg/util/metricsinfo/cache_test.go similarity index 100% rename from internal/util/metricsinfo/cache_test.go rename to pkg/util/metricsinfo/cache_test.go diff --git a/internal/util/metricsinfo/err.go b/pkg/util/metricsinfo/err.go similarity index 100% rename from internal/util/metricsinfo/err.go rename to pkg/util/metricsinfo/err.go diff --git a/internal/util/metricsinfo/metric_type.go b/pkg/util/metricsinfo/metric_type.go similarity index 95% rename from internal/util/metricsinfo/metric_type.go rename to pkg/util/metricsinfo/metric_type.go index 7f44ad5775..b8eff4db26 100644 --- a/internal/util/metricsinfo/metric_type.go +++ b/pkg/util/metricsinfo/metric_type.go @@ -17,8 +17,9 @@ import ( "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/util/commonpbutil" + + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/util/commonpbutil" ) const ( diff --git a/internal/util/metricsinfo/metric_type_test.go b/pkg/util/metricsinfo/metric_type_test.go similarity index 97% rename from internal/util/metricsinfo/metric_type_test.go rename to pkg/util/metricsinfo/metric_type_test.go index 64cffd1d56..07b62df436 100644 --- a/internal/util/metricsinfo/metric_type_test.go +++ b/pkg/util/metricsinfo/metric_type_test.go @@ -15,10 +15,10 @@ import ( "encoding/json" "testing" - "github.com/milvus-io/milvus/internal/log" + "github.com/stretchr/testify/assert" "go.uber.org/zap" - "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/pkg/log" ) func Test_ParseMetricType(t *testing.T) { diff --git a/internal/util/metricsinfo/metrics_info.go b/pkg/util/metricsinfo/metrics_info.go similarity index 100% rename from internal/util/metricsinfo/metrics_info.go rename to pkg/util/metricsinfo/metrics_info.go diff --git a/internal/util/metricsinfo/metrics_info_test.go b/pkg/util/metricsinfo/metrics_info_test.go similarity index 98% rename from internal/util/metricsinfo/metrics_info_test.go rename to pkg/util/metricsinfo/metrics_info_test.go index a61d3acf32..b9b6386fe2 100644 --- a/internal/util/metricsinfo/metrics_info_test.go +++ b/pkg/util/metricsinfo/metrics_info_test.go @@ -15,12 +15,11 @@ import ( "testing" "time" + "github.com/stretchr/testify/assert" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" - - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func TestBaseComponentInfos_Codec(t *testing.T) { diff --git a/internal/util/metricsinfo/quota_metric.go b/pkg/util/metricsinfo/quota_metric.go similarity index 98% rename from internal/util/metricsinfo/quota_metric.go rename to pkg/util/metricsinfo/quota_metric.go index b782a5ab8d..36b873829b 100644 --- a/internal/util/metricsinfo/quota_metric.go +++ b/pkg/util/metricsinfo/quota_metric.go @@ -19,7 +19,7 @@ package metricsinfo import ( "time" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // RateMetricLabel defines the metric label collected from nodes. diff --git a/internal/util/metricsinfo/topology.go b/pkg/util/metricsinfo/topology.go similarity index 98% rename from internal/util/metricsinfo/topology.go rename to pkg/util/metricsinfo/topology.go index eb99d3fc92..a9d8810aef 100644 --- a/internal/util/metricsinfo/topology.go +++ b/pkg/util/metricsinfo/topology.go @@ -15,7 +15,7 @@ import ( "encoding/json" "strconv" - "github.com/milvus-io/milvus/internal/util/typeutil" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // in topology graph, the name of all nodes are consisted of role name and its' id diff --git a/internal/util/metricsinfo/topology_test.go b/pkg/util/metricsinfo/topology_test.go similarity index 99% rename from internal/util/metricsinfo/topology_test.go rename to pkg/util/metricsinfo/topology_test.go index 16da9cecda..93ab7185dc 100644 --- a/internal/util/metricsinfo/topology_test.go +++ b/pkg/util/metricsinfo/topology_test.go @@ -14,12 +14,11 @@ package metricsinfo import ( "testing" - "github.com/milvus-io/milvus/internal/log" + "github.com/stretchr/testify/assert" "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/util/typeutil" - - "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func Test_ConstructComponentName(t *testing.T) { diff --git a/internal/util/metricsinfo/utils.go b/pkg/util/metricsinfo/utils.go similarity index 100% rename from internal/util/metricsinfo/utils.go rename to pkg/util/metricsinfo/utils.go diff --git a/internal/util/metricsinfo/utils_test.go b/pkg/util/metricsinfo/utils_test.go similarity index 100% rename from internal/util/metricsinfo/utils_test.go rename to pkg/util/metricsinfo/utils_test.go diff --git a/internal/util/milvuserrors/errors.go b/pkg/util/milvuserrors/errors.go similarity index 100% rename from internal/util/milvuserrors/errors.go rename to pkg/util/milvuserrors/errors.go diff --git a/internal/util/milvuserrors/errors_test.go b/pkg/util/milvuserrors/errors_test.go similarity index 100% rename from internal/util/milvuserrors/errors_test.go rename to pkg/util/milvuserrors/errors_test.go diff --git a/internal/util/paramtable/autoindex_param.go b/pkg/util/paramtable/autoindex_param.go similarity index 97% rename from internal/util/paramtable/autoindex_param.go rename to pkg/util/paramtable/autoindex_param.go index 715cc3935e..00a1c99514 100644 --- a/internal/util/paramtable/autoindex_param.go +++ b/pkg/util/paramtable/autoindex_param.go @@ -17,7 +17,7 @@ package paramtable import ( - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/common" ) // ///////////////////////////////////////////////////////////////////////////// diff --git a/internal/util/paramtable/autoindex_param_test.go b/pkg/util/paramtable/autoindex_param_test.go similarity index 98% rename from internal/util/paramtable/autoindex_param_test.go rename to pkg/util/paramtable/autoindex_param_test.go index 5a7c0893db..7a4d26e7c1 100644 --- a/internal/util/paramtable/autoindex_param_test.go +++ b/pkg/util/paramtable/autoindex_param_test.go @@ -23,7 +23,7 @@ import ( "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/common" ) const ( diff --git a/internal/util/paramtable/base_table.go b/pkg/util/paramtable/base_table.go similarity index 96% rename from internal/util/paramtable/base_table.go rename to pkg/util/paramtable/base_table.go index aa1fc9a57f..ae45754b27 100644 --- a/internal/util/paramtable/base_table.go +++ b/pkg/util/paramtable/base_table.go @@ -19,12 +19,13 @@ import ( "sync" "time" - config "github.com/milvus-io/milvus/internal/config" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/typeutil" - "github.com/samber/lo" "go.uber.org/zap" + "github.com/samber/lo" + + config "github.com/milvus-io/milvus/pkg/config" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/typeutil" ) // UniqueID is type alias of typeutil.UniqueID diff --git a/internal/util/paramtable/base_table_test.go b/pkg/util/paramtable/base_table_test.go similarity index 98% rename from internal/util/paramtable/base_table_test.go rename to pkg/util/paramtable/base_table_test.go index e492d5531d..4bb57c3382 100644 --- a/internal/util/paramtable/base_table_test.go +++ b/pkg/util/paramtable/base_table_test.go @@ -16,8 +16,9 @@ import ( "strings" "testing" - "github.com/milvus-io/milvus/internal/config" "github.com/stretchr/testify/assert" + + "github.com/milvus-io/milvus/pkg/config" ) var baseParams = BaseTable{} diff --git a/internal/util/paramtable/component_param.go b/pkg/util/paramtable/component_param.go similarity index 99% rename from internal/util/paramtable/component_param.go rename to pkg/util/paramtable/component_param.go index 070212f69d..d6537db78b 100644 --- a/internal/util/paramtable/component_param.go +++ b/pkg/util/paramtable/component_param.go @@ -24,9 +24,9 @@ import ( "github.com/shirou/gopsutil/v3/disk" "go.uber.org/zap" - config "github.com/milvus-io/milvus/internal/config" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/metricsinfo" + config "github.com/milvus-io/milvus/pkg/config" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" ) const ( diff --git a/internal/util/paramtable/component_param_test.go b/pkg/util/paramtable/component_param_test.go similarity index 99% rename from internal/util/paramtable/component_param_test.go rename to pkg/util/paramtable/component_param_test.go index c74b18e42d..72c27b850b 100644 --- a/internal/util/paramtable/component_param_test.go +++ b/pkg/util/paramtable/component_param_test.go @@ -16,8 +16,9 @@ import ( "testing" "time" - "github.com/milvus-io/milvus/internal/config" "github.com/stretchr/testify/assert" + + "github.com/milvus-io/milvus/pkg/config" ) func shouldPanic(t *testing.T, name string, f func()) { diff --git a/internal/util/paramtable/grpc_param.go b/pkg/util/paramtable/grpc_param.go similarity index 99% rename from internal/util/paramtable/grpc_param.go rename to pkg/util/paramtable/grpc_param.go index 3ab2d70a84..3c7f53385e 100644 --- a/internal/util/paramtable/grpc_param.go +++ b/pkg/util/paramtable/grpc_param.go @@ -15,9 +15,10 @@ import ( "fmt" "strconv" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/funcutil" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/funcutil" ) const ( diff --git a/internal/util/paramtable/grpc_param_test.go b/pkg/util/paramtable/grpc_param_test.go similarity index 99% rename from internal/util/paramtable/grpc_param_test.go rename to pkg/util/paramtable/grpc_param_test.go index c46557b2db..66a298f67a 100644 --- a/internal/util/paramtable/grpc_param_test.go +++ b/pkg/util/paramtable/grpc_param_test.go @@ -15,8 +15,9 @@ import ( "testing" "time" - "github.com/milvus-io/milvus/internal/util/typeutil" "github.com/stretchr/testify/assert" + + "github.com/milvus-io/milvus/pkg/util/typeutil" ) func TestGrpcServerParams(t *testing.T) { @@ -61,6 +62,7 @@ func TestGrpcServerParams(t *testing.T) { base.Save("grpc.serverMaxSendSize", "a") assert.Equal(t, serverConfig.ServerMaxSendSize.GetAsInt(), DefaultServerMaxSendSize) } + func TestGrpcClientParams(t *testing.T) { role := typeutil.DataNodeRole base := ComponentParam{} diff --git a/internal/util/paramtable/hook_config.go b/pkg/util/paramtable/hook_config.go similarity index 95% rename from internal/util/paramtable/hook_config.go rename to pkg/util/paramtable/hook_config.go index d6f25173c9..f019ca36dd 100644 --- a/internal/util/paramtable/hook_config.go +++ b/pkg/util/paramtable/hook_config.go @@ -1,8 +1,9 @@ package paramtable import ( - "github.com/milvus-io/milvus/internal/log" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" ) const hookYamlFile = "hook.yaml" diff --git a/internal/util/paramtable/http_param.go b/pkg/util/paramtable/http_param.go similarity index 100% rename from internal/util/paramtable/http_param.go rename to pkg/util/paramtable/http_param.go diff --git a/internal/util/paramtable/http_param_test.go b/pkg/util/paramtable/http_param_test.go similarity index 100% rename from internal/util/paramtable/http_param_test.go rename to pkg/util/paramtable/http_param_test.go diff --git a/internal/util/paramtable/param_item.go b/pkg/util/paramtable/param_item.go similarity index 97% rename from internal/util/paramtable/param_item.go rename to pkg/util/paramtable/param_item.go index fb15fa6d6b..028e03f7c9 100644 --- a/internal/util/paramtable/param_item.go +++ b/pkg/util/paramtable/param_item.go @@ -16,8 +16,8 @@ import ( "strings" "time" - "github.com/milvus-io/milvus/internal/config" - "github.com/milvus-io/milvus/internal/util/funcutil" + "github.com/milvus-io/milvus/pkg/config" + "github.com/milvus-io/milvus/pkg/util/funcutil" ) type ParamItem struct { @@ -181,6 +181,7 @@ func getAsDuration(v string, unit time.Duration) time.Duration { return time.Duration(v) * unit, err }, 0) } + func getAndConvert[T any](v string, converter func(input string) (T, error), defaultValue T) T { t, err := converter(v) if err != nil { diff --git a/internal/util/paramtable/quota_param.go b/pkg/util/paramtable/quota_param.go similarity index 99% rename from internal/util/paramtable/quota_param.go rename to pkg/util/paramtable/quota_param.go index b33bd5d0e2..c219e016eb 100644 --- a/internal/util/paramtable/quota_param.go +++ b/pkg/util/paramtable/quota_param.go @@ -23,7 +23,7 @@ import ( "go.uber.org/zap" - "github.com/milvus-io/milvus/internal/log" + "github.com/milvus-io/milvus/pkg/log" ) const ( diff --git a/internal/util/paramtable/quota_param_test.go b/pkg/util/paramtable/quota_param_test.go similarity index 100% rename from internal/util/paramtable/quota_param_test.go rename to pkg/util/paramtable/quota_param_test.go diff --git a/internal/util/paramtable/runtime.go b/pkg/util/paramtable/runtime.go similarity index 100% rename from internal/util/paramtable/runtime.go rename to pkg/util/paramtable/runtime.go diff --git a/internal/util/paramtable/service_param.go b/pkg/util/paramtable/service_param.go similarity index 99% rename from internal/util/paramtable/service_param.go rename to pkg/util/paramtable/service_param.go index a44045c399..8d92ddb45b 100644 --- a/internal/util/paramtable/service_param.go +++ b/pkg/util/paramtable/service_param.go @@ -24,10 +24,11 @@ import ( "strconv" "strings" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util" - "github.com/milvus-io/milvus/internal/util/metricsinfo" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" ) const ( diff --git a/internal/util/paramtable/service_param_test.go b/pkg/util/paramtable/service_param_test.go similarity index 98% rename from internal/util/paramtable/service_param_test.go rename to pkg/util/paramtable/service_param_test.go index cddc4a6abf..7e9fb1631f 100644 --- a/internal/util/paramtable/service_param_test.go +++ b/pkg/util/paramtable/service_param_test.go @@ -14,10 +14,10 @@ package paramtable import ( "testing" - "github.com/milvus-io/milvus/internal/config" - - "github.com/milvus-io/milvus/internal/util/metricsinfo" "github.com/stretchr/testify/assert" + + "github.com/milvus-io/milvus/pkg/config" + "github.com/milvus-io/milvus/pkg/util/metricsinfo" ) func TestServiceParam(t *testing.T) { diff --git a/internal/util/ratelimitutil/limiter.go b/pkg/util/ratelimitutil/limiter.go similarity index 100% rename from internal/util/ratelimitutil/limiter.go rename to pkg/util/ratelimitutil/limiter.go diff --git a/internal/util/ratelimitutil/limiter_test.go b/pkg/util/ratelimitutil/limiter_test.go similarity index 100% rename from internal/util/ratelimitutil/limiter_test.go rename to pkg/util/ratelimitutil/limiter_test.go diff --git a/internal/util/ratelimitutil/rate_collector.go b/pkg/util/ratelimitutil/rate_collector.go similarity index 100% rename from internal/util/ratelimitutil/rate_collector.go rename to pkg/util/ratelimitutil/rate_collector.go diff --git a/internal/util/ratelimitutil/rate_collector_test.go b/pkg/util/ratelimitutil/rate_collector_test.go similarity index 100% rename from internal/util/ratelimitutil/rate_collector_test.go rename to pkg/util/ratelimitutil/rate_collector_test.go diff --git a/internal/util/retry/options.go b/pkg/util/retry/options.go similarity index 100% rename from internal/util/retry/options.go rename to pkg/util/retry/options.go diff --git a/internal/util/retry/retry.go b/pkg/util/retry/retry.go similarity index 95% rename from internal/util/retry/retry.go rename to pkg/util/retry/retry.go index 7518a91658..eb56745365 100644 --- a/internal/util/retry/retry.go +++ b/pkg/util/retry/retry.go @@ -15,11 +15,11 @@ import ( "context" "time" + "github.com/cockroachdb/errors" "go.uber.org/zap" - "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/merr" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/merr" ) // Do will run function with retry mechanism. diff --git a/internal/util/retry/retry_test.go b/pkg/util/retry/retry_test.go similarity index 100% rename from internal/util/retry/retry_test.go rename to pkg/util/retry/retry_test.go diff --git a/internal/util/symbolizer/symbolizer.go b/pkg/util/symbolizer/symbolizer.go similarity index 100% rename from internal/util/symbolizer/symbolizer.go rename to pkg/util/symbolizer/symbolizer.go diff --git a/internal/util/timerecord/group_checker.go b/pkg/util/timerecord/group_checker.go similarity index 100% rename from internal/util/timerecord/group_checker.go rename to pkg/util/timerecord/group_checker.go diff --git a/internal/util/timerecord/group_checker_test.go b/pkg/util/timerecord/group_checker_test.go similarity index 100% rename from internal/util/timerecord/group_checker_test.go rename to pkg/util/timerecord/group_checker_test.go diff --git a/internal/util/timerecord/time_recorder.go b/pkg/util/timerecord/time_recorder.go similarity index 98% rename from internal/util/timerecord/time_recorder.go rename to pkg/util/timerecord/time_recorder.go index 1221497172..2d8097286e 100644 --- a/internal/util/timerecord/time_recorder.go +++ b/pkg/util/timerecord/time_recorder.go @@ -16,9 +16,10 @@ import ( "fmt" "time" - "github.com/milvus-io/milvus/internal/log" "go.opentelemetry.io/otel/trace" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" ) // TimeRecorder provides methods to record time duration diff --git a/pkg/util/tsoutil/tso.go b/pkg/util/tsoutil/tso.go new file mode 100644 index 0000000000..20913fbc72 --- /dev/null +++ b/pkg/util/tsoutil/tso.go @@ -0,0 +1,98 @@ +// Licensed to the LF AI & Data foundation under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package tsoutil + +import ( + "time" + + "github.com/milvus-io/milvus/pkg/util/typeutil" +) + +const ( + logicalBits = 18 + logicalBitsMask = (1 << logicalBits) - 1 +) + +// ComposeTS returns a timestamp composed of physical part and logical part +func ComposeTS(physical, logical int64) uint64 { + return uint64((physical << logicalBits) + logical) +} + +// ComposeTSByTime returns a timestamp composed of physical time.Time and logical time +func ComposeTSByTime(physical time.Time, logical int64) uint64 { + return ComposeTS(physical.UnixNano()/int64(time.Millisecond), logical) +} + +// GetCurrentTime returns the current timestamp +func GetCurrentTime() typeutil.Timestamp { + return ComposeTSByTime(time.Now(), 0) +} + +// ParseTS parses the ts to (physical,logical). +func ParseTS(ts uint64) (time.Time, uint64) { + logical := ts & logicalBitsMask + physical := ts >> logicalBits + physicalTime := time.Unix(int64(physical/1000), int64(physical)%1000*time.Millisecond.Nanoseconds()) + return physicalTime, logical +} + +func PhysicalTime(ts uint64) time.Time { + physicalTime, _ := ParseTS(ts) + return physicalTime +} + +// ParseHybridTs parses the ts to (physical, logical), physical part is of utc-timestamp format. +func ParseHybridTs(ts uint64) (int64, int64) { + logical := ts & logicalBitsMask + physical := ts >> logicalBits + return int64(physical), int64(logical) +} + +// ParseAndFormatHybridTs parses the ts and returns its human-readable format. +func ParseAndFormatHybridTs(ts uint64) string { + physicalTs, _ := ParseHybridTs(ts) + return time.Unix(physicalTs, 0).Format(time.RFC3339) // Convert to RFC3339 format +} + +// CalculateDuration returns the number of milliseconds obtained by subtracting ts2 from ts1. +func CalculateDuration(ts1, ts2 typeutil.Timestamp) int64 { + p1, _ := ParseHybridTs(ts1) + p2, _ := ParseHybridTs(ts2) + return p1 - p2 +} + +// Mod24H parses the ts to millisecond in one day +func Mod24H(ts uint64) uint64 { + logical := ts & logicalBitsMask + physical := ts >> logicalBits + physical = physical % (uint64(24 * 60 * 60 * 1000)) + return (physical << logicalBits) | logical +} + +// AddPhysicalDurationOnTs adds physical interval on ts +func AddPhysicalDurationOnTs(ts uint64, duration time.Duration) uint64 { + msecs := duration.Milliseconds() + physical, logical := ParseHybridTs(ts) + return ComposeTS(physical+msecs, logical) +} + +// SubByNow ts is a hybrid +func SubByNow(ts uint64) int64 { + utcT, _ := ParseHybridTs(ts) + now := time.Now().UnixMilli() + return now - utcT +} diff --git a/internal/util/tsoutil/tso_test.go b/pkg/util/tsoutil/tso_test.go similarity index 98% rename from internal/util/tsoutil/tso_test.go rename to pkg/util/tsoutil/tso_test.go index dfade68f85..fac9bedce3 100644 --- a/internal/util/tsoutil/tso_test.go +++ b/pkg/util/tsoutil/tso_test.go @@ -20,9 +20,10 @@ import ( "testing" "time" - "github.com/milvus-io/milvus/internal/log" "github.com/stretchr/testify/assert" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" ) func TestParseHybridTs(t *testing.T) { diff --git a/internal/util/typeutil/cache.go b/pkg/util/typeutil/cache.go similarity index 100% rename from internal/util/typeutil/cache.go rename to pkg/util/typeutil/cache.go diff --git a/internal/util/typeutil/convension.go b/pkg/util/typeutil/convension.go similarity index 97% rename from internal/util/typeutil/convension.go rename to pkg/util/typeutil/convension.go index 4f0efe6f6e..d5e2e96e34 100644 --- a/internal/util/typeutil/convension.go +++ b/pkg/util/typeutil/convension.go @@ -23,9 +23,10 @@ import ( "reflect" "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" ) // Generic Clone for proto message diff --git a/internal/util/typeutil/conversion_test.go b/pkg/util/typeutil/conversion_test.go similarity index 100% rename from internal/util/typeutil/conversion_test.go rename to pkg/util/typeutil/conversion_test.go diff --git a/internal/util/typeutil/data_format.go b/pkg/util/typeutil/data_format.go similarity index 98% rename from internal/util/typeutil/data_format.go rename to pkg/util/typeutil/data_format.go index b1142d09d5..5924ced697 100644 --- a/internal/util/typeutil/data_format.go +++ b/pkg/util/typeutil/data_format.go @@ -23,12 +23,12 @@ import ( "reflect" "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" ) type rowsHelper = [][]interface{} diff --git a/internal/util/typeutil/data_format_test.go b/pkg/util/typeutil/data_format_test.go similarity index 99% rename from internal/util/typeutil/data_format_test.go rename to pkg/util/typeutil/data_format_test.go index 030c66a649..8a5e95ab4e 100644 --- a/internal/util/typeutil/data_format_test.go +++ b/pkg/util/typeutil/data_format_test.go @@ -20,12 +20,11 @@ import ( "encoding/binary" "testing" - "github.com/milvus-io/milvus/internal/common" - - "github.com/stretchr/testify/assert" - "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" + "github.com/stretchr/testify/assert" + + "github.com/milvus-io/milvus/pkg/common" ) func TestTransferColumnBasedDataToRowBasedData(t *testing.T) { diff --git a/internal/util/typeutil/float_util.go b/pkg/util/typeutil/float_util.go similarity index 100% rename from internal/util/typeutil/float_util.go rename to pkg/util/typeutil/float_util.go diff --git a/internal/util/typeutil/float_util_test.go b/pkg/util/typeutil/float_util_test.go similarity index 100% rename from internal/util/typeutil/float_util_test.go rename to pkg/util/typeutil/float_util_test.go diff --git a/internal/util/typeutil/gen_empty_field_data.go b/pkg/util/typeutil/gen_empty_field_data.go similarity index 79% rename from internal/util/typeutil/gen_empty_field_data.go rename to pkg/util/typeutil/gen_empty_field_data.go index 1a9feb576b..458f91c597 100644 --- a/internal/util/typeutil/gen_empty_field_data.go +++ b/pkg/util/typeutil/gen_empty_field_data.go @@ -6,35 +6,6 @@ import ( "github.com/milvus-io/milvus-proto/go-api/schemapb" ) -func fieldDataEmpty(data *schemapb.FieldData) bool { - if data == nil { - return true - } - switch realData := data.Field.(type) { - case *schemapb.FieldData_Scalars: - switch realScalars := realData.Scalars.Data.(type) { - case *schemapb.ScalarField_BoolData: - return len(realScalars.BoolData.GetData()) <= 0 - case *schemapb.ScalarField_LongData: - return len(realScalars.LongData.GetData()) <= 0 - case *schemapb.ScalarField_FloatData: - return len(realScalars.FloatData.GetData()) <= 0 - case *schemapb.ScalarField_DoubleData: - return len(realScalars.DoubleData.GetData()) <= 0 - case *schemapb.ScalarField_StringData: - return len(realScalars.StringData.GetData()) <= 0 - } - case *schemapb.FieldData_Vectors: - switch realVectors := realData.Vectors.Data.(type) { - case *schemapb.VectorField_BinaryVector: - return len(realVectors.BinaryVector) <= 0 - case *schemapb.VectorField_FloatVector: - return len(realVectors.FloatVector.Data) <= 0 - } - } - return true -} - func genEmptyBoolFieldData(field *schemapb.FieldSchema) *schemapb.FieldData { return &schemapb.FieldData{ Type: field.GetDataType(), diff --git a/internal/util/typeutil/get_dim.go b/pkg/util/typeutil/get_dim.go similarity index 100% rename from internal/util/typeutil/get_dim.go rename to pkg/util/typeutil/get_dim.go diff --git a/internal/util/typeutil/hash.go b/pkg/util/typeutil/hash.go similarity index 98% rename from internal/util/typeutil/hash.go rename to pkg/util/typeutil/hash.go index 008922f05b..1e97814162 100644 --- a/internal/util/typeutil/hash.go +++ b/pkg/util/typeutil/hash.go @@ -20,10 +20,10 @@ import ( "hash/crc32" "unsafe" + "github.com/milvus-io/milvus-proto/go-api/schemapb" "github.com/spaolacci/murmur3" - "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" + "github.com/milvus-io/milvus/pkg/common" ) const substringLengthForCRC = 100 diff --git a/internal/util/typeutil/hash_test.go b/pkg/util/typeutil/hash_test.go similarity index 100% rename from internal/util/typeutil/hash_test.go rename to pkg/util/typeutil/hash_test.go diff --git a/internal/util/typeutil/index.go b/pkg/util/typeutil/index.go similarity index 100% rename from internal/util/typeutil/index.go rename to pkg/util/typeutil/index.go diff --git a/internal/util/typeutil/index_test.go b/pkg/util/typeutil/index_test.go similarity index 100% rename from internal/util/typeutil/index_test.go rename to pkg/util/typeutil/index_test.go diff --git a/internal/util/typeutil/kv_pair_helper.go b/pkg/util/typeutil/kv_pair_helper.go similarity index 100% rename from internal/util/typeutil/kv_pair_helper.go rename to pkg/util/typeutil/kv_pair_helper.go diff --git a/internal/util/typeutil/kv_pair_helper_test.go b/pkg/util/typeutil/kv_pair_helper_test.go similarity index 100% rename from internal/util/typeutil/kv_pair_helper_test.go rename to pkg/util/typeutil/kv_pair_helper_test.go diff --git a/internal/util/typeutil/map.go b/pkg/util/typeutil/map.go similarity index 100% rename from internal/util/typeutil/map.go rename to pkg/util/typeutil/map.go diff --git a/internal/util/typeutil/map_test.go b/pkg/util/typeutil/map_test.go similarity index 100% rename from internal/util/typeutil/map_test.go rename to pkg/util/typeutil/map_test.go diff --git a/internal/util/typeutil/ordered_map.go b/pkg/util/typeutil/ordered_map.go similarity index 100% rename from internal/util/typeutil/ordered_map.go rename to pkg/util/typeutil/ordered_map.go diff --git a/internal/util/typeutil/ordered_map_test.go b/pkg/util/typeutil/ordered_map_test.go similarity index 100% rename from internal/util/typeutil/ordered_map_test.go rename to pkg/util/typeutil/ordered_map_test.go diff --git a/internal/util/typeutil/schema.go b/pkg/util/typeutil/schema.go similarity index 98% rename from internal/util/typeutil/schema.go rename to pkg/util/typeutil/schema.go index 10bbedd4ca..3ece6aacac 100644 --- a/internal/util/typeutil/schema.go +++ b/pkg/util/typeutil/schema.go @@ -22,12 +22,10 @@ import ( "strconv" "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/internalpb" "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/log" ) func GetAvgLengthOfVarLengthField(fieldSchema *schemapb.FieldSchema) (int, error) { @@ -686,20 +684,6 @@ func GetPK(data *schemapb.IDs, idx int64) interface{} { return nil } -func GetTS(i *internalpb.RetrieveResults, idx int64) uint64 { - if i.FieldsData == nil { - return 0 - } - for _, fieldData := range i.FieldsData { - fieldID := fieldData.FieldId - if fieldID == common.TimeStampField { - res := fieldData.GetScalars().GetLongData().Data - return uint64(res[idx]) - } - } - return 0 -} - func AppendPKs(pks *schemapb.IDs, pk interface{}) { switch realPK := pk.(type) { case int64: diff --git a/internal/util/typeutil/schema_test.go b/pkg/util/typeutil/schema_test.go similarity index 96% rename from internal/util/typeutil/schema_test.go rename to pkg/util/typeutil/schema_test.go index 0e32907d7d..2e42280a3e 100644 --- a/internal/util/typeutil/schema_test.go +++ b/pkg/util/typeutil/schema_test.go @@ -20,15 +20,14 @@ import ( "reflect" "testing" - "go.uber.org/zap" - "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/proto/internalpb" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" + "go.uber.org/zap" + + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" ) func TestSchema(t *testing.T) { @@ -670,26 +669,6 @@ func TestGetPK(t *testing.T) { } } -func TestGetTS(t *testing.T) { - var timeStampFieldData = [5]Timestamp{0, 1, 2, 3, 4} - result := &internalpb.RetrieveResults{ - FieldsData: []*schemapb.FieldData{ - genFieldData(common.TimeStampFieldName, common.TimeStampField, schemapb.DataType_Int64, - []int64{0, 1, 2, 3, 4}, 1), - }, - } - timeStamp := GetTS(result, 0) - assert.Equal(t, timeStampFieldData[0], timeStamp) - timeStamp = GetTS(result, 1) - assert.Equal(t, timeStampFieldData[1], timeStamp) - timeStamp = GetTS(result, 2) - assert.Equal(t, timeStampFieldData[2], timeStamp) - timeStamp = GetTS(result, 3) - assert.Equal(t, timeStampFieldData[3], timeStamp) - timeStamp = GetTS(result, 4) - assert.Equal(t, timeStampFieldData[4], timeStamp) -} - func TestAppendPKs(t *testing.T) { intPks := &schemapb.IDs{} AppendPKs(intPks, int64(1)) diff --git a/internal/util/typeutil/set.go b/pkg/util/typeutil/set.go similarity index 100% rename from internal/util/typeutil/set.go rename to pkg/util/typeutil/set.go diff --git a/internal/util/typeutil/set_test.go b/pkg/util/typeutil/set_test.go similarity index 100% rename from internal/util/typeutil/set_test.go rename to pkg/util/typeutil/set_test.go diff --git a/internal/util/typeutil/skip_list.go b/pkg/util/typeutil/skip_list.go similarity index 100% rename from internal/util/typeutil/skip_list.go rename to pkg/util/typeutil/skip_list.go diff --git a/internal/util/typeutil/skip_list_test.go b/pkg/util/typeutil/skip_list_test.go similarity index 100% rename from internal/util/typeutil/skip_list_test.go rename to pkg/util/typeutil/skip_list_test.go diff --git a/internal/util/typeutil/string_util.go b/pkg/util/typeutil/string_util.go similarity index 100% rename from internal/util/typeutil/string_util.go rename to pkg/util/typeutil/string_util.go diff --git a/internal/util/typeutil/string_util_test.go b/pkg/util/typeutil/string_util_test.go similarity index 100% rename from internal/util/typeutil/string_util_test.go rename to pkg/util/typeutil/string_util_test.go diff --git a/internal/util/typeutil/time.go b/pkg/util/typeutil/time.go similarity index 100% rename from internal/util/typeutil/time.go rename to pkg/util/typeutil/time.go diff --git a/internal/util/typeutil/time_test.go b/pkg/util/typeutil/time_test.go similarity index 100% rename from internal/util/typeutil/time_test.go rename to pkg/util/typeutil/time_test.go diff --git a/internal/util/typeutil/type.go b/pkg/util/typeutil/type.go similarity index 100% rename from internal/util/typeutil/type.go rename to pkg/util/typeutil/type.go diff --git a/internal/util/uniquegenerator/unique_int_generator.go b/pkg/util/uniquegenerator/unique_int_generator.go similarity index 99% rename from internal/util/uniquegenerator/unique_int_generator.go rename to pkg/util/uniquegenerator/unique_int_generator.go index 083d0a9311..16d8ba031f 100644 --- a/internal/util/uniquegenerator/unique_int_generator.go +++ b/pkg/util/uniquegenerator/unique_int_generator.go @@ -55,6 +55,7 @@ func NewNaiveUniqueIntGenerator() *NaiveUniqueIntGenerator { } var uniqueIntGeneratorIns UniqueIntGenerator + var getUniqueIntGeneratorInsOnce sync.Once // GetUniqueIntGeneratorIns returns a singleton of UniqueIntGenerator diff --git a/internal/util/uniquegenerator/unique_int_generator_test.go b/pkg/util/uniquegenerator/unique_int_generator_test.go similarity index 100% rename from internal/util/uniquegenerator/unique_int_generator_test.go rename to pkg/util/uniquegenerator/unique_int_generator_test.go diff --git a/tests/integration/bulkinsert_test.go b/tests/integration/bulkinsert_test.go index 7772f8395d..985a7daf23 100644 --- a/tests/integration/bulkinsert_test.go +++ b/tests/integration/bulkinsert_test.go @@ -24,18 +24,18 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/milvus-io/milvus-proto/go-api/commonpb" - "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/distance" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/importutil" - "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" "go.uber.org/zap" + + "github.com/milvus-io/milvus-proto/go-api/commonpb" + "github.com/milvus-io/milvus-proto/go-api/milvuspb" + "github.com/milvus-io/milvus-proto/go-api/schemapb" + "github.com/milvus-io/milvus/internal/util/importutil" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/distance" + "github.com/milvus-io/milvus/pkg/util/funcutil" ) const ( diff --git a/tests/integration/hello_milvus_test.go b/tests/integration/hello_milvus_test.go index 9888c3c62c..3313144223 100644 --- a/tests/integration/hello_milvus_test.go +++ b/tests/integration/hello_milvus_test.go @@ -28,18 +28,17 @@ import ( "time" "github.com/cockroachdb/errors" + "github.com/golang/protobuf/proto" + "github.com/stretchr/testify/assert" + "go.uber.org/zap" "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/distance" - "github.com/milvus-io/milvus/internal/util/funcutil" - - "github.com/golang/protobuf/proto" - "github.com/stretchr/testify/assert" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/distance" + "github.com/milvus-io/milvus/pkg/util/funcutil" ) func TestHelloMilvus(t *testing.T) { diff --git a/tests/integration/meta_watcher.go b/tests/integration/meta_watcher.go index f187bb95dd..84312718d9 100644 --- a/tests/integration/meta_watcher.go +++ b/tests/integration/meta_watcher.go @@ -25,10 +25,11 @@ import ( "time" "github.com/golang/protobuf/proto" - "github.com/milvus-io/milvus-proto/go-api/milvuspb" - "github.com/milvus-io/milvus/internal/proto/datapb" "github.com/milvus-io/milvus/internal/util/sessionutil" clientv3 "go.etcd.io/etcd/client/v3" + + "github.com/milvus-io/milvus-proto/go-api/milvuspb" + "github.com/milvus-io/milvus/internal/proto/datapb" ) // MetaWatcher to observe meta data of milvus cluster diff --git a/tests/integration/meta_watcher_test.go b/tests/integration/meta_watcher_test.go index 70c8817999..2377d273bd 100644 --- a/tests/integration/meta_watcher_test.go +++ b/tests/integration/meta_watcher_test.go @@ -23,17 +23,17 @@ import ( "time" "github.com/cockroachdb/errors" - "github.com/golang/protobuf/proto" + "github.com/stretchr/testify/assert" + "go.uber.org/zap" + "github.com/milvus-io/milvus-proto/go-api/commonpb" "github.com/milvus-io/milvus-proto/go-api/milvuspb" "github.com/milvus-io/milvus-proto/go-api/schemapb" - "github.com/milvus-io/milvus/internal/common" - "github.com/milvus-io/milvus/internal/log" - "github.com/milvus-io/milvus/internal/util/distance" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/stretchr/testify/assert" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/common" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/distance" + "github.com/milvus-io/milvus/pkg/util/funcutil" ) func TestShowSessions(t *testing.T) { diff --git a/tests/integration/minicluster.go b/tests/integration/minicluster.go index be97f57a08..e9554bc928 100644 --- a/tests/integration/minicluster.go +++ b/tests/integration/minicluster.go @@ -24,11 +24,12 @@ import ( "time" "github.com/cockroachdb/errors" + clientv3 "go.etcd.io/etcd/client/v3" + "go.uber.org/zap" "github.com/milvus-io/milvus/internal/datacoord" "github.com/milvus-io/milvus/internal/datanode" "github.com/milvus-io/milvus/internal/indexnode" - "github.com/milvus-io/milvus/internal/log" proxy2 "github.com/milvus-io/milvus/internal/proxy" querycoord "github.com/milvus-io/milvus/internal/querycoordv2" "github.com/milvus-io/milvus/internal/querynode" @@ -36,11 +37,10 @@ import ( "github.com/milvus-io/milvus/internal/storage" "github.com/milvus-io/milvus/internal/types" "github.com/milvus-io/milvus/internal/util/dependency" - "github.com/milvus-io/milvus/internal/util/etcd" - "github.com/milvus-io/milvus/internal/util/funcutil" - "github.com/milvus-io/milvus/internal/util/paramtable" - clientv3 "go.etcd.io/etcd/client/v3" - "go.uber.org/zap" + "github.com/milvus-io/milvus/pkg/log" + "github.com/milvus-io/milvus/pkg/util/etcd" + "github.com/milvus-io/milvus/pkg/util/funcutil" + "github.com/milvus-io/milvus/pkg/util/paramtable" ) type Cluster interface { diff --git a/tests/integration/minicluster_test.go b/tests/integration/minicluster_test.go index 9f05db47d9..2e27eac25c 100644 --- a/tests/integration/minicluster_test.go +++ b/tests/integration/minicluster_test.go @@ -20,10 +20,11 @@ import ( "context" "testing" + "github.com/stretchr/testify/assert" + "github.com/milvus-io/milvus/internal/datanode" "github.com/milvus-io/milvus/internal/indexnode" "github.com/milvus-io/milvus/internal/querynode" - "github.com/stretchr/testify/assert" ) func TestMiniClusterStartAndStop(t *testing.T) {