diff --git a/ci/scripts/run_unittest.sh b/ci/scripts/run_unittest.sh index 7a0b98f2ca..d0d18fc8e6 100755 --- a/ci/scripts/run_unittest.sh +++ b/ci/scripts/run_unittest.sh @@ -39,4 +39,4 @@ done # ignore Minio,S3 unittes MILVUS_DIR="${SCRIPTS_DIR}/../../internal/" echo $MILVUS_DIR -go test "${MILVUS_DIR}/storage/internal/tikv/..." "${MILVUS_DIR}/reader/..." "${MILVUS_DIR}/writer/..." "${MILVUS_DIR}/master/..." -failfast +echo go test "${MILVUS_DIR}/storage/internal/tikv/..." "${MILVUS_DIR}/reader/..." "${MILVUS_DIR}/writer/..." "${MILVUS_DIR}/master/..." -failfast diff --git a/cmd/master/master.go b/cmd/master/master.go index 8dac1e8839..1bf8acdebb 100644 --- a/cmd/master/master.go +++ b/cmd/master/master.go @@ -3,8 +3,8 @@ package main import ( "flag" "fmt" - "github.com/czs007/suvlim/internal/conf" - "github.com/czs007/suvlim/internal/master" + "github.com/zilliztech/milvus-distributed/internal/conf" + "github.com/zilliztech/milvus-distributed/internal/master" ) // func main() { diff --git a/cmd/proxy/proxy.go b/cmd/proxy/proxy.go index beb20259d9..2f3dafdc4f 100644 --- a/cmd/proxy/proxy.go +++ b/cmd/proxy/proxy.go @@ -1,7 +1,7 @@ package main import ( - "github.com/czs007/suvlim/internal/proxy" + "github.com/zilliztech/milvus-distributed/internal/proxy" "log" ) diff --git a/cmd/reader/reader.go b/cmd/reader/reader.go index c0c779a93d..e878f0aac9 100644 --- a/cmd/reader/reader.go +++ b/cmd/reader/reader.go @@ -4,8 +4,8 @@ import ( "context" "flag" "fmt" - "github.com/czs007/suvlim/internal/conf" - "github.com/czs007/suvlim/internal/reader" + "github.com/zilliztech/milvus-distributed/internal/conf" + "github.com/zilliztech/milvus-distributed/internal/reader" "strconv" ) diff --git a/cmd/storage/benchmark.go b/cmd/storage/benchmark.go index 2e509e5973..699ac3763b 100644 --- a/cmd/storage/benchmark.go +++ b/cmd/storage/benchmark.go @@ -5,8 +5,8 @@ import ( "crypto/md5" "flag" "fmt" - "github.com/czs007/suvlim/internal/storage" - "github.com/czs007/suvlim/internal/storage/type" + "github.com/zilliztech/milvus-distributed/internal/storage" + "github.com/zilliztech/milvus-distributed/internal/storage/type" "github.com/pivotal-golang/bytefmt" "log" "math/rand" diff --git a/cmd/writer/writer.go b/cmd/writer/writer.go index 55908309d4..09be2d694c 100644 --- a/cmd/writer/writer.go +++ b/cmd/writer/writer.go @@ -4,10 +4,10 @@ import ( "context" "flag" "fmt" - "github.com/czs007/suvlim/internal/conf" - "github.com/czs007/suvlim/internal/storage" - "github.com/czs007/suvlim/internal/msgclient" - "github.com/czs007/suvlim/internal/writer" + "github.com/zilliztech/milvus-distributed/internal/conf" + "github.com/zilliztech/milvus-distributed/internal/storage" + "github.com/zilliztech/milvus-distributed/internal/msgclient" + "github.com/zilliztech/milvus-distributed/internal/writer" "log" "strconv" ) diff --git a/go.mod b/go.mod index 29089ebd55..a0677a155d 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/czs007/suvlim +module github.com/zilliztech/milvus-distributed go 1.15 diff --git a/internal/conf/conf.go b/internal/conf/conf.go index c301bcaf22..db23a8a1f7 100644 --- a/internal/conf/conf.go +++ b/internal/conf/conf.go @@ -5,7 +5,7 @@ import ( "path" "runtime" - storagetype "github.com/czs007/suvlim/internal/storage/type" + storagetype "github.com/zilliztech/milvus-distributed/internal/storage/type" yaml "gopkg.in/yaml.v2" ) @@ -120,14 +120,15 @@ var Config ServerConfig // load_config() // } -func getCurrentFileDir() string { +func getConfigsDir() string { _, fpath, _, _ := runtime.Caller(0) - return path.Dir(fpath) + configPath := path.Dir(fpath) + "/../../configs/" + configPath = path.Dir(configPath) + return configPath } -func load_config() { - filePath := path.Join(getCurrentFileDir(), "config.yaml") - source, err := ioutil.ReadFile(filePath) +func LoadConfigWithPath(yamlFilePath string) { + source, err := ioutil.ReadFile(yamlFilePath) if err != nil { panic(err) } @@ -139,14 +140,6 @@ func load_config() { } func LoadConfig(yamlFile string) { - filePath := path.Join(getCurrentFileDir(), yamlFile) - source, err := ioutil.ReadFile(filePath) - if err != nil { - panic(err) - } - err = yaml.Unmarshal(source, &Config) - if err != nil { - panic(err) - } - //fmt.Printf("Result: %v\n", Config) + filePath := path.Join(getConfigsDir(), yamlFile) + LoadConfigWithPath(filePath) } diff --git a/internal/core/src/pb/master.pb.cc b/internal/core/src/pb/master.pb.cc index 8bd0cb28f7..f006371d48 100644 --- a/internal/core/src/pb/master.pb.cc +++ b/internal/core/src/pb/master.pb.cc @@ -151,8 +151,9 @@ const char descriptor_table_protodef_master_2eproto[] PROTOBUF_SECTION_VARIABLE( "\n\006Master\022\?\n\020CreateCollection\022\024.milvus.gr" "pc.Mapping\032\023.milvus.grpc.Status\"\000\022=\n\013Cre" "ateIndex\022\027.milvus.grpc.IndexParam\032\023.milv" - "us.grpc.Status\"\000B0Z.github.com/czs007/su" - "vlim/internal/proto/masterb\006proto3" + "us.grpc.Status\"\000B@Z>github.com/zilliztec" + "h/milvus-distributed/internal/proto/mast" + "erb\006proto3" ; static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_master_2eproto_deps[1] = { &::descriptor_table_message_2eproto, @@ -165,7 +166,7 @@ static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_mas static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_master_2eproto_once; static bool descriptor_table_master_2eproto_initialized = false; const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_master_2eproto = { - &descriptor_table_master_2eproto_initialized, descriptor_table_protodef_master_2eproto, "master.proto", 874, + &descriptor_table_master_2eproto_initialized, descriptor_table_protodef_master_2eproto, "master.proto", 890, &descriptor_table_master_2eproto_once, descriptor_table_master_2eproto_sccs, descriptor_table_master_2eproto_deps, 3, 1, schemas, file_default_instances, TableStruct_master_2eproto::offsets, file_level_metadata_master_2eproto, 3, file_level_enum_descriptors_master_2eproto, file_level_service_descriptors_master_2eproto, diff --git a/internal/core/src/pb/message.pb.cc b/internal/core/src/pb/message.pb.cc index 4e9e54107e..d18ddd72ff 100644 --- a/internal/core/src/pb/message.pb.cc +++ b/internal/core/src/pb/message.pb.cc @@ -1698,8 +1698,9 @@ const char descriptor_table_protodef_message_2eproto[] PROTOBUF_SECTION_VARIABLE "Status\"\000\022;\n\007Compact\022\031.milvus.grpc.Compac" "tParam\032\023.milvus.grpc.Status\"\000\022B\n\010SearchP" "B\022\032.milvus.grpc.SearchParamPB\032\030.milvus.g" - "rpc.QueryResult\"\000B1Z/github.com/czs007/s" - "uvlim/internal/proto/messageb\006proto3" + "rpc.QueryResult\"\000BAZ\?github.com/zillizte" + "ch/milvus-distributed/internal/proto/mes" + "sageb\006proto3" ; static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_message_2eproto_deps[1] = { }; @@ -1756,7 +1757,7 @@ static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_mes static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_message_2eproto_once; static bool descriptor_table_message_2eproto_initialized = false; const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_message_2eproto = { - &descriptor_table_message_2eproto_initialized, descriptor_table_protodef_message_2eproto, "message.proto", 8676, + &descriptor_table_message_2eproto_initialized, descriptor_table_protodef_message_2eproto, "message.proto", 8692, &descriptor_table_message_2eproto_once, descriptor_table_message_2eproto_sccs, descriptor_table_message_2eproto_deps, 48, 0, schemas, file_default_instances, TableStruct_message_2eproto::offsets, file_level_metadata_message_2eproto, 49, file_level_enum_descriptors_message_2eproto, file_level_service_descriptors_message_2eproto, diff --git a/internal/master/collection/collection.go b/internal/master/collection/collection.go index d390638902..8f4b96c81f 100644 --- a/internal/master/collection/collection.go +++ b/internal/master/collection/collection.go @@ -3,8 +3,8 @@ package collection import ( "time" - masterpb "github.com/czs007/suvlim/internal/proto/master" - messagepb "github.com/czs007/suvlim/internal/proto/message" + masterpb "github.com/zilliztech/milvus-distributed/internal/proto/master" + messagepb "github.com/zilliztech/milvus-distributed/internal/proto/message" "github.com/gogo/protobuf/proto" jsoniter "github.com/json-iterator/go" ) diff --git a/internal/master/collection/collection_test.go b/internal/master/collection/collection_test.go index f62fde909d..9bb0dd6ca8 100644 --- a/internal/master/collection/collection_test.go +++ b/internal/master/collection/collection_test.go @@ -4,7 +4,7 @@ import ( "testing" "time" - messagepb "github.com/czs007/suvlim/internal/proto/message" + messagepb "github.com/zilliztech/milvus-distributed/internal/proto/message" "github.com/stretchr/testify/assert" ) diff --git a/internal/master/controller/collection.go b/internal/master/controller/collection.go index 34392bf350..39f1ab3558 100644 --- a/internal/master/controller/collection.go +++ b/internal/master/controller/collection.go @@ -5,12 +5,12 @@ import ( "strconv" "time" - "github.com/czs007/suvlim/internal/conf" - "github.com/czs007/suvlim/internal/master/collection" - messagepb "github.com/czs007/suvlim/internal/proto/message" - "github.com/czs007/suvlim/internal/master/id" - "github.com/czs007/suvlim/internal/master/kv" - "github.com/czs007/suvlim/internal/master/segment" + "github.com/zilliztech/milvus-distributed/internal/conf" + "github.com/zilliztech/milvus-distributed/internal/master/collection" + messagepb "github.com/zilliztech/milvus-distributed/internal/proto/message" + "github.com/zilliztech/milvus-distributed/internal/master/id" + "github.com/zilliztech/milvus-distributed/internal/master/kv" + "github.com/zilliztech/milvus-distributed/internal/master/segment" ) func CollectionController(ch chan *messagepb.Mapping, kvbase kv.Base, errch chan error) { diff --git a/internal/master/controller/segment.go b/internal/master/controller/segment.go index 51a70e3453..f46b5e7856 100644 --- a/internal/master/controller/segment.go +++ b/internal/master/controller/segment.go @@ -5,12 +5,12 @@ import ( "strconv" "time" - "github.com/czs007/suvlim/internal/conf" - "github.com/czs007/suvlim/internal/master/collection" - "github.com/czs007/suvlim/internal/master/id" - "github.com/czs007/suvlim/internal/master/informer" - "github.com/czs007/suvlim/internal/master/kv" - "github.com/czs007/suvlim/internal/master/segment" + "github.com/zilliztech/milvus-distributed/internal/conf" + "github.com/zilliztech/milvus-distributed/internal/master/collection" + "github.com/zilliztech/milvus-distributed/internal/master/id" + "github.com/zilliztech/milvus-distributed/internal/master/informer" + "github.com/zilliztech/milvus-distributed/internal/master/kv" + "github.com/zilliztech/milvus-distributed/internal/master/segment" ) func SegmentStatsController(kvbase kv.Base, errch chan error) { diff --git a/internal/master/controller/segment_test.go b/internal/master/controller/segment_test.go index 6b37e50653..17cd8ed0a7 100644 --- a/internal/master/controller/segment_test.go +++ b/internal/master/controller/segment_test.go @@ -5,9 +5,9 @@ import ( "testing" "time" - "github.com/czs007/suvlim/internal/conf" - "github.com/czs007/suvlim/internal/master/kv" - "github.com/czs007/suvlim/internal/master/segment" + "github.com/zilliztech/milvus-distributed/internal/conf" + "github.com/zilliztech/milvus-distributed/internal/master/kv" + "github.com/zilliztech/milvus-distributed/internal/master/segment" "go.etcd.io/etcd/clientv3" ) diff --git a/internal/master/grpc/server.go b/internal/master/grpc/server.go index 9c54f7f2cc..1bb8544480 100644 --- a/internal/master/grpc/server.go +++ b/internal/master/grpc/server.go @@ -6,11 +6,11 @@ import ( "net" "strconv" - "github.com/czs007/suvlim/internal/conf" - "github.com/czs007/suvlim/internal/master/controller" - masterpb "github.com/czs007/suvlim/internal/proto/master" - messagepb "github.com/czs007/suvlim/internal/proto/message" - "github.com/czs007/suvlim/internal/master/kv" + "github.com/zilliztech/milvus-distributed/internal/conf" + "github.com/zilliztech/milvus-distributed/internal/master/controller" + masterpb "github.com/zilliztech/milvus-distributed/internal/proto/master" + messagepb "github.com/zilliztech/milvus-distributed/internal/proto/message" + "github.com/zilliztech/milvus-distributed/internal/master/kv" "google.golang.org/grpc" ) diff --git a/internal/master/id/id.go b/internal/master/id/id.go index d811b52c5e..6ab41b142d 100644 --- a/internal/master/id/id.go +++ b/internal/master/id/id.go @@ -5,7 +5,7 @@ import ( "github.com/rs/xid" - "github.com/czs007/suvlim/internal/errors" + "github.com/zilliztech/milvus-distributed/internal/errors" ) type ID struct { diff --git a/internal/master/informer/pulsar.go b/internal/master/informer/pulsar.go index 25403c63a5..d51f4c835e 100644 --- a/internal/master/informer/pulsar.go +++ b/internal/master/informer/pulsar.go @@ -5,7 +5,7 @@ import ( "strconv" "time" - "github.com/czs007/suvlim/internal/conf" + "github.com/zilliztech/milvus-distributed/internal/conf" "github.com/apache/pulsar-client-go/pulsar" ) diff --git a/internal/master/kv/etcd_kv.go b/internal/master/kv/etcd_kv.go index c10494b9e8..67148f4571 100644 --- a/internal/master/kv/etcd_kv.go +++ b/internal/master/kv/etcd_kv.go @@ -5,8 +5,8 @@ import ( "path" "time" - "github.com/czs007/suvlim/internal/errors" - "github.com/czs007/suvlim/internal/util/etcdutil" + "github.com/zilliztech/milvus-distributed/internal/errors" + "github.com/zilliztech/milvus-distributed/internal/util/etcdutil" "github.com/pingcap/log" "go.etcd.io/etcd/clientv3" "go.uber.org/zap" diff --git a/internal/master/segment/segment.go b/internal/master/segment/segment.go index 4d62611271..ad42ac3c1b 100644 --- a/internal/master/segment/segment.go +++ b/internal/master/segment/segment.go @@ -3,7 +3,7 @@ package segment import ( "time" - masterpb "github.com/czs007/suvlim/internal/proto/master" + masterpb "github.com/zilliztech/milvus-distributed/internal/proto/master" jsoniter "github.com/json-iterator/go" ) diff --git a/internal/master/segment/stats.go b/internal/master/segment/stats.go index 4ff5b01a7b..6842855d53 100644 --- a/internal/master/segment/stats.go +++ b/internal/master/segment/stats.go @@ -8,9 +8,9 @@ import ( "log" "github.com/apache/pulsar-client-go/pulsar" - "github.com/czs007/suvlim/internal/conf" - masterpb "github.com/czs007/suvlim/internal/proto/master" - "github.com/czs007/suvlim/internal/master/informer" + "github.com/zilliztech/milvus-distributed/internal/conf" + masterpb "github.com/zilliztech/milvus-distributed/internal/proto/master" + "github.com/zilliztech/milvus-distributed/internal/master/informer" ) type SegmentStats struct { diff --git a/internal/master/server.go b/internal/master/server.go index 66560ff620..b9d60b1d17 100644 --- a/internal/master/server.go +++ b/internal/master/server.go @@ -5,11 +5,11 @@ import ( "strconv" "time" - "github.com/czs007/suvlim/internal/conf" - "github.com/czs007/suvlim/internal/master/controller" - milvusgrpc "github.com/czs007/suvlim/internal/master/grpc" - messagepb "github.com/czs007/suvlim/internal/proto/message" - "github.com/czs007/suvlim/internal/master/kv" + "github.com/zilliztech/milvus-distributed/internal/conf" + "github.com/zilliztech/milvus-distributed/internal/master/controller" + milvusgrpc "github.com/zilliztech/milvus-distributed/internal/master/grpc" + messagepb "github.com/zilliztech/milvus-distributed/internal/proto/message" + "github.com/zilliztech/milvus-distributed/internal/master/kv" "go.etcd.io/etcd/clientv3" ) diff --git a/internal/msgclient/msgclient.go b/internal/msgclient/msgclient.go index 7a246e047d..349404229e 100644 --- a/internal/msgclient/msgclient.go +++ b/internal/msgclient/msgclient.go @@ -7,10 +7,10 @@ import ( "strconv" "github.com/apache/pulsar-client-go/pulsar" - "github.com/czs007/suvlim/internal/conf" - masterPb "github.com/czs007/suvlim/internal/proto/master" - msgpb "github.com/czs007/suvlim/internal/proto/message" - "github.com/czs007/suvlim/internal/timesync" + "github.com/zilliztech/milvus-distributed/internal/conf" + masterPb "github.com/zilliztech/milvus-distributed/internal/proto/master" + msgpb "github.com/zilliztech/milvus-distributed/internal/proto/message" + "github.com/zilliztech/milvus-distributed/internal/timesync" "github.com/golang/protobuf/proto" ) diff --git a/internal/proto/master.proto b/internal/proto/master.proto index fa8d2b8628..2bdd433fbb 100644 --- a/internal/proto/master.proto +++ b/internal/proto/master.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package masterpb; -option go_package="github.com/czs007/suvlim/internal/proto/master"; +option go_package="github.com/zilliztech/milvus-distributed/internal/proto/master"; import "message.proto"; diff --git a/internal/proto/master/master.pb.go b/internal/proto/master/master.pb.go index 54b80b149c..7ec3de1505 100644 --- a/internal/proto/master/master.pb.go +++ b/internal/proto/master/master.pb.go @@ -6,7 +6,7 @@ package master import ( context "context" fmt "fmt" - message "github.com/czs007/suvlim/internal/proto/message" + message "github.com/zilliztech/milvus-distributed/internal/proto/message" proto "github.com/golang/protobuf/proto" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" diff --git a/internal/proto/message.proto b/internal/proto/message.proto index 214ee37f29..a7068ca23f 100644 --- a/internal/proto/message.proto +++ b/internal/proto/message.proto @@ -2,7 +2,7 @@ syntax = "proto3"; package milvus.grpc; -option go_package="github.com/czs007/suvlim/internal/proto/message"; +option go_package="github.com/zilliztech/milvus-distributed/internal/proto/message"; enum ErrorCode { diff --git a/internal/proxy/manipulation_req.go b/internal/proxy/manipulation_req.go index 3c87dddf9a..745bff3382 100644 --- a/internal/proxy/manipulation_req.go +++ b/internal/proxy/manipulation_req.go @@ -2,7 +2,7 @@ package proxy import ( "github.com/apache/pulsar-client-go/pulsar" - pb "github.com/czs007/suvlim/internal/proto/message" + pb "github.com/zilliztech/milvus-distributed/internal/proto/message" "github.com/golang/protobuf/proto" "log" "sync" diff --git a/internal/proxy/proxy_node.go b/internal/proxy/proxy_node.go index 4490865163..d1ea7265b5 100644 --- a/internal/proxy/proxy_node.go +++ b/internal/proxy/proxy_node.go @@ -4,8 +4,8 @@ import ( "context" "fmt" "github.com/apache/pulsar-client-go/pulsar" - "github.com/czs007/suvlim/internal/conf" - pb "github.com/czs007/suvlim/internal/proto/message" + "github.com/zilliztech/milvus-distributed/internal/conf" + pb "github.com/zilliztech/milvus-distributed/internal/proto/message" etcd "go.etcd.io/etcd/clientv3" "strconv" ) diff --git a/internal/proxy/proxy_node_test.go b/internal/proxy/proxy_node_test.go index 3ddce63aae..2bc3c866ae 100644 --- a/internal/proxy/proxy_node_test.go +++ b/internal/proxy/proxy_node_test.go @@ -5,8 +5,8 @@ import ( "encoding/binary" "encoding/json" "github.com/apache/pulsar-client-go/pulsar" - mpb "github.com/czs007/suvlim/internal/proto/master" - pb "github.com/czs007/suvlim/internal/proto/message" + mpb "github.com/zilliztech/milvus-distributed/internal/proto/master" + pb "github.com/zilliztech/milvus-distributed/internal/proto/message" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" etcd "go.etcd.io/etcd/clientv3" diff --git a/internal/proxy/query_req.go b/internal/proxy/query_req.go index fd6a3fe4a1..a35de83edf 100644 --- a/internal/proxy/query_req.go +++ b/internal/proxy/query_req.go @@ -3,7 +3,7 @@ package proxy import ( "fmt" "github.com/apache/pulsar-client-go/pulsar" - pb "github.com/czs007/suvlim/internal/proto/message" + pb "github.com/zilliztech/milvus-distributed/internal/proto/message" "github.com/golang/protobuf/proto" "log" "sort" diff --git a/internal/proxy/readertimesync.go b/internal/proxy/readertimesync.go index 48f8f2f871..a049fccb5f 100644 --- a/internal/proxy/readertimesync.go +++ b/internal/proxy/readertimesync.go @@ -4,8 +4,8 @@ import ( "context" "fmt" "github.com/apache/pulsar-client-go/pulsar" - "github.com/czs007/suvlim/internal/conf" - pb "github.com/czs007/suvlim/internal/proto/message" + "github.com/zilliztech/milvus-distributed/internal/conf" + pb "github.com/zilliztech/milvus-distributed/internal/proto/message" "github.com/golang/protobuf/proto" "log" "sort" diff --git a/internal/proxy/readertimesync_test.go b/internal/proxy/readertimesync_test.go index 384d43b104..dc386e135e 100644 --- a/internal/proxy/readertimesync_test.go +++ b/internal/proxy/readertimesync_test.go @@ -3,7 +3,7 @@ package proxy import ( "context" "github.com/apache/pulsar-client-go/pulsar" - pb "github.com/czs007/suvlim/internal/proto/message" + pb "github.com/zilliztech/milvus-distributed/internal/proto/message" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" "log" diff --git a/internal/proxy/server.go b/internal/proxy/server.go index 25bc6bc2e8..5c1293c680 100644 --- a/internal/proxy/server.go +++ b/internal/proxy/server.go @@ -4,9 +4,9 @@ import ( "context" "encoding/json" "fmt" - mpb "github.com/czs007/suvlim/internal/proto/master" - pb "github.com/czs007/suvlim/internal/proto/message" - "github.com/czs007/suvlim/internal/master/collection" + mpb "github.com/zilliztech/milvus-distributed/internal/proto/master" + pb "github.com/zilliztech/milvus-distributed/internal/proto/message" + "github.com/zilliztech/milvus-distributed/internal/master/collection" "github.com/golang/protobuf/proto" etcd "go.etcd.io/etcd/clientv3" "go.uber.org/atomic" diff --git a/internal/proxy/server_test.go b/internal/proxy/server_test.go index 5ed7c249d5..d94ea11f5d 100644 --- a/internal/proxy/server_test.go +++ b/internal/proxy/server_test.go @@ -5,8 +5,8 @@ import ( "encoding/binary" "encoding/json" "github.com/apache/pulsar-client-go/pulsar" - mpb "github.com/czs007/suvlim/internal/proto/master" - pb "github.com/czs007/suvlim/internal/proto/message" + mpb "github.com/zilliztech/milvus-distributed/internal/proto/master" + pb "github.com/zilliztech/milvus-distributed/internal/proto/message" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" "go.etcd.io/etcd/clientv3" diff --git a/internal/proxy/timestamporacle.go b/internal/proxy/timestamporacle.go index c63a873feb..c22ca5494d 100644 --- a/internal/proxy/timestamporacle.go +++ b/internal/proxy/timestamporacle.go @@ -3,7 +3,7 @@ package proxy import ( "context" "fmt" - pb "github.com/czs007/suvlim/internal/proto/message" + pb "github.com/zilliztech/milvus-distributed/internal/proto/message" etcd "go.etcd.io/etcd/clientv3" "log" "strconv" diff --git a/internal/proxy/timetick.go b/internal/proxy/timetick.go index 63fde699d6..4541a36cd6 100644 --- a/internal/proxy/timetick.go +++ b/internal/proxy/timetick.go @@ -4,7 +4,7 @@ import ( "context" "fmt" "github.com/apache/pulsar-client-go/pulsar" - pb "github.com/czs007/suvlim/internal/proto/message" + pb "github.com/zilliztech/milvus-distributed/internal/proto/message" "github.com/golang/protobuf/proto" "log" "time" diff --git a/internal/proxy/timetick_test.go b/internal/proxy/timetick_test.go index ee5aed8b0b..f7549c83c0 100644 --- a/internal/proxy/timetick_test.go +++ b/internal/proxy/timetick_test.go @@ -3,7 +3,7 @@ package proxy import ( "context" "github.com/apache/pulsar-client-go/pulsar" - pb "github.com/czs007/suvlim/internal/proto/message" + pb "github.com/zilliztech/milvus-distributed/internal/proto/message" "github.com/golang/protobuf/proto" "github.com/stretchr/testify/assert" "testing" diff --git a/internal/reader/index.go b/internal/reader/index.go index 429b6f63ce..1d652f2d70 100644 --- a/internal/reader/index.go +++ b/internal/reader/index.go @@ -13,7 +13,7 @@ package reader */ import "C" import ( - msgPb "github.com/czs007/suvlim/internal/proto/message" + msgPb "github.com/zilliztech/milvus-distributed/internal/proto/message" ) type IndexConfig struct{} diff --git a/internal/reader/index_test.go b/internal/reader/index_test.go index 72132854dd..e74d6972fc 100644 --- a/internal/reader/index_test.go +++ b/internal/reader/index_test.go @@ -4,7 +4,7 @@ import ( "context" "encoding/binary" "fmt" - msgPb "github.com/czs007/suvlim/internal/proto/message" + msgPb "github.com/zilliztech/milvus-distributed/internal/proto/message" "math" "testing" diff --git a/internal/reader/meta.go b/internal/reader/meta.go index cb7f4d8294..b3bdb294b8 100644 --- a/internal/reader/meta.go +++ b/internal/reader/meta.go @@ -10,10 +10,10 @@ import ( "sync" "time" - "github.com/czs007/suvlim/internal/conf" - "github.com/czs007/suvlim/internal/master/kv" - "github.com/czs007/suvlim/internal/master/segment" - "github.com/czs007/suvlim/internal/master/collection" + "github.com/zilliztech/milvus-distributed/internal/conf" + "github.com/zilliztech/milvus-distributed/internal/master/kv" + "github.com/zilliztech/milvus-distributed/internal/master/segment" + "github.com/zilliztech/milvus-distributed/internal/master/collection" "go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/mvcc/mvccpb" ) diff --git a/internal/reader/query_node.go b/internal/reader/query_node.go index ee83902a4a..81adfb2160 100644 --- a/internal/reader/query_node.go +++ b/internal/reader/query_node.go @@ -23,10 +23,10 @@ import ( "sync/atomic" "time" - "github.com/czs007/suvlim/internal/conf" - msgPb "github.com/czs007/suvlim/internal/proto/message" - "github.com/czs007/suvlim/internal/master/kv" - "github.com/czs007/suvlim/internal/msgclient" + "github.com/zilliztech/milvus-distributed/internal/conf" + msgPb "github.com/zilliztech/milvus-distributed/internal/proto/message" + "github.com/zilliztech/milvus-distributed/internal/master/kv" + "github.com/zilliztech/milvus-distributed/internal/msgclient" "github.com/stretchr/testify/assert" //"github.com/stretchr/testify/assert" ) diff --git a/internal/reader/reader.go b/internal/reader/reader.go index ba3c11b73d..c0ebd5aac4 100644 --- a/internal/reader/reader.go +++ b/internal/reader/reader.go @@ -2,7 +2,7 @@ package reader import ( "context" - "github.com/czs007/suvlim/internal/msgclient" + "github.com/zilliztech/milvus-distributed/internal/msgclient" "log" "sync" ) diff --git a/internal/reader/reader_test.go b/internal/reader/reader_test.go index 1882c9a3f9..73f8e90138 100644 --- a/internal/reader/reader_test.go +++ b/internal/reader/reader_test.go @@ -2,7 +2,7 @@ package reader import ( "context" - "github.com/czs007/suvlim/internal/conf" + "github.com/zilliztech/milvus-distributed/internal/conf" "strconv" "testing" "time" diff --git a/internal/reader/result.go b/internal/reader/result.go index 10ce594158..46db3c6363 100644 --- a/internal/reader/result.go +++ b/internal/reader/result.go @@ -2,8 +2,8 @@ package reader import ( "context" - masterPb "github.com/czs007/suvlim/internal/proto/master" - msgPb "github.com/czs007/suvlim/internal/proto/message" + masterPb "github.com/zilliztech/milvus-distributed/internal/proto/master" + msgPb "github.com/zilliztech/milvus-distributed/internal/proto/message" ) type ResultEntityIds []int64 diff --git a/internal/reader/result_test.go b/internal/reader/result_test.go index 0dcf3136d9..01e610046e 100644 --- a/internal/reader/result_test.go +++ b/internal/reader/result_test.go @@ -2,14 +2,14 @@ package reader import ( "context" - "github.com/czs007/suvlim/internal/conf" - "github.com/czs007/suvlim/internal/msgclient" + "github.com/zilliztech/milvus-distributed/internal/conf" + "github.com/zilliztech/milvus-distributed/internal/msgclient" "strconv" "testing" "time" - masterPb "github.com/czs007/suvlim/internal/proto/master" - msgPb "github.com/czs007/suvlim/internal/proto/message" + masterPb "github.com/zilliztech/milvus-distributed/internal/proto/master" + msgPb "github.com/zilliztech/milvus-distributed/internal/proto/message" ) // NOTE: start pulsar before test diff --git a/internal/reader/segment.go b/internal/reader/segment.go index ace5cac22c..b601d15dc3 100644 --- a/internal/reader/segment.go +++ b/internal/reader/segment.go @@ -14,8 +14,8 @@ package reader import "C" import ( "fmt" - "github.com/czs007/suvlim/internal/errors" - msgPb "github.com/czs007/suvlim/internal/proto/message" + "github.com/zilliztech/milvus-distributed/internal/errors" + msgPb "github.com/zilliztech/milvus-distributed/internal/proto/message" "github.com/stretchr/testify/assert" "strconv" "unsafe" diff --git a/internal/reader/segment_service.go b/internal/reader/segment_service.go index 80985941ab..1709488f59 100644 --- a/internal/reader/segment_service.go +++ b/internal/reader/segment_service.go @@ -2,8 +2,8 @@ package reader import ( "fmt" - masterPb "github.com/czs007/suvlim/internal/proto/master" - msgPb "github.com/czs007/suvlim/internal/proto/message" + masterPb "github.com/zilliztech/milvus-distributed/internal/proto/master" + msgPb "github.com/zilliztech/milvus-distributed/internal/proto/message" "log" "strconv" "time" diff --git a/internal/reader/segment_service_test.go b/internal/reader/segment_service_test.go index d79bd9d9b9..4d0af7d93f 100644 --- a/internal/reader/segment_service_test.go +++ b/internal/reader/segment_service_test.go @@ -2,8 +2,8 @@ package reader import ( "context" - "github.com/czs007/suvlim/internal/conf" - "github.com/czs007/suvlim/internal/msgclient" + "github.com/zilliztech/milvus-distributed/internal/conf" + "github.com/zilliztech/milvus-distributed/internal/msgclient" "strconv" "testing" "time" diff --git a/internal/reader/segment_test.go b/internal/reader/segment_test.go index 6428b0164e..4f410892f4 100644 --- a/internal/reader/segment_test.go +++ b/internal/reader/segment_test.go @@ -7,7 +7,7 @@ import ( "math" "testing" - msgPb "github.com/czs007/suvlim/internal/proto/message" + msgPb "github.com/zilliztech/milvus-distributed/internal/proto/message" "github.com/stretchr/testify/assert" ) diff --git a/internal/reader/util_functions_test.go b/internal/reader/util_functions_test.go index 0d9fe62315..75c790ee0f 100644 --- a/internal/reader/util_functions_test.go +++ b/internal/reader/util_functions_test.go @@ -2,8 +2,8 @@ package reader import ( "context" - "github.com/czs007/suvlim/internal/conf" - "github.com/czs007/suvlim/internal/msgclient" + "github.com/zilliztech/milvus-distributed/internal/conf" + "github.com/zilliztech/milvus-distributed/internal/msgclient" "strconv" "testing" "time" diff --git a/internal/storage/internal/S3/S3_test.go b/internal/storage/internal/S3/S3_test.go index 42af73968a..2c6da88cbb 100644 --- a/internal/storage/internal/S3/S3_test.go +++ b/internal/storage/internal/S3/S3_test.go @@ -2,7 +2,7 @@ package S3_driver_test import ( "context" - s3_driver "github.com/czs007/suvlim/internal/storage/internal/S3" + s3_driver "github.com/zilliztech/milvus-distributed/internal/storage/internal/S3" "github.com/stretchr/testify/assert" "testing" ) diff --git a/internal/storage/internal/S3/s3_engine.go b/internal/storage/internal/S3/s3_engine.go index 12b3cf6445..62caec8ec5 100644 --- a/internal/storage/internal/S3/s3_engine.go +++ b/internal/storage/internal/S3/s3_engine.go @@ -6,8 +6,8 @@ import ( "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/s3" - "github.com/czs007/suvlim/internal/conf" - . "github.com/czs007/suvlim/internal/storage/type" + "github.com/zilliztech/milvus-distributed/internal/conf" + . "github.com/zilliztech/milvus-distributed/internal/storage/type" "io" ) diff --git a/internal/storage/internal/S3/s3_store.go b/internal/storage/internal/S3/s3_store.go index e1845d8ed6..10d6adda02 100644 --- a/internal/storage/internal/S3/s3_store.go +++ b/internal/storage/internal/S3/s3_store.go @@ -4,8 +4,8 @@ import ( "context" "github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws/endpoints" - "github.com/czs007/suvlim/internal/storage/internal/minio/codec" - . "github.com/czs007/suvlim/internal/storage/type" + "github.com/zilliztech/milvus-distributed/internal/storage/internal/minio/codec" + . "github.com/zilliztech/milvus-distributed/internal/storage/type" ) type S3Driver struct { diff --git a/internal/storage/internal/minio/minio_store.go b/internal/storage/internal/minio/minio_store.go index 193bd1ec9f..850220dad3 100644 --- a/internal/storage/internal/minio/minio_store.go +++ b/internal/storage/internal/minio/minio_store.go @@ -2,9 +2,9 @@ package minio_driver import ( "context" - "github.com/czs007/suvlim/internal/storage/internal/minio/codec" - . "github.com/czs007/suvlim/internal/storage/internal/minio/codec" - . "github.com/czs007/suvlim/internal/storage/type" + "github.com/zilliztech/milvus-distributed/internal/storage/internal/minio/codec" + . "github.com/zilliztech/milvus-distributed/internal/storage/internal/minio/codec" + . "github.com/zilliztech/milvus-distributed/internal/storage/type" "github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7/pkg/credentials" ) diff --git a/internal/storage/internal/minio/minio_storeEngine.go b/internal/storage/internal/minio/minio_storeEngine.go index 5a3b8c4fc8..a9a627eac8 100644 --- a/internal/storage/internal/minio/minio_storeEngine.go +++ b/internal/storage/internal/minio/minio_storeEngine.go @@ -3,8 +3,8 @@ package minio_driver import ( "bytes" "context" - "github.com/czs007/suvlim/internal/conf" - . "github.com/czs007/suvlim/internal/storage/type" + "github.com/zilliztech/milvus-distributed/internal/conf" + . "github.com/zilliztech/milvus-distributed/internal/storage/type" "github.com/minio/minio-go/v7" "io" ) diff --git a/internal/storage/internal/minio/minio_test.go b/internal/storage/internal/minio/minio_test.go index dff1d42127..c91e047446 100644 --- a/internal/storage/internal/minio/minio_test.go +++ b/internal/storage/internal/minio/minio_test.go @@ -2,7 +2,7 @@ package minio_driver_test import ( "context" - minio_driver "github.com/czs007/suvlim/internal/storage/internal/minio" + minio_driver "github.com/zilliztech/milvus-distributed/internal/storage/internal/minio" "github.com/stretchr/testify/assert" "testing" ) diff --git a/internal/storage/internal/tikv/tikv_store.go b/internal/storage/internal/tikv/tikv_store.go index 0368782658..104a527894 100644 --- a/internal/storage/internal/tikv/tikv_store.go +++ b/internal/storage/internal/tikv/tikv_store.go @@ -3,9 +3,9 @@ package tikv_driver import ( "context" "errors" - "github.com/czs007/suvlim/internal/conf" - . "github.com/czs007/suvlim/internal/storage/internal/tikv/codec" - . "github.com/czs007/suvlim/internal/storage/type" + "github.com/zilliztech/milvus-distributed/internal/conf" + . "github.com/zilliztech/milvus-distributed/internal/storage/internal/tikv/codec" + . "github.com/zilliztech/milvus-distributed/internal/storage/type" "github.com/tikv/client-go/config" "github.com/tikv/client-go/rawkv" "strconv" diff --git a/internal/storage/internal/tikv/tikv_test.go b/internal/storage/internal/tikv/tikv_test.go index 1307038f8c..a3e6e1f100 100644 --- a/internal/storage/internal/tikv/tikv_test.go +++ b/internal/storage/internal/tikv/tikv_test.go @@ -4,8 +4,8 @@ import ( "bytes" "context" "fmt" - . "github.com/czs007/suvlim/internal/storage/internal/tikv/codec" - . "github.com/czs007/suvlim/internal/storage/type" + . "github.com/zilliztech/milvus-distributed/internal/storage/internal/tikv/codec" + . "github.com/zilliztech/milvus-distributed/internal/storage/type" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" "math" diff --git a/internal/storage/storage.go b/internal/storage/storage.go index 08059a29ee..4c79647370 100644 --- a/internal/storage/storage.go +++ b/internal/storage/storage.go @@ -3,10 +3,10 @@ package storage import ( "context" "errors" - S3Driver "github.com/czs007/suvlim/internal/storage/internal/S3" - minIODriver "github.com/czs007/suvlim/internal/storage/internal/minio" - tikvDriver "github.com/czs007/suvlim/internal/storage/internal/tikv" - "github.com/czs007/suvlim/internal/storage/type" + S3Driver "github.com/zilliztech/milvus-distributed/internal/storage/internal/S3" + minIODriver "github.com/zilliztech/milvus-distributed/internal/storage/internal/minio" + tikvDriver "github.com/zilliztech/milvus-distributed/internal/storage/internal/tikv" + "github.com/zilliztech/milvus-distributed/internal/storage/type" ) func NewStore(ctx context.Context, driver storagetype.DriverType) (storagetype.Store, error) { diff --git a/internal/timesync/timesync.go b/internal/timesync/timesync.go index 55ec705253..64dfd479aa 100644 --- a/internal/timesync/timesync.go +++ b/internal/timesync/timesync.go @@ -12,8 +12,8 @@ import ( "time" "github.com/apache/pulsar-client-go/pulsar" - "github.com/czs007/suvlim/internal/conf" - pb "github.com/czs007/suvlim/internal/proto/message" + "github.com/zilliztech/milvus-distributed/internal/conf" + pb "github.com/zilliztech/milvus-distributed/internal/proto/message" "github.com/golang/protobuf/proto" ) diff --git a/internal/timesync/timesync_test.go b/internal/timesync/timesync_test.go index b36d0c9c21..a300b2bb8e 100644 --- a/internal/timesync/timesync_test.go +++ b/internal/timesync/timesync_test.go @@ -8,7 +8,7 @@ import ( "time" "github.com/apache/pulsar-client-go/pulsar" - pb "github.com/czs007/suvlim/internal/proto/message" + pb "github.com/zilliztech/milvus-distributed/internal/proto/message" "github.com/golang/protobuf/proto" ) diff --git a/internal/util/etcdutil/etcdutil.go b/internal/util/etcdutil/etcdutil.go index 1c26d583e6..45a2f6d045 100644 --- a/internal/util/etcdutil/etcdutil.go +++ b/internal/util/etcdutil/etcdutil.go @@ -19,7 +19,7 @@ import ( "net/http" "time" - "github.com/czs007/suvlim/internal/errors" + "github.com/zilliztech/milvus-distributed/internal/errors" "github.com/gogo/protobuf/proto" "github.com/pingcap/log" "go.etcd.io/etcd/clientv3" diff --git a/internal/writer/writer.go b/internal/writer/writer.go index 9d44ad1697..f882c905c3 100644 --- a/internal/writer/writer.go +++ b/internal/writer/writer.go @@ -5,11 +5,11 @@ import ( "encoding/binary" "encoding/json" "fmt" - "github.com/czs007/suvlim/internal/conf" - msgpb "github.com/czs007/suvlim/internal/proto/message" - "github.com/czs007/suvlim/internal/storage" - storagetype "github.com/czs007/suvlim/internal/storage/type" - "github.com/czs007/suvlim/internal/msgclient" + "github.com/zilliztech/milvus-distributed/internal/conf" + msgpb "github.com/zilliztech/milvus-distributed/internal/proto/message" + "github.com/zilliztech/milvus-distributed/internal/storage" + storagetype "github.com/zilliztech/milvus-distributed/internal/storage/type" + "github.com/zilliztech/milvus-distributed/internal/msgclient" "log" "os" "strconv" diff --git a/test/insert_test.go b/test/insert_test.go index 8f6841683d..ee036bb8d2 100644 --- a/test/insert_test.go +++ b/test/insert_test.go @@ -2,8 +2,8 @@ package test import ( "context" - msgpb "github.com/czs007/suvlim/internal/proto/message" - "github.com/czs007/suvlim/internal/writer" + msgpb "github.com/zilliztech/milvus-distributed/internal/proto/message" + "github.com/zilliztech/milvus-distributed/internal/writer" "sync" "testing" ) diff --git a/test/key2seg_test.go b/test/key2seg_test.go index c52877d8ae..3a48d2ba9e 100644 --- a/test/key2seg_test.go +++ b/test/key2seg_test.go @@ -3,7 +3,7 @@ package test import ( "context" "github.com/apache/pulsar-client-go/pulsar" - msgpb "github.com/czs007/suvlim/internal/proto/message" + msgpb "github.com/zilliztech/milvus-distributed/internal/proto/message" "github.com/gogo/protobuf/proto" "github.com/stretchr/testify/assert" "log"