diff --git a/codec/testdata/gen.sh b/codec/testdata/gen.sh index 712613b..cc7d908 100644 --- a/codec/testdata/gen.sh +++ b/codec/testdata/gen.sh @@ -1,5 +1,5 @@ # generate .go files from IDL -protoc --go_out=./ ./protobuf.proto +protoc -I. --go_out=. --go_opt=module="testdata" ./protobuf.proto thrift -r -out ../ --gen go ./thrift_colorgroup.thrift diff --git a/codec/testdata/protobuf.pb.go b/codec/testdata/protobuf.pb.go index d87614b..e44ddf5 100644 --- a/codec/testdata/protobuf.pb.go +++ b/codec/testdata/protobuf.pb.go @@ -1,13 +1,12 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.21.0 -// protoc v3.12.4 +// protoc-gen-go v1.33.0 +// protoc v5.26.0 // source: protobuf.proto package testdata import ( - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -21,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type ProtoColorGroup struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -97,8 +92,8 @@ var file_protobuf_proto_rawDesc = []byte{ 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, - 0x09, 0x52, 0x06, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x09, 0x52, 0x06, 0x63, 0x6f, 0x6c, 0x6f, 0x72, 0x73, 0x42, 0x0c, 0x5a, 0x0a, 0x2e, 0x2f, 0x74, + 0x65, 0x73, 0x74, 0x64, 0x61, 0x74, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/codec/testdata/protobuf.proto b/codec/testdata/protobuf.proto index e7848c7..7c93a49 100644 --- a/codec/testdata/protobuf.proto +++ b/codec/testdata/protobuf.proto @@ -2,6 +2,7 @@ syntax = "proto3"; package testdata; +option go_package = "./testdata"; message ProtoColorGroup { int32 id = 1; diff --git a/go.mod b/go.mod index 59291f3..adeee67 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,6 @@ require ( github.com/go-redis/redis_rate/v9 v9.1.2 github.com/godzie44/go-uring v0.0.0-20220926161041-69611e8b13d5 github.com/gogo/protobuf v1.3.2 - github.com/golang/protobuf v1.5.3 github.com/golang/snappy v0.0.4 github.com/grandcat/zeroconf v1.0.0 github.com/hashicorp/go-multierror v1.1.1 diff --git a/go.sum b/go.sum index b91dd86..8e82238 100644 --- a/go.sum +++ b/go.sum @@ -100,9 +100,6 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= -github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg= -github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -438,8 +435,6 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= google.golang.org/protobuf v1.34.1 h1:9ddQBjfCyZPOHPUiPxpYESBLc+T8P3E+Vo4IbKZgFWg= google.golang.org/protobuf v1.34.1/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= diff --git a/protocol/testdata/benchmark.pb.go b/protocol/testdata/benchmark.pb.go index 8323dae..9f4f5c5 100644 --- a/protocol/testdata/benchmark.pb.go +++ b/protocol/testdata/benchmark.pb.go @@ -451,10 +451,8 @@ var file_benchmark_proto_rawDesc = []byte{ 0x64, 0x31, 0x32, 0x39, 0x18, 0x81, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x31, 0x32, 0x39, 0x12, 0x1b, 0x0a, 0x08, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x31, 0x33, 0x31, 0x18, 0x83, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x66, 0x69, 0x65, 0x6c, 0x64, 0x31, - 0x33, 0x31, 0x42, 0x2f, 0x48, 0x01, 0x5a, 0x2b, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, - 0x6f, 0x6d, 0x2f, 0x73, 0x6d, 0x61, 0x6c, 0x6c, 0x6e, 0x65, 0x73, 0x74, 0x2f, 0x72, 0x70, 0x63, - 0x78, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, - 0x61, 0x74, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x33, 0x31, 0x42, 0x0e, 0x48, 0x01, 0x5a, 0x0a, 0x2e, 0x2f, 0x74, 0x65, 0x73, 0x74, 0x64, 0x61, + 0x74, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/protocol/testdata/benchmark.proto b/protocol/testdata/benchmark.proto index a4af1c8..2aa589b 100644 --- a/protocol/testdata/benchmark.proto +++ b/protocol/testdata/benchmark.proto @@ -3,7 +3,7 @@ syntax = "proto3"; package testdata; option optimize_for = SPEED; -option go_package = "github.com/smallnest/rpcx/protocol/testdata"; +option go_package = "./testdata"; message BenchmarkMessage { diff --git a/protocol/testdata/gen.sh b/protocol/testdata/gen.sh index 5d0c28e..910bf8d 100644 --- a/protocol/testdata/gen.sh +++ b/protocol/testdata/gen.sh @@ -2,4 +2,4 @@ # generate .go files from IDL -protoc -I. --go_out=. --go_opt=module="github.com/smallnest/rpcx/protocol/testdata" ./benchmark.proto \ No newline at end of file +protoc -I. --go_out=. --go_opt=module="testdata" ./benchmark.proto \ No newline at end of file