From 97b172e11451c3409a6c16b6571f3a85a94c7ac8 Mon Sep 17 00:00:00 2001 From: Sean Busbey Date: Fri, 22 Sep 2017 15:35:47 -0500 Subject: [PATCH] HBASE-18866 clean up warnings about proto syntax --- hbase-protocol-shaded/src/main/protobuf/AccessControl.proto | 1 + hbase-protocol-shaded/src/main/protobuf/Admin.proto | 2 +- hbase-protocol-shaded/src/main/protobuf/Backup.proto | 4 ++-- hbase-protocol-shaded/src/main/protobuf/Cell.proto | 2 +- hbase-protocol-shaded/src/main/protobuf/Client.proto | 2 +- hbase-protocol-shaded/src/main/protobuf/ClusterId.proto | 2 +- hbase-protocol-shaded/src/main/protobuf/ClusterStatus.proto | 2 +- hbase-protocol-shaded/src/main/protobuf/Comparator.proto | 1 + hbase-protocol-shaded/src/main/protobuf/Encryption.proto | 1 + hbase-protocol-shaded/src/main/protobuf/ErrorHandling.proto | 1 + hbase-protocol-shaded/src/main/protobuf/FS.proto | 1 + hbase-protocol-shaded/src/main/protobuf/Filter.proto | 1 + hbase-protocol-shaded/src/main/protobuf/HBase.proto | 1 + hbase-protocol-shaded/src/main/protobuf/HFile.proto | 1 + hbase-protocol-shaded/src/main/protobuf/LoadBalancer.proto | 1 + hbase-protocol-shaded/src/main/protobuf/LockService.proto | 1 + hbase-protocol-shaded/src/main/protobuf/MapReduce.proto | 1 + hbase-protocol-shaded/src/main/protobuf/Master.proto | 1 + hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto | 1 + hbase-protocol-shaded/src/main/protobuf/Procedure.proto | 1 + hbase-protocol-shaded/src/main/protobuf/Quota.proto | 1 + hbase-protocol-shaded/src/main/protobuf/RPC.proto | 1 + hbase-protocol-shaded/src/main/protobuf/RegionNormalizer.proto | 1 + hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto | 1 + hbase-protocol-shaded/src/main/protobuf/Replication.proto | 1 + hbase-protocol-shaded/src/main/protobuf/Snapshot.proto | 1 + hbase-protocol-shaded/src/main/protobuf/TestProcedure.proto | 1 + hbase-protocol-shaded/src/main/protobuf/Tracing.proto | 1 + hbase-protocol-shaded/src/main/protobuf/WAL.proto | 1 + hbase-protocol-shaded/src/main/protobuf/ZooKeeper.proto | 1 + hbase-protocol-shaded/src/main/protobuf/test.proto | 1 + hbase-protocol-shaded/src/main/protobuf/test_rpc_service.proto | 1 + 32 files changed, 33 insertions(+), 7 deletions(-) diff --git a/hbase-protocol-shaded/src/main/protobuf/AccessControl.proto b/hbase-protocol-shaded/src/main/protobuf/AccessControl.proto index 39143e25b3..3b0e9bbffd 100644 --- a/hbase-protocol-shaded/src/main/protobuf/AccessControl.proto +++ b/hbase-protocol-shaded/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.shaded.protobuf.generated"; diff --git a/hbase-protocol-shaded/src/main/protobuf/Admin.proto b/hbase-protocol-shaded/src/main/protobuf/Admin.proto index 62aac9aa13..dc4e324f9e 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Admin.proto +++ b/hbase-protocol-shaded/src/main/protobuf/Admin.proto @@ -15,7 +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-shaded/src/main/protobuf/Backup.proto b/hbase-protocol-shaded/src/main/protobuf/Backup.proto index 241d42a8b7..6084e17bcd 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Backup.proto +++ b/hbase-protocol-shaded/src/main/protobuf/Backup.proto @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - +syntax = "proto2"; // This file contains Backup manifest package hbase.pb; @@ -114,4 +114,4 @@ message BackupInfo { INCREMENTAL_COPY = 4; STORE_MANIFEST = 5; } -} \ No newline at end of file +} diff --git a/hbase-protocol-shaded/src/main/protobuf/Cell.proto b/hbase-protocol-shaded/src/main/protobuf/Cell.proto index 82c960f984..0e9eb94b5e 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Cell.proto +++ b/hbase-protocol-shaded/src/main/protobuf/Cell.proto @@ -15,7 +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-shaded/src/main/protobuf/Client.proto b/hbase-protocol-shaded/src/main/protobuf/Client.proto index 14d2b4c071..e5c843f285 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Client.proto +++ b/hbase-protocol-shaded/src/main/protobuf/Client.proto @@ -15,7 +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-shaded/src/main/protobuf/ClusterId.proto b/hbase-protocol-shaded/src/main/protobuf/ClusterId.proto index a69b09ee77..d452aa5540 100644 --- a/hbase-protocol-shaded/src/main/protobuf/ClusterId.proto +++ b/hbase-protocol-shaded/src/main/protobuf/ClusterId.proto @@ -15,7 +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-shaded/src/main/protobuf/ClusterStatus.proto b/hbase-protocol-shaded/src/main/protobuf/ClusterStatus.proto index 52fcc3ebbf..2fb221b844 100644 --- a/hbase-protocol-shaded/src/main/protobuf/ClusterStatus.proto +++ b/hbase-protocol-shaded/src/main/protobuf/ClusterStatus.proto @@ -15,7 +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-shaded/src/main/protobuf/Comparator.proto b/hbase-protocol-shaded/src/main/protobuf/Comparator.proto index 5e1e2daeb2..822fd2b1f9 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Comparator.proto +++ b/hbase-protocol-shaded/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-shaded/src/main/protobuf/Encryption.proto b/hbase-protocol-shaded/src/main/protobuf/Encryption.proto index d9ad575cb9..d0b445c0aa 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Encryption.proto +++ b/hbase-protocol-shaded/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-shaded/src/main/protobuf/ErrorHandling.proto b/hbase-protocol-shaded/src/main/protobuf/ErrorHandling.proto index b08b3b3df9..367fd85f36 100644 --- a/hbase-protocol-shaded/src/main/protobuf/ErrorHandling.proto +++ b/hbase-protocol-shaded/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-shaded/src/main/protobuf/FS.proto b/hbase-protocol-shaded/src/main/protobuf/FS.proto index 2ef59e2077..f32aa04170 100644 --- a/hbase-protocol-shaded/src/main/protobuf/FS.proto +++ b/hbase-protocol-shaded/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-shaded/src/main/protobuf/Filter.proto b/hbase-protocol-shaded/src/main/protobuf/Filter.proto index 39a7d515c0..743498532b 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Filter.proto +++ b/hbase-protocol-shaded/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-shaded/src/main/protobuf/HBase.proto b/hbase-protocol-shaded/src/main/protobuf/HBase.proto index 10742ad517..9de897a7be 100644 --- a/hbase-protocol-shaded/src/main/protobuf/HBase.proto +++ b/hbase-protocol-shaded/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-shaded/src/main/protobuf/HFile.proto b/hbase-protocol-shaded/src/main/protobuf/HFile.proto index c88ef17557..33f89a2832 100644 --- a/hbase-protocol-shaded/src/main/protobuf/HFile.proto +++ b/hbase-protocol-shaded/src/main/protobuf/HFile.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; package hbase.pb; diff --git a/hbase-protocol-shaded/src/main/protobuf/LoadBalancer.proto b/hbase-protocol-shaded/src/main/protobuf/LoadBalancer.proto index 857d2b6910..2a75ca47e6 100644 --- a/hbase-protocol-shaded/src/main/protobuf/LoadBalancer.proto +++ b/hbase-protocol-shaded/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-shaded/src/main/protobuf/LockService.proto b/hbase-protocol-shaded/src/main/protobuf/LockService.proto index 567dee7f47..b8d180cbb3 100644 --- a/hbase-protocol-shaded/src/main/protobuf/LockService.proto +++ b/hbase-protocol-shaded/src/main/protobuf/LockService.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; package hbase.pb; diff --git a/hbase-protocol-shaded/src/main/protobuf/MapReduce.proto b/hbase-protocol-shaded/src/main/protobuf/MapReduce.proto index 26bade58c8..2496fa73a4 100644 --- a/hbase-protocol-shaded/src/main/protobuf/MapReduce.proto +++ b/hbase-protocol-shaded/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-shaded/src/main/protobuf/Master.proto b/hbase-protocol-shaded/src/main/protobuf/Master.proto index 6b16bf8bee..0a13e22102 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Master.proto +++ b/hbase-protocol-shaded/src/main/protobuf/Master.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; // All to do with the Master. Includes schema management since these // changes are run by the Master process. diff --git a/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto b/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto index 70753c689c..2cdebb1e58 100644 --- a/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.proto +++ b/hbase-protocol-shaded/src/main/protobuf/MasterProcedure.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.shaded.protobuf.generated"; diff --git a/hbase-protocol-shaded/src/main/protobuf/Procedure.proto b/hbase-protocol-shaded/src/main/protobuf/Procedure.proto index c13a37ec55..2c5f1aad27 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Procedure.proto +++ b/hbase-protocol-shaded/src/main/protobuf/Procedure.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.shaded.protobuf.generated"; diff --git a/hbase-protocol-shaded/src/main/protobuf/Quota.proto b/hbase-protocol-shaded/src/main/protobuf/Quota.proto index 0d7443524f..cd4c7df0b7 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Quota.proto +++ b/hbase-protocol-shaded/src/main/protobuf/Quota.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; package hbase.pb; diff --git a/hbase-protocol-shaded/src/main/protobuf/RPC.proto b/hbase-protocol-shaded/src/main/protobuf/RPC.proto index 9cdf98c7bd..1ccf6e84ee 100644 --- a/hbase-protocol-shaded/src/main/protobuf/RPC.proto +++ b/hbase-protocol-shaded/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-shaded/src/main/protobuf/RegionNormalizer.proto b/hbase-protocol-shaded/src/main/protobuf/RegionNormalizer.proto index ed7a9ec462..c5a1d41956 100644 --- a/hbase-protocol-shaded/src/main/protobuf/RegionNormalizer.proto +++ b/hbase-protocol-shaded/src/main/protobuf/RegionNormalizer.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. diff --git a/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto b/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto index 7d35df019d..1cd4376e8a 100644 --- a/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.proto +++ b/hbase-protocol-shaded/src/main/protobuf/RegionServerStatus.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 RegionServerStatusProtocol. package hbase.pb; diff --git a/hbase-protocol-shaded/src/main/protobuf/Replication.proto b/hbase-protocol-shaded/src/main/protobuf/Replication.proto index 4cb4436bed..7e78144cb2 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Replication.proto +++ b/hbase-protocol-shaded/src/main/protobuf/Replication.proto @@ -15,6 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ +syntax = "proto2"; package hbase.pb; diff --git a/hbase-protocol-shaded/src/main/protobuf/Snapshot.proto b/hbase-protocol-shaded/src/main/protobuf/Snapshot.proto index 595a8cf875..479e33ee54 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Snapshot.proto +++ b/hbase-protocol-shaded/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.shaded.protobuf.generated"; diff --git a/hbase-protocol-shaded/src/main/protobuf/TestProcedure.proto b/hbase-protocol-shaded/src/main/protobuf/TestProcedure.proto index 1b21e8e8ba..e927e4b801 100644 --- a/hbase-protocol-shaded/src/main/protobuf/TestProcedure.proto +++ b/hbase-protocol-shaded/src/main/protobuf/TestProcedure.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.shaded.ipc.protobuf.generated"; option java_outer_classname = "TestProcedureProtos"; option java_generic_services = true; diff --git a/hbase-protocol-shaded/src/main/protobuf/Tracing.proto b/hbase-protocol-shaded/src/main/protobuf/Tracing.proto index 3ec10a8bf8..64ead844d9 100644 --- a/hbase-protocol-shaded/src/main/protobuf/Tracing.proto +++ b/hbase-protocol-shaded/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.shaded.protobuf.generated"; diff --git a/hbase-protocol-shaded/src/main/protobuf/WAL.proto b/hbase-protocol-shaded/src/main/protobuf/WAL.proto index 81e5650462..08d4741aa4 100644 --- a/hbase-protocol-shaded/src/main/protobuf/WAL.proto +++ b/hbase-protocol-shaded/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.shaded.protobuf.generated"; diff --git a/hbase-protocol-shaded/src/main/protobuf/ZooKeeper.proto b/hbase-protocol-shaded/src/main/protobuf/ZooKeeper.proto index fcf9bf5382..9d3d17325e 100644 --- a/hbase-protocol-shaded/src/main/protobuf/ZooKeeper.proto +++ b/hbase-protocol-shaded/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-shaded/src/main/protobuf/test.proto b/hbase-protocol-shaded/src/main/protobuf/test.proto index 647fafe6c0..5101644138 100644 --- a/hbase-protocol-shaded/src/main/protobuf/test.proto +++ b/hbase-protocol-shaded/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.shaded.ipc.protobuf.generated"; option java_outer_classname = "TestProtos"; diff --git a/hbase-protocol-shaded/src/main/protobuf/test_rpc_service.proto b/hbase-protocol-shaded/src/main/protobuf/test_rpc_service.proto index 51472dbebb..03ac385251 100644 --- a/hbase-protocol-shaded/src/main/protobuf/test_rpc_service.proto +++ b/hbase-protocol-shaded/src/main/protobuf/test_rpc_service.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.shaded.ipc.protobuf.generated"; option java_outer_classname = "TestRpcServiceProtos"; option java_generic_services = true; -- 2.14.1