From b0333c6588f62dfdcdc5c5c24649d321fc0a10bd Mon Sep 17 00:00:00 2001 From: Carl Mastrangelo Date: Mon, 30 Apr 2018 14:12:53 -0700 Subject: [PATCH] benchmarks: move proto to matching package structure --- .../proto/BenchmarkServiceGrpc.java | 2 +- .../proto/ReportQpsScenarioServiceGrpc.java | 2 +- .../benchmarks/proto/WorkerServiceGrpc.java | 2 +- .../io/grpc/benchmarks/proto/Control.java | 163 +++++++++--------- .../io/grpc/benchmarks/proto/Messages.java | 70 ++++---- .../io/grpc/benchmarks/proto/Payloads.java | 24 +-- .../io/grpc/benchmarks/proto/Services.java | 49 +++--- .../java/io/grpc/benchmarks/proto/Stats.java | 36 ++-- .../proto/{ => grpc/testing}/control.proto | 4 +- .../proto/{ => grpc/testing}/messages.proto | 0 .../proto/{ => grpc/testing}/payloads.proto | 0 .../proto/{ => grpc/testing}/services.proto | 4 +- .../main/proto/{ => grpc/testing}/stats.proto | 0 13 files changed, 179 insertions(+), 177 deletions(-) rename benchmarks/src/main/proto/{ => grpc/testing}/control.proto (99%) rename benchmarks/src/main/proto/{ => grpc/testing}/messages.proto (100%) rename benchmarks/src/main/proto/{ => grpc/testing}/payloads.proto (100%) rename benchmarks/src/main/proto/{ => grpc/testing}/services.proto (97%) rename benchmarks/src/main/proto/{ => grpc/testing}/stats.proto (100%) diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java index ce9c269adc..211a2ea0cf 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/BenchmarkServiceGrpc.java @@ -19,7 +19,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall; */ @javax.annotation.Generated( value = "by gRPC proto compiler", - comments = "Source: services.proto") + comments = "Source: grpc/testing/services.proto") public final class BenchmarkServiceGrpc { private BenchmarkServiceGrpc() {} diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java index 53cd0260da..380c9663dc 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/ReportQpsScenarioServiceGrpc.java @@ -19,7 +19,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall; */ @javax.annotation.Generated( value = "by gRPC proto compiler", - comments = "Source: services.proto") + comments = "Source: grpc/testing/services.proto") public final class ReportQpsScenarioServiceGrpc { private ReportQpsScenarioServiceGrpc() {} diff --git a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java index 8d8059a6b8..66229a3aa7 100644 --- a/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java +++ b/benchmarks/src/generated/main/grpc/io/grpc/benchmarks/proto/WorkerServiceGrpc.java @@ -19,7 +19,7 @@ import static io.grpc.stub.ServerCalls.asyncUnimplementedUnaryCall; */ @javax.annotation.Generated( value = "by gRPC proto compiler", - comments = "Source: services.proto") + comments = "Source: grpc/testing/services.proto") public final class WorkerServiceGrpc { private WorkerServiceGrpc() {} diff --git a/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Control.java b/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Control.java index 2508a9597b..de7d131bb2 100644 --- a/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Control.java +++ b/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Control.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: control.proto +// source: grpc/testing/control.proto package io.grpc.benchmarks.proto; @@ -20206,86 +20206,87 @@ public final class Control { descriptor; static { java.lang.String[] descriptorData = { - "\n\rcontrol.proto\022\014grpc.testing\032\016payloads." + - "proto\032\013stats.proto\"%\n\rPoissonParams\022\024\n\014o" + - "ffered_load\030\001 \001(\001\"\022\n\020ClosedLoopParams\"{\n" + - "\nLoadParams\0225\n\013closed_loop\030\001 \001(\0132\036.grpc." + - "testing.ClosedLoopParamsH\000\022.\n\007poisson\030\002 " + - "\001(\0132\033.grpc.testing.PoissonParamsH\000B\006\n\004lo" + - "ad\"C\n\016SecurityParams\022\023\n\013use_test_ca\030\001 \001(" + - "\010\022\034\n\024server_host_override\030\002 \001(\t\"M\n\nChann" + - "elArg\022\014\n\004name\030\001 \001(\t\022\023\n\tstr_value\030\002 \001(\tH\000" + - "\022\023\n\tint_value\030\003 \001(\005H\000B\007\n\005value\"\275\004\n\014Clien" + - "tConfig\022\026\n\016server_targets\030\001 \003(\t\022-\n\013clien" + - "t_type\030\002 \001(\0162\030.grpc.testing.ClientType\0225" + - "\n\017security_params\030\003 \001(\0132\034.grpc.testing.S" + - "ecurityParams\022$\n\034outstanding_rpcs_per_ch" + - "annel\030\004 \001(\005\022\027\n\017client_channels\030\005 \001(\005\022\034\n\024" + - "async_client_threads\030\007 \001(\005\022\'\n\010rpc_type\030\010" + - " \001(\0162\025.grpc.testing.RpcType\022-\n\013load_para" + - "ms\030\n \001(\0132\030.grpc.testing.LoadParams\0223\n\016pa" + - "yload_config\030\013 \001(\0132\033.grpc.testing.Payloa" + - "dConfig\0227\n\020histogram_params\030\014 \001(\0132\035.grpc" + - ".testing.HistogramParams\022\021\n\tcore_list\030\r " + - "\003(\005\022\022\n\ncore_limit\030\016 \001(\005\022\030\n\020other_client_" + - "api\030\017 \001(\t\022.\n\014channel_args\030\020 \003(\0132\030.grpc.t" + - "esting.ChannelArg\022\033\n\023messages_per_stream" + - "\030\022 \001(\005\"8\n\014ClientStatus\022(\n\005stats\030\001 \001(\0132\031." + - "grpc.testing.ClientStats\"\025\n\004Mark\022\r\n\005rese" + - "t\030\001 \001(\010\"h\n\nClientArgs\022+\n\005setup\030\001 \001(\0132\032.g" + - "rpc.testing.ClientConfigH\000\022\"\n\004mark\030\002 \001(\013" + - "2\022.grpc.testing.MarkH\000B\t\n\007argtype\"\264\002\n\014Se" + - "rverConfig\022-\n\013server_type\030\001 \001(\0162\030.grpc.t" + - "esting.ServerType\0225\n\017security_params\030\002 \001" + - "(\0132\034.grpc.testing.SecurityParams\022\014\n\004port" + - "\030\004 \001(\005\022\034\n\024async_server_threads\030\007 \001(\005\022\022\n\n" + - "core_limit\030\010 \001(\005\0223\n\016payload_config\030\t \001(\013" + - "2\033.grpc.testing.PayloadConfig\022\021\n\tcore_li" + - "st\030\n \003(\005\022\030\n\020other_server_api\030\013 \001(\t\022\034\n\023re" + - "source_quota_size\030\351\007 \001(\005\"h\n\nServerArgs\022+" + - "\n\005setup\030\001 \001(\0132\032.grpc.testing.ServerConfi" + - "gH\000\022\"\n\004mark\030\002 \001(\0132\022.grpc.testing.MarkH\000B" + - "\t\n\007argtype\"U\n\014ServerStatus\022(\n\005stats\030\001 \001(" + - "\0132\031.grpc.testing.ServerStats\022\014\n\004port\030\002 \001" + - "(\005\022\r\n\005cores\030\003 \001(\005\"\r\n\013CoreRequest\"\035\n\014Core" + - "Response\022\r\n\005cores\030\001 \001(\005\"\006\n\004Void\"\375\001\n\010Scen" + - "ario\022\014\n\004name\030\001 \001(\t\0221\n\rclient_config\030\002 \001(" + - "\0132\032.grpc.testing.ClientConfig\022\023\n\013num_cli" + - "ents\030\003 \001(\005\0221\n\rserver_config\030\004 \001(\0132\032.grpc" + - ".testing.ServerConfig\022\023\n\013num_servers\030\005 \001" + - "(\005\022\026\n\016warmup_seconds\030\006 \001(\005\022\031\n\021benchmark_" + - "seconds\030\007 \001(\005\022 \n\030spawn_local_worker_coun" + - "t\030\010 \001(\005\"6\n\tScenarios\022)\n\tscenarios\030\001 \003(\0132" + - "\026.grpc.testing.Scenario\"\274\003\n\025ScenarioResu" + - "ltSummary\022\013\n\003qps\030\001 \001(\001\022\033\n\023qps_per_server" + - "_core\030\002 \001(\001\022\032\n\022server_system_time\030\003 \001(\001\022" + - "\030\n\020server_user_time\030\004 \001(\001\022\032\n\022client_syst" + - "em_time\030\005 \001(\001\022\030\n\020client_user_time\030\006 \001(\001\022" + - "\022\n\nlatency_50\030\007 \001(\001\022\022\n\nlatency_90\030\010 \001(\001\022" + - "\022\n\nlatency_95\030\t \001(\001\022\022\n\nlatency_99\030\n \001(\001\022" + - "\023\n\013latency_999\030\013 \001(\001\022\030\n\020server_cpu_usage" + - "\030\014 \001(\001\022&\n\036successful_requests_per_second" + - "\030\r \001(\001\022\"\n\032failed_requests_per_second\030\016 \001" + - "(\001\022 \n\030client_polls_per_request\030\017 \001(\001\022 \n\030" + - "server_polls_per_request\030\020 \001(\001\"\203\003\n\016Scena" + - "rioResult\022(\n\010scenario\030\001 \001(\0132\026.grpc.testi" + - "ng.Scenario\022.\n\tlatencies\030\002 \001(\0132\033.grpc.te" + - "sting.HistogramData\022/\n\014client_stats\030\003 \003(" + - "\0132\031.grpc.testing.ClientStats\022/\n\014server_s" + - "tats\030\004 \003(\0132\031.grpc.testing.ServerStats\022\024\n" + - "\014server_cores\030\005 \003(\005\0224\n\007summary\030\006 \001(\0132#.g" + - "rpc.testing.ScenarioResultSummary\022\026\n\016cli" + - "ent_success\030\007 \003(\010\022\026\n\016server_success\030\010 \003(" + - "\010\0229\n\017request_results\030\t \003(\0132 .grpc.testin" + - "g.RequestResultCount*A\n\nClientType\022\017\n\013SY" + - "NC_CLIENT\020\000\022\020\n\014ASYNC_CLIENT\020\001\022\020\n\014OTHER_C" + - "LIENT\020\002*[\n\nServerType\022\017\n\013SYNC_SERVER\020\000\022\020" + - "\n\014ASYNC_SERVER\020\001\022\030\n\024ASYNC_GENERIC_SERVER" + - "\020\002\022\020\n\014OTHER_SERVER\020\003*r\n\007RpcType\022\t\n\005UNARY" + - "\020\000\022\r\n\tSTREAMING\020\001\022\031\n\025STREAMING_FROM_CLIE" + - "NT\020\002\022\031\n\025STREAMING_FROM_SERVER\020\003\022\027\n\023STREA" + - "MING_BOTH_WAYS\020\004B#\n\030io.grpc.benchmarks.p" + - "rotoB\007Controlb\006proto3" + "\n\032grpc/testing/control.proto\022\014grpc.testi" + + "ng\032\033grpc/testing/payloads.proto\032\030grpc/te" + + "sting/stats.proto\"%\n\rPoissonParams\022\024\n\014of" + + "fered_load\030\001 \001(\001\"\022\n\020ClosedLoopParams\"{\n\n" + + "LoadParams\0225\n\013closed_loop\030\001 \001(\0132\036.grpc.t" + + "esting.ClosedLoopParamsH\000\022.\n\007poisson\030\002 \001" + + "(\0132\033.grpc.testing.PoissonParamsH\000B\006\n\004loa" + + "d\"C\n\016SecurityParams\022\023\n\013use_test_ca\030\001 \001(\010" + + "\022\034\n\024server_host_override\030\002 \001(\t\"M\n\nChanne" + + "lArg\022\014\n\004name\030\001 \001(\t\022\023\n\tstr_value\030\002 \001(\tH\000\022" + + "\023\n\tint_value\030\003 \001(\005H\000B\007\n\005value\"\275\004\n\014Client" + + "Config\022\026\n\016server_targets\030\001 \003(\t\022-\n\013client" + + "_type\030\002 \001(\0162\030.grpc.testing.ClientType\0225\n" + + "\017security_params\030\003 \001(\0132\034.grpc.testing.Se" + + "curityParams\022$\n\034outstanding_rpcs_per_cha" + + "nnel\030\004 \001(\005\022\027\n\017client_channels\030\005 \001(\005\022\034\n\024a" + + "sync_client_threads\030\007 \001(\005\022\'\n\010rpc_type\030\010 " + + "\001(\0162\025.grpc.testing.RpcType\022-\n\013load_param" + + "s\030\n \001(\0132\030.grpc.testing.LoadParams\0223\n\016pay" + + "load_config\030\013 \001(\0132\033.grpc.testing.Payload" + + "Config\0227\n\020histogram_params\030\014 \001(\0132\035.grpc." + + "testing.HistogramParams\022\021\n\tcore_list\030\r \003" + + "(\005\022\022\n\ncore_limit\030\016 \001(\005\022\030\n\020other_client_a" + + "pi\030\017 \001(\t\022.\n\014channel_args\030\020 \003(\0132\030.grpc.te" + + "sting.ChannelArg\022\033\n\023messages_per_stream\030" + + "\022 \001(\005\"8\n\014ClientStatus\022(\n\005stats\030\001 \001(\0132\031.g" + + "rpc.testing.ClientStats\"\025\n\004Mark\022\r\n\005reset" + + "\030\001 \001(\010\"h\n\nClientArgs\022+\n\005setup\030\001 \001(\0132\032.gr" + + "pc.testing.ClientConfigH\000\022\"\n\004mark\030\002 \001(\0132" + + "\022.grpc.testing.MarkH\000B\t\n\007argtype\"\264\002\n\014Ser" + + "verConfig\022-\n\013server_type\030\001 \001(\0162\030.grpc.te" + + "sting.ServerType\0225\n\017security_params\030\002 \001(" + + "\0132\034.grpc.testing.SecurityParams\022\014\n\004port\030" + + "\004 \001(\005\022\034\n\024async_server_threads\030\007 \001(\005\022\022\n\nc" + + "ore_limit\030\010 \001(\005\0223\n\016payload_config\030\t \001(\0132" + + "\033.grpc.testing.PayloadConfig\022\021\n\tcore_lis" + + "t\030\n \003(\005\022\030\n\020other_server_api\030\013 \001(\t\022\034\n\023res" + + "ource_quota_size\030\351\007 \001(\005\"h\n\nServerArgs\022+\n" + + "\005setup\030\001 \001(\0132\032.grpc.testing.ServerConfig" + + "H\000\022\"\n\004mark\030\002 \001(\0132\022.grpc.testing.MarkH\000B\t" + + "\n\007argtype\"U\n\014ServerStatus\022(\n\005stats\030\001 \001(\013" + + "2\031.grpc.testing.ServerStats\022\014\n\004port\030\002 \001(" + + "\005\022\r\n\005cores\030\003 \001(\005\"\r\n\013CoreRequest\"\035\n\014CoreR" + + "esponse\022\r\n\005cores\030\001 \001(\005\"\006\n\004Void\"\375\001\n\010Scena" + + "rio\022\014\n\004name\030\001 \001(\t\0221\n\rclient_config\030\002 \001(\013" + + "2\032.grpc.testing.ClientConfig\022\023\n\013num_clie" + + "nts\030\003 \001(\005\0221\n\rserver_config\030\004 \001(\0132\032.grpc." + + "testing.ServerConfig\022\023\n\013num_servers\030\005 \001(" + + "\005\022\026\n\016warmup_seconds\030\006 \001(\005\022\031\n\021benchmark_s" + + "econds\030\007 \001(\005\022 \n\030spawn_local_worker_count" + + "\030\010 \001(\005\"6\n\tScenarios\022)\n\tscenarios\030\001 \003(\0132\026" + + ".grpc.testing.Scenario\"\274\003\n\025ScenarioResul" + + "tSummary\022\013\n\003qps\030\001 \001(\001\022\033\n\023qps_per_server_" + + "core\030\002 \001(\001\022\032\n\022server_system_time\030\003 \001(\001\022\030" + + "\n\020server_user_time\030\004 \001(\001\022\032\n\022client_syste" + + "m_time\030\005 \001(\001\022\030\n\020client_user_time\030\006 \001(\001\022\022" + + "\n\nlatency_50\030\007 \001(\001\022\022\n\nlatency_90\030\010 \001(\001\022\022" + + "\n\nlatency_95\030\t \001(\001\022\022\n\nlatency_99\030\n \001(\001\022\023" + + "\n\013latency_999\030\013 \001(\001\022\030\n\020server_cpu_usage\030" + + "\014 \001(\001\022&\n\036successful_requests_per_second\030" + + "\r \001(\001\022\"\n\032failed_requests_per_second\030\016 \001(" + + "\001\022 \n\030client_polls_per_request\030\017 \001(\001\022 \n\030s" + + "erver_polls_per_request\030\020 \001(\001\"\203\003\n\016Scenar" + + "ioResult\022(\n\010scenario\030\001 \001(\0132\026.grpc.testin" + + "g.Scenario\022.\n\tlatencies\030\002 \001(\0132\033.grpc.tes" + + "ting.HistogramData\022/\n\014client_stats\030\003 \003(\013" + + "2\031.grpc.testing.ClientStats\022/\n\014server_st" + + "ats\030\004 \003(\0132\031.grpc.testing.ServerStats\022\024\n\014" + + "server_cores\030\005 \003(\005\0224\n\007summary\030\006 \001(\0132#.gr" + + "pc.testing.ScenarioResultSummary\022\026\n\016clie" + + "nt_success\030\007 \003(\010\022\026\n\016server_success\030\010 \003(\010" + + "\0229\n\017request_results\030\t \003(\0132 .grpc.testing" + + ".RequestResultCount*A\n\nClientType\022\017\n\013SYN" + + "C_CLIENT\020\000\022\020\n\014ASYNC_CLIENT\020\001\022\020\n\014OTHER_CL" + + "IENT\020\002*[\n\nServerType\022\017\n\013SYNC_SERVER\020\000\022\020\n" + + "\014ASYNC_SERVER\020\001\022\030\n\024ASYNC_GENERIC_SERVER\020" + + "\002\022\020\n\014OTHER_SERVER\020\003*r\n\007RpcType\022\t\n\005UNARY\020" + + "\000\022\r\n\tSTREAMING\020\001\022\031\n\025STREAMING_FROM_CLIEN" + + "T\020\002\022\031\n\025STREAMING_FROM_SERVER\020\003\022\027\n\023STREAM" + + "ING_BOTH_WAYS\020\004B#\n\030io.grpc.benchmarks.pr" + + "otoB\007Controlb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Messages.java b/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Messages.java index 34591b2bf7..5dfcb911cf 100644 --- a/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Messages.java +++ b/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Messages.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: messages.proto +// source: grpc/testing/messages.proto package io.grpc.benchmarks.proto; @@ -10343,41 +10343,41 @@ public final class Messages { descriptor; static { java.lang.String[] descriptorData = { - "\n\016messages.proto\022\014grpc.testing\"\032\n\tBoolVa" + - "lue\022\r\n\005value\030\001 \001(\010\"@\n\007Payload\022\'\n\004type\030\001 " + - "\001(\0162\031.grpc.testing.PayloadType\022\014\n\004body\030\002" + - " \001(\014\"+\n\nEchoStatus\022\014\n\004code\030\001 \001(\005\022\017\n\007mess" + - "age\030\002 \001(\t\"\316\002\n\rSimpleRequest\0220\n\rresponse_" + - "type\030\001 \001(\0162\031.grpc.testing.PayloadType\022\025\n" + - "\rresponse_size\030\002 \001(\005\022&\n\007payload\030\003 \001(\0132\025." + - "grpc.testing.Payload\022\025\n\rfill_username\030\004 " + - "\001(\010\022\030\n\020fill_oauth_scope\030\005 \001(\010\0224\n\023respons" + - "e_compressed\030\006 \001(\0132\027.grpc.testing.BoolVa" + - "lue\0221\n\017response_status\030\007 \001(\0132\030.grpc.test" + - "ing.EchoStatus\0222\n\021expect_compressed\030\010 \001(" + - "\0132\027.grpc.testing.BoolValue\"_\n\016SimpleResp" + - "onse\022&\n\007payload\030\001 \001(\0132\025.grpc.testing.Pay" + - "load\022\020\n\010username\030\002 \001(\t\022\023\n\013oauth_scope\030\003 " + - "\001(\t\"w\n\031StreamingInputCallRequest\022&\n\007payl" + - "oad\030\001 \001(\0132\025.grpc.testing.Payload\0222\n\021expe" + - "ct_compressed\030\002 \001(\0132\027.grpc.testing.BoolV" + - "alue\"=\n\032StreamingInputCallResponse\022\037\n\027ag" + - "gregated_payload_size\030\001 \001(\005\"d\n\022ResponseP" + - "arameters\022\014\n\004size\030\001 \001(\005\022\023\n\013interval_us\030\002" + - " \001(\005\022+\n\ncompressed\030\003 \001(\0132\027.grpc.testing." + - "BoolValue\"\350\001\n\032StreamingOutputCallRequest" + + "\n\033grpc/testing/messages.proto\022\014grpc.test" + + "ing\"\032\n\tBoolValue\022\r\n\005value\030\001 \001(\010\"@\n\007Paylo" + + "ad\022\'\n\004type\030\001 \001(\0162\031.grpc.testing.PayloadT" + + "ype\022\014\n\004body\030\002 \001(\014\"+\n\nEchoStatus\022\014\n\004code\030" + + "\001 \001(\005\022\017\n\007message\030\002 \001(\t\"\316\002\n\rSimpleRequest" + "\0220\n\rresponse_type\030\001 \001(\0162\031.grpc.testing.P" + - "ayloadType\022=\n\023response_parameters\030\002 \003(\0132" + - " .grpc.testing.ResponseParameters\022&\n\007pay" + - "load\030\003 \001(\0132\025.grpc.testing.Payload\0221\n\017res" + - "ponse_status\030\007 \001(\0132\030.grpc.testing.EchoSt" + - "atus\"E\n\033StreamingOutputCallResponse\022&\n\007p" + - "ayload\030\001 \001(\0132\025.grpc.testing.Payload\"3\n\017R" + - "econnectParams\022 \n\030max_reconnect_backoff_" + - "ms\030\001 \001(\005\"3\n\rReconnectInfo\022\016\n\006passed\030\001 \001(" + - "\010\022\022\n\nbackoff_ms\030\002 \003(\005*\037\n\013PayloadType\022\020\n\014" + - "COMPRESSABLE\020\000B$\n\030io.grpc.benchmarks.pro" + - "toB\010Messagesb\006proto3" + "ayloadType\022\025\n\rresponse_size\030\002 \001(\005\022&\n\007pay" + + "load\030\003 \001(\0132\025.grpc.testing.Payload\022\025\n\rfil" + + "l_username\030\004 \001(\010\022\030\n\020fill_oauth_scope\030\005 \001" + + "(\010\0224\n\023response_compressed\030\006 \001(\0132\027.grpc.t" + + "esting.BoolValue\0221\n\017response_status\030\007 \001(" + + "\0132\030.grpc.testing.EchoStatus\0222\n\021expect_co" + + "mpressed\030\010 \001(\0132\027.grpc.testing.BoolValue\"" + + "_\n\016SimpleResponse\022&\n\007payload\030\001 \001(\0132\025.grp" + + "c.testing.Payload\022\020\n\010username\030\002 \001(\t\022\023\n\013o" + + "auth_scope\030\003 \001(\t\"w\n\031StreamingInputCallRe" + + "quest\022&\n\007payload\030\001 \001(\0132\025.grpc.testing.Pa" + + "yload\0222\n\021expect_compressed\030\002 \001(\0132\027.grpc." + + "testing.BoolValue\"=\n\032StreamingInputCallR" + + "esponse\022\037\n\027aggregated_payload_size\030\001 \001(\005" + + "\"d\n\022ResponseParameters\022\014\n\004size\030\001 \001(\005\022\023\n\013" + + "interval_us\030\002 \001(\005\022+\n\ncompressed\030\003 \001(\0132\027." + + "grpc.testing.BoolValue\"\350\001\n\032StreamingOutp" + + "utCallRequest\0220\n\rresponse_type\030\001 \001(\0162\031.g" + + "rpc.testing.PayloadType\022=\n\023response_para" + + "meters\030\002 \003(\0132 .grpc.testing.ResponsePara" + + "meters\022&\n\007payload\030\003 \001(\0132\025.grpc.testing.P" + + "ayload\0221\n\017response_status\030\007 \001(\0132\030.grpc.t" + + "esting.EchoStatus\"E\n\033StreamingOutputCall" + + "Response\022&\n\007payload\030\001 \001(\0132\025.grpc.testing" + + ".Payload\"3\n\017ReconnectParams\022 \n\030max_recon" + + "nect_backoff_ms\030\001 \001(\005\"3\n\rReconnectInfo\022\016" + + "\n\006passed\030\001 \001(\010\022\022\n\nbackoff_ms\030\002 \003(\005*\037\n\013Pa" + + "yloadType\022\020\n\014COMPRESSABLE\020\000B$\n\030io.grpc.b" + + "enchmarks.protoB\010Messagesb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Payloads.java b/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Payloads.java index 7c7f7ad594..0f5d3cd915 100644 --- a/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Payloads.java +++ b/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Payloads.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: payloads.proto +// source: grpc/testing/payloads.proto package io.grpc.benchmarks.proto; @@ -2577,17 +2577,17 @@ public final class Payloads { descriptor; static { java.lang.String[] descriptorData = { - "\n\016payloads.proto\022\014grpc.testing\"7\n\020ByteBu" + - "fferParams\022\020\n\010req_size\030\001 \001(\005\022\021\n\tresp_siz" + - "e\030\002 \001(\005\"8\n\021SimpleProtoParams\022\020\n\010req_size" + - "\030\001 \001(\005\022\021\n\tresp_size\030\002 \001(\005\"\024\n\022ComplexProt" + - "oParams\"\312\001\n\rPayloadConfig\0228\n\016bytebuf_par" + - "ams\030\001 \001(\0132\036.grpc.testing.ByteBufferParam" + - "sH\000\0228\n\rsimple_params\030\002 \001(\0132\037.grpc.testin" + - "g.SimpleProtoParamsH\000\022:\n\016complex_params\030" + - "\003 \001(\0132 .grpc.testing.ComplexProtoParamsH" + - "\000B\t\n\007payloadB$\n\030io.grpc.benchmarks.proto" + - "B\010Payloadsb\006proto3" + "\n\033grpc/testing/payloads.proto\022\014grpc.test" + + "ing\"7\n\020ByteBufferParams\022\020\n\010req_size\030\001 \001(" + + "\005\022\021\n\tresp_size\030\002 \001(\005\"8\n\021SimpleProtoParam" + + "s\022\020\n\010req_size\030\001 \001(\005\022\021\n\tresp_size\030\002 \001(\005\"\024" + + "\n\022ComplexProtoParams\"\312\001\n\rPayloadConfig\0228" + + "\n\016bytebuf_params\030\001 \001(\0132\036.grpc.testing.By" + + "teBufferParamsH\000\0228\n\rsimple_params\030\002 \001(\0132" + + "\037.grpc.testing.SimpleProtoParamsH\000\022:\n\016co" + + "mplex_params\030\003 \001(\0132 .grpc.testing.Comple" + + "xProtoParamsH\000B\t\n\007payloadB$\n\030io.grpc.ben" + + "chmarks.protoB\010Payloadsb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Services.java b/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Services.java index a57dd9303c..c076e9a2ed 100644 --- a/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Services.java +++ b/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Services.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: services.proto +// source: grpc/testing/services.proto package io.grpc.benchmarks.proto; @@ -23,29 +23,30 @@ public final class Services { descriptor; static { java.lang.String[] descriptorData = { - "\n\016services.proto\022\014grpc.testing\032\016messages" + - ".proto\032\rcontrol.proto2\246\003\n\020BenchmarkServi" + - "ce\022F\n\tUnaryCall\022\033.grpc.testing.SimpleReq" + - "uest\032\034.grpc.testing.SimpleResponse\022N\n\rSt" + - "reamingCall\022\033.grpc.testing.SimpleRequest" + - "\032\034.grpc.testing.SimpleResponse(\0010\001\022R\n\023St" + - "reamingFromClient\022\033.grpc.testing.SimpleR" + - "equest\032\034.grpc.testing.SimpleResponse(\001\022R" + - "\n\023StreamingFromServer\022\033.grpc.testing.Sim" + - "pleRequest\032\034.grpc.testing.SimpleResponse" + - "0\001\022R\n\021StreamingBothWays\022\033.grpc.testing.S" + - "impleRequest\032\034.grpc.testing.SimpleRespon" + - "se(\0010\0012\227\002\n\rWorkerService\022E\n\tRunServer\022\030." + - "grpc.testing.ServerArgs\032\032.grpc.testing.S" + - "erverStatus(\0010\001\022E\n\tRunClient\022\030.grpc.test" + - "ing.ClientArgs\032\032.grpc.testing.ClientStat" + - "us(\0010\001\022B\n\tCoreCount\022\031.grpc.testing.CoreR" + - "equest\032\032.grpc.testing.CoreResponse\0224\n\nQu" + - "itWorker\022\022.grpc.testing.Void\032\022.grpc.test" + - "ing.Void2^\n\030ReportQpsScenarioService\022B\n\016" + - "ReportScenario\022\034.grpc.testing.ScenarioRe" + - "sult\032\022.grpc.testing.VoidB$\n\030io.grpc.benc" + - "hmarks.protoB\010Servicesb\006proto3" + "\n\033grpc/testing/services.proto\022\014grpc.test" + + "ing\032\033grpc/testing/messages.proto\032\032grpc/t" + + "esting/control.proto2\246\003\n\020BenchmarkServic" + + "e\022F\n\tUnaryCall\022\033.grpc.testing.SimpleRequ" + + "est\032\034.grpc.testing.SimpleResponse\022N\n\rStr" + + "eamingCall\022\033.grpc.testing.SimpleRequest\032" + + "\034.grpc.testing.SimpleResponse(\0010\001\022R\n\023Str" + + "eamingFromClient\022\033.grpc.testing.SimpleRe" + + "quest\032\034.grpc.testing.SimpleResponse(\001\022R\n" + + "\023StreamingFromServer\022\033.grpc.testing.Simp" + + "leRequest\032\034.grpc.testing.SimpleResponse0" + + "\001\022R\n\021StreamingBothWays\022\033.grpc.testing.Si" + + "mpleRequest\032\034.grpc.testing.SimpleRespons" + + "e(\0010\0012\227\002\n\rWorkerService\022E\n\tRunServer\022\030.g" + + "rpc.testing.ServerArgs\032\032.grpc.testing.Se" + + "rverStatus(\0010\001\022E\n\tRunClient\022\030.grpc.testi" + + "ng.ClientArgs\032\032.grpc.testing.ClientStatu" + + "s(\0010\001\022B\n\tCoreCount\022\031.grpc.testing.CoreRe" + + "quest\032\032.grpc.testing.CoreResponse\0224\n\nQui" + + "tWorker\022\022.grpc.testing.Void\032\022.grpc.testi" + + "ng.Void2^\n\030ReportQpsScenarioService\022B\n\016R" + + "eportScenario\022\034.grpc.testing.ScenarioRes" + + "ult\032\022.grpc.testing.VoidB$\n\030io.grpc.bench" + + "marks.protoB\010Servicesb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Stats.java b/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Stats.java index 8337a3364a..2a71076684 100644 --- a/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Stats.java +++ b/benchmarks/src/generated/main/java/io/grpc/benchmarks/proto/Stats.java @@ -1,5 +1,5 @@ // Generated by the protocol buffer compiler. DO NOT EDIT! -// source: stats.proto +// source: grpc/testing/stats.proto package io.grpc.benchmarks.proto; @@ -4365,23 +4365,23 @@ public final class Stats { descriptor; static { java.lang.String[] descriptorData = { - "\n\013stats.proto\022\014grpc.testing\"\221\001\n\013ServerSt" + - "ats\022\024\n\014time_elapsed\030\001 \001(\001\022\021\n\ttime_user\030\002" + - " \001(\001\022\023\n\013time_system\030\003 \001(\001\022\026\n\016total_cpu_t" + - "ime\030\004 \001(\004\022\025\n\ridle_cpu_time\030\005 \001(\004\022\025\n\rcq_p" + - "oll_count\030\006 \001(\004\";\n\017HistogramParams\022\022\n\nre" + - "solution\030\001 \001(\001\022\024\n\014max_possible\030\002 \001(\001\"w\n\r" + - "HistogramData\022\016\n\006bucket\030\001 \003(\r\022\020\n\010min_see" + - "n\030\002 \001(\001\022\020\n\010max_seen\030\003 \001(\001\022\013\n\003sum\030\004 \001(\001\022\026" + - "\n\016sum_of_squares\030\005 \001(\001\022\r\n\005count\030\006 \001(\001\"8\n" + - "\022RequestResultCount\022\023\n\013status_code\030\001 \001(\005" + - "\022\r\n\005count\030\002 \001(\003\"\315\001\n\013ClientStats\022.\n\tlaten" + - "cies\030\001 \001(\0132\033.grpc.testing.HistogramData\022" + - "\024\n\014time_elapsed\030\002 \001(\001\022\021\n\ttime_user\030\003 \001(\001" + - "\022\023\n\013time_system\030\004 \001(\001\0229\n\017request_results" + - "\030\005 \003(\0132 .grpc.testing.RequestResultCount" + - "\022\025\n\rcq_poll_count\030\006 \001(\004B!\n\030io.grpc.bench" + - "marks.protoB\005Statsb\006proto3" + "\n\030grpc/testing/stats.proto\022\014grpc.testing" + + "\"\221\001\n\013ServerStats\022\024\n\014time_elapsed\030\001 \001(\001\022\021" + + "\n\ttime_user\030\002 \001(\001\022\023\n\013time_system\030\003 \001(\001\022\026" + + "\n\016total_cpu_time\030\004 \001(\004\022\025\n\ridle_cpu_time\030" + + "\005 \001(\004\022\025\n\rcq_poll_count\030\006 \001(\004\";\n\017Histogra" + + "mParams\022\022\n\nresolution\030\001 \001(\001\022\024\n\014max_possi" + + "ble\030\002 \001(\001\"w\n\rHistogramData\022\016\n\006bucket\030\001 \003" + + "(\r\022\020\n\010min_seen\030\002 \001(\001\022\020\n\010max_seen\030\003 \001(\001\022\013" + + "\n\003sum\030\004 \001(\001\022\026\n\016sum_of_squares\030\005 \001(\001\022\r\n\005c" + + "ount\030\006 \001(\001\"8\n\022RequestResultCount\022\023\n\013stat" + + "us_code\030\001 \001(\005\022\r\n\005count\030\002 \001(\003\"\315\001\n\013ClientS" + + "tats\022.\n\tlatencies\030\001 \001(\0132\033.grpc.testing.H" + + "istogramData\022\024\n\014time_elapsed\030\002 \001(\001\022\021\n\tti" + + "me_user\030\003 \001(\001\022\023\n\013time_system\030\004 \001(\001\0229\n\017re" + + "quest_results\030\005 \003(\0132 .grpc.testing.Reque" + + "stResultCount\022\025\n\rcq_poll_count\030\006 \001(\004B!\n\030" + + "io.grpc.benchmarks.protoB\005Statsb\006proto3" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { diff --git a/benchmarks/src/main/proto/control.proto b/benchmarks/src/main/proto/grpc/testing/control.proto similarity index 99% rename from benchmarks/src/main/proto/control.proto rename to benchmarks/src/main/proto/grpc/testing/control.proto index 057adf42f2..dce39bab6d 100644 --- a/benchmarks/src/main/proto/control.proto +++ b/benchmarks/src/main/proto/grpc/testing/control.proto @@ -14,8 +14,8 @@ // limitations under the License. syntax = "proto3"; -import "payloads.proto"; -import "stats.proto"; +import "grpc/testing/payloads.proto"; +import "grpc/testing/stats.proto"; package grpc.testing; diff --git a/benchmarks/src/main/proto/messages.proto b/benchmarks/src/main/proto/grpc/testing/messages.proto similarity index 100% rename from benchmarks/src/main/proto/messages.proto rename to benchmarks/src/main/proto/grpc/testing/messages.proto diff --git a/benchmarks/src/main/proto/payloads.proto b/benchmarks/src/main/proto/grpc/testing/payloads.proto similarity index 100% rename from benchmarks/src/main/proto/payloads.proto rename to benchmarks/src/main/proto/grpc/testing/payloads.proto diff --git a/benchmarks/src/main/proto/services.proto b/benchmarks/src/main/proto/grpc/testing/services.proto similarity index 97% rename from benchmarks/src/main/proto/services.proto rename to benchmarks/src/main/proto/grpc/testing/services.proto index e0ba7bab3c..592f5a28d2 100644 --- a/benchmarks/src/main/proto/services.proto +++ b/benchmarks/src/main/proto/grpc/testing/services.proto @@ -16,8 +16,8 @@ // of unary/streaming requests/responses. syntax = "proto3"; -import "messages.proto"; -import "control.proto"; +import "grpc/testing/messages.proto"; +import "grpc/testing/control.proto"; package grpc.testing; diff --git a/benchmarks/src/main/proto/stats.proto b/benchmarks/src/main/proto/grpc/testing/stats.proto similarity index 100% rename from benchmarks/src/main/proto/stats.proto rename to benchmarks/src/main/proto/grpc/testing/stats.proto