opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update server reflection code to comply with the change to the grpc generator

Browse Source
This commit is contained in:
Mak Mukhi
2016-10-21 18:06:55 -07:00
parent 2b7e876a2e
commit 727a60e4d1
12 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
benchmark/grpc_testing/services.pb.go
View File

@ -24,7 +24,7 @@ var _ grpc.ClientConn
// This is a compile-time assertion to ensure that this generated file // This is a compile-time assertion to ensure that this generated file
// is compatible with the grpc package it is being compiled against. // is compatible with the grpc package it is being compiled against.
const _ = grpc.SupportPackageIsVersion3 const _ = grpc.SupportPackageIsVersion4
// Client API for BenchmarkService service // Client API for BenchmarkService service

2
examples/helloworld/helloworld/helloworld.pb.go
View File

@ -65,7 +65,7 @@ var _ grpc.ClientConn
// This is a compile-time assertion to ensure that this generated file // This is a compile-time assertion to ensure that this generated file
// is compatible with the grpc package it is being compiled against. // is compatible with the grpc package it is being compiled against.
const _ = grpc.SupportPackageIsVersion3 const _ = grpc.SupportPackageIsVersion4
// Client API for Greeter service // Client API for Greeter service

2
examples/route_guide/routeguide/route_guide.pb.go
View File

@ -156,7 +156,7 @@ var _ grpc.ClientConn
// This is a compile-time assertion to ensure that this generated file // This is a compile-time assertion to ensure that this generated file
// is compatible with the grpc package it is being compiled against. // is compatible with the grpc package it is being compiled against.
const _ = grpc.SupportPackageIsVersion3 const _ = grpc.SupportPackageIsVersion4
// Client API for RouteGuide service // Client API for RouteGuide service

2
grpclb/grpc_lb_v1/grpclb.pb.go
View File

@ -420,7 +420,7 @@ var _ grpc.ClientConn
// This is a compile-time assertion to ensure that this generated file // This is a compile-time assertion to ensure that this generated file
// is compatible with the grpc package it is being compiled against. // is compatible with the grpc package it is being compiled against.
const _ = grpc.SupportPackageIsVersion3 const _ = grpc.SupportPackageIsVersion4
// Client API for LoadBalancer service // Client API for LoadBalancer service

2
health/grpc_health_v1/health.pb.go
View File

@ -90,7 +90,7 @@ var _ grpc.ClientConn
// This is a compile-time assertion to ensure that this generated file // This is a compile-time assertion to ensure that this generated file
// is compatible with the grpc package it is being compiled against. // is compatible with the grpc package it is being compiled against.
const _ = grpc.SupportPackageIsVersion3 const _ = grpc.SupportPackageIsVersion4
// Client API for Health service // Client API for Health service

2
interop/grpc_testing/test.pb.go
View File

@ -407,7 +407,7 @@ var _ grpc.ClientConn
// This is a compile-time assertion to ensure that this generated file // This is a compile-time assertion to ensure that this generated file
// is compatible with the grpc package it is being compiled against. // is compatible with the grpc package it is being compiled against.
const _ = grpc.SupportPackageIsVersion3 const _ = grpc.SupportPackageIsVersion4
// Client API for TestService service // Client API for TestService service

2
reflection/grpc_reflection_v1alpha/reflection.pb.go
View File

@ -544,7 +544,7 @@ var _ grpc.ClientConn
// This is a compile-time assertion to ensure that this generated file // This is a compile-time assertion to ensure that this generated file
// is compatible with the grpc package it is being compiled against. // is compatible with the grpc package it is being compiled against.
const _ = grpc.SupportPackageIsVersion3 const _ = grpc.SupportPackageIsVersion4
// Client API for ServerReflection service // Client API for ServerReflection service

2
reflection/grpc_testing/test.pb.go
View File

@ -66,7 +66,7 @@ var _ grpc.ClientConn
// This is a compile-time assertion to ensure that this generated file // This is a compile-time assertion to ensure that this generated file
// is compatible with the grpc package it is being compiled against. // is compatible with the grpc package it is being compiled against.
const _ = grpc.SupportPackageIsVersion3 const _ = grpc.SupportPackageIsVersion4
// Client API for SearchService service // Client API for SearchService service

3
reflection/serverreflection.go
View File

@ -251,11 +251,12 @@ func (s *serverReflectionServer) fileDescEncodingContainingSymbol(name string) (
} }
// Metadata not valid. // Metadata not valid.
enc, ok := meta.([]byte) fileNameForMeta, ok := meta.(string)
if !ok { if !ok {
return nil, fmt.Errorf("invalid file descriptor for symbol: %v", name) return nil, fmt.Errorf("invalid file descriptor for symbol: %v", name)
} }
enc := proto.FileDescriptor(fileNameForMeta)
fd, err = s.decodeFileDesc(enc) fd, err = s.decodeFileDesc(enc)
if err != nil { if err != nil {
return nil, err return nil, err

4
rpc_util.go
View File

@ -448,10 +448,10 @@ func convertCode(err error) codes.Code {
return codes.Unknown return codes.Unknown
} }
// SupportPackageIsVersion3 is referenced from generated protocol buffer files // SupportPackageIsVersion4 is referenced from generated protocol buffer files
// to assert that that code is compatible with this version of the grpc package. // to assert that that code is compatible with this version of the grpc package.
// //
// This constant may be renamed in the future if a change in the generated code // This constant may be renamed in the future if a change in the generated code
// requires a synchronised update of grpc-go and protoc-gen-go. This constant // requires a synchronised update of grpc-go and protoc-gen-go. This constant
// should not be referenced from any other code. // should not be referenced from any other code.
const SupportPackageIsVersion3 = true const SupportPackageIsVersion4 = true

2
stress/grpc_testing/metrics.pb.go
View File

@ -205,7 +205,7 @@ var _ grpc.ClientConn
// This is a compile-time assertion to ensure that this generated file // This is a compile-time assertion to ensure that this generated file
// is compatible with the grpc package it is being compiled against. // is compatible with the grpc package it is being compiled against.
const _ = grpc.SupportPackageIsVersion3 const _ = grpc.SupportPackageIsVersion4
// Client API for MetricsService service // Client API for MetricsService service

2
test/grpc_testing/test.pb.go
View File

@ -360,7 +360,7 @@ var _ grpc.ClientConn
// This is a compile-time assertion to ensure that this generated file // This is a compile-time assertion to ensure that this generated file
// is compatible with the grpc package it is being compiled against. // is compatible with the grpc package it is being compiled against.
const _ = grpc.SupportPackageIsVersion3 const _ = grpc.SupportPackageIsVersion4
// Client API for TestService service // Client API for TestService service