From 0894f21c2fa7cc281bc584c0e08cbbbad1d04b28 Mon Sep 17 00:00:00 2001 From: Stanley Cheung Date: Thu, 13 Aug 2020 23:00:32 -0700 Subject: [PATCH] Ran generate_proto_ruby.sh to update generated files --- src/ruby/bin/math_services_pb.rb | 8 ++-- .../pb/grpc/health/v1/health_services_pb.rb | 4 +- .../pb/src/proto/grpc/testing/messages_pb.rb | 5 +++ .../proto/grpc/testing/test_services_pb.rb | 40 +++++++++++++------ .../testing/benchmark_service_services_pb.rb | 10 ++--- .../qps/src/proto/grpc/testing/messages_pb.rb | 5 +++ ...report_qps_scenario_service_services_pb.rb | 2 +- .../testing/worker_service_services_pb.rb | 8 ++-- 8 files changed, 54 insertions(+), 28 deletions(-) diff --git a/src/ruby/bin/math_services_pb.rb b/src/ruby/bin/math_services_pb.rb index e6f32e3d01a..961117ccfaf 100644 --- a/src/ruby/bin/math_services_pb.rb +++ b/src/ruby/bin/math_services_pb.rb @@ -31,19 +31,19 @@ module Math # Div divides DivArgs.dividend by DivArgs.divisor and returns the quotient # and remainder. - rpc :Div, DivArgs, DivReply + rpc :Div, ::Math::DivArgs, ::Math::DivReply # DivMany accepts an arbitrary number of division args from the client stream # and sends back the results in the reply stream. The stream continues until # the client closes its end; the server does the same after sending all the # replies. The stream ends immediately if either end aborts. - rpc :DivMany, stream(DivArgs), stream(DivReply) + rpc :DivMany, stream(::Math::DivArgs), stream(::Math::DivReply) # Fib generates numbers in the Fibonacci sequence. If FibArgs.limit > 0, Fib # generates up to limit numbers; otherwise it continues until the call is # canceled. Unlike Fib above, Fib has no final FibReply. - rpc :Fib, FibArgs, stream(Num) + rpc :Fib, ::Math::FibArgs, stream(::Math::Num) # Sum sums a stream of numbers, returning the final result once the stream # is closed. - rpc :Sum, stream(Num), Num + rpc :Sum, stream(::Math::Num), ::Math::Num end Stub = Service.rpc_stub_class diff --git a/src/ruby/pb/grpc/health/v1/health_services_pb.rb b/src/ruby/pb/grpc/health/v1/health_services_pb.rb index 5992f1c403d..351e7e150a5 100644 --- a/src/ruby/pb/grpc/health/v1/health_services_pb.rb +++ b/src/ruby/pb/grpc/health/v1/health_services_pb.rb @@ -36,7 +36,7 @@ module Grpc # If the requested service is unknown, the call will fail with status # NOT_FOUND. - rpc :Check, HealthCheckRequest, HealthCheckResponse + rpc :Check, ::Grpc::Health::V1::HealthCheckRequest, ::Grpc::Health::V1::HealthCheckResponse # Performs a watch for the serving status of the requested service. # The server will immediately send back a message indicating the current # serving status. It will then subsequently send a new message whenever @@ -52,7 +52,7 @@ module Grpc # should assume this method is not supported and should not retry the # call. If the call terminates with any other status (including OK), # clients should retry the call with appropriate exponential backoff. - rpc :Watch, HealthCheckRequest, stream(HealthCheckResponse) + rpc :Watch, ::Grpc::Health::V1::HealthCheckRequest, stream(::Grpc::Health::V1::HealthCheckResponse) end Stub = Service.rpc_stub_class diff --git a/src/ruby/pb/src/proto/grpc/testing/messages_pb.rb b/src/ruby/pb/src/proto/grpc/testing/messages_pb.rb index f492ccfa670..d902ae0e736 100644 --- a/src/ruby/pb/src/proto/grpc/testing/messages_pb.rb +++ b/src/ruby/pb/src/proto/grpc/testing/messages_pb.rb @@ -71,6 +71,10 @@ Google::Protobuf::DescriptorPool.generated_pool.build do add_message "grpc.testing.LoadBalancerStatsResponse" do map :rpcs_by_peer, :string, :int32, 1 optional :num_failures, :int32, 2 + map :rpcs_by_method, :string, :message, 3, "grpc.testing.LoadBalancerStatsResponse.RpcsByPeer" + end + add_message "grpc.testing.LoadBalancerStatsResponse.RpcsByPeer" do + map :rpcs_by_peer, :string, :int32, 1 end add_enum "grpc.testing.PayloadType" do value :COMPRESSABLE, 0 @@ -99,6 +103,7 @@ module Grpc ReconnectInfo = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.ReconnectInfo").msgclass LoadBalancerStatsRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.LoadBalancerStatsRequest").msgclass LoadBalancerStatsResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.LoadBalancerStatsResponse").msgclass + LoadBalancerStatsResponse::RpcsByPeer = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.LoadBalancerStatsResponse.RpcsByPeer").msgclass PayloadType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.PayloadType").enummodule GrpclbRouteType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.GrpclbRouteType").enummodule end diff --git a/src/ruby/pb/src/proto/grpc/testing/test_services_pb.rb b/src/ruby/pb/src/proto/grpc/testing/test_services_pb.rb index 8138bd0114d..115acd0dcae 100644 --- a/src/ruby/pb/src/proto/grpc/testing/test_services_pb.rb +++ b/src/ruby/pb/src/proto/grpc/testing/test_services_pb.rb @@ -36,31 +36,31 @@ module Grpc self.service_name = 'grpc.testing.TestService' # One empty request followed by one empty response. - rpc :EmptyCall, Empty, Empty + rpc :EmptyCall, ::Grpc::Testing::Empty, ::Grpc::Testing::Empty # One request followed by one response. - rpc :UnaryCall, SimpleRequest, SimpleResponse + rpc :UnaryCall, ::Grpc::Testing::SimpleRequest, ::Grpc::Testing::SimpleResponse # One request followed by one response. Response has cache control # headers set such that a caching HTTP proxy (such as GFE) can # satisfy subsequent requests. - rpc :CacheableUnaryCall, SimpleRequest, SimpleResponse + rpc :CacheableUnaryCall, ::Grpc::Testing::SimpleRequest, ::Grpc::Testing::SimpleResponse # One request followed by a sequence of responses (streamed download). # The server returns the payload with client desired type and sizes. - rpc :StreamingOutputCall, StreamingOutputCallRequest, stream(StreamingOutputCallResponse) + rpc :StreamingOutputCall, ::Grpc::Testing::StreamingOutputCallRequest, stream(::Grpc::Testing::StreamingOutputCallResponse) # A sequence of requests followed by one response (streamed upload). # The server returns the aggregated size of client payload as the result. - rpc :StreamingInputCall, stream(StreamingInputCallRequest), StreamingInputCallResponse + rpc :StreamingInputCall, stream(::Grpc::Testing::StreamingInputCallRequest), ::Grpc::Testing::StreamingInputCallResponse # A sequence of requests with each request served by the server immediately. # As one request could lead to multiple responses, this interface # demonstrates the idea of full duplexing. - rpc :FullDuplexCall, stream(StreamingOutputCallRequest), stream(StreamingOutputCallResponse) + rpc :FullDuplexCall, stream(::Grpc::Testing::StreamingOutputCallRequest), stream(::Grpc::Testing::StreamingOutputCallResponse) # A sequence of requests followed by a sequence of responses. # The server buffers all the client requests and then serves them in order. A # stream of responses are returned to the client when the server starts with # first request. - rpc :HalfDuplexCall, stream(StreamingOutputCallRequest), stream(StreamingOutputCallResponse) + rpc :HalfDuplexCall, stream(::Grpc::Testing::StreamingOutputCallRequest), stream(::Grpc::Testing::StreamingOutputCallResponse) # The test server will not implement this method. It will be used # to test the behavior when clients call unimplemented methods. - rpc :UnimplementedCall, Empty, Empty + rpc :UnimplementedCall, ::Grpc::Testing::Empty, ::Grpc::Testing::Empty end Stub = Service.rpc_stub_class @@ -77,7 +77,7 @@ module Grpc self.service_name = 'grpc.testing.UnimplementedService' # A call that no server should implement - rpc :UnimplementedCall, Empty, Empty + rpc :UnimplementedCall, ::Grpc::Testing::Empty, ::Grpc::Testing::Empty end Stub = Service.rpc_stub_class @@ -92,8 +92,8 @@ module Grpc self.unmarshal_class_method = :decode self.service_name = 'grpc.testing.ReconnectService' - rpc :Start, ReconnectParams, Empty - rpc :Stop, Empty, ReconnectInfo + rpc :Start, ::Grpc::Testing::ReconnectParams, ::Grpc::Testing::Empty + rpc :Stop, ::Grpc::Testing::Empty, ::Grpc::Testing::ReconnectInfo end Stub = Service.rpc_stub_class @@ -109,7 +109,23 @@ module Grpc self.service_name = 'grpc.testing.LoadBalancerStatsService' # Gets the backend distribution for RPCs sent by a test client. - rpc :GetClientStats, LoadBalancerStatsRequest, LoadBalancerStatsResponse + rpc :GetClientStats, ::Grpc::Testing::LoadBalancerStatsRequest, ::Grpc::Testing::LoadBalancerStatsResponse + end + + Stub = Service.rpc_stub_class + end + module XdsUpdateHealthService + # A service to remotely control health status of an xDS test server. + class Service + + include GRPC::GenericService + + self.marshal_class_method = :encode + self.unmarshal_class_method = :decode + self.service_name = 'grpc.testing.XdsUpdateHealthService' + + rpc :SetServing, ::Grpc::Testing::Empty, ::Grpc::Testing::Empty + rpc :SetNotServing, ::Grpc::Testing::Empty, ::Grpc::Testing::Empty end Stub = Service.rpc_stub_class diff --git a/src/ruby/qps/src/proto/grpc/testing/benchmark_service_services_pb.rb b/src/ruby/qps/src/proto/grpc/testing/benchmark_service_services_pb.rb index 65e5a75c4d8..63e2d5d20fa 100644 --- a/src/ruby/qps/src/proto/grpc/testing/benchmark_service_services_pb.rb +++ b/src/ruby/qps/src/proto/grpc/testing/benchmark_service_services_pb.rb @@ -34,20 +34,20 @@ module Grpc # One request followed by one response. # The server returns the client payload as-is. - rpc :UnaryCall, SimpleRequest, SimpleResponse + rpc :UnaryCall, ::Grpc::Testing::SimpleRequest, ::Grpc::Testing::SimpleResponse # Repeated sequence of one request followed by one response. # Should be called streaming ping-pong # The server returns the client payload as-is on each response - rpc :StreamingCall, stream(SimpleRequest), stream(SimpleResponse) + rpc :StreamingCall, stream(::Grpc::Testing::SimpleRequest), stream(::Grpc::Testing::SimpleResponse) # Single-sided unbounded streaming from client to server # The server returns the client payload as-is once the client does WritesDone - rpc :StreamingFromClient, stream(SimpleRequest), SimpleResponse + rpc :StreamingFromClient, stream(::Grpc::Testing::SimpleRequest), ::Grpc::Testing::SimpleResponse # Single-sided unbounded streaming from server to client # The server repeatedly returns the client payload as-is - rpc :StreamingFromServer, SimpleRequest, stream(SimpleResponse) + rpc :StreamingFromServer, ::Grpc::Testing::SimpleRequest, stream(::Grpc::Testing::SimpleResponse) # Two-sided unbounded streaming between server to client # Both sides send the content of their own choice to the other - rpc :StreamingBothWays, stream(SimpleRequest), stream(SimpleResponse) + rpc :StreamingBothWays, stream(::Grpc::Testing::SimpleRequest), stream(::Grpc::Testing::SimpleResponse) end Stub = Service.rpc_stub_class diff --git a/src/ruby/qps/src/proto/grpc/testing/messages_pb.rb b/src/ruby/qps/src/proto/grpc/testing/messages_pb.rb index f492ccfa670..d902ae0e736 100644 --- a/src/ruby/qps/src/proto/grpc/testing/messages_pb.rb +++ b/src/ruby/qps/src/proto/grpc/testing/messages_pb.rb @@ -71,6 +71,10 @@ Google::Protobuf::DescriptorPool.generated_pool.build do add_message "grpc.testing.LoadBalancerStatsResponse" do map :rpcs_by_peer, :string, :int32, 1 optional :num_failures, :int32, 2 + map :rpcs_by_method, :string, :message, 3, "grpc.testing.LoadBalancerStatsResponse.RpcsByPeer" + end + add_message "grpc.testing.LoadBalancerStatsResponse.RpcsByPeer" do + map :rpcs_by_peer, :string, :int32, 1 end add_enum "grpc.testing.PayloadType" do value :COMPRESSABLE, 0 @@ -99,6 +103,7 @@ module Grpc ReconnectInfo = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.ReconnectInfo").msgclass LoadBalancerStatsRequest = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.LoadBalancerStatsRequest").msgclass LoadBalancerStatsResponse = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.LoadBalancerStatsResponse").msgclass + LoadBalancerStatsResponse::RpcsByPeer = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.LoadBalancerStatsResponse.RpcsByPeer").msgclass PayloadType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.PayloadType").enummodule GrpclbRouteType = ::Google::Protobuf::DescriptorPool.generated_pool.lookup("grpc.testing.GrpclbRouteType").enummodule end diff --git a/src/ruby/qps/src/proto/grpc/testing/report_qps_scenario_service_services_pb.rb b/src/ruby/qps/src/proto/grpc/testing/report_qps_scenario_service_services_pb.rb index ddc81bed3da..5e41cfeead1 100644 --- a/src/ruby/qps/src/proto/grpc/testing/report_qps_scenario_service_services_pb.rb +++ b/src/ruby/qps/src/proto/grpc/testing/report_qps_scenario_service_services_pb.rb @@ -33,7 +33,7 @@ module Grpc self.service_name = 'grpc.testing.ReportQpsScenarioService' # Report results of a QPS test benchmark scenario. - rpc :ReportScenario, ScenarioResult, Void + rpc :ReportScenario, ::Grpc::Testing::ScenarioResult, ::Grpc::Testing::Void end Stub = Service.rpc_stub_class diff --git a/src/ruby/qps/src/proto/grpc/testing/worker_service_services_pb.rb b/src/ruby/qps/src/proto/grpc/testing/worker_service_services_pb.rb index a7ecc957571..049db477789 100644 --- a/src/ruby/qps/src/proto/grpc/testing/worker_service_services_pb.rb +++ b/src/ruby/qps/src/proto/grpc/testing/worker_service_services_pb.rb @@ -38,18 +38,18 @@ module Grpc # stats. Closing the stream will initiate shutdown of the test server # and once the shutdown has finished, the OK status is sent to terminate # this RPC. - rpc :RunServer, stream(ServerArgs), stream(ServerStatus) + rpc :RunServer, stream(::Grpc::Testing::ServerArgs), stream(::Grpc::Testing::ServerStatus) # Start client with specified workload. # First request sent specifies the ClientConfig followed by ClientStatus # response. After that, a "Mark" can be sent anytime to request the latest # stats. Closing the stream will initiate shutdown of the test client # and once the shutdown has finished, the OK status is sent to terminate # this RPC. - rpc :RunClient, stream(ClientArgs), stream(ClientStatus) + rpc :RunClient, stream(::Grpc::Testing::ClientArgs), stream(::Grpc::Testing::ClientStatus) # Just return the core count - unary call - rpc :CoreCount, CoreRequest, CoreResponse + rpc :CoreCount, ::Grpc::Testing::CoreRequest, ::Grpc::Testing::CoreResponse # Quit this worker - rpc :QuitWorker, Void, Void + rpc :QuitWorker, ::Grpc::Testing::Void, ::Grpc::Testing::Void end Stub = Service.rpc_stub_class