diff options
| author | chrislu <chris.lu@gmail.com> | 2022-08-17 12:05:07 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2022-08-17 12:05:07 -0700 |
| commit | eaeb141b09326aa7c4d1d1e7b7f27e119d019f9c (patch) | |
| tree | 30d8115e8df623d300fd34f4d187f965b5dc62c6 /weed/filer | |
| parent | e259052a70b72bf193013829b272611a32f12bde (diff) | |
| download | seaweedfs-eaeb141b09326aa7c4d1d1e7b7f27e119d019f9c.tar.xz seaweedfs-eaeb141b09326aa7c4d1d1e7b7f27e119d019f9c.zip | |
move proto package
Diffstat (limited to 'weed/filer')
| -rw-r--r-- | weed/filer/entry_codec.go | 2 | ||||
| -rw-r--r-- | weed/filer/filechunk_manifest.go | 2 | ||||
| -rw-r--r-- | weed/filer/filer_conf.go | 2 | ||||
| -rw-r--r-- | weed/filer/filer_notify.go | 2 | ||||
| -rw-r--r-- | weed/filer/filer_notify_test.go | 2 | ||||
| -rw-r--r-- | weed/filer/meta_aggregator.go | 2 | ||||
| -rw-r--r-- | weed/filer/redis3/item_list_serde.go | 2 | ||||
| -rw-r--r-- | weed/filer/redis3/skiplist_element_store.go | 2 | ||||
| -rw-r--r-- | weed/filer/remote_mapping.go | 2 | ||||
| -rw-r--r-- | weed/filer/remote_storage.go | 2 | ||||
| -rw-r--r-- | weed/filer/s3iam_conf.go | 4 |
11 files changed, 12 insertions, 12 deletions
diff --git a/weed/filer/entry_codec.go b/weed/filer/entry_codec.go index 4b142885d..786ecea49 100644 --- a/weed/filer/entry_codec.go +++ b/weed/filer/entry_codec.go @@ -6,7 +6,7 @@ import ( "os" "time" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" ) diff --git a/weed/filer/filechunk_manifest.go b/weed/filer/filechunk_manifest.go index bc6c5ef77..956d35b77 100644 --- a/weed/filer/filechunk_manifest.go +++ b/weed/filer/filechunk_manifest.go @@ -12,7 +12,7 @@ import ( "github.com/seaweedfs/seaweedfs/weed/wdclient" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" diff --git a/weed/filer/filer_conf.go b/weed/filer/filer_conf.go index 263669960..59abaa5ab 100644 --- a/weed/filer/filer_conf.go +++ b/weed/filer/filer_conf.go @@ -9,11 +9,11 @@ import ( "google.golang.org/grpc" "io" - "github.com/golang/protobuf/jsonpb" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/util" "github.com/viant/ptrie" + "google.golang.org/protobuf/jsonpb" ) const ( diff --git a/weed/filer/filer_notify.go b/weed/filer/filer_notify.go index 2757e6c65..7033a70c4 100644 --- a/weed/filer/filer_notify.go +++ b/weed/filer/filer_notify.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/notification" diff --git a/weed/filer/filer_notify_test.go b/weed/filer/filer_notify_test.go index 4d2983d00..cf11a4bc0 100644 --- a/weed/filer/filer_notify_test.go +++ b/weed/filer/filer_notify_test.go @@ -7,7 +7,7 @@ import ( "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/util" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" ) func TestProtoMarshalText(t *testing.T) { diff --git a/weed/filer/meta_aggregator.go b/weed/filer/meta_aggregator.go index b48ef01c6..d384c2c38 100644 --- a/weed/filer/meta_aggregator.go +++ b/weed/filer/meta_aggregator.go @@ -11,8 +11,8 @@ import ( "sync" "time" - "github.com/golang/protobuf/proto" "google.golang.org/grpc" + "google.golang.org/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb" diff --git a/weed/filer/redis3/item_list_serde.go b/weed/filer/redis3/item_list_serde.go index 6f0ac66e2..e71243838 100644 --- a/weed/filer/redis3/item_list_serde.go +++ b/weed/filer/redis3/item_list_serde.go @@ -2,9 +2,9 @@ package redis3 import ( "github.com/go-redis/redis/v8" - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/util/skiplist" + "google.golang.org/protobuf/proto" ) func LoadItemList(data []byte, prefix string, client redis.UniversalClient, store skiplist.ListStore, batchSize int) *ItemList { diff --git a/weed/filer/redis3/skiplist_element_store.go b/weed/filer/redis3/skiplist_element_store.go index 7d885c220..b589e3e77 100644 --- a/weed/filer/redis3/skiplist_element_store.go +++ b/weed/filer/redis3/skiplist_element_store.go @@ -4,9 +4,9 @@ import ( "context" "fmt" "github.com/go-redis/redis/v8" - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/util/skiplist" + "google.golang.org/protobuf/proto" ) type SkipListElementStore struct { diff --git a/weed/filer/remote_mapping.go b/weed/filer/remote_mapping.go index 3451773ad..9fb73ef59 100644 --- a/weed/filer/remote_mapping.go +++ b/weed/filer/remote_mapping.go @@ -2,11 +2,11 @@ package filer import ( "fmt" - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/pb/remote_pb" "google.golang.org/grpc" + "google.golang.org/protobuf/proto" ) func ReadMountMappings(grpcDialOption grpc.DialOption, filerAddress pb.ServerAddress) (mappings *remote_pb.RemoteStorageMapping, readErr error) { diff --git a/weed/filer/remote_storage.go b/weed/filer/remote_storage.go index 2933508af..d8acf2572 100644 --- a/weed/filer/remote_storage.go +++ b/weed/filer/remote_storage.go @@ -3,12 +3,12 @@ package filer import ( "context" "fmt" - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/pb/remote_pb" "github.com/seaweedfs/seaweedfs/weed/remote_storage" "github.com/seaweedfs/seaweedfs/weed/util" "google.golang.org/grpc" + "google.golang.org/protobuf/proto" "math" "strings" diff --git a/weed/filer/s3iam_conf.go b/weed/filer/s3iam_conf.go index ee55a09c1..6240058a4 100644 --- a/weed/filer/s3iam_conf.go +++ b/weed/filer/s3iam_conf.go @@ -5,9 +5,9 @@ import ( "fmt" "io" - "github.com/golang/protobuf/jsonpb" - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/pb/iam_pb" + "google.golang.org/protobuf/jsonpb" + "google.golang.org/protobuf/proto" ) func ParseS3ConfigurationFromBytes[T proto.Message](content []byte, config T) error { |
