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

Fix conf.LoadConfig failed to load yaml file

Browse Source 
Signed-off-by: zhenshan.cao <zhenshan.cao@zilliz.com>
This commit is contained in:
zhenshan.cao 2020-10-19 18:31:00 +08:00 committed by yefu.chen
parent 974496a2b2
commit 251bc2a19e
65 changed files with 149 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/scripts/run_unittest.sh
View File

@ -39,4 +39,4 @@ done
# ignore Minio,S3 unittes # ignore Minio,S3 unittes
MILVUS_DIR="${SCRIPTS_DIR}/../../internal/" MILVUS_DIR="${SCRIPTS_DIR}/../../internal/"
echo $MILVUS_DIR 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

4
cmd/master/master.go
View File

@ -3,8 +3,8 @@ package main
import ( import (
"flag" "flag"
"fmt" "fmt"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
"github.com/czs007/suvlim/internal/master" "github.com/zilliztech/milvus-distributed/internal/master"
) )
// func main() { // func main() {

2
cmd/proxy/proxy.go
View File

@ -1,7 +1,7 @@
package main package main
import ( import (
"github.com/czs007/suvlim/internal/proxy" "github.com/zilliztech/milvus-distributed/internal/proxy"
"log" "log"
) )

4
cmd/reader/reader.go
View File

@ -4,8 +4,8 @@ import (
"context" "context"
"flag" "flag"
"fmt" "fmt"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
"github.com/czs007/suvlim/internal/reader" "github.com/zilliztech/milvus-distributed/internal/reader"
"strconv" "strconv"
) )

4
cmd/storage/benchmark.go
View File

@ -5,8 +5,8 @@ import (
"crypto/md5" "crypto/md5"
"flag" "flag"
"fmt" "fmt"
"github.com/czs007/suvlim/internal/storage" "github.com/zilliztech/milvus-distributed/internal/storage"
"github.com/czs007/suvlim/internal/storage/type" "github.com/zilliztech/milvus-distributed/internal/storage/type"
"github.com/pivotal-golang/bytefmt" "github.com/pivotal-golang/bytefmt"
"log" "log"
"math/rand" "math/rand"

8
cmd/writer/writer.go
View File

@ -4,10 +4,10 @@ import (
"context" "context"
"flag" "flag"
"fmt" "fmt"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
"github.com/czs007/suvlim/internal/storage" "github.com/zilliztech/milvus-distributed/internal/storage"
"github.com/czs007/suvlim/internal/msgclient" "github.com/zilliztech/milvus-distributed/internal/msgclient"
"github.com/czs007/suvlim/internal/writer" "github.com/zilliztech/milvus-distributed/internal/writer"
"log" "log"
"strconv" "strconv"
) )

2
go.mod
View File

@ -1,4 +1,4 @@
module github.com/czs007/suvlim module github.com/zilliztech/milvus-distributed
go 1.15 go 1.15

25
internal/conf/conf.go
View File

@ -5,7 +5,7 @@ import (
"path" "path"
"runtime" "runtime"
storagetype "github.com/czs007/suvlim/internal/storage/type" storagetype "github.com/zilliztech/milvus-distributed/internal/storage/type"
yaml "gopkg.in/yaml.v2" yaml "gopkg.in/yaml.v2"
) )
@ -120,14 +120,15 @@ var Config ServerConfig
// load_config() // load_config()
// } // }
func getCurrentFileDir() string { func getConfigsDir() string {
_, fpath, _, _ := runtime.Caller(0) _, fpath, _, _ := runtime.Caller(0)
return path.Dir(fpath) configPath := path.Dir(fpath) + "/../../configs/"
configPath = path.Dir(configPath)
return configPath
} }
func load_config() { func LoadConfigWithPath(yamlFilePath string) {
filePath := path.Join(getCurrentFileDir(), "config.yaml") source, err := ioutil.ReadFile(yamlFilePath)
source, err := ioutil.ReadFile(filePath)
if err != nil { if err != nil {
panic(err) panic(err)
} }
@ -139,14 +140,6 @@ func load_config() {
} }
func LoadConfig(yamlFile string) { func LoadConfig(yamlFile string) {
filePath := path.Join(getCurrentFileDir(), yamlFile) filePath := path.Join(getConfigsDir(), yamlFile)
source, err := ioutil.ReadFile(filePath) LoadConfigWithPath(filePath)
if err != nil {
panic(err)
}
err = yaml.Unmarshal(source, &Config)
if err != nil {
panic(err)
}
//fmt.Printf("Result: %v\n", Config)
} }

7
internal/core/src/pb/master.pb.cc
View File

@ -151,8 +151,9 @@ const char descriptor_table_protodef_master_2eproto[] PROTOBUF_SECTION_VARIABLE(
"\n\006Master\022\?\n\020CreateCollection\022\024.milvus.gr" "\n\006Master\022\?\n\020CreateCollection\022\024.milvus.gr"
"pc.Mapping\032\023.milvus.grpc.Status\"\000\022=\n\013Cre" "pc.Mapping\032\023.milvus.grpc.Status\"\000\022=\n\013Cre"
"ateIndex\022\027.milvus.grpc.IndexParam\032\023.milv" "ateIndex\022\027.milvus.grpc.IndexParam\032\023.milv"
"us.grpc.Status\"\000B0Z.github.com/czs007/su" "us.grpc.Status\"\000B@Z>github.com/zilliztec"
"vlim/internal/proto/masterb\006proto3" "h/milvus-distributed/internal/proto/mast"
"erb\006proto3"
; ;
static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_master_2eproto_deps[1] = { static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_master_2eproto_deps[1] = {
&::descriptor_table_message_2eproto, &::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 ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_master_2eproto_once;
static bool descriptor_table_master_2eproto_initialized = false; static bool descriptor_table_master_2eproto_initialized = false;
const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_master_2eproto = { 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, &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, 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, file_level_metadata_master_2eproto, 3, file_level_enum_descriptors_master_2eproto, file_level_service_descriptors_master_2eproto,

7
internal/core/src/pb/message.pb.cc
View File

@ -1698,8 +1698,9 @@ const char descriptor_table_protodef_message_2eproto[] PROTOBUF_SECTION_VARIABLE
"Status\"\000\022;\n\007Compact\022\031.milvus.grpc.Compac" "Status\"\000\022;\n\007Compact\022\031.milvus.grpc.Compac"
"tParam\032\023.milvus.grpc.Status\"\000\022B\n\010SearchP" "tParam\032\023.milvus.grpc.Status\"\000\022B\n\010SearchP"
"B\022\032.milvus.grpc.SearchParamPB\032\030.milvus.g" "B\022\032.milvus.grpc.SearchParamPB\032\030.milvus.g"
"rpc.QueryResult\"\000B1Z/github.com/czs007/s" "rpc.QueryResult\"\000BAZ\?github.com/zillizte"
"uvlim/internal/proto/messageb\006proto3" "ch/milvus-distributed/internal/proto/mes"
"sageb\006proto3"
; ;
static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_message_2eproto_deps[1] = { 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 ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_message_2eproto_once;
static bool descriptor_table_message_2eproto_initialized = false; static bool descriptor_table_message_2eproto_initialized = false;
const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_message_2eproto = { 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, &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, 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, file_level_metadata_message_2eproto, 49, file_level_enum_descriptors_message_2eproto, file_level_service_descriptors_message_2eproto,

4
internal/master/collection/collection.go
View File

@ -3,8 +3,8 @@ package collection
import ( import (
"time" "time"
masterpb "github.com/czs007/suvlim/internal/proto/master" masterpb "github.com/zilliztech/milvus-distributed/internal/proto/master"
messagepb "github.com/czs007/suvlim/internal/proto/message" messagepb "github.com/zilliztech/milvus-distributed/internal/proto/message"
"github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/proto"
jsoniter "github.com/json-iterator/go" jsoniter "github.com/json-iterator/go"
) )

2
internal/master/collection/collection_test.go
View File

@ -4,7 +4,7 @@ import (
"testing" "testing"
"time" "time"
messagepb "github.com/czs007/suvlim/internal/proto/message" messagepb "github.com/zilliztech/milvus-distributed/internal/proto/message"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

12
internal/master/controller/collection.go
View File

@ -5,12 +5,12 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
"github.com/czs007/suvlim/internal/master/collection" "github.com/zilliztech/milvus-distributed/internal/master/collection"
messagepb "github.com/czs007/suvlim/internal/proto/message" messagepb "github.com/zilliztech/milvus-distributed/internal/proto/message"
"github.com/czs007/suvlim/internal/master/id" "github.com/zilliztech/milvus-distributed/internal/master/id"
"github.com/czs007/suvlim/internal/master/kv" "github.com/zilliztech/milvus-distributed/internal/master/kv"
"github.com/czs007/suvlim/internal/master/segment" "github.com/zilliztech/milvus-distributed/internal/master/segment"
) )
func CollectionController(ch chan *messagepb.Mapping, kvbase kv.Base, errch chan error) { func CollectionController(ch chan *messagepb.Mapping, kvbase kv.Base, errch chan error) {

12
internal/master/controller/segment.go
View File

@ -5,12 +5,12 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
"github.com/czs007/suvlim/internal/master/collection" "github.com/zilliztech/milvus-distributed/internal/master/collection"
"github.com/czs007/suvlim/internal/master/id" "github.com/zilliztech/milvus-distributed/internal/master/id"
"github.com/czs007/suvlim/internal/master/informer" "github.com/zilliztech/milvus-distributed/internal/master/informer"
"github.com/czs007/suvlim/internal/master/kv" "github.com/zilliztech/milvus-distributed/internal/master/kv"
"github.com/czs007/suvlim/internal/master/segment" "github.com/zilliztech/milvus-distributed/internal/master/segment"
) )
func SegmentStatsController(kvbase kv.Base, errch chan error) { func SegmentStatsController(kvbase kv.Base, errch chan error) {

6
internal/master/controller/segment_test.go
View File

@ -5,9 +5,9 @@ import (
"testing" "testing"
"time" "time"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
"github.com/czs007/suvlim/internal/master/kv" "github.com/zilliztech/milvus-distributed/internal/master/kv"
"github.com/czs007/suvlim/internal/master/segment" "github.com/zilliztech/milvus-distributed/internal/master/segment"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/clientv3"
) )

10
internal/master/grpc/server.go
View File

@ -6,11 +6,11 @@ import (
"net" "net"
"strconv" "strconv"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
"github.com/czs007/suvlim/internal/master/controller" "github.com/zilliztech/milvus-distributed/internal/master/controller"
masterpb "github.com/czs007/suvlim/internal/proto/master" masterpb "github.com/zilliztech/milvus-distributed/internal/proto/master"
messagepb "github.com/czs007/suvlim/internal/proto/message" messagepb "github.com/zilliztech/milvus-distributed/internal/proto/message"
"github.com/czs007/suvlim/internal/master/kv" "github.com/zilliztech/milvus-distributed/internal/master/kv"
"google.golang.org/grpc" "google.golang.org/grpc"
) )

2
internal/master/id/id.go
View File

@ -5,7 +5,7 @@ import (
"github.com/rs/xid" "github.com/rs/xid"
"github.com/czs007/suvlim/internal/errors" "github.com/zilliztech/milvus-distributed/internal/errors"
) )
type ID struct { type ID struct {

2
internal/master/informer/pulsar.go
View File

@ -5,7 +5,7 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
"github.com/apache/pulsar-client-go/pulsar" "github.com/apache/pulsar-client-go/pulsar"
) )

4
internal/master/kv/etcd_kv.go
View File

@ -5,8 +5,8 @@ import (
"path" "path"
"time" "time"
"github.com/czs007/suvlim/internal/errors" "github.com/zilliztech/milvus-distributed/internal/errors"
"github.com/czs007/suvlim/internal/util/etcdutil" "github.com/zilliztech/milvus-distributed/internal/util/etcdutil"
"github.com/pingcap/log" "github.com/pingcap/log"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/clientv3"
"go.uber.org/zap" "go.uber.org/zap"

2
internal/master/segment/segment.go
View File

@ -3,7 +3,7 @@ package segment
import ( import (
"time" "time"
masterpb "github.com/czs007/suvlim/internal/proto/master" masterpb "github.com/zilliztech/milvus-distributed/internal/proto/master"
jsoniter "github.com/json-iterator/go" jsoniter "github.com/json-iterator/go"
) )

6
internal/master/segment/stats.go
View File

@ -8,9 +8,9 @@ import (
"log" "log"
"github.com/apache/pulsar-client-go/pulsar" "github.com/apache/pulsar-client-go/pulsar"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
masterpb "github.com/czs007/suvlim/internal/proto/master" masterpb "github.com/zilliztech/milvus-distributed/internal/proto/master"
"github.com/czs007/suvlim/internal/master/informer" "github.com/zilliztech/milvus-distributed/internal/master/informer"
) )
type SegmentStats struct { type SegmentStats struct {

10
internal/master/server.go
View File

@ -5,11 +5,11 @@ import (
"strconv" "strconv"
"time" "time"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
"github.com/czs007/suvlim/internal/master/controller" "github.com/zilliztech/milvus-distributed/internal/master/controller"
milvusgrpc "github.com/czs007/suvlim/internal/master/grpc" milvusgrpc "github.com/zilliztech/milvus-distributed/internal/master/grpc"
messagepb "github.com/czs007/suvlim/internal/proto/message" messagepb "github.com/zilliztech/milvus-distributed/internal/proto/message"
"github.com/czs007/suvlim/internal/master/kv" "github.com/zilliztech/milvus-distributed/internal/master/kv"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/clientv3"
) )

8
internal/msgclient/msgclient.go
View File

@ -7,10 +7,10 @@ import (
"strconv" "strconv"
"github.com/apache/pulsar-client-go/pulsar" "github.com/apache/pulsar-client-go/pulsar"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
masterPb "github.com/czs007/suvlim/internal/proto/master" masterPb "github.com/zilliztech/milvus-distributed/internal/proto/master"
msgpb "github.com/czs007/suvlim/internal/proto/message" msgpb "github.com/zilliztech/milvus-distributed/internal/proto/message"
"github.com/czs007/suvlim/internal/timesync" "github.com/zilliztech/milvus-distributed/internal/timesync"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
) )

2
internal/proto/master.proto
View File

@ -2,7 +2,7 @@ syntax = "proto3";
package masterpb; 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"; import "message.proto";

2
internal/proto/master/master.pb.go
View File

@ -6,7 +6,7 @@ package master
import ( import (
context "context" context "context"
fmt "fmt" 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" proto "github.com/golang/protobuf/proto"
grpc "google.golang.org/grpc" grpc "google.golang.org/grpc"
codes "google.golang.org/grpc/codes" codes "google.golang.org/grpc/codes"

2
internal/proto/message.proto
View File

@ -2,7 +2,7 @@ syntax = "proto3";
package milvus.grpc; 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 { enum ErrorCode {

2
internal/proxy/manipulation_req.go
View File

@ -2,7 +2,7 @@ package proxy
import ( import (
"github.com/apache/pulsar-client-go/pulsar" "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/golang/protobuf/proto"
"log" "log"
"sync" "sync"

4
internal/proxy/proxy_node.go
View File

@ -4,8 +4,8 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/apache/pulsar-client-go/pulsar" "github.com/apache/pulsar-client-go/pulsar"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
pb "github.com/czs007/suvlim/internal/proto/message" pb "github.com/zilliztech/milvus-distributed/internal/proto/message"
etcd "go.etcd.io/etcd/clientv3" etcd "go.etcd.io/etcd/clientv3"
"strconv" "strconv"
) )

4
internal/proxy/proxy_node_test.go
View File

@ -5,8 +5,8 @@ import (
"encoding/binary" "encoding/binary"
"encoding/json" "encoding/json"
"github.com/apache/pulsar-client-go/pulsar" "github.com/apache/pulsar-client-go/pulsar"
mpb "github.com/czs007/suvlim/internal/proto/master" mpb "github.com/zilliztech/milvus-distributed/internal/proto/master"
pb "github.com/czs007/suvlim/internal/proto/message" pb "github.com/zilliztech/milvus-distributed/internal/proto/message"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
etcd "go.etcd.io/etcd/clientv3" etcd "go.etcd.io/etcd/clientv3"

2
internal/proxy/query_req.go
View File

@ -3,7 +3,7 @@ package proxy
import ( import (
"fmt" "fmt"
"github.com/apache/pulsar-client-go/pulsar" "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/golang/protobuf/proto"
"log" "log"
"sort" "sort"

4
internal/proxy/readertimesync.go
View File

@ -4,8 +4,8 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/apache/pulsar-client-go/pulsar" "github.com/apache/pulsar-client-go/pulsar"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
pb "github.com/czs007/suvlim/internal/proto/message" pb "github.com/zilliztech/milvus-distributed/internal/proto/message"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"log" "log"
"sort" "sort"

2
internal/proxy/readertimesync_test.go
View File

@ -3,7 +3,7 @@ package proxy
import ( import (
"context" "context"
"github.com/apache/pulsar-client-go/pulsar" "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/golang/protobuf/proto"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"log" "log"

6
internal/proxy/server.go
View File

@ -4,9 +4,9 @@ import (
"context" "context"
"encoding/json" "encoding/json"
"fmt" "fmt"
mpb "github.com/czs007/suvlim/internal/proto/master" mpb "github.com/zilliztech/milvus-distributed/internal/proto/master"
pb "github.com/czs007/suvlim/internal/proto/message" pb "github.com/zilliztech/milvus-distributed/internal/proto/message"
"github.com/czs007/suvlim/internal/master/collection" "github.com/zilliztech/milvus-distributed/internal/master/collection"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
etcd "go.etcd.io/etcd/clientv3" etcd "go.etcd.io/etcd/clientv3"
"go.uber.org/atomic" "go.uber.org/atomic"

4
internal/proxy/server_test.go
View File

@ -5,8 +5,8 @@ import (
"encoding/binary" "encoding/binary"
"encoding/json" "encoding/json"
"github.com/apache/pulsar-client-go/pulsar" "github.com/apache/pulsar-client-go/pulsar"
mpb "github.com/czs007/suvlim/internal/proto/master" mpb "github.com/zilliztech/milvus-distributed/internal/proto/master"
pb "github.com/czs007/suvlim/internal/proto/message" pb "github.com/zilliztech/milvus-distributed/internal/proto/message"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/clientv3"

2
internal/proxy/timestamporacle.go
View File

@ -3,7 +3,7 @@ package proxy
import ( import (
"context" "context"
"fmt" "fmt"
pb "github.com/czs007/suvlim/internal/proto/message" pb "github.com/zilliztech/milvus-distributed/internal/proto/message"
etcd "go.etcd.io/etcd/clientv3" etcd "go.etcd.io/etcd/clientv3"
"log" "log"
"strconv" "strconv"

2
internal/proxy/timetick.go
View File

@ -4,7 +4,7 @@ import (
"context" "context"
"fmt" "fmt"
"github.com/apache/pulsar-client-go/pulsar" "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/golang/protobuf/proto"
"log" "log"
"time" "time"

2
internal/proxy/timetick_test.go
View File

@ -3,7 +3,7 @@ package proxy
import ( import (
"context" "context"
"github.com/apache/pulsar-client-go/pulsar" "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/golang/protobuf/proto"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"testing" "testing"

2
internal/reader/index.go
View File

@ -13,7 +13,7 @@ package reader
*/ */
import "C" import "C"
import ( import (
msgPb "github.com/czs007/suvlim/internal/proto/message" msgPb "github.com/zilliztech/milvus-distributed/internal/proto/message"
) )
type IndexConfig struct{} type IndexConfig struct{}

2
internal/reader/index_test.go
View File

@ -4,7 +4,7 @@ import (
"context" "context"
"encoding/binary" "encoding/binary"
"fmt" "fmt"
msgPb "github.com/czs007/suvlim/internal/proto/message" msgPb "github.com/zilliztech/milvus-distributed/internal/proto/message"
"math" "math"
"testing" "testing"

8
internal/reader/meta.go
View File

@ -10,10 +10,10 @@ import (
"sync" "sync"
"time" "time"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
"github.com/czs007/suvlim/internal/master/kv" "github.com/zilliztech/milvus-distributed/internal/master/kv"
"github.com/czs007/suvlim/internal/master/segment" "github.com/zilliztech/milvus-distributed/internal/master/segment"
"github.com/czs007/suvlim/internal/master/collection" "github.com/zilliztech/milvus-distributed/internal/master/collection"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/clientv3"
"go.etcd.io/etcd/mvcc/mvccpb" "go.etcd.io/etcd/mvcc/mvccpb"
) )

8
internal/reader/query_node.go
View File

@ -23,10 +23,10 @@ import (
"sync/atomic" "sync/atomic"
"time" "time"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
msgPb "github.com/czs007/suvlim/internal/proto/message" msgPb "github.com/zilliztech/milvus-distributed/internal/proto/message"
"github.com/czs007/suvlim/internal/master/kv" "github.com/zilliztech/milvus-distributed/internal/master/kv"
"github.com/czs007/suvlim/internal/msgclient" "github.com/zilliztech/milvus-distributed/internal/msgclient"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
//"github.com/stretchr/testify/assert" //"github.com/stretchr/testify/assert"
) )

2
internal/reader/reader.go
View File

@ -2,7 +2,7 @@ package reader
import ( import (
"context" "context"
"github.com/czs007/suvlim/internal/msgclient" "github.com/zilliztech/milvus-distributed/internal/msgclient"
"log" "log"
"sync" "sync"
) )

2
internal/reader/reader_test.go
View File

@ -2,7 +2,7 @@ package reader
import ( import (
"context" "context"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
"strconv" "strconv"
"testing" "testing"
"time" "time"

4
internal/reader/result.go
View File

@ -2,8 +2,8 @@ package reader
import ( import (
"context" "context"
masterPb "github.com/czs007/suvlim/internal/proto/master" masterPb "github.com/zilliztech/milvus-distributed/internal/proto/master"
msgPb "github.com/czs007/suvlim/internal/proto/message" msgPb "github.com/zilliztech/milvus-distributed/internal/proto/message"
) )
type ResultEntityIds []int64 type ResultEntityIds []int64

8
internal/reader/result_test.go
View File

@ -2,14 +2,14 @@ package reader
import ( import (
"context" "context"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
"github.com/czs007/suvlim/internal/msgclient" "github.com/zilliztech/milvus-distributed/internal/msgclient"
"strconv" "strconv"
"testing" "testing"
"time" "time"
masterPb "github.com/czs007/suvlim/internal/proto/master" masterPb "github.com/zilliztech/milvus-distributed/internal/proto/master"
msgPb "github.com/czs007/suvlim/internal/proto/message" msgPb "github.com/zilliztech/milvus-distributed/internal/proto/message"
) )
// NOTE: start pulsar before test // NOTE: start pulsar before test

4
internal/reader/segment.go
View File

@ -14,8 +14,8 @@ package reader
import "C" import "C"
import ( import (
"fmt" "fmt"
"github.com/czs007/suvlim/internal/errors" "github.com/zilliztech/milvus-distributed/internal/errors"
msgPb "github.com/czs007/suvlim/internal/proto/message" msgPb "github.com/zilliztech/milvus-distributed/internal/proto/message"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"strconv" "strconv"
"unsafe" "unsafe"

4
internal/reader/segment_service.go
View File

@ -2,8 +2,8 @@ package reader
import ( import (
"fmt" "fmt"
masterPb "github.com/czs007/suvlim/internal/proto/master" masterPb "github.com/zilliztech/milvus-distributed/internal/proto/master"
msgPb "github.com/czs007/suvlim/internal/proto/message" msgPb "github.com/zilliztech/milvus-distributed/internal/proto/message"
"log" "log"
"strconv" "strconv"
"time" "time"

4
internal/reader/segment_service_test.go
View File

@ -2,8 +2,8 @@ package reader
import ( import (
"context" "context"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
"github.com/czs007/suvlim/internal/msgclient" "github.com/zilliztech/milvus-distributed/internal/msgclient"
"strconv" "strconv"
"testing" "testing"
"time" "time"

2
internal/reader/segment_test.go
View File

@ -7,7 +7,7 @@ import (
"math" "math"
"testing" "testing"
msgPb "github.com/czs007/suvlim/internal/proto/message" msgPb "github.com/zilliztech/milvus-distributed/internal/proto/message"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
) )

4
internal/reader/util_functions_test.go
View File

@ -2,8 +2,8 @@ package reader
import ( import (
"context" "context"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
"github.com/czs007/suvlim/internal/msgclient" "github.com/zilliztech/milvus-distributed/internal/msgclient"
"strconv" "strconv"
"testing" "testing"
"time" "time"

2
internal/storage/internal/S3/S3_test.go
View File

@ -2,7 +2,7 @@ package S3_driver_test
import ( import (
"context" "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" "github.com/stretchr/testify/assert"
"testing" "testing"
) )

4
internal/storage/internal/S3/s3_engine.go
View File

@ -6,8 +6,8 @@ import (
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/s3" "github.com/aws/aws-sdk-go/service/s3"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
. "github.com/czs007/suvlim/internal/storage/type" . "github.com/zilliztech/milvus-distributed/internal/storage/type"
"io" "io"
) )

4
internal/storage/internal/S3/s3_store.go
View File

@ -4,8 +4,8 @@ import (
"context" "context"
"github.com/aws/aws-sdk-go/aws" "github.com/aws/aws-sdk-go/aws"
"github.com/aws/aws-sdk-go/aws/endpoints" "github.com/aws/aws-sdk-go/aws/endpoints"
"github.com/czs007/suvlim/internal/storage/internal/minio/codec" "github.com/zilliztech/milvus-distributed/internal/storage/internal/minio/codec"
. "github.com/czs007/suvlim/internal/storage/type" . "github.com/zilliztech/milvus-distributed/internal/storage/type"
) )
type S3Driver struct { type S3Driver struct {

6
internal/storage/internal/minio/minio_store.go
View File

@ -2,9 +2,9 @@ package minio_driver
import ( import (
"context" "context"
"github.com/czs007/suvlim/internal/storage/internal/minio/codec" "github.com/zilliztech/milvus-distributed/internal/storage/internal/minio/codec"
. "github.com/czs007/suvlim/internal/storage/internal/minio/codec" . "github.com/zilliztech/milvus-distributed/internal/storage/internal/minio/codec"
. "github.com/czs007/suvlim/internal/storage/type" . "github.com/zilliztech/milvus-distributed/internal/storage/type"
"github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7"
"github.com/minio/minio-go/v7/pkg/credentials" "github.com/minio/minio-go/v7/pkg/credentials"
) )

4
internal/storage/internal/minio/minio_storeEngine.go
View File

@ -3,8 +3,8 @@ package minio_driver
import ( import (
"bytes" "bytes"
"context" "context"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
. "github.com/czs007/suvlim/internal/storage/type" . "github.com/zilliztech/milvus-distributed/internal/storage/type"
"github.com/minio/minio-go/v7" "github.com/minio/minio-go/v7"
"io" "io"
) )

2
internal/storage/internal/minio/minio_test.go
View File

@ -2,7 +2,7 @@ package minio_driver_test
import ( import (
"context" "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" "github.com/stretchr/testify/assert"
"testing" "testing"
) )

6
internal/storage/internal/tikv/tikv_store.go
View File

@ -3,9 +3,9 @@ package tikv_driver
import ( import (
"context" "context"
"errors" "errors"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
. "github.com/czs007/suvlim/internal/storage/internal/tikv/codec" . "github.com/zilliztech/milvus-distributed/internal/storage/internal/tikv/codec"
. "github.com/czs007/suvlim/internal/storage/type" . "github.com/zilliztech/milvus-distributed/internal/storage/type"
"github.com/tikv/client-go/config" "github.com/tikv/client-go/config"
"github.com/tikv/client-go/rawkv" "github.com/tikv/client-go/rawkv"
"strconv" "strconv"

4
internal/storage/internal/tikv/tikv_test.go
View File

@ -4,8 +4,8 @@ import (
"bytes" "bytes"
"context" "context"
"fmt" "fmt"
. "github.com/czs007/suvlim/internal/storage/internal/tikv/codec" . "github.com/zilliztech/milvus-distributed/internal/storage/internal/tikv/codec"
. "github.com/czs007/suvlim/internal/storage/type" . "github.com/zilliztech/milvus-distributed/internal/storage/type"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
"math" "math"

8
internal/storage/storage.go
View File

@ -3,10 +3,10 @@ package storage
import ( import (
"context" "context"
"errors" "errors"
S3Driver "github.com/czs007/suvlim/internal/storage/internal/S3" S3Driver "github.com/zilliztech/milvus-distributed/internal/storage/internal/S3"
minIODriver "github.com/czs007/suvlim/internal/storage/internal/minio" minIODriver "github.com/zilliztech/milvus-distributed/internal/storage/internal/minio"
tikvDriver "github.com/czs007/suvlim/internal/storage/internal/tikv" tikvDriver "github.com/zilliztech/milvus-distributed/internal/storage/internal/tikv"
"github.com/czs007/suvlim/internal/storage/type" "github.com/zilliztech/milvus-distributed/internal/storage/type"
) )
func NewStore(ctx context.Context, driver storagetype.DriverType) (storagetype.Store, error) { func NewStore(ctx context.Context, driver storagetype.DriverType) (storagetype.Store, error) {

4
internal/timesync/timesync.go
View File

@ -12,8 +12,8 @@ import (
"time" "time"
"github.com/apache/pulsar-client-go/pulsar" "github.com/apache/pulsar-client-go/pulsar"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
pb "github.com/czs007/suvlim/internal/proto/message" pb "github.com/zilliztech/milvus-distributed/internal/proto/message"
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
) )

2
internal/timesync/timesync_test.go
View File

@ -8,7 +8,7 @@ import (
"time" "time"
"github.com/apache/pulsar-client-go/pulsar" "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/golang/protobuf/proto"
) )

2
internal/util/etcdutil/etcdutil.go
View File

@ -19,7 +19,7 @@ import (
"net/http" "net/http"
"time" "time"
"github.com/czs007/suvlim/internal/errors" "github.com/zilliztech/milvus-distributed/internal/errors"
"github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/proto"
"github.com/pingcap/log" "github.com/pingcap/log"
"go.etcd.io/etcd/clientv3" "go.etcd.io/etcd/clientv3"

10
internal/writer/writer.go
View File

@ -5,11 +5,11 @@ import (
"encoding/binary" "encoding/binary"
"encoding/json" "encoding/json"
"fmt" "fmt"
"github.com/czs007/suvlim/internal/conf" "github.com/zilliztech/milvus-distributed/internal/conf"
msgpb "github.com/czs007/suvlim/internal/proto/message" msgpb "github.com/zilliztech/milvus-distributed/internal/proto/message"
"github.com/czs007/suvlim/internal/storage" "github.com/zilliztech/milvus-distributed/internal/storage"
storagetype "github.com/czs007/suvlim/internal/storage/type" storagetype "github.com/zilliztech/milvus-distributed/internal/storage/type"
"github.com/czs007/suvlim/internal/msgclient" "github.com/zilliztech/milvus-distributed/internal/msgclient"
"log" "log"
"os" "os"
"strconv" "strconv"

4
test/insert_test.go
View File

@ -2,8 +2,8 @@ package test
import ( import (
"context" "context"
msgpb "github.com/czs007/suvlim/internal/proto/message" msgpb "github.com/zilliztech/milvus-distributed/internal/proto/message"
"github.com/czs007/suvlim/internal/writer" "github.com/zilliztech/milvus-distributed/internal/writer"
"sync" "sync"
"testing" "testing"
) )

2
test/key2seg_test.go
View File

@ -3,7 +3,7 @@ package test
import ( import (
"context" "context"
"github.com/apache/pulsar-client-go/pulsar" "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/gogo/protobuf/proto"
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"log" "log"