HBASE-14077 Add package to hbase-protocol protobuf files.
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/62bce5f9 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/62bce5f9 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/62bce5f9 Branch: refs/heads/master Commit: 62bce5f903b5744af4130a7915d98ce90a880efb Parents: a63e3ac Author: Elliott Clark <[email protected]> Authored: Tue Jul 14 14:48:02 2015 -0700 Committer: Elliott Clark <[email protected]> Committed: Wed Jul 15 11:15:58 2015 -0700 ---------------------------------------------------------------------- .../example/generated/BulkDeleteProtos.java | 151 +- .../example/generated/ExampleProtos.java | 83 +- .../src/main/protobuf/BulkDelete.proto | 2 + hbase-examples/src/main/protobuf/Examples.proto | 1 + .../protobuf/generated/AccessControlProtos.java | 1212 ++-- .../hbase/protobuf/generated/AdminProtos.java | 2300 ++++---- .../protobuf/generated/AggregateProtos.java | 161 +- .../generated/AuthenticationProtos.java | 310 +- .../hbase/protobuf/generated/CellProtos.java | 128 +- .../hbase/protobuf/generated/ClientProtos.java | 3297 +++++------ .../protobuf/generated/ClusterIdProtos.java | 35 +- .../protobuf/generated/ClusterStatusProtos.java | 1409 ++--- .../protobuf/generated/ComparatorProtos.java | 458 +- .../protobuf/generated/EncryptionProtos.java | 38 +- .../protobuf/generated/ErrorHandlingProtos.java | 205 +- .../hbase/protobuf/generated/FSProtos.java | 94 +- .../hbase/protobuf/generated/FilterProtos.java | 1600 +++--- .../hbase/protobuf/generated/HBaseProtos.java | 1472 ++--- .../hbase/protobuf/generated/HFileProtos.java | 147 +- .../protobuf/generated/LoadBalancerProtos.java | 36 +- .../protobuf/generated/MapReduceProtos.java | 205 +- .../generated/MasterProcedureProtos.java | 1789 +++--- .../hbase/protobuf/generated/MasterProtos.java | 5211 +++++++++--------- .../generated/MultiRowMutationProtos.java | 203 +- .../protobuf/generated/ProcedureProtos.java | 496 +- .../hbase/protobuf/generated/QuotaProtos.java | 548 +- .../hbase/protobuf/generated/RPCProtos.java | 460 +- .../generated/RegionServerStatusProtos.java | 843 +-- .../protobuf/generated/RowProcessorProtos.java | 85 +- .../generated/SecureBulkLoadProtos.java | 392 +- .../hbase/protobuf/generated/TracingProtos.java | 36 +- .../generated/VisibilityLabelsProtos.java | 541 +- .../hbase/protobuf/generated/WALProtos.java | 872 +-- .../protobuf/generated/ZooKeeperProtos.java | 775 +-- .../src/main/protobuf/AccessControl.proto | 1 + hbase-protocol/src/main/protobuf/Admin.proto | 1 + .../src/main/protobuf/Aggregate.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 | 3 + .../src/main/protobuf/LoadBalancer.proto | 1 + .../src/main/protobuf/MapReduce.proto | 1 + hbase-protocol/src/main/protobuf/Master.proto | 1 + .../src/main/protobuf/MasterProcedure.proto | 2 + .../src/main/protobuf/MultiRowMutation.proto | 2 + .../src/main/protobuf/Procedure.proto | 1 + hbase-protocol/src/main/protobuf/Quota.proto | 3 + hbase-protocol/src/main/protobuf/RPC.proto | 2 + .../src/main/protobuf/RegionServerStatus.proto | 1 + .../src/main/protobuf/RowProcessor.proto | 2 + .../src/main/protobuf/SecureBulkLoad.proto | 1 + hbase-protocol/src/main/protobuf/Snapshot.proto | 2 + hbase-protocol/src/main/protobuf/Tracing.proto | 2 + .../src/main/protobuf/VisibilityLabels.proto | 1 + hbase-protocol/src/main/protobuf/WAL.proto | 2 + .../src/main/protobuf/ZooKeeper.proto | 1 + 65 files changed, 12903 insertions(+), 12734 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/62bce5f9/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/generated/BulkDeleteProtos.java ---------------------------------------------------------------------- diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/generated/BulkDeleteProtos.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/generated/BulkDeleteProtos.java index 911fd16..373e036 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/generated/BulkDeleteProtos.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/generated/BulkDeleteProtos.java @@ -11,27 +11,27 @@ public final class BulkDeleteProtos { public interface BulkDeleteRequestOrBuilder extends com.google.protobuf.MessageOrBuilder { - // required .Scan scan = 1; + // required .hbase.pb.Scan scan = 1; /** - * <code>required .Scan scan = 1;</code> + * <code>required .hbase.pb.Scan scan = 1;</code> */ boolean hasScan(); /** - * <code>required .Scan scan = 1;</code> + * <code>required .hbase.pb.Scan scan = 1;</code> */ org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan getScan(); /** - * <code>required .Scan scan = 1;</code> + * <code>required .hbase.pb.Scan scan = 1;</code> */ org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanOrBuilder getScanOrBuilder(); - // required .BulkDeleteRequest.DeleteType deleteType = 2; + // required .hbase.pb.BulkDeleteRequest.DeleteType deleteType = 2; /** - * <code>required .BulkDeleteRequest.DeleteType deleteType = 2;</code> + * <code>required .hbase.pb.BulkDeleteRequest.DeleteType deleteType = 2;</code> */ boolean hasDeleteType(); /** - * <code>required .BulkDeleteRequest.DeleteType deleteType = 2;</code> + * <code>required .hbase.pb.BulkDeleteRequest.DeleteType deleteType = 2;</code> */ org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest.DeleteType getDeleteType(); @@ -56,7 +56,7 @@ public final class BulkDeleteProtos { int getRowBatchSize(); } /** - * Protobuf type {@code BulkDeleteRequest} + * Protobuf type {@code hbase.pb.BulkDeleteRequest} */ public static final class BulkDeleteRequest extends com.google.protobuf.GeneratedMessage @@ -154,12 +154,12 @@ public final class BulkDeleteProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_BulkDeleteRequest_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_hbase_pb_BulkDeleteRequest_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_BulkDeleteRequest_fieldAccessorTable + return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_hbase_pb_BulkDeleteRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest.class, org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest.Builder.class); } @@ -180,7 +180,7 @@ public final class BulkDeleteProtos { } /** - * Protobuf enum {@code BulkDeleteRequest.DeleteType} + * Protobuf enum {@code hbase.pb.BulkDeleteRequest.DeleteType} */ public enum DeleteType implements com.google.protobuf.ProtocolMessageEnum { @@ -276,43 +276,43 @@ public final class BulkDeleteProtos { this.value = value; } - // @@protoc_insertion_point(enum_scope:BulkDeleteRequest.DeleteType) + // @@protoc_insertion_point(enum_scope:hbase.pb.BulkDeleteRequest.DeleteType) } private int bitField0_; - // required .Scan scan = 1; + // required .hbase.pb.Scan scan = 1; public static final int SCAN_FIELD_NUMBER = 1; private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan scan_; /** - * <code>required .Scan scan = 1;</code> + * <code>required .hbase.pb.Scan scan = 1;</code> */ public boolean hasScan() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * <code>required .Scan scan = 1;</code> + * <code>required .hbase.pb.Scan scan = 1;</code> */ public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan getScan() { return scan_; } /** - * <code>required .Scan scan = 1;</code> + * <code>required .hbase.pb.Scan scan = 1;</code> */ public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanOrBuilder getScanOrBuilder() { return scan_; } - // required .BulkDeleteRequest.DeleteType deleteType = 2; + // required .hbase.pb.BulkDeleteRequest.DeleteType deleteType = 2; public static final int DELETETYPE_FIELD_NUMBER = 2; private org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest.DeleteType deleteType_; /** - * <code>required .BulkDeleteRequest.DeleteType deleteType = 2;</code> + * <code>required .hbase.pb.BulkDeleteRequest.DeleteType deleteType = 2;</code> */ public boolean hasDeleteType() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * <code>required .BulkDeleteRequest.DeleteType deleteType = 2;</code> + * <code>required .hbase.pb.BulkDeleteRequest.DeleteType deleteType = 2;</code> */ public org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest.DeleteType getDeleteType() { return deleteType_; @@ -565,19 +565,19 @@ public final class BulkDeleteProtos { return builder; } /** - * Protobuf type {@code BulkDeleteRequest} + * Protobuf type {@code hbase.pb.BulkDeleteRequest} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder<Builder> implements org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_BulkDeleteRequest_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_hbase_pb_BulkDeleteRequest_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_BulkDeleteRequest_fieldAccessorTable + return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_hbase_pb_BulkDeleteRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest.class, org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest.Builder.class); } @@ -624,7 +624,7 @@ public final class BulkDeleteProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_BulkDeleteRequest_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_hbase_pb_BulkDeleteRequest_descriptor; } public org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest getDefaultInstanceForType() { @@ -734,18 +734,18 @@ public final class BulkDeleteProtos { } private int bitField0_; - // required .Scan scan = 1; + // required .hbase.pb.Scan scan = 1; private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan scan_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanOrBuilder> scanBuilder_; /** - * <code>required .Scan scan = 1;</code> + * <code>required .hbase.pb.Scan scan = 1;</code> */ public boolean hasScan() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * <code>required .Scan scan = 1;</code> + * <code>required .hbase.pb.Scan scan = 1;</code> */ public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan getScan() { if (scanBuilder_ == null) { @@ -755,7 +755,7 @@ public final class BulkDeleteProtos { } } /** - * <code>required .Scan scan = 1;</code> + * <code>required .hbase.pb.Scan scan = 1;</code> */ public Builder setScan(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan value) { if (scanBuilder_ == null) { @@ -771,7 +771,7 @@ public final class BulkDeleteProtos { return this; } /** - * <code>required .Scan scan = 1;</code> + * <code>required .hbase.pb.Scan scan = 1;</code> */ public Builder setScan( org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.Builder builderForValue) { @@ -785,7 +785,7 @@ public final class BulkDeleteProtos { return this; } /** - * <code>required .Scan scan = 1;</code> + * <code>required .hbase.pb.Scan scan = 1;</code> */ public Builder mergeScan(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan value) { if (scanBuilder_ == null) { @@ -804,7 +804,7 @@ public final class BulkDeleteProtos { return this; } /** - * <code>required .Scan scan = 1;</code> + * <code>required .hbase.pb.Scan scan = 1;</code> */ public Builder clearScan() { if (scanBuilder_ == null) { @@ -817,7 +817,7 @@ public final class BulkDeleteProtos { return this; } /** - * <code>required .Scan scan = 1;</code> + * <code>required .hbase.pb.Scan scan = 1;</code> */ public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.Builder getScanBuilder() { bitField0_ |= 0x00000001; @@ -825,7 +825,7 @@ public final class BulkDeleteProtos { return getScanFieldBuilder().getBuilder(); } /** - * <code>required .Scan scan = 1;</code> + * <code>required .hbase.pb.Scan scan = 1;</code> */ public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanOrBuilder getScanOrBuilder() { if (scanBuilder_ != null) { @@ -835,7 +835,7 @@ public final class BulkDeleteProtos { } } /** - * <code>required .Scan scan = 1;</code> + * <code>required .hbase.pb.Scan scan = 1;</code> */ private com.google.protobuf.SingleFieldBuilder< org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Scan.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanOrBuilder> @@ -851,22 +851,22 @@ public final class BulkDeleteProtos { return scanBuilder_; } - // required .BulkDeleteRequest.DeleteType deleteType = 2; + // required .hbase.pb.BulkDeleteRequest.DeleteType deleteType = 2; private org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest.DeleteType deleteType_ = org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest.DeleteType.ROW; /** - * <code>required .BulkDeleteRequest.DeleteType deleteType = 2;</code> + * <code>required .hbase.pb.BulkDeleteRequest.DeleteType deleteType = 2;</code> */ public boolean hasDeleteType() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * <code>required .BulkDeleteRequest.DeleteType deleteType = 2;</code> + * <code>required .hbase.pb.BulkDeleteRequest.DeleteType deleteType = 2;</code> */ public org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest.DeleteType getDeleteType() { return deleteType_; } /** - * <code>required .BulkDeleteRequest.DeleteType deleteType = 2;</code> + * <code>required .hbase.pb.BulkDeleteRequest.DeleteType deleteType = 2;</code> */ public Builder setDeleteType(org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest.DeleteType value) { if (value == null) { @@ -878,7 +878,7 @@ public final class BulkDeleteProtos { return this; } /** - * <code>required .BulkDeleteRequest.DeleteType deleteType = 2;</code> + * <code>required .hbase.pb.BulkDeleteRequest.DeleteType deleteType = 2;</code> */ public Builder clearDeleteType() { bitField0_ = (bitField0_ & ~0x00000002); @@ -953,7 +953,7 @@ public final class BulkDeleteProtos { return this; } - // @@protoc_insertion_point(builder_scope:BulkDeleteRequest) + // @@protoc_insertion_point(builder_scope:hbase.pb.BulkDeleteRequest) } static { @@ -961,7 +961,7 @@ public final class BulkDeleteProtos { defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:BulkDeleteRequest) + // @@protoc_insertion_point(class_scope:hbase.pb.BulkDeleteRequest) } public interface BulkDeleteResponseOrBuilder @@ -988,7 +988,7 @@ public final class BulkDeleteProtos { long getVersionsDeleted(); } /** - * Protobuf type {@code BulkDeleteResponse} + * Protobuf type {@code hbase.pb.BulkDeleteResponse} */ public static final class BulkDeleteResponse extends com.google.protobuf.GeneratedMessage @@ -1062,12 +1062,12 @@ public final class BulkDeleteProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_BulkDeleteResponse_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_hbase_pb_BulkDeleteResponse_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_BulkDeleteResponse_fieldAccessorTable + return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_hbase_pb_BulkDeleteResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteResponse.class, org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteResponse.Builder.class); } @@ -1289,19 +1289,19 @@ public final class BulkDeleteProtos { return builder; } /** - * Protobuf type {@code BulkDeleteResponse} + * Protobuf type {@code hbase.pb.BulkDeleteResponse} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder<Builder> implements org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteResponseOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_BulkDeleteResponse_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_hbase_pb_BulkDeleteResponse_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_BulkDeleteResponse_fieldAccessorTable + return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_hbase_pb_BulkDeleteResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteResponse.class, org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteResponse.Builder.class); } @@ -1339,7 +1339,7 @@ public final class BulkDeleteProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_BulkDeleteResponse_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.internal_static_hbase_pb_BulkDeleteResponse_descriptor; } public org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteResponse getDefaultInstanceForType() { @@ -1485,7 +1485,7 @@ public final class BulkDeleteProtos { return this; } - // @@protoc_insertion_point(builder_scope:BulkDeleteResponse) + // @@protoc_insertion_point(builder_scope:hbase.pb.BulkDeleteResponse) } static { @@ -1493,11 +1493,11 @@ public final class BulkDeleteProtos { defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:BulkDeleteResponse) + // @@protoc_insertion_point(class_scope:hbase.pb.BulkDeleteResponse) } /** - * Protobuf service {@code BulkDeleteService} + * Protobuf service {@code hbase.pb.BulkDeleteService} */ public static abstract class BulkDeleteService implements com.google.protobuf.Service { @@ -1505,7 +1505,7 @@ public final class BulkDeleteProtos { public interface Interface { /** - * <code>rpc delete(.BulkDeleteRequest) returns (.BulkDeleteResponse);</code> + * <code>rpc delete(.hbase.pb.BulkDeleteRequest) returns (.hbase.pb.BulkDeleteResponse);</code> */ public abstract void delete( com.google.protobuf.RpcController controller, @@ -1590,7 +1590,7 @@ public final class BulkDeleteProtos { } /** - * <code>rpc delete(.BulkDeleteRequest) returns (.BulkDeleteResponse);</code> + * <code>rpc delete(.hbase.pb.BulkDeleteRequest) returns (.hbase.pb.BulkDeleteResponse);</code> */ public abstract void delete( com.google.protobuf.RpcController controller, @@ -1725,19 +1725,19 @@ public final class BulkDeleteProtos { } - // @@protoc_insertion_point(class_scope:BulkDeleteService) + // @@protoc_insertion_point(class_scope:hbase.pb.BulkDeleteService) } private static com.google.protobuf.Descriptors.Descriptor - internal_static_BulkDeleteRequest_descriptor; + internal_static_hbase_pb_BulkDeleteRequest_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_BulkDeleteRequest_fieldAccessorTable; + internal_static_hbase_pb_BulkDeleteRequest_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor - internal_static_BulkDeleteResponse_descriptor; + internal_static_hbase_pb_BulkDeleteResponse_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_BulkDeleteResponse_fieldAccessorTable; + internal_static_hbase_pb_BulkDeleteResponse_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -1747,35 +1747,36 @@ public final class BulkDeleteProtos { descriptor; static { java.lang.String[] descriptorData = { - "\n\020BulkDelete.proto\032\014Client.proto\"\300\001\n\021Bul" + - "kDeleteRequest\022\023\n\004scan\030\001 \002(\0132\005.Scan\0221\n\nd" + - "eleteType\030\002 \002(\0162\035.BulkDeleteRequest.Dele" + - "teType\022\021\n\ttimestamp\030\003 \001(\004\022\024\n\014rowBatchSiz" + - "e\030\004 \002(\r\":\n\nDeleteType\022\007\n\003ROW\020\000\022\n\n\006FAMILY" + - "\020\001\022\n\n\006COLUMN\020\002\022\013\n\007VERSION\020\003\"B\n\022BulkDelet" + - "eResponse\022\023\n\013rowsDeleted\030\001 \002(\004\022\027\n\017versio" + - "nsDeleted\030\002 \001(\0042F\n\021BulkDeleteService\0221\n\006" + - "delete\022\022.BulkDeleteRequest\032\023.BulkDeleteR" + - "esponseBQ\n5org.apache.hadoop.hbase.copro", - "cessor.example.generatedB\020BulkDeleteProt" + - "osH\001\210\001\001\240\001\001" + "\n\020BulkDelete.proto\022\010hbase.pb\032\014Client.pro" + + "to\"\322\001\n\021BulkDeleteRequest\022\034\n\004scan\030\001 \002(\0132\016" + + ".hbase.pb.Scan\022:\n\ndeleteType\030\002 \002(\0162&.hba" + + "se.pb.BulkDeleteRequest.DeleteType\022\021\n\tti" + + "mestamp\030\003 \001(\004\022\024\n\014rowBatchSize\030\004 \002(\r\":\n\nD" + + "eleteType\022\007\n\003ROW\020\000\022\n\n\006FAMILY\020\001\022\n\n\006COLUMN" + + "\020\002\022\013\n\007VERSION\020\003\"B\n\022BulkDeleteResponse\022\023\n" + + "\013rowsDeleted\030\001 \002(\004\022\027\n\017versionsDeleted\030\002 " + + "\001(\0042X\n\021BulkDeleteService\022C\n\006delete\022\033.hba" + + "se.pb.BulkDeleteRequest\032\034.hbase.pb.BulkD", + "eleteResponseBQ\n5org.apache.hadoop.hbase" + + ".coprocessor.example.generatedB\020BulkDele" + + "teProtosH\001\210\001\001\240\001\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.Descriptors.FileDescriptor root) { descriptor = root; - internal_static_BulkDeleteRequest_descriptor = + internal_static_hbase_pb_BulkDeleteRequest_descriptor = getDescriptor().getMessageTypes().get(0); - internal_static_BulkDeleteRequest_fieldAccessorTable = new + internal_static_hbase_pb_BulkDeleteRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_BulkDeleteRequest_descriptor, + internal_static_hbase_pb_BulkDeleteRequest_descriptor, new java.lang.String[] { "Scan", "DeleteType", "Timestamp", "RowBatchSize", }); - internal_static_BulkDeleteResponse_descriptor = + internal_static_hbase_pb_BulkDeleteResponse_descriptor = getDescriptor().getMessageTypes().get(1); - internal_static_BulkDeleteResponse_fieldAccessorTable = new + internal_static_hbase_pb_BulkDeleteResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_BulkDeleteResponse_descriptor, + internal_static_hbase_pb_BulkDeleteResponse_descriptor, new java.lang.String[] { "RowsDeleted", "VersionsDeleted", }); return null; } http://git-wip-us.apache.org/repos/asf/hbase/blob/62bce5f9/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/generated/ExampleProtos.java ---------------------------------------------------------------------- diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/generated/ExampleProtos.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/generated/ExampleProtos.java index a71e351..b780985 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/generated/ExampleProtos.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/generated/ExampleProtos.java @@ -12,7 +12,7 @@ public final class ExampleProtos { extends com.google.protobuf.MessageOrBuilder { } /** - * Protobuf type {@code CountRequest} + * Protobuf type {@code hbase.pb.CountRequest} */ public static final class CountRequest extends com.google.protobuf.GeneratedMessage @@ -75,12 +75,12 @@ public final class ExampleProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_CountRequest_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_hbase_pb_CountRequest_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_CountRequest_fieldAccessorTable + return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_hbase_pb_CountRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountRequest.class, org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountRequest.Builder.class); } @@ -231,19 +231,19 @@ public final class ExampleProtos { return builder; } /** - * Protobuf type {@code CountRequest} + * Protobuf type {@code hbase.pb.CountRequest} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder<Builder> implements org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountRequestOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_CountRequest_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_hbase_pb_CountRequest_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_CountRequest_fieldAccessorTable + return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_hbase_pb_CountRequest_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountRequest.class, org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountRequest.Builder.class); } @@ -277,7 +277,7 @@ public final class ExampleProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_CountRequest_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_hbase_pb_CountRequest_descriptor; } public org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountRequest getDefaultInstanceForType() { @@ -335,7 +335,7 @@ public final class ExampleProtos { return this; } - // @@protoc_insertion_point(builder_scope:CountRequest) + // @@protoc_insertion_point(builder_scope:hbase.pb.CountRequest) } static { @@ -343,7 +343,7 @@ public final class ExampleProtos { defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:CountRequest) + // @@protoc_insertion_point(class_scope:hbase.pb.CountRequest) } public interface CountResponseOrBuilder @@ -360,7 +360,7 @@ public final class ExampleProtos { long getCount(); } /** - * Protobuf type {@code CountResponse} + * Protobuf type {@code hbase.pb.CountResponse} */ public static final class CountResponse extends com.google.protobuf.GeneratedMessage @@ -429,12 +429,12 @@ public final class ExampleProtos { } public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_CountResponse_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_hbase_pb_CountResponse_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_CountResponse_fieldAccessorTable + return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_hbase_pb_CountResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountResponse.class, org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountResponse.Builder.class); } @@ -623,19 +623,19 @@ public final class ExampleProtos { return builder; } /** - * Protobuf type {@code CountResponse} + * Protobuf type {@code hbase.pb.CountResponse} */ public static final class Builder extends com.google.protobuf.GeneratedMessage.Builder<Builder> implements org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountResponseOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { - return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_CountResponse_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_hbase_pb_CountResponse_descriptor; } protected com.google.protobuf.GeneratedMessage.FieldAccessorTable internalGetFieldAccessorTable() { - return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_CountResponse_fieldAccessorTable + return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_hbase_pb_CountResponse_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountResponse.class, org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountResponse.Builder.class); } @@ -671,7 +671,7 @@ public final class ExampleProtos { public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { - return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_CountResponse_descriptor; + return org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.internal_static_hbase_pb_CountResponse_descriptor; } public org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountResponse getDefaultInstanceForType() { @@ -777,7 +777,7 @@ public final class ExampleProtos { return this; } - // @@protoc_insertion_point(builder_scope:CountResponse) + // @@protoc_insertion_point(builder_scope:hbase.pb.CountResponse) } static { @@ -785,11 +785,11 @@ public final class ExampleProtos { defaultInstance.initFields(); } - // @@protoc_insertion_point(class_scope:CountResponse) + // @@protoc_insertion_point(class_scope:hbase.pb.CountResponse) } /** - * Protobuf service {@code RowCountService} + * Protobuf service {@code hbase.pb.RowCountService} */ public static abstract class RowCountService implements com.google.protobuf.Service { @@ -797,7 +797,7 @@ public final class ExampleProtos { public interface Interface { /** - * <code>rpc getRowCount(.CountRequest) returns (.CountResponse);</code> + * <code>rpc getRowCount(.hbase.pb.CountRequest) returns (.hbase.pb.CountResponse);</code> */ public abstract void getRowCount( com.google.protobuf.RpcController controller, @@ -805,7 +805,7 @@ public final class ExampleProtos { com.google.protobuf.RpcCallback<org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountResponse> done); /** - * <code>rpc getKeyValueCount(.CountRequest) returns (.CountResponse);</code> + * <code>rpc getKeyValueCount(.hbase.pb.CountRequest) returns (.hbase.pb.CountResponse);</code> */ public abstract void getKeyValueCount( com.google.protobuf.RpcController controller, @@ -904,7 +904,7 @@ public final class ExampleProtos { } /** - * <code>rpc getRowCount(.CountRequest) returns (.CountResponse);</code> + * <code>rpc getRowCount(.hbase.pb.CountRequest) returns (.hbase.pb.CountResponse);</code> */ public abstract void getRowCount( com.google.protobuf.RpcController controller, @@ -912,7 +912,7 @@ public final class ExampleProtos { com.google.protobuf.RpcCallback<org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos.CountResponse> done); /** - * <code>rpc getKeyValueCount(.CountRequest) returns (.CountResponse);</code> + * <code>rpc getKeyValueCount(.hbase.pb.CountRequest) returns (.hbase.pb.CountResponse);</code> */ public abstract void getKeyValueCount( com.google.protobuf.RpcController controller, @@ -1088,19 +1088,19 @@ public final class ExampleProtos { } - // @@protoc_insertion_point(class_scope:RowCountService) + // @@protoc_insertion_point(class_scope:hbase.pb.RowCountService) } private static com.google.protobuf.Descriptors.Descriptor - internal_static_CountRequest_descriptor; + internal_static_hbase_pb_CountRequest_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_CountRequest_fieldAccessorTable; + internal_static_hbase_pb_CountRequest_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor - internal_static_CountResponse_descriptor; + internal_static_hbase_pb_CountResponse_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable - internal_static_CountResponse_fieldAccessorTable; + internal_static_hbase_pb_CountResponse_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { @@ -1110,30 +1110,31 @@ public final class ExampleProtos { descriptor; static { java.lang.String[] descriptorData = { - "\n\016Examples.proto\"\016\n\014CountRequest\"!\n\rCoun" + - "tResponse\022\020\n\005count\030\001 \002(\003:\00102r\n\017RowCountS" + - "ervice\022,\n\013getRowCount\022\r.CountRequest\032\016.C" + - "ountResponse\0221\n\020getKeyValueCount\022\r.Count" + - "Request\032\016.CountResponseBN\n5org.apache.ha" + - "doop.hbase.coprocessor.example.generated" + - "B\rExampleProtosH\001\210\001\001\240\001\001" + "\n\016Examples.proto\022\010hbase.pb\"\016\n\014CountReque" + + "st\"!\n\rCountResponse\022\020\n\005count\030\001 \002(\003:\00102\226\001" + + "\n\017RowCountService\022>\n\013getRowCount\022\026.hbase" + + ".pb.CountRequest\032\027.hbase.pb.CountRespons" + + "e\022C\n\020getKeyValueCount\022\026.hbase.pb.CountRe" + + "quest\032\027.hbase.pb.CountResponseBN\n5org.ap" + + "ache.hadoop.hbase.coprocessor.example.ge" + + "neratedB\rExampleProtosH\001\210\001\001\240\001\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { public com.google.protobuf.ExtensionRegistry assignDescriptors( com.google.protobuf.Descriptors.FileDescriptor root) { descriptor = root; - internal_static_CountRequest_descriptor = + internal_static_hbase_pb_CountRequest_descriptor = getDescriptor().getMessageTypes().get(0); - internal_static_CountRequest_fieldAccessorTable = new + internal_static_hbase_pb_CountRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_CountRequest_descriptor, + internal_static_hbase_pb_CountRequest_descriptor, new java.lang.String[] { }); - internal_static_CountResponse_descriptor = + internal_static_hbase_pb_CountResponse_descriptor = getDescriptor().getMessageTypes().get(1); - internal_static_CountResponse_fieldAccessorTable = new + internal_static_hbase_pb_CountResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_CountResponse_descriptor, + internal_static_hbase_pb_CountResponse_descriptor, new java.lang.String[] { "Count", }); return null; } http://git-wip-us.apache.org/repos/asf/hbase/blob/62bce5f9/hbase-examples/src/main/protobuf/BulkDelete.proto ---------------------------------------------------------------------- diff --git a/hbase-examples/src/main/protobuf/BulkDelete.proto b/hbase-examples/src/main/protobuf/BulkDelete.proto index a0e56dd..c2ec8ca 100644 --- a/hbase-examples/src/main/protobuf/BulkDelete.proto +++ b/hbase-examples/src/main/protobuf/BulkDelete.proto @@ -16,6 +16,8 @@ * limitations under the License. */ +package hbase.pb; + option java_package = "org.apache.hadoop.hbase.coprocessor.example.generated"; option java_outer_classname = "BulkDeleteProtos"; option java_generic_services = true; http://git-wip-us.apache.org/repos/asf/hbase/blob/62bce5f9/hbase-examples/src/main/protobuf/Examples.proto ---------------------------------------------------------------------- diff --git a/hbase-examples/src/main/protobuf/Examples.proto b/hbase-examples/src/main/protobuf/Examples.proto index 24fbad6..ed9ed07 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. */ +package hbase.pb; option java_package = "org.apache.hadoop.hbase.coprocessor.example.generated"; option java_outer_classname = "ExampleProtos";
