Merge pull request #941 from MakMukhi/mmukhi_update_server_relection

update pre-generated code and server reflection code to comply with the change to the grpc g…
grpc · Nov 3, 2016 · 777daa1 · 777daa1
2 parents f8b3c60 + 883bfc7
commit 777daa1
Show file tree

Hide file tree

Showing 12 changed files with 25 additions and 24 deletions.
diff --git a/benchmark/grpc_testing/services.pb.go b/benchmark/grpc_testing/services.pb.go
diff --git a/examples/helloworld/helloworld/helloworld.pb.go b/examples/helloworld/helloworld/helloworld.pb.go
diff --git a/examples/route_guide/routeguide/route_guide.pb.go b/examples/route_guide/routeguide/route_guide.pb.go
diff --git a/grpclb/grpc_lb_v1/grpclb.pb.go b/grpclb/grpc_lb_v1/grpclb.pb.go
diff --git a/health/grpc_health_v1/health.pb.go b/health/grpc_health_v1/health.pb.go
diff --git a/interop/grpc_testing/test.pb.go b/interop/grpc_testing/test.pb.go
diff --git a/reflection/grpc_reflection_v1alpha/reflection.pb.go b/reflection/grpc_reflection_v1alpha/reflection.pb.go
diff --git a/reflection/grpc_testing/test.pb.go b/reflection/grpc_testing/test.pb.go
diff --git a/reflection/serverreflection.go b/reflection/serverreflection.go
@@ -251,11 +251,12 @@ func (s *serverReflectionServer) fileDescEncodingContainingSymbol(name string) (
 		}
 
 		// Metadata not valid.
-		enc, ok := meta.([]byte)
+		fileNameForMeta, ok := meta.(string)
 		if !ok {
 			return nil, fmt.Errorf("invalid file descriptor for symbol: %v", name)
 		}
 
+		enc := proto.FileDescriptor(fileNameForMeta)
 		fd, err = s.decodeFileDesc(enc)
 		if err != nil {
 			return nil, err

diff --git a/rpc_util.go b/rpc_util.go
@@ -448,10 +448,10 @@ func convertCode(err error) codes.Code {
 	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.
 //
 // 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
 // should not be referenced from any other code.
-const SupportPackageIsVersion3 = true
+const SupportPackageIsVersion4 = true
diff --git a/stress/grpc_testing/metrics.pb.go b/stress/grpc_testing/metrics.pb.go
diff --git a/test/grpc_testing/test.pb.go b/test/grpc_testing/test.pb.go