From 292cadf847c32018778ce483b8a4859b3f1bccab Mon Sep 17 00:00:00 2001 From: wen_yi Date: Fri, 13 Mar 2020 19:08:23 +0800 Subject: [PATCH] HBASE-23971 protoc warns: "no protobuf syntax specified" --- .../src/main/protobuf/Aggregate.proto | 1 + .../src/main/protobuf/BulkDelete.proto | 2 +- ...olumnAggregationNullResponseProtocol.proto | 2 ++ .../protobuf/ColumnAggregationProtocol.proto | 2 ++ .../ColumnAggregationWithErrorsProtocol.proto | 2 ++ .../protobuf/DummyRegionServerEndpoint.proto | 2 +- hbase-endpoint/src/main/protobuf/Export.proto | 2 +- .../protobuf/IncrementCounterProcessor.proto | 1 + .../src/main/protobuf/SecureBulkLoad.proto | 2 ++ .../src/main/protobuf/Examples.proto | 1 + .../src/main/protobuf/RefreshHFiles.proto | 2 +- .../src/main/protobuf/AccessControl.proto | 1 + hbase-protocol/src/main/protobuf/Admin.proto | 1 + .../src/main/protobuf/Authentication.proto | 1 + hbase-protocol/src/main/protobuf/Cell.proto | 1 + hbase-protocol/src/main/protobuf/Client.proto | 1 + .../src/main/protobuf/ClusterId.proto | 1 + .../src/main/protobuf/ClusterStatus.proto | 1 + .../src/main/protobuf/Comparator.proto | 1 + .../src/main/protobuf/Encryption.proto | 1 + .../src/main/protobuf/ErrorHandling.proto | 1 + hbase-protocol/src/main/protobuf/FS.proto | 1 + hbase-protocol/src/main/protobuf/Filter.proto | 1 + hbase-protocol/src/main/protobuf/HBase.proto | 1 + hbase-protocol/src/main/protobuf/HFile.proto | 2 +- .../src/main/protobuf/LoadBalancer.proto | 1 + .../src/main/protobuf/MapReduce.proto | 1 + .../src/main/protobuf/MultiRowMutation.proto | 1 + .../src/main/protobuf/PingProtocol.proto | 2 ++ hbase-protocol/src/main/protobuf/Quota.proto | 2 +- hbase-protocol/src/main/protobuf/RPC.proto | 1 + .../src/main/protobuf/RSGroup.proto | 2 +- .../src/main/protobuf/RowProcessor.proto | 2 ++ .../src/main/protobuf/Snapshot.proto | 1 + hbase-protocol/src/main/protobuf/Table.proto | 1 + .../src/main/protobuf/TestProcedure.proto | 2 ++ .../src/main/protobuf/Tracing.proto | 1 + .../src/main/protobuf/VisibilityLabels.proto | 1 + hbase-protocol/src/main/protobuf/WAL.proto | 1 + .../src/main/protobuf/ZooKeeper.proto | 1 + hbase-protocol/src/main/protobuf/test.proto | 1 + .../src/main/protobuf/test_rpc_service.proto | 2 ++ .../src/main/protobuf/CellMessage.proto | 35 ++++++++++--------- .../src/main/protobuf/CellSetMessage.proto | 34 +++++++++--------- .../main/protobuf/ColumnSchemaMessage.proto | 35 ++++++++++--------- .../protobuf/NamespacePropertiesMessage.proto | 35 ++++++++++--------- .../src/main/protobuf/NamespacesMessage.proto | 35 ++++++++++--------- .../src/main/protobuf/ScannerMessage.proto | 35 ++++++++++--------- .../StorageClusterStatusMessage.proto | 35 ++++++++++--------- .../src/main/protobuf/TableInfoMessage.proto | 35 ++++++++++--------- .../src/main/protobuf/TableListMessage.proto | 35 ++++++++++--------- .../main/protobuf/TableSchemaMessage.proto | 34 +++++++++--------- .../src/main/protobuf/VersionMessage.proto | 35 ++++++++++--------- .../src/main/protobuf/RSGroupAdmin.proto | 2 +- 54 files changed, 249 insertions(+), 193 deletions(-) diff --git a/hbase-endpoint/src/main/protobuf/Aggregate.proto b/hbase-endpoint/src/main/protobuf/Aggregate.proto index 4d32e709dc7..bf1adcb45cd 100644 --- a/hbase-endpoint/src/main/protobuf/Aggregate.proto +++ b/hbase-endpoint/src/main/protobuf/Aggregate.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; package hbase.pb; option java_package = "org.apache.hadoop.hbase.protobuf.generated"; diff --git a/hbase-endpoint/src/main/protobuf/BulkDelete.proto b/hbase-endpoint/src/main/protobuf/BulkDelete.proto index c2ec8ca3d1d..80b08dc0899 100644 --- a/hbase-endpoint/src/main/protobuf/BulkDelete.proto +++ b/hbase-endpoint/src/main/protobuf/BulkDelete.proto @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +syntax = "proto2"; package hbase.pb; option java_package = "org.apache.hadoop.hbase.coprocessor.example.generated"; diff --git a/hbase-endpoint/src/main/protobuf/ColumnAggregationNullResponseProtocol.proto b/hbase-endpoint/src/main/protobuf/ColumnAggregationNullResponseProtocol.proto index b4dc01e68e3..36c03ee1055 100644 --- a/hbase-endpoint/src/main/protobuf/ColumnAggregationNullResponseProtocol.proto +++ b/hbase-endpoint/src/main/protobuf/ColumnAggregationNullResponseProtocol.proto @@ -15,6 +15,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; + // Coprocessor test option java_package = "org.apache.hadoop.hbase.coprocessor.protobuf.generated"; option java_outer_classname = "ColumnAggregationWithNullResponseProtos"; diff --git a/hbase-endpoint/src/main/protobuf/ColumnAggregationProtocol.proto b/hbase-endpoint/src/main/protobuf/ColumnAggregationProtocol.proto index ad1acdadd21..e7b301de2d4 100644 --- a/hbase-endpoint/src/main/protobuf/ColumnAggregationProtocol.proto +++ b/hbase-endpoint/src/main/protobuf/ColumnAggregationProtocol.proto @@ -15,6 +15,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; + // Coprocessor test option java_package = "org.apache.hadoop.hbase.coprocessor.protobuf.generated"; option java_outer_classname = "ColumnAggregationProtos"; diff --git a/hbase-endpoint/src/main/protobuf/ColumnAggregationWithErrorsProtocol.proto b/hbase-endpoint/src/main/protobuf/ColumnAggregationWithErrorsProtocol.proto index 78089497557..04f07413736 100644 --- a/hbase-endpoint/src/main/protobuf/ColumnAggregationWithErrorsProtocol.proto +++ b/hbase-endpoint/src/main/protobuf/ColumnAggregationWithErrorsProtocol.proto @@ -15,6 +15,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; + // Coprocessor test option java_package = "org.apache.hadoop.hbase.coprocessor.protobuf.generated"; option java_outer_classname = "ColumnAggregationWithErrorsProtos"; diff --git a/hbase-endpoint/src/main/protobuf/DummyRegionServerEndpoint.proto b/hbase-endpoint/src/main/protobuf/DummyRegionServerEndpoint.proto index 88947180781..4225ba418b0 100644 --- a/hbase-endpoint/src/main/protobuf/DummyRegionServerEndpoint.proto +++ b/hbase-endpoint/src/main/protobuf/DummyRegionServerEndpoint.proto @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +syntax = "proto2"; package hbase.test.pb; // Coprocessor test diff --git a/hbase-endpoint/src/main/protobuf/Export.proto b/hbase-endpoint/src/main/protobuf/Export.proto index 5e6c262e8ee..e33a2c000cd 100644 --- a/hbase-endpoint/src/main/protobuf/Export.proto +++ b/hbase-endpoint/src/main/protobuf/Export.proto @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +syntax = "proto2"; package hbase.pb; option java_package = "org.apache.hadoop.hbase.protobuf.generated"; diff --git a/hbase-endpoint/src/main/protobuf/IncrementCounterProcessor.proto b/hbase-endpoint/src/main/protobuf/IncrementCounterProcessor.proto index b8c77caa628..64dce671057 100644 --- a/hbase-endpoint/src/main/protobuf/IncrementCounterProcessor.proto +++ b/hbase-endpoint/src/main/protobuf/IncrementCounterProcessor.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; option java_package = "org.apache.hadoop.hbase.coprocessor.protobuf.generated"; option java_outer_classname = "IncrementCounterProcessorTestProtos"; diff --git a/hbase-endpoint/src/main/protobuf/SecureBulkLoad.proto b/hbase-endpoint/src/main/protobuf/SecureBulkLoad.proto index d86d1621270..c732baaa651 100644 --- a/hbase-endpoint/src/main/protobuf/SecureBulkLoad.proto +++ b/hbase-endpoint/src/main/protobuf/SecureBulkLoad.proto @@ -15,6 +15,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; + package hbase.pb; option java_package = "org.apache.hadoop.hbase.protobuf.generated"; diff --git a/hbase-examples/src/main/protobuf/Examples.proto b/hbase-examples/src/main/protobuf/Examples.proto index ed9ed079c9e..2cada6945e4 100644 --- a/hbase-examples/src/main/protobuf/Examples.proto +++ b/hbase-examples/src/main/protobuf/Examples.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; package hbase.pb; option java_package = "org.apache.hadoop.hbase.coprocessor.example.generated"; diff --git a/hbase-examples/src/main/protobuf/RefreshHFiles.proto b/hbase-examples/src/main/protobuf/RefreshHFiles.proto index 11cbab048bc..3cdc3f9941c 100644 --- a/hbase-examples/src/main/protobuf/RefreshHFiles.proto +++ b/hbase-examples/src/main/protobuf/RefreshHFiles.proto @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +syntax = "proto2"; package hbase.pb; option java_package = "org.apache.hadoop.hbase.protobuf.generated"; diff --git a/hbase-protocol/src/main/protobuf/AccessControl.proto b/hbase-protocol/src/main/protobuf/AccessControl.proto index 502a8d37b29..dc92b1d931d 100644 --- a/hbase-protocol/src/main/protobuf/AccessControl.proto +++ b/hbase-protocol/src/main/protobuf/AccessControl.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; package hbase.pb; option java_package = "org.apache.hadoop.hbase.protobuf.generated"; diff --git a/hbase-protocol/src/main/protobuf/Admin.proto b/hbase-protocol/src/main/protobuf/Admin.proto index 2c1d1749cf6..68194d63b1b 100644 --- a/hbase-protocol/src/main/protobuf/Admin.proto +++ b/hbase-protocol/src/main/protobuf/Admin.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; // This file contains protocol buffers that are used for Admin service. package hbase.pb; diff --git a/hbase-protocol/src/main/protobuf/Authentication.proto b/hbase-protocol/src/main/protobuf/Authentication.proto index 2f64799f283..aa0211f7b48 100644 --- a/hbase-protocol/src/main/protobuf/Authentication.proto +++ b/hbase-protocol/src/main/protobuf/Authentication.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; package hbase.pb; option java_package = "org.apache.hadoop.hbase.protobuf.generated"; diff --git a/hbase-protocol/src/main/protobuf/Cell.proto b/hbase-protocol/src/main/protobuf/Cell.proto index e518e658f63..f9628081897 100644 --- a/hbase-protocol/src/main/protobuf/Cell.proto +++ b/hbase-protocol/src/main/protobuf/Cell.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; // Cell and KeyValue protos package hbase.pb; diff --git a/hbase-protocol/src/main/protobuf/Client.proto b/hbase-protocol/src/main/protobuf/Client.proto index b9855820f53..9f66f702627 100644 --- a/hbase-protocol/src/main/protobuf/Client.proto +++ b/hbase-protocol/src/main/protobuf/Client.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; // This file contains protocol buffers that are used for Client service. package hbase.pb; diff --git a/hbase-protocol/src/main/protobuf/ClusterId.proto b/hbase-protocol/src/main/protobuf/ClusterId.proto index aed8cfcab27..8d916a690fd 100644 --- a/hbase-protocol/src/main/protobuf/ClusterId.proto +++ b/hbase-protocol/src/main/protobuf/ClusterId.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; // This file contains protocol buffers that are shared throughout HBase package hbase.pb; diff --git a/hbase-protocol/src/main/protobuf/ClusterStatus.proto b/hbase-protocol/src/main/protobuf/ClusterStatus.proto index 13ec5b7b36f..18f580c421a 100644 --- a/hbase-protocol/src/main/protobuf/ClusterStatus.proto +++ b/hbase-protocol/src/main/protobuf/ClusterStatus.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; // This file contains protocol buffers that are used for ClustStatus package hbase.pb; diff --git a/hbase-protocol/src/main/protobuf/Comparator.proto b/hbase-protocol/src/main/protobuf/Comparator.proto index 802021f7ccd..0a59cf3874b 100644 --- a/hbase-protocol/src/main/protobuf/Comparator.proto +++ b/hbase-protocol/src/main/protobuf/Comparator.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; // This file contains protocol buffers that are used for filters package hbase.pb; diff --git a/hbase-protocol/src/main/protobuf/Encryption.proto b/hbase-protocol/src/main/protobuf/Encryption.proto index 97ab5b24939..e08ca2b0481 100644 --- a/hbase-protocol/src/main/protobuf/Encryption.proto +++ b/hbase-protocol/src/main/protobuf/Encryption.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; // This file contains protocol buffers used for encryption package hbase.pb; diff --git a/hbase-protocol/src/main/protobuf/ErrorHandling.proto b/hbase-protocol/src/main/protobuf/ErrorHandling.proto index be9a7437d44..c57a6d25250 100644 --- a/hbase-protocol/src/main/protobuf/ErrorHandling.proto +++ b/hbase-protocol/src/main/protobuf/ErrorHandling.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; // This file contains protocol buffers that are used for error handling package hbase.pb; diff --git a/hbase-protocol/src/main/protobuf/FS.proto b/hbase-protocol/src/main/protobuf/FS.proto index 9e931205cd6..090617972fa 100644 --- a/hbase-protocol/src/main/protobuf/FS.proto +++ b/hbase-protocol/src/main/protobuf/FS.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; // This file contains protocol buffers that are written into the filesystem package hbase.pb; diff --git a/hbase-protocol/src/main/protobuf/Filter.proto b/hbase-protocol/src/main/protobuf/Filter.proto index 8a0a9bf5029..0b4c2013f4c 100644 --- a/hbase-protocol/src/main/protobuf/Filter.proto +++ b/hbase-protocol/src/main/protobuf/Filter.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; // This file contains protocol buffers that are used for filters package hbase.pb; diff --git a/hbase-protocol/src/main/protobuf/HBase.proto b/hbase-protocol/src/main/protobuf/HBase.proto index 5cf509d4183..ecfdc8c2c79 100644 --- a/hbase-protocol/src/main/protobuf/HBase.proto +++ b/hbase-protocol/src/main/protobuf/HBase.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; // This file contains protocol buffers that are shared throughout HBase package hbase.pb; diff --git a/hbase-protocol/src/main/protobuf/HFile.proto b/hbase-protocol/src/main/protobuf/HFile.proto index 5c5e4f38f5b..5a26522816f 100644 --- a/hbase-protocol/src/main/protobuf/HFile.proto +++ b/hbase-protocol/src/main/protobuf/HFile.proto @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +syntax = "proto2"; package hbase.pb; option java_package = "org.apache.hadoop.hbase.protobuf.generated"; diff --git a/hbase-protocol/src/main/protobuf/LoadBalancer.proto b/hbase-protocol/src/main/protobuf/LoadBalancer.proto index f9c5d0d73cf..0c0882170c7 100644 --- a/hbase-protocol/src/main/protobuf/LoadBalancer.proto +++ b/hbase-protocol/src/main/protobuf/LoadBalancer.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; // This file contains protocol buffers to represent the state of the load balancer. package hbase.pb; diff --git a/hbase-protocol/src/main/protobuf/MapReduce.proto b/hbase-protocol/src/main/protobuf/MapReduce.proto index f96ffdffff2..7fb6850539f 100644 --- a/hbase-protocol/src/main/protobuf/MapReduce.proto +++ b/hbase-protocol/src/main/protobuf/MapReduce.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; //This file includes protocol buffers used in MapReduce only. package hbase.pb; diff --git a/hbase-protocol/src/main/protobuf/MultiRowMutation.proto b/hbase-protocol/src/main/protobuf/MultiRowMutation.proto index f55739fee01..d3140e9b2e0 100644 --- a/hbase-protocol/src/main/protobuf/MultiRowMutation.proto +++ b/hbase-protocol/src/main/protobuf/MultiRowMutation.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; package hbase.pb; import "Client.proto"; diff --git a/hbase-protocol/src/main/protobuf/PingProtocol.proto b/hbase-protocol/src/main/protobuf/PingProtocol.proto index ef63ee0d477..9a645994886 100644 --- a/hbase-protocol/src/main/protobuf/PingProtocol.proto +++ b/hbase-protocol/src/main/protobuf/PingProtocol.proto @@ -15,6 +15,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; + // Coprocessor test option java_package = "org.apache.hadoop.hbase.coprocessor.protobuf.generated"; option java_outer_classname = "PingProtos"; diff --git a/hbase-protocol/src/main/protobuf/Quota.proto b/hbase-protocol/src/main/protobuf/Quota.proto index 8e5c17ccf8d..fa5462c5f1b 100644 --- a/hbase-protocol/src/main/protobuf/Quota.proto +++ b/hbase-protocol/src/main/protobuf/Quota.proto @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +syntax = "proto2"; package hbase.pb; option java_package = "org.apache.hadoop.hbase.protobuf.generated"; diff --git a/hbase-protocol/src/main/protobuf/RPC.proto b/hbase-protocol/src/main/protobuf/RPC.proto index 8413d2590f3..25e051430e2 100644 --- a/hbase-protocol/src/main/protobuf/RPC.proto +++ b/hbase-protocol/src/main/protobuf/RPC.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; package hbase.pb; import "Tracing.proto"; diff --git a/hbase-protocol/src/main/protobuf/RSGroup.proto b/hbase-protocol/src/main/protobuf/RSGroup.proto index b88e82cfea9..ba8217515ec 100644 --- a/hbase-protocol/src/main/protobuf/RSGroup.proto +++ b/hbase-protocol/src/main/protobuf/RSGroup.proto @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +syntax = "proto2"; package hbase.pb; option java_package = "org.apache.hadoop.hbase.protobuf.generated"; diff --git a/hbase-protocol/src/main/protobuf/RowProcessor.proto b/hbase-protocol/src/main/protobuf/RowProcessor.proto index cf2f30f3529..b2ed362df74 100644 --- a/hbase-protocol/src/main/protobuf/RowProcessor.proto +++ b/hbase-protocol/src/main/protobuf/RowProcessor.proto @@ -15,6 +15,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; + /** * Defines a protocol to perform multi row transactions. * See BaseRowProcessorEndpoint for the implementation. diff --git a/hbase-protocol/src/main/protobuf/Snapshot.proto b/hbase-protocol/src/main/protobuf/Snapshot.proto index ae1a1e680ac..59a65a9a662 100644 --- a/hbase-protocol/src/main/protobuf/Snapshot.proto +++ b/hbase-protocol/src/main/protobuf/Snapshot.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; package hbase.pb; option java_package = "org.apache.hadoop.hbase.protobuf.generated"; diff --git a/hbase-protocol/src/main/protobuf/Table.proto b/hbase-protocol/src/main/protobuf/Table.proto index 4452eb2de30..1fde8691c12 100644 --- a/hbase-protocol/src/main/protobuf/Table.proto +++ b/hbase-protocol/src/main/protobuf/Table.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; // This file contains protocol buffers that are shared throughout HBase package hbase.pb; diff --git a/hbase-protocol/src/main/protobuf/TestProcedure.proto b/hbase-protocol/src/main/protobuf/TestProcedure.proto index de74f367c61..982ea674b40 100644 --- a/hbase-protocol/src/main/protobuf/TestProcedure.proto +++ b/hbase-protocol/src/main/protobuf/TestProcedure.proto @@ -15,6 +15,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; + option java_package = "org.apache.hadoop.hbase.ipc.protobuf.generated"; option java_outer_classname = "TestProcedureProtos"; option java_generic_services = true; diff --git a/hbase-protocol/src/main/protobuf/Tracing.proto b/hbase-protocol/src/main/protobuf/Tracing.proto index 5a64cfce7e3..4fa1ab8c12d 100644 --- a/hbase-protocol/src/main/protobuf/Tracing.proto +++ b/hbase-protocol/src/main/protobuf/Tracing.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; package hbase.pb; option java_package = "org.apache.hadoop.hbase.protobuf.generated"; diff --git a/hbase-protocol/src/main/protobuf/VisibilityLabels.proto b/hbase-protocol/src/main/protobuf/VisibilityLabels.proto index d2dc44d30cf..68003fe6e93 100644 --- a/hbase-protocol/src/main/protobuf/VisibilityLabels.proto +++ b/hbase-protocol/src/main/protobuf/VisibilityLabels.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; package hbase.pb; option java_package = "org.apache.hadoop.hbase.protobuf.generated"; diff --git a/hbase-protocol/src/main/protobuf/WAL.proto b/hbase-protocol/src/main/protobuf/WAL.proto index 50c3b1987c4..3e0b15cb169 100644 --- a/hbase-protocol/src/main/protobuf/WAL.proto +++ b/hbase-protocol/src/main/protobuf/WAL.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; package hbase.pb; option java_package = "org.apache.hadoop.hbase.protobuf.generated"; diff --git a/hbase-protocol/src/main/protobuf/ZooKeeper.proto b/hbase-protocol/src/main/protobuf/ZooKeeper.proto index 955b5fd3e88..c0f40e970ee 100644 --- a/hbase-protocol/src/main/protobuf/ZooKeeper.proto +++ b/hbase-protocol/src/main/protobuf/ZooKeeper.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; // ZNode data in hbase are serialized protobufs with a four byte // 'magic' 'PBUF' prefix. diff --git a/hbase-protocol/src/main/protobuf/test.proto b/hbase-protocol/src/main/protobuf/test.proto index 72b68e9aae6..89d47865c39 100644 --- a/hbase-protocol/src/main/protobuf/test.proto +++ b/hbase-protocol/src/main/protobuf/test.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; option java_package = "org.apache.hadoop.hbase.ipc.protobuf.generated"; option java_outer_classname = "TestProtos"; diff --git a/hbase-protocol/src/main/protobuf/test_rpc_service.proto b/hbase-protocol/src/main/protobuf/test_rpc_service.proto index 5f91dc4df4c..7c67ef2dd43 100644 --- a/hbase-protocol/src/main/protobuf/test_rpc_service.proto +++ b/hbase-protocol/src/main/protobuf/test_rpc_service.proto @@ -15,6 +15,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; + option java_package = "org.apache.hadoop.hbase.ipc.protobuf.generated"; option java_outer_classname = "TestRpcServiceProtos"; option java_generic_services = true; diff --git a/hbase-rest/src/main/protobuf/CellMessage.proto b/hbase-rest/src/main/protobuf/CellMessage.proto index 8d4515417f0..0170be8fe23 100644 --- a/hbase-rest/src/main/protobuf/CellMessage.proto +++ b/hbase-rest/src/main/protobuf/CellMessage.proto @@ -1,20 +1,21 @@ -// -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +syntax = "proto2"; package org.apache.hadoop.hbase.rest.protobuf.generated; message Cell { diff --git a/hbase-rest/src/main/protobuf/CellSetMessage.proto b/hbase-rest/src/main/protobuf/CellSetMessage.proto index 4774a8d0e8f..e65c9d5fa6c 100644 --- a/hbase-rest/src/main/protobuf/CellSetMessage.proto +++ b/hbase-rest/src/main/protobuf/CellSetMessage.proto @@ -1,19 +1,21 @@ -// -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +syntax = "proto2"; import "CellMessage.proto"; diff --git a/hbase-rest/src/main/protobuf/ColumnSchemaMessage.proto b/hbase-rest/src/main/protobuf/ColumnSchemaMessage.proto index 05e33b64832..c6c957d82b2 100644 --- a/hbase-rest/src/main/protobuf/ColumnSchemaMessage.proto +++ b/hbase-rest/src/main/protobuf/ColumnSchemaMessage.proto @@ -1,20 +1,21 @@ -// -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +syntax = "proto2"; package org.apache.hadoop.hbase.rest.protobuf.generated; message ColumnSchema { diff --git a/hbase-rest/src/main/protobuf/NamespacePropertiesMessage.proto b/hbase-rest/src/main/protobuf/NamespacePropertiesMessage.proto index 3e000753f81..5858aefc39d 100644 --- a/hbase-rest/src/main/protobuf/NamespacePropertiesMessage.proto +++ b/hbase-rest/src/main/protobuf/NamespacePropertiesMessage.proto @@ -1,20 +1,21 @@ -// -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +syntax = "proto2"; package org.apache.hadoop.hbase.rest.protobuf.generated; message NamespaceProperties { diff --git a/hbase-rest/src/main/protobuf/NamespacesMessage.proto b/hbase-rest/src/main/protobuf/NamespacesMessage.proto index 2c5cbb33c0d..a0f39810e93 100644 --- a/hbase-rest/src/main/protobuf/NamespacesMessage.proto +++ b/hbase-rest/src/main/protobuf/NamespacesMessage.proto @@ -1,20 +1,21 @@ -// -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +syntax = "proto2"; package org.apache.hadoop.hbase.rest.protobuf.generated; message Namespaces { diff --git a/hbase-rest/src/main/protobuf/ScannerMessage.proto b/hbase-rest/src/main/protobuf/ScannerMessage.proto index 185eac68421..08e34081ca4 100644 --- a/hbase-rest/src/main/protobuf/ScannerMessage.proto +++ b/hbase-rest/src/main/protobuf/ScannerMessage.proto @@ -1,20 +1,21 @@ -// -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +syntax = "proto2"; package org.apache.hadoop.hbase.rest.protobuf.generated; message Scanner { diff --git a/hbase-rest/src/main/protobuf/StorageClusterStatusMessage.proto b/hbase-rest/src/main/protobuf/StorageClusterStatusMessage.proto index f03a6bc3997..d4959875b8b 100644 --- a/hbase-rest/src/main/protobuf/StorageClusterStatusMessage.proto +++ b/hbase-rest/src/main/protobuf/StorageClusterStatusMessage.proto @@ -1,20 +1,21 @@ -// -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +syntax = "proto2"; package org.apache.hadoop.hbase.rest.protobuf.generated; message StorageClusterStatus { diff --git a/hbase-rest/src/main/protobuf/TableInfoMessage.proto b/hbase-rest/src/main/protobuf/TableInfoMessage.proto index 674499c2687..d0b1121d5e0 100644 --- a/hbase-rest/src/main/protobuf/TableInfoMessage.proto +++ b/hbase-rest/src/main/protobuf/TableInfoMessage.proto @@ -1,20 +1,21 @@ -// -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +syntax = "proto2"; package org.apache.hadoop.hbase.rest.protobuf.generated; message TableInfo { diff --git a/hbase-rest/src/main/protobuf/TableListMessage.proto b/hbase-rest/src/main/protobuf/TableListMessage.proto index fbd76ea029a..643994811b0 100644 --- a/hbase-rest/src/main/protobuf/TableListMessage.proto +++ b/hbase-rest/src/main/protobuf/TableListMessage.proto @@ -1,20 +1,21 @@ -// -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +syntax = "proto2"; package org.apache.hadoop.hbase.rest.protobuf.generated; message TableList { diff --git a/hbase-rest/src/main/protobuf/TableSchemaMessage.proto b/hbase-rest/src/main/protobuf/TableSchemaMessage.proto index 47a4da589b9..d918cbabe57 100644 --- a/hbase-rest/src/main/protobuf/TableSchemaMessage.proto +++ b/hbase-rest/src/main/protobuf/TableSchemaMessage.proto @@ -1,19 +1,21 @@ -// -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +syntax = "proto2"; import "ColumnSchemaMessage.proto"; diff --git a/hbase-rest/src/main/protobuf/VersionMessage.proto b/hbase-rest/src/main/protobuf/VersionMessage.proto index cc107b3d9a6..8f5ddeb9c4c 100644 --- a/hbase-rest/src/main/protobuf/VersionMessage.proto +++ b/hbase-rest/src/main/protobuf/VersionMessage.proto @@ -1,20 +1,21 @@ -// -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - +/** + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +syntax = "proto2"; package org.apache.hadoop.hbase.rest.protobuf.generated; message Version { diff --git a/hbase-rsgroup/src/main/protobuf/RSGroupAdmin.proto b/hbase-rsgroup/src/main/protobuf/RSGroupAdmin.proto index fbd55ad2213..316b06f55c9 100644 --- a/hbase-rsgroup/src/main/protobuf/RSGroupAdmin.proto +++ b/hbase-rsgroup/src/main/protobuf/RSGroupAdmin.proto @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +syntax = "proto2"; package hbase.pb; option java_package = "org.apache.hadoop.hbase.protobuf.generated";