From 6865cbce1bca87e717e1a343c4314d817241e6c8 Mon Sep 17 00:00:00 2001 From: Nick Dimiduk Date: Mon, 6 Dec 2021 12:14:02 -0800 Subject: [PATCH] HBASE-26542 Apply a `package` to test protobuf files This is needed in a couple places in order to test that traces over the IPC layer carry correct span names, and it's good hygiene anyway. Signed-off-by: Duo Zhang --- .../test/coprocessor/ColumnAggregationNullResponseProtocol.proto | 1 + .../protobuf/test/coprocessor/ColumnAggregationProtocol.proto | 1 + .../test/coprocessor/ColumnAggregationWithErrorsProtocol.proto | 1 + .../protobuf/test/coprocessor/IncrementCounterProcessor.proto | 1 + .../src/main/protobuf/test/coprocessor/PingProtocol.proto | 1 + .../src/main/protobuf/test/coprocessor/ShellExecEndpoint.proto | 1 + .../src/main/protobuf/test/ipc/TestProcedure.proto | 1 + hbase-protocol-shaded/src/main/protobuf/test/ipc/test.proto | 1 + .../src/main/protobuf/test/ipc/test_rpc_service.proto | 1 + 9 files changed, 9 insertions(+) diff --git a/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/ColumnAggregationNullResponseProtocol.proto b/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/ColumnAggregationNullResponseProtocol.proto index a59fa9da8e31..01f0545b3889 100644 --- a/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/ColumnAggregationNullResponseProtocol.proto +++ b/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/ColumnAggregationNullResponseProtocol.proto @@ -16,6 +16,7 @@ * limitations under the License. */ syntax = "proto2"; +package hbase.test.pb; // Coprocessor test option java_package = "org.apache.hadoop.hbase.shaded.coprocessor.protobuf.generated"; diff --git a/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/ColumnAggregationProtocol.proto b/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/ColumnAggregationProtocol.proto index 760c993ff374..0c9acdd48180 100644 --- a/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/ColumnAggregationProtocol.proto +++ b/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/ColumnAggregationProtocol.proto @@ -16,6 +16,7 @@ * limitations under the License. */ syntax = "proto2"; +package hbase.test.pb; // Coprocessor test option java_package = "org.apache.hadoop.hbase.shaded.coprocessor.protobuf.generated"; diff --git a/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/ColumnAggregationWithErrorsProtocol.proto b/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/ColumnAggregationWithErrorsProtocol.proto index d34f2aa411f6..c15b934eff93 100644 --- a/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/ColumnAggregationWithErrorsProtocol.proto +++ b/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/ColumnAggregationWithErrorsProtocol.proto @@ -16,6 +16,7 @@ * limitations under the License. */ syntax = "proto2"; +package hbase.test.pb; // Coprocessor test option java_package = "org.apache.hadoop.hbase.shaded.coprocessor.protobuf.generated"; diff --git a/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/IncrementCounterProcessor.proto b/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/IncrementCounterProcessor.proto index dfda82d83adc..d56938c06f6e 100644 --- a/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/IncrementCounterProcessor.proto +++ b/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/IncrementCounterProcessor.proto @@ -16,6 +16,7 @@ * limitations under the License. */ syntax = "proto2"; +package hbase.test.pb; option java_package = "org.apache.hadoop.hbase.shaded.coprocessor.protobuf.generated"; option java_outer_classname = "IncrementCounterProcessorTestProtos"; diff --git a/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/PingProtocol.proto b/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/PingProtocol.proto index ad148d2d1058..d6d9284d4a0b 100644 --- a/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/PingProtocol.proto +++ b/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/PingProtocol.proto @@ -17,6 +17,7 @@ */ // Coprocessor test syntax = "proto2"; +package hbase.test.pb; option java_package = "org.apache.hadoop.hbase.shaded.coprocessor.protobuf.generated"; option java_outer_classname = "PingProtos"; option java_generic_services = true; diff --git a/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/ShellExecEndpoint.proto b/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/ShellExecEndpoint.proto index 96c72da13c02..fdc890e082a6 100644 --- a/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/ShellExecEndpoint.proto +++ b/hbase-protocol-shaded/src/main/protobuf/test/coprocessor/ShellExecEndpoint.proto @@ -21,6 +21,7 @@ */ syntax = "proto2"; +package hbase.test.pb; option java_package = "org.apache.hadoop.hbase.coprocessor.protobuf.generated"; option java_outer_classname = "ShellExecEndpoint"; option java_generic_services = true; diff --git a/hbase-protocol-shaded/src/main/protobuf/test/ipc/TestProcedure.proto b/hbase-protocol-shaded/src/main/protobuf/test/ipc/TestProcedure.proto index e927e4b80197..5f031ade3db9 100644 --- a/hbase-protocol-shaded/src/main/protobuf/test/ipc/TestProcedure.proto +++ b/hbase-protocol-shaded/src/main/protobuf/test/ipc/TestProcedure.proto @@ -16,6 +16,7 @@ * limitations under the License. */ syntax = "proto2"; +package hbase.test.pb; option java_package = "org.apache.hadoop.hbase.shaded.ipc.protobuf.generated"; option java_outer_classname = "TestProcedureProtos"; option java_generic_services = true; diff --git a/hbase-protocol-shaded/src/main/protobuf/test/ipc/test.proto b/hbase-protocol-shaded/src/main/protobuf/test/ipc/test.proto index 5101644138d0..7b342ea1027b 100644 --- a/hbase-protocol-shaded/src/main/protobuf/test/ipc/test.proto +++ b/hbase-protocol-shaded/src/main/protobuf/test/ipc/test.proto @@ -16,6 +16,7 @@ * limitations under the License. */ syntax = "proto2"; +package hbase.test.pb; option java_package = "org.apache.hadoop.hbase.shaded.ipc.protobuf.generated"; option java_outer_classname = "TestProtos"; diff --git a/hbase-protocol-shaded/src/main/protobuf/test/ipc/test_rpc_service.proto b/hbase-protocol-shaded/src/main/protobuf/test/ipc/test_rpc_service.proto index 2dcf1d8d09bb..46681fcbd110 100644 --- a/hbase-protocol-shaded/src/main/protobuf/test/ipc/test_rpc_service.proto +++ b/hbase-protocol-shaded/src/main/protobuf/test/ipc/test_rpc_service.proto @@ -16,6 +16,7 @@ * limitations under the License. */ syntax = "proto2"; +package hbase.test.pb; option java_package = "org.apache.hadoop.hbase.shaded.ipc.protobuf.generated"; option java_outer_classname = "TestRpcServiceProtos"; option java_generic_services = true;