From eaeb141b09326aa7c4d1d1e7b7f27e119d019f9c Mon Sep 17 00:00:00 2001 From: chrislu Date: Wed, 17 Aug 2022 12:05:07 -0700 Subject: [PATCH] move proto package --- unmaintained/see_log_entry/see_log_entry.go | 2 +- unmaintained/see_meta/see_meta.go | 2 +- weed/command/filer_meta_tail.go | 2 +- weed/command/filer_remote_gateway_buckets.go | 2 +- weed/command/filer_remote_sync_dir.go | 2 +- weed/filer/entry_codec.go | 2 +- weed/filer/filechunk_manifest.go | 2 +- weed/filer/filer_conf.go | 2 +- weed/filer/filer_notify.go | 2 +- weed/filer/filer_notify_test.go | 2 +- weed/filer/meta_aggregator.go | 2 +- weed/filer/redis3/item_list_serde.go | 2 +- weed/filer/redis3/skiplist_element_store.go | 2 +- weed/filer/remote_mapping.go | 2 +- weed/filer/remote_storage.go | 2 +- weed/filer/s3iam_conf.go | 4 ++-- weed/mq/broker/broker_segment_serde.go | 2 +- weed/notification/aws_sqs/aws_sqs_pub.go | 2 +- weed/notification/configuration.go | 2 +- weed/notification/gocdk_pub_sub/gocdk_pub_sub.go | 2 +- weed/notification/google_pub_sub/google_pub_sub.go | 2 +- weed/notification/kafka/kafka_queue.go | 2 +- weed/notification/log/log_queue.go | 2 +- weed/pb/filer_pb/filer_pb_helper.go | 2 +- weed/pb/filer_pb/filer_pb_helper_test.go | 2 +- weed/pb/proto_read_write_test.go | 2 +- weed/pb/remote_pb/remote_pb_helper.go | 2 +- weed/remote_storage/remote_storage.go | 2 +- weed/replication/sub/notification_aws_sqs.go | 2 +- weed/replication/sub/notification_gocdk_pub_sub.go | 2 +- weed/replication/sub/notification_google_pub_sub.go | 2 +- weed/replication/sub/notification_kafka.go | 2 +- weed/s3api/auth_credentials_test.go | 2 +- weed/server/filer_grpc_server_remote.go | 2 +- weed/server/filer_grpc_server_sub_meta.go | 2 +- weed/shell/command_fs_meta_cat.go | 4 ++-- weed/shell/command_fs_meta_load.go | 2 +- weed/shell/command_fs_meta_save.go | 2 +- weed/shell/command_remote_configure.go | 4 ++-- weed/shell/command_remote_mount.go | 4 ++-- weed/shell/command_volume_list_test.go | 2 +- weed/storage/super_block/super_block.go | 2 +- weed/storage/super_block/super_block_read.go.go | 2 +- weed/storage/volume_info/volume_info.go | 2 +- weed/util/log_buffer/log_buffer.go | 2 +- weed/util/log_buffer/log_read.go | 2 +- weed/util/skiplist/name_batch.go | 2 +- weed/util/skiplist/name_list_serde.go | 2 +- weed/util/skiplist/skiplist.pb.go | 2 +- 49 files changed, 53 insertions(+), 53 deletions(-) diff --git a/unmaintained/see_log_entry/see_log_entry.go b/unmaintained/see_log_entry/see_log_entry.go index 1bd3ed1c8..d5deff283 100644 --- a/unmaintained/see_log_entry/see_log_entry.go +++ b/unmaintained/see_log_entry/see_log_entry.go @@ -7,7 +7,7 @@ import ( "log" "os" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" diff --git a/unmaintained/see_meta/see_meta.go b/unmaintained/see_meta/see_meta.go index c3e2c0023..405aed0ba 100644 --- a/unmaintained/see_meta/see_meta.go +++ b/unmaintained/see_meta/see_meta.go @@ -7,7 +7,7 @@ import ( "log" "os" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/util" diff --git a/weed/command/filer_meta_tail.go b/weed/command/filer_meta_tail.go index adacf4978..a433d1b07 100644 --- a/weed/command/filer_meta_tail.go +++ b/weed/command/filer_meta_tail.go @@ -2,8 +2,8 @@ package command import ( "fmt" - "github.com/golang/protobuf/jsonpb" "github.com/seaweedfs/seaweedfs/weed/pb" + "google.golang.org/protobuf/jsonpb" "os" "path/filepath" "strings" diff --git a/weed/command/filer_remote_gateway_buckets.go b/weed/command/filer_remote_gateway_buckets.go index bdba71085..974b3620e 100644 --- a/weed/command/filer_remote_gateway_buckets.go +++ b/weed/command/filer_remote_gateway_buckets.go @@ -2,7 +2,6 @@ package command import ( "fmt" - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb" @@ -12,6 +11,7 @@ import ( "github.com/seaweedfs/seaweedfs/weed/replication/source" "github.com/seaweedfs/seaweedfs/weed/s3api/s3_constants" "github.com/seaweedfs/seaweedfs/weed/util" + "google.golang.org/protobuf/proto" "math" "math/rand" "path/filepath" diff --git a/weed/command/filer_remote_sync_dir.go b/weed/command/filer_remote_sync_dir.go index 14aed2465..283838bb0 100644 --- a/weed/command/filer_remote_sync_dir.go +++ b/weed/command/filer_remote_sync_dir.go @@ -7,7 +7,6 @@ import ( "strings" "time" - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb" @@ -17,6 +16,7 @@ import ( "github.com/seaweedfs/seaweedfs/weed/replication/source" "github.com/seaweedfs/seaweedfs/weed/util" "google.golang.org/grpc" + "google.golang.org/protobuf/proto" ) func followUpdatesAndUploadToRemote(option *RemoteSyncOptions, filerSource *source.FilerSource, mountedDir string) error { 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 { diff --git a/weed/mq/broker/broker_segment_serde.go b/weed/mq/broker/broker_segment_serde.go index c0741071f..44bc1b7d3 100644 --- a/weed/mq/broker/broker_segment_serde.go +++ b/weed/mq/broker/broker_segment_serde.go @@ -3,12 +3,12 @@ package broker import ( "bytes" "fmt" - "github.com/golang/protobuf/jsonpb" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/mq" "github.com/seaweedfs/seaweedfs/weed/pb" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/pb/mq_pb" + "google.golang.org/protobuf/jsonpb" "time" ) diff --git a/weed/notification/aws_sqs/aws_sqs_pub.go b/weed/notification/aws_sqs/aws_sqs_pub.go index 36b883544..f647134c7 100644 --- a/weed/notification/aws_sqs/aws_sqs_pub.go +++ b/weed/notification/aws_sqs/aws_sqs_pub.go @@ -8,10 +8,10 @@ import ( "github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/sqs" - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/notification" "github.com/seaweedfs/seaweedfs/weed/util" + "google.golang.org/protobuf/proto" ) func init() { diff --git a/weed/notification/configuration.go b/weed/notification/configuration.go index 497b2a74b..1c620f2e6 100644 --- a/weed/notification/configuration.go +++ b/weed/notification/configuration.go @@ -1,9 +1,9 @@ package notification import ( - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/util" + "google.golang.org/protobuf/proto" ) type MessageQueue interface { diff --git a/weed/notification/gocdk_pub_sub/gocdk_pub_sub.go b/weed/notification/gocdk_pub_sub/gocdk_pub_sub.go index dfe2ff061..58ee43767 100644 --- a/weed/notification/gocdk_pub_sub/gocdk_pub_sub.go +++ b/weed/notification/gocdk_pub_sub/gocdk_pub_sub.go @@ -20,11 +20,11 @@ package gocdk_pub_sub import ( "context" "fmt" - "github.com/golang/protobuf/proto" "github.com/streadway/amqp" "gocloud.dev/pubsub" _ "gocloud.dev/pubsub/awssnssqs" "gocloud.dev/pubsub/rabbitpubsub" + "google.golang.org/protobuf/proto" "net/url" "path" "time" diff --git a/weed/notification/google_pub_sub/google_pub_sub.go b/weed/notification/google_pub_sub/google_pub_sub.go index 0b6ec2dba..f5593fa48 100644 --- a/weed/notification/google_pub_sub/google_pub_sub.go +++ b/weed/notification/google_pub_sub/google_pub_sub.go @@ -6,11 +6,11 @@ import ( "os" "cloud.google.com/go/pubsub" - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/notification" "github.com/seaweedfs/seaweedfs/weed/util" "google.golang.org/api/option" + "google.golang.org/protobuf/proto" ) func init() { diff --git a/weed/notification/kafka/kafka_queue.go b/weed/notification/kafka/kafka_queue.go index 4d4616e38..64cb4eaa9 100644 --- a/weed/notification/kafka/kafka_queue.go +++ b/weed/notification/kafka/kafka_queue.go @@ -2,10 +2,10 @@ package kafka import ( "github.com/Shopify/sarama" - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/notification" "github.com/seaweedfs/seaweedfs/weed/util" + "google.golang.org/protobuf/proto" ) func init() { diff --git a/weed/notification/log/log_queue.go b/weed/notification/log/log_queue.go index 60d586106..cc3557fee 100644 --- a/weed/notification/log/log_queue.go +++ b/weed/notification/log/log_queue.go @@ -1,10 +1,10 @@ package kafka import ( - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/notification" "github.com/seaweedfs/seaweedfs/weed/util" + "google.golang.org/protobuf/proto" ) func init() { diff --git a/weed/pb/filer_pb/filer_pb_helper.go b/weed/pb/filer_pb/filer_pb_helper.go index 12ead208a..2278d9a7c 100644 --- a/weed/pb/filer_pb/filer_pb_helper.go +++ b/weed/pb/filer_pb/filer_pb_helper.go @@ -7,10 +7,10 @@ import ( "os" "strings" - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/storage/needle" "github.com/viant/ptrie" + "google.golang.org/protobuf/proto" ) func (entry *Entry) IsInRemoteOnly() bool { diff --git a/weed/pb/filer_pb/filer_pb_helper_test.go b/weed/pb/filer_pb/filer_pb_helper_test.go index 0009afdbe..4e0b53017 100644 --- a/weed/pb/filer_pb/filer_pb_helper_test.go +++ b/weed/pb/filer_pb/filer_pb_helper_test.go @@ -3,7 +3,7 @@ package filer_pb import ( "testing" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" ) func TestFileIdSize(t *testing.T) { diff --git a/weed/pb/proto_read_write_test.go b/weed/pb/proto_read_write_test.go index c7cecf671..f4751c3bb 100644 --- a/weed/pb/proto_read_write_test.go +++ b/weed/pb/proto_read_write_test.go @@ -4,8 +4,8 @@ import ( "fmt" "testing" - "github.com/golang/protobuf/jsonpb" "github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb" + "google.golang.org/protobuf/jsonpb" ) func TestJsonpMarshalUnmarshal(t *testing.T) { diff --git a/weed/pb/remote_pb/remote_pb_helper.go b/weed/pb/remote_pb/remote_pb_helper.go index 03a635e60..665239f1a 100644 --- a/weed/pb/remote_pb/remote_pb_helper.go +++ b/weed/pb/remote_pb/remote_pb_helper.go @@ -1,6 +1,6 @@ package remote_pb -import "github.com/golang/protobuf/proto" +import "google.golang.org/protobuf/proto" func (fp *RemoteStorageLocation) Key() interface{} { key, _ := proto.Marshal(fp) diff --git a/weed/remote_storage/remote_storage.go b/weed/remote_storage/remote_storage.go index 4523806d3..93b0b9d84 100644 --- a/weed/remote_storage/remote_storage.go +++ b/weed/remote_storage/remote_storage.go @@ -2,9 +2,9 @@ package remote_storage import ( "fmt" - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/pb/remote_pb" + "google.golang.org/protobuf/proto" "io" "sort" "strings" diff --git a/weed/replication/sub/notification_aws_sqs.go b/weed/replication/sub/notification_aws_sqs.go index a15b5b64e..146f42c72 100644 --- a/weed/replication/sub/notification_aws_sqs.go +++ b/weed/replication/sub/notification_aws_sqs.go @@ -8,10 +8,10 @@ import ( "github.com/aws/aws-sdk-go/aws/credentials" "github.com/aws/aws-sdk-go/aws/session" "github.com/aws/aws-sdk-go/service/sqs" - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/util" + "google.golang.org/protobuf/proto" ) func init() { diff --git a/weed/replication/sub/notification_gocdk_pub_sub.go b/weed/replication/sub/notification_gocdk_pub_sub.go index 70c7cf293..8167b5d5d 100644 --- a/weed/replication/sub/notification_gocdk_pub_sub.go +++ b/weed/replication/sub/notification_gocdk_pub_sub.go @@ -5,7 +5,6 @@ package sub import ( "context" - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/util" @@ -13,6 +12,7 @@ import ( "gocloud.dev/pubsub" _ "gocloud.dev/pubsub/awssnssqs" "gocloud.dev/pubsub/rabbitpubsub" + "google.golang.org/protobuf/proto" "net/url" "os" "path" diff --git a/weed/replication/sub/notification_google_pub_sub.go b/weed/replication/sub/notification_google_pub_sub.go index 06f0cbf05..c7509abf2 100644 --- a/weed/replication/sub/notification_google_pub_sub.go +++ b/weed/replication/sub/notification_google_pub_sub.go @@ -6,11 +6,11 @@ import ( "os" "cloud.google.com/go/pubsub" - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/util" "google.golang.org/api/option" + "google.golang.org/protobuf/proto" ) func init() { diff --git a/weed/replication/sub/notification_kafka.go b/weed/replication/sub/notification_kafka.go index c9573bdbf..951026fe1 100644 --- a/weed/replication/sub/notification_kafka.go +++ b/weed/replication/sub/notification_kafka.go @@ -8,10 +8,10 @@ import ( "time" "github.com/Shopify/sarama" - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/util" + "google.golang.org/protobuf/proto" ) func init() { diff --git a/weed/s3api/auth_credentials_test.go b/weed/s3api/auth_credentials_test.go index 52f83e6d3..dacbc775d 100644 --- a/weed/s3api/auth_credentials_test.go +++ b/weed/s3api/auth_credentials_test.go @@ -5,7 +5,7 @@ import ( "github.com/stretchr/testify/assert" "testing" - "github.com/golang/protobuf/jsonpb" + "google.golang.org/protobuf/jsonpb" "github.com/seaweedfs/seaweedfs/weed/pb/iam_pb" ) diff --git a/weed/server/filer_grpc_server_remote.go b/weed/server/filer_grpc_server_remote.go index 22ff52d0c..879ed62b0 100644 --- a/weed/server/filer_grpc_server_remote.go +++ b/weed/server/filer_grpc_server_remote.go @@ -7,7 +7,6 @@ import ( "sync" "time" - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/operation" "github.com/seaweedfs/seaweedfs/weed/pb" @@ -16,6 +15,7 @@ import ( "github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb" "github.com/seaweedfs/seaweedfs/weed/storage/needle" "github.com/seaweedfs/seaweedfs/weed/util" + "google.golang.org/protobuf/proto" ) func (fs *FilerServer) CacheRemoteObjectToLocalCluster(ctx context.Context, req *filer_pb.CacheRemoteObjectToLocalClusterRequest) (*filer_pb.CacheRemoteObjectToLocalClusterResponse, error) { diff --git a/weed/server/filer_grpc_server_sub_meta.go b/weed/server/filer_grpc_server_sub_meta.go index 768e86ffe..03f4f4281 100644 --- a/weed/server/filer_grpc_server_sub_meta.go +++ b/weed/server/filer_grpc_server_sub_meta.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/glog" diff --git a/weed/shell/command_fs_meta_cat.go b/weed/shell/command_fs_meta_cat.go index a4d8dd44c..4f3b3551e 100644 --- a/weed/shell/command_fs_meta_cat.go +++ b/weed/shell/command_fs_meta_cat.go @@ -2,9 +2,9 @@ package shell import ( "fmt" - "github.com/golang/protobuf/jsonpb" - "github.com/golang/protobuf/proto" "golang.org/x/exp/slices" + "google.golang.org/protobuf/jsonpb" + "google.golang.org/protobuf/proto" "io" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" diff --git a/weed/shell/command_fs_meta_load.go b/weed/shell/command_fs_meta_load.go index ced5f5b88..1de569788 100644 --- a/weed/shell/command_fs_meta_load.go +++ b/weed/shell/command_fs_meta_load.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/util" diff --git a/weed/shell/command_fs_meta_save.go b/weed/shell/command_fs_meta_save.go index 56a3e1ab9..698484898 100644 --- a/weed/shell/command_fs_meta_save.go +++ b/weed/shell/command_fs_meta_save.go @@ -12,7 +12,7 @@ import ( "sync/atomic" "time" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/pb/filer_pb" "github.com/seaweedfs/seaweedfs/weed/util" diff --git a/weed/shell/command_remote_configure.go b/weed/shell/command_remote_configure.go index e0759f5b3..306858271 100644 --- a/weed/shell/command_remote_configure.go +++ b/weed/shell/command_remote_configure.go @@ -4,13 +4,13 @@ import ( "context" "flag" "fmt" - "github.com/golang/protobuf/jsonpb" - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/pb/filer_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/protobuf/jsonpb" + "google.golang.org/protobuf/proto" "io" "regexp" "strings" diff --git a/weed/shell/command_remote_mount.go b/weed/shell/command_remote_mount.go index a2a34304a..ef837a821 100644 --- a/weed/shell/command_remote_mount.go +++ b/weed/shell/command_remote_mount.go @@ -4,13 +4,13 @@ import ( "context" "flag" "fmt" - "github.com/golang/protobuf/jsonpb" - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/filer" "github.com/seaweedfs/seaweedfs/weed/pb/filer_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/protobuf/jsonpb" + "google.golang.org/protobuf/proto" "io" "os" "strings" diff --git a/weed/shell/command_volume_list_test.go b/weed/shell/command_volume_list_test.go index 60e304bf8..5da9ca49a 100644 --- a/weed/shell/command_volume_list_test.go +++ b/weed/shell/command_volume_list_test.go @@ -2,9 +2,9 @@ package shell import ( _ "embed" - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/storage/types" "github.com/stretchr/testify/assert" + "google.golang.org/protobuf/proto" "strconv" "strings" "testing" diff --git a/weed/storage/super_block/super_block.go b/weed/storage/super_block/super_block.go index 8837c44db..d2ef09e6a 100644 --- a/weed/storage/super_block/super_block.go +++ b/weed/storage/super_block/super_block.go @@ -1,7 +1,7 @@ package super_block import ( - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb/master_pb" diff --git a/weed/storage/super_block/super_block_read.go.go b/weed/storage/super_block/super_block_read.go.go index 47e4fb30c..fd1a874dd 100644 --- a/weed/storage/super_block/super_block_read.go.go +++ b/weed/storage/super_block/super_block_read.go.go @@ -3,7 +3,7 @@ package super_block import ( "fmt" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/pb/master_pb" "github.com/seaweedfs/seaweedfs/weed/storage/backend" diff --git a/weed/storage/volume_info/volume_info.go b/weed/storage/volume_info/volume_info.go index b89457803..8002e9c19 100644 --- a/weed/storage/volume_info/volume_info.go +++ b/weed/storage/volume_info/volume_info.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/golang/protobuf/jsonpb" + "google.golang.org/protobuf/jsonpb" "github.com/seaweedfs/seaweedfs/weed/glog" "github.com/seaweedfs/seaweedfs/weed/pb/volume_server_pb" diff --git a/weed/util/log_buffer/log_buffer.go b/weed/util/log_buffer/log_buffer.go index 5f145f48d..86857b563 100644 --- a/weed/util/log_buffer/log_buffer.go +++ b/weed/util/log_buffer/log_buffer.go @@ -5,7 +5,7 @@ import ( "sync" "time" - "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/util/log_buffer/log_read.go b/weed/util/log_buffer/log_read.go index 6464ade91..059f74286 100644 --- a/weed/util/log_buffer/log_read.go +++ b/weed/util/log_buffer/log_read.go @@ -5,7 +5,7 @@ import ( "fmt" "time" - "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/util/skiplist/name_batch.go b/weed/util/skiplist/name_batch.go index d5d5de122..aa608d322 100644 --- a/weed/util/skiplist/name_batch.go +++ b/weed/util/skiplist/name_batch.go @@ -1,9 +1,9 @@ package skiplist import ( - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/glog" "golang.org/x/exp/slices" + "google.golang.org/protobuf/proto" "strings" ) diff --git a/weed/util/skiplist/name_list_serde.go b/weed/util/skiplist/name_list_serde.go index fee6815d3..364c0f87a 100644 --- a/weed/util/skiplist/name_list_serde.go +++ b/weed/util/skiplist/name_list_serde.go @@ -1,8 +1,8 @@ package skiplist import ( - "github.com/golang/protobuf/proto" "github.com/seaweedfs/seaweedfs/weed/glog" + "google.golang.org/protobuf/proto" ) func LoadNameList(data []byte, store ListStore, batchSize int) *NameList { diff --git a/weed/util/skiplist/skiplist.pb.go b/weed/util/skiplist/skiplist.pb.go index adb121bfc..ef3827a65 100644 --- a/weed/util/skiplist/skiplist.pb.go +++ b/weed/util/skiplist/skiplist.pb.go @@ -7,7 +7,7 @@ package skiplist import ( - proto "github.com/golang/protobuf/proto" + proto "google.golang.org/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect"