move proto package

This commit is contained in:
chrislu
2022-08-17 12:05:07 -07:00
parent e259052a70
commit eaeb141b09
49 changed files with 53 additions and 53 deletions

View File

@@ -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"
)

View File

@@ -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"

View File

@@ -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 (

View File

@@ -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"

View File

@@ -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) {

View File

@@ -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"

View File

@@ -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 {

View File

@@ -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 {

View File

@@ -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) {

View File

@@ -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"

View File

@@ -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 {