grpc
/
grpc-go
mirror of https://github.com/grpc/grpc-go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

encoding/proto: make sure proto imports are renamed (#6934)

This commit is contained in:
Doug Fawley 2024-01-23 11:18:17 -08:00 committed by GitHub
parent 4d792e5b29
commit d66bc9b79c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
encoding/proto/proto_benchmark_test.go
View File

@ -24,7 +24,7 @@ import (
"github.com/golang/protobuf/proto" "github.com/golang/protobuf/proto"
"google.golang.org/grpc/encoding" "google.golang.org/grpc/encoding"
"google.golang.org/grpc/test/codec_perf" pb "google.golang.org/grpc/test/codec_perf"
) )
func setupBenchmarkProtoCodecInputs(payloadBaseSize uint32) []proto.Message { func setupBenchmarkProtoCodecInputs(payloadBaseSize uint32) []proto.Message {
@ -40,7 +40,7 @@ func setupBenchmarkProtoCodecInputs(payloadBaseSize uint32) []proto.Message {
protoStructs := make([]proto.Message, 0) protoStructs := make([]proto.Message, 0)
for _, p := range payloadSuffixes { for _, p := range payloadSuffixes {
ps := &codec_perf.Buffer{} ps := &pb.Buffer{}
ps.Body = append(payloadBase, p...) ps.Body = append(payloadBase, p...)
protoStructs = append(protoStructs, ps) protoStructs = append(protoStructs, ps)
} }
@ -91,7 +91,7 @@ func fastMarshalAndUnmarshal(codec encoding.Codec, protoStruct proto.Message, b
if err != nil { if err != nil {
b.Errorf("codec.Marshal(_) returned an error") b.Errorf("codec.Marshal(_) returned an error")
} }
res := codec_perf.Buffer{} res := pb.Buffer{}
if err := codec.Unmarshal(marshaledBytes, &res); err != nil { if err := codec.Unmarshal(marshaledBytes, &res); err != nil {
b.Errorf("codec.Unmarshal(_) returned an error") b.Errorf("codec.Unmarshal(_) returned an error")
} }

8
encoding/proto/proto_test.go
View File

@ -25,11 +25,11 @@ import (
"google.golang.org/grpc/encoding" "google.golang.org/grpc/encoding"
"google.golang.org/grpc/internal/grpctest" "google.golang.org/grpc/internal/grpctest"
"google.golang.org/grpc/test/codec_perf" pb "google.golang.org/grpc/test/codec_perf"
) )
func marshalAndUnmarshal(t *testing.T, codec encoding.Codec, expectedBody []byte) { func marshalAndUnmarshal(t *testing.T, codec encoding.Codec, expectedBody []byte) {
p := &codec_perf.Buffer{} p := &pb.Buffer{}
p.Body = expectedBody p.Body = expectedBody
marshalledBytes, err := codec.Marshal(p) marshalledBytes, err := codec.Marshal(p)
@ -99,8 +99,8 @@ func (s) TestStaggeredMarshalAndUnmarshalUsingSamePool(t *testing.T) {
expectedBody1 := []byte{1, 2, 3} expectedBody1 := []byte{1, 2, 3}
expectedBody2 := []byte{4, 5, 6} expectedBody2 := []byte{4, 5, 6}
proto1 := codec_perf.Buffer{Body: expectedBody1} proto1 := pb.Buffer{Body: expectedBody1}
proto2 := codec_perf.Buffer{Body: expectedBody2} proto2 := pb.Buffer{Body: expectedBody2}
var m1, m2 []byte var m1, m2 []byte
var err error var err error