You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2017/04/03 22:30:02 UTC
[1/7] hbase git commit: HBASE-16780 Since move to protobuf3.1, Cells
are limited to 64MB where previous they had no limit Update internal pb to
3.2 from 3.1.; AMENDMENT -- FORGOT TO REBUILD PBs
Repository: hbase
Updated Branches:
refs/heads/master 73e1bcd33 -> e916b79db
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MasterProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MasterProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MasterProtos.java
index bb6b40e..0071bef 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MasterProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MasterProtos.java
@@ -440,7 +440,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTableName()) {
hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER;
hash = (53 * hash) + getTableName().hashCode();
@@ -1245,7 +1245,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasProcId()) {
hash = (37 * hash) + PROC_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -1867,7 +1867,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTableName()) {
hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER;
hash = (53 * hash) + getTableName().hashCode();
@@ -2577,7 +2577,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasProcId()) {
hash = (37 * hash) + PROC_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -3220,7 +3220,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTableName()) {
hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER;
hash = (53 * hash) + getTableName().hashCode();
@@ -4025,7 +4025,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasProcId()) {
hash = (37 * hash) + PROC_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -4582,7 +4582,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegion()) {
hash = (37 * hash) + REGION_FIELD_NUMBER;
hash = (53 * hash) + getRegion().hashCode();
@@ -5250,7 +5250,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -5843,7 +5843,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getRegionCount() > 0) {
hash = (37 * hash) + REGION_FIELD_NUMBER;
hash = (53 * hash) + getRegionList().hashCode();
@@ -6698,7 +6698,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasProcId()) {
hash = (37 * hash) + PROC_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -7190,7 +7190,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegion()) {
hash = (37 * hash) + REGION_FIELD_NUMBER;
hash = (53 * hash) + getRegion().hashCode();
@@ -7713,7 +7713,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -8197,7 +8197,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegion()) {
hash = (37 * hash) + REGION_FIELD_NUMBER;
hash = (53 * hash) + getRegion().hashCode();
@@ -8766,7 +8766,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -9208,7 +9208,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegion()) {
hash = (37 * hash) + REGION_FIELD_NUMBER;
hash = (53 * hash) + getRegion().hashCode();
@@ -9731,7 +9731,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -10318,7 +10318,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTableSchema()) {
hash = (37 * hash) + TABLE_SCHEMA_FIELD_NUMBER;
hash = (53 * hash) + getTableSchema().hashCode();
@@ -11070,7 +11070,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasProcId()) {
hash = (37 * hash) + PROC_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -11646,7 +11646,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTableName()) {
hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER;
hash = (53 * hash) + getTableName().hashCode();
@@ -12305,7 +12305,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasProcId()) {
hash = (37 * hash) + PROC_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -12923,7 +12923,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTableName()) {
hash = (37 * hash) + TABLENAME_FIELD_NUMBER;
hash = (53 * hash) + getTableName().hashCode();
@@ -13628,7 +13628,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasProcId()) {
hash = (37 * hash) + PROC_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -14204,7 +14204,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTableName()) {
hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER;
hash = (53 * hash) + getTableName().hashCode();
@@ -14863,7 +14863,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasProcId()) {
hash = (37 * hash) + PROC_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -15439,7 +15439,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTableName()) {
hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER;
hash = (53 * hash) + getTableName().hashCode();
@@ -16098,7 +16098,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasProcId()) {
hash = (37 * hash) + PROC_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -16741,7 +16741,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTableName()) {
hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER;
hash = (53 * hash) + getTableName().hashCode();
@@ -17546,7 +17546,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasProcId()) {
hash = (37 * hash) + PROC_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -18122,7 +18122,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasNamespaceDescriptor()) {
hash = (37 * hash) + NAMESPACEDESCRIPTOR_FIELD_NUMBER;
hash = (53 * hash) + getNamespaceDescriptor().hashCode();
@@ -18781,7 +18781,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasProcId()) {
hash = (37 * hash) + PROC_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -19368,7 +19368,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasNamespaceName()) {
hash = (37 * hash) + NAMESPACENAME_FIELD_NUMBER;
hash = (53 * hash) + getNamespaceName().hashCode();
@@ -19975,7 +19975,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasProcId()) {
hash = (37 * hash) + PROC_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -20551,7 +20551,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasNamespaceDescriptor()) {
hash = (37 * hash) + NAMESPACEDESCRIPTOR_FIELD_NUMBER;
hash = (53 * hash) + getNamespaceDescriptor().hashCode();
@@ -21210,7 +21210,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasProcId()) {
hash = (37 * hash) + PROC_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -21713,7 +21713,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasNamespaceName()) {
hash = (37 * hash) + NAMESPACENAME_FIELD_NUMBER;
hash = (53 * hash) + getNamespaceName().hashCode();
@@ -22253,7 +22253,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasNamespaceDescriptor()) {
hash = (37 * hash) + NAMESPACEDESCRIPTOR_FIELD_NUMBER;
hash = (53 * hash) + getNamespaceDescriptor().hashCode();
@@ -22776,7 +22776,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -23237,7 +23237,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getNamespaceDescriptorCount() > 0) {
hash = (37 * hash) + NAMESPACEDESCRIPTOR_FIELD_NUMBER;
hash = (53 * hash) + getNamespaceDescriptorList().hashCode();
@@ -23983,7 +23983,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasNamespaceName()) {
hash = (37 * hash) + NAMESPACENAME_FIELD_NUMBER;
hash = (53 * hash) + getNamespaceName().hashCode();
@@ -24542,7 +24542,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getTableSchemaCount() > 0) {
hash = (37 * hash) + TABLESCHEMA_FIELD_NUMBER;
hash = (53 * hash) + getTableSchemaList().hashCode();
@@ -25288,7 +25288,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasNamespaceName()) {
hash = (37 * hash) + NAMESPACENAME_FIELD_NUMBER;
hash = (53 * hash) + getNamespaceName().hashCode();
@@ -25847,7 +25847,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getTableNameCount() > 0) {
hash = (37 * hash) + TABLENAME_FIELD_NUMBER;
hash = (53 * hash) + getTableNameList().hashCode();
@@ -26513,7 +26513,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -26886,7 +26886,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -27259,7 +27259,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -27632,7 +27632,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -28005,7 +28005,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -28426,7 +28426,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasInMaintenanceMode()) {
hash = (37 * hash) + INMAINTENANCEMODE_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -28896,7 +28896,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasForce()) {
hash = (37 * hash) + FORCE_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -29367,7 +29367,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasBalancerRan()) {
hash = (37 * hash) + BALANCER_RAN_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -29883,7 +29883,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasOn()) {
hash = (37 * hash) + ON_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -30399,7 +30399,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasPrevBalanceValue()) {
hash = (37 * hash) + PREV_BALANCE_VALUE_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -30822,7 +30822,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -31243,7 +31243,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasEnabled()) {
hash = (37 * hash) + ENABLED_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -31853,7 +31853,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasEnabled()) {
hash = (37 * hash) + ENABLED_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -32492,7 +32492,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getPrevValueCount() > 0) {
hash = (37 * hash) + PREV_VALUE_FIELD_NUMBER;
hash = (53 * hash) + getPrevValueList().hashCode();
@@ -33008,7 +33008,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasSwitchType()) {
hash = (37 * hash) + SWITCH_TYPE_FIELD_NUMBER;
hash = (53 * hash) + switchType_;
@@ -33485,7 +33485,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasEnabled()) {
hash = (37 * hash) + ENABLED_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -33911,7 +33911,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -34332,7 +34332,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasNormalizerRan()) {
hash = (37 * hash) + NORMALIZER_RAN_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -34806,7 +34806,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasOn()) {
hash = (37 * hash) + ON_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -35276,7 +35276,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasPrevNormalizerValue()) {
hash = (37 * hash) + PREV_NORMALIZER_VALUE_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -35699,7 +35699,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -36120,7 +36120,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasEnabled()) {
hash = (37 * hash) + ENABLED_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -36546,7 +36546,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -36963,7 +36963,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasScanResult()) {
hash = (37 * hash) + SCAN_RESULT_FIELD_NUMBER;
hash = (53 * hash) + getScanResult();
@@ -37433,7 +37433,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasEnable()) {
hash = (37 * hash) + ENABLE_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -37903,7 +37903,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasPrevValue()) {
hash = (37 * hash) + PREV_VALUE_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -38326,7 +38326,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -38747,7 +38747,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasValue()) {
hash = (37 * hash) + VALUE_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -39173,7 +39173,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -39594,7 +39594,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasCleanerChoreRan()) {
hash = (37 * hash) + CLEANER_CHORE_RAN_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -40068,7 +40068,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasOn()) {
hash = (37 * hash) + ON_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -40538,7 +40538,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasPrevValue()) {
hash = (37 * hash) + PREV_VALUE_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -40961,7 +40961,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -41382,7 +41382,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasValue()) {
hash = (37 * hash) + VALUE_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -41877,7 +41877,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasSnapshot()) {
hash = (37 * hash) + SNAPSHOT_FIELD_NUMBER;
hash = (53 * hash) + getSnapshot().hashCode();
@@ -42448,7 +42448,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasExpectedTimeout()) {
hash = (37 * hash) + EXPECTED_TIMEOUT_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -42874,7 +42874,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -43335,7 +43335,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getSnapshotsCount() > 0) {
hash = (37 * hash) + SNAPSHOTS_FIELD_NUMBER;
hash = (53 * hash) + getSnapshotsList().hashCode();
@@ -44070,7 +44070,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasSnapshot()) {
hash = (37 * hash) + SNAPSHOT_FIELD_NUMBER;
hash = (53 * hash) + getSnapshot().hashCode();
@@ -44593,7 +44593,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -45119,7 +45119,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasSnapshot()) {
hash = (37 * hash) + SNAPSHOT_FIELD_NUMBER;
hash = (53 * hash) + getSnapshot().hashCode();
@@ -45782,7 +45782,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasProcId()) {
hash = (37 * hash) + PROC_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -46280,7 +46280,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasSnapshot()) {
hash = (37 * hash) + SNAPSHOT_FIELD_NUMBER;
hash = (53 * hash) + getSnapshot().hashCode();
@@ -46916,7 +46916,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasDone()) {
hash = (37 * hash) + DONE_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -47551,7 +47551,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasSnapshot()) {
hash = (37 * hash) + SNAPSHOT_FIELD_NUMBER;
hash = (53 * hash) + getSnapshot().hashCode();
@@ -48117,7 +48117,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasDone()) {
hash = (37 * hash) + DONE_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -48609,7 +48609,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTableName()) {
hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER;
hash = (53 * hash) + getTableName().hashCode();
@@ -49218,7 +49218,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasYetToUpdateRegions()) {
hash = (37 * hash) + YET_TO_UPDATE_REGIONS_FIELD_NUMBER;
hash = (53 * hash) + getYetToUpdateRegions();
@@ -49964,7 +49964,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getTableNamesCount() > 0) {
hash = (37 * hash) + TABLE_NAMES_FIELD_NUMBER;
hash = (53 * hash) + getTableNamesList().hashCode();
@@ -50948,7 +50948,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getTableSchemaCount() > 0) {
hash = (37 * hash) + TABLE_SCHEMA_FIELD_NUMBER;
hash = (53 * hash) + getTableSchemaList().hashCode();
@@ -51806,7 +51806,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegex()) {
hash = (37 * hash) + REGEX_FIELD_NUMBER;
hash = (53 * hash) + getRegex().hashCode();
@@ -52499,7 +52499,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getTableNamesCount() > 0) {
hash = (37 * hash) + TABLE_NAMES_FIELD_NUMBER;
hash = (53 * hash) + getTableNamesList().hashCode();
@@ -53234,7 +53234,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTableName()) {
hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER;
hash = (53 * hash) + getTableName().hashCode();
@@ -53826,7 +53826,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTableState()) {
hash = (37 * hash) + TABLE_STATE_FIELD_NUMBER;
hash = (53 * hash) + getTableState().hashCode();
@@ -54349,7 +54349,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -54791,7 +54791,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasClusterStatus()) {
hash = (37 * hash) + CLUSTER_STATUS_FIELD_NUMBER;
hash = (53 * hash) + getClusterStatus().hashCode();
@@ -55314,7 +55314,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -55735,7 +55735,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasIsMasterRunning()) {
hash = (37 * hash) + IS_MASTER_RUNNING_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -56230,7 +56230,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasProcedure()) {
hash = (37 * hash) + PROCEDURE_FIELD_NUMBER;
hash = (53 * hash) + getProcedure().hashCode();
@@ -56839,7 +56839,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasExpectedTimeout()) {
hash = (37 * hash) + EXPECTED_TIMEOUT_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -57377,7 +57377,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasProcedure()) {
hash = (37 * hash) + PROCEDURE_FIELD_NUMBER;
hash = (53 * hash) + getProcedure().hashCode();
@@ -58008,7 +58008,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasDone()) {
hash = (37 * hash) + DONE_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -58624,7 +58624,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasProcId()) {
hash = (37 * hash) + PROC_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -59388,7 +59388,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasState()) {
hash = (37 * hash) + STATE_FIELD_NUMBER;
hash = (53 * hash) + state_;
@@ -60187,7 +60187,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasProcId()) {
hash = (37 * hash) + PROC_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -60707,7 +60707,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasIsProcedureAborted()) {
hash = (37 * hash) + IS_PROCEDURE_ABORTED_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -61133,7 +61133,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -61594,7 +61594,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getProcedureCount() > 0) {
hash = (37 * hash) + PROCEDURE_FIELD_NUMBER;
hash = (53 * hash) + getProcedureList().hashCode();
@@ -62698,7 +62698,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasUserName()) {
hash = (37 * hash) + USER_NAME_FIELD_NUMBER;
hash = (53 * hash) + getUserName().hashCode();
@@ -63730,7 +63730,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -64172,7 +64172,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTableName()) {
hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER;
hash = (53 * hash) + getTableName().hashCode();
@@ -64764,7 +64764,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegion()) {
hash = (37 * hash) + REGION_FIELD_NUMBER;
hash = (53 * hash) + getRegion().hashCode();
@@ -65335,7 +65335,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasCompactionTimestamp()) {
hash = (37 * hash) + COMPACTION_TIMESTAMP_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -65761,7 +65761,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -66346,7 +66346,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getCapabilitiesCount() > 0) {
hash = (37 * hash) + CAPABILITIES_FIELD_NUMBER;
hash = (53 * hash) + capabilities_.hashCode();
@@ -66816,7 +66816,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -67277,7 +67277,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getServerNameCount() > 0) {
hash = (37 * hash) + SERVER_NAME_FIELD_NUMBER;
hash = (53 * hash) + getServerNameList().hashCode();
@@ -68031,7 +68031,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getServerNameCount() > 0) {
hash = (37 * hash) + SERVER_NAME_FIELD_NUMBER;
hash = (53 * hash) + getServerNameList().hashCode();
@@ -68697,7 +68697,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -69158,7 +69158,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getServerNameCount() > 0) {
hash = (37 * hash) + SERVER_NAME_FIELD_NUMBER;
hash = (53 * hash) + getServerNameList().hashCode();
@@ -69824,7 +69824,7 @@ public final class MasterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ProcedureProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ProcedureProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ProcedureProtos.java
index 91989d7..b0ba843 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ProcedureProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ProcedureProtos.java
@@ -1190,7 +1190,7 @@ public final class ProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasClassName()) {
hash = (37 * hash) + CLASS_NAME_FIELD_NUMBER;
hash = (53 * hash) + getClassName().hashCode();
@@ -2683,7 +2683,7 @@ public final class ProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasExecuted()) {
hash = (37 * hash) + EXECUTED_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -3194,7 +3194,7 @@ public final class ProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getStateCount() > 0) {
hash = (37 * hash) + STATE_FIELD_NUMBER;
hash = (53 * hash) + getStateList().hashCode();
@@ -3852,7 +3852,7 @@ public final class ProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasVersion()) {
hash = (37 * hash) + VERSION_FIELD_NUMBER;
hash = (53 * hash) + getVersion();
@@ -4527,7 +4527,7 @@ public final class ProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasVersion()) {
hash = (37 * hash) + VERSION_FIELD_NUMBER;
hash = (53 * hash) + getVersion();
@@ -5309,7 +5309,7 @@ public final class ProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasStartId()) {
hash = (37 * hash) + START_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -5890,7 +5890,7 @@ public final class ProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getNodeCount() > 0) {
hash = (37 * hash) + NODE_FIELD_NUMBER;
hash = (53 * hash) + getNodeList().hashCode();
@@ -6939,7 +6939,7 @@ public final class ProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasType()) {
hash = (37 * hash) + TYPE_FIELD_NUMBER;
hash = (53 * hash) + type_;
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java
index d14336a..01ba8f6 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/QuotaProtos.java
@@ -615,7 +615,7 @@ public final class QuotaProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTimeUnit()) {
hash = (37 * hash) + TIME_UNIT_FIELD_NUMBER;
hash = (53 * hash) + timeUnit_;
@@ -1577,7 +1577,7 @@ public final class QuotaProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasReqNum()) {
hash = (37 * hash) + REQ_NUM_FIELD_NUMBER;
hash = (53 * hash) + getReqNum().hashCode();
@@ -2939,7 +2939,7 @@ public final class QuotaProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasType()) {
hash = (37 * hash) + TYPE_FIELD_NUMBER;
hash = (53 * hash) + type_;
@@ -3619,7 +3619,7 @@ public final class QuotaProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasBypassGlobals()) {
hash = (37 * hash) + BYPASS_GLOBALS_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -4187,7 +4187,7 @@ public final class QuotaProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RPCProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RPCProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RPCProtos.java
index d12b30e..a7adb06 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RPCProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RPCProtos.java
@@ -288,7 +288,7 @@ public final class RPCProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasEffectiveUser()) {
hash = (37 * hash) + EFFECTIVE_USER_FIELD_NUMBER;
hash = (53 * hash) + getEffectiveUser().hashCode();
@@ -1370,7 +1370,7 @@ public final class RPCProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasUserInfo()) {
hash = (37 * hash) + USER_INFO_FIELD_NUMBER;
hash = (53 * hash) + getUserInfo().hashCode();
@@ -2584,7 +2584,7 @@ public final class RPCProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasCryptoCipherMeta()) {
hash = (37 * hash) + CRYPTO_CIPHER_META_FIELD_NUMBER;
hash = (53 * hash) + getCryptoCipherMeta().hashCode();
@@ -3210,7 +3210,7 @@ public final class RPCProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasLength()) {
hash = (37 * hash) + LENGTH_FIELD_NUMBER;
hash = (53 * hash) + getLength();
@@ -4059,7 +4059,7 @@ public final class RPCProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasExceptionClassName()) {
hash = (37 * hash) + EXCEPTION_CLASS_NAME_FIELD_NUMBER;
hash = (53 * hash) + getExceptionClassName().hashCode();
@@ -5152,7 +5152,7 @@ public final class RPCProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTransformation()) {
hash = (37 * hash) + TRANSFORMATION_FIELD_NUMBER;
hash = (53 * hash) + getTransformation().hashCode();
@@ -6262,7 +6262,7 @@ public final class RPCProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasCallId()) {
hash = (37 * hash) + CALL_ID_FIELD_NUMBER;
hash = (53 * hash) + getCallId();
@@ -7493,7 +7493,7 @@ public final class RPCProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasCallId()) {
hash = (37 * hash) + CALL_ID_FIELD_NUMBER;
hash = (53 * hash) + getCallId();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionNormalizerProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionNormalizerProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionNormalizerProtos.java
index 0a58113..2421f0a 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionNormalizerProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionNormalizerProtos.java
@@ -174,7 +174,7 @@ public final class RegionNormalizerProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasNormalizerOn()) {
hash = (37 * hash) + NORMALIZER_ON_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionServerStatusProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionServerStatusProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionServerStatusProtos.java
index 8f368e9..d7d4db0 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionServerStatusProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/RegionServerStatusProtos.java
@@ -416,7 +416,7 @@ public final class RegionServerStatusProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasPort()) {
hash = (37 * hash) + PORT_FIELD_NUMBER;
hash = (53 * hash) + getPort();
@@ -1260,7 +1260,7 @@ public final class RegionServerStatusProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getMapEntriesCount() > 0) {
hash = (37 * hash) + MAP_ENTRIES_FIELD_NUMBER;
hash = (53 * hash) + getMapEntriesList().hashCode();
@@ -2210,7 +2210,7 @@ public final class RegionServerStatusProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasServer()) {
hash = (37 * hash) + SERVER_FIELD_NUMBER;
hash = (53 * hash) + getServer().hashCode();
@@ -2914,7 +2914,7 @@ public final class RegionServerStatusProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -3482,7 +3482,7 @@ public final class RegionServerStatusProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasServer()) {
hash = (37 * hash) + SERVER_FIELD_NUMBER;
hash = (53 * hash) + getServer().hashCode();
@@ -4159,7 +4159,7 @@ public final class RegionServerStatusProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -4596,7 +4596,7 @@ public final class RegionServerStatusProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegionName()) {
hash = (37 * hash) + REGION_NAME_FIELD_NUMBER;
hash = (53 * hash) + getRegionName().hashCode();
@@ -5231,7 +5231,7 @@ public final class RegionServerStatusProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasLastFlushedSequenceId()) {
hash = (37 * hash) + LAST_FLUSHED_SEQUENCE_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -6462,7 +6462,7 @@ public final class RegionServerStatusProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTransitionCode()) {
hash = (37 * hash) + TRANSITION_CODE_FIELD_NUMBER;
hash = (53 * hash) + transitionCode_;
@@ -7496,7 +7496,7 @@ public final class RegionServerStatusProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasServer()) {
hash = (37 * hash) + SERVER_FIELD_NUMBER;
hash = (53 * hash) + getServer().hashCode();
@@ -8446,7 +8446,7 @@ public final class RegionServerStatusProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasErrorMessage()) {
hash = (37 * hash) + ERROR_MESSAGE_FIELD_NUMBER;
hash = (53 * hash) + getErrorMessage().hashCode();
@@ -9142,7 +9142,7 @@ public final class RegionServerStatusProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegionInfo()) {
hash = (37 * hash) + REGION_INFO_FIELD_NUMBER;
hash = (53 * hash) + getRegionInfo().hashCode();
@@ -9857,7 +9857,7 @@ public final class RegionServerStatusProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasProcId()) {
hash = (37 * hash) + PROC_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ReplicationProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ReplicationProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ReplicationProtos.java
index 6a6d4bf..4052c12 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ReplicationProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ReplicationProtos.java
@@ -258,7 +258,7 @@ public final class ReplicationProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTableName()) {
hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER;
hash = (53 * hash) + getTableName().hashCode();
@@ -1426,7 +1426,7 @@ public final class ReplicationProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasClusterkey()) {
hash = (37 * hash) + CLUSTERKEY_FIELD_NUMBER;
hash = (53 * hash) + getClusterkey().hashCode();
@@ -3184,7 +3184,7 @@ public final class ReplicationProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasState()) {
hash = (37 * hash) + STATE_FIELD_NUMBER;
hash = (53 * hash) + state_;
@@ -3837,7 +3837,7 @@ public final class ReplicationProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasId()) {
hash = (37 * hash) + ID_FIELD_NUMBER;
hash = (53 * hash) + getId().hashCode();
@@ -4658,7 +4658,7 @@ public final class ReplicationProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasPosition()) {
hash = (37 * hash) + POSITION_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -5236,7 +5236,7 @@ public final class ReplicationProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasPeerId()) {
hash = (37 * hash) + PEER_ID_FIELD_NUMBER;
hash = (53 * hash) + getPeerId().hashCode();
@@ -5853,7 +5853,7 @@ public final class ReplicationProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -6306,7 +6306,7 @@ public final class ReplicationProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasPeerId()) {
hash = (37 * hash) + PEER_ID_FIELD_NUMBER;
hash = (53 * hash) + getPeerId().hashCode();
@@ -6777,7 +6777,7 @@ public final class ReplicationProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -7230,7 +7230,7 @@ public final class ReplicationProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasPeerId()) {
hash = (37 * hash) + PEER_ID_FIELD_NUMBER;
hash = (53 * hash) + getPeerId().hashCode();
@@ -7701,7 +7701,7 @@ public final class ReplicationProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -8154,7 +8154,7 @@ public final class ReplicationProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasPeerId()) {
hash = (37 * hash) + PEER_ID_FIELD_NUMBER;
hash = (53 * hash) + getPeerId().hashCode();
@@ -8625,7 +8625,7 @@ public final class ReplicationProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -9078,7 +9078,7 @@ public final class ReplicationProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasPeerId()) {
hash = (37 * hash) + PEER_ID_FIELD_NUMBER;
hash = (53 * hash) + getPeerId().hashCode();
@@ -9696,7 +9696,7 @@ public final class ReplicationProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasPeerId()) {
hash = (37 * hash) + PEER_ID_FIELD_NUMBER;
hash = (53 * hash) + getPeerId().hashCode();
@@ -10460,7 +10460,7 @@ public final class ReplicationProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasPeerId()) {
hash = (37 * hash) + PEER_ID_FIELD_NUMBER;
hash = (53 * hash) + getPeerId().hashCode();
@@ -11077,7 +11077,7 @@ public final class ReplicationProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -11526,7 +11526,7 @@ public final class ReplicationProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegex()) {
hash = (37 * hash) + REGEX_FIELD_NUMBER;
hash = (53 * hash) + getRegex().hashCode();
@@ -12082,7 +12082,7 @@ public final class ReplicationProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getPeerDescCount() > 0) {
hash = (37 * hash) + PEER_DESC_FIELD_NUMBER;
hash = (53 * hash) + getPeerDescList().hashCode();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/SnapshotProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/SnapshotProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/SnapshotProtos.java
index d40086b..a366f77 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/SnapshotProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/SnapshotProtos.java
@@ -496,7 +496,7 @@ public final class SnapshotProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasType()) {
hash = (37 * hash) + TYPE_FIELD_NUMBER;
hash = (53 * hash) + type_;
@@ -1549,7 +1549,7 @@ public final class SnapshotProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasName()) {
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
@@ -2362,7 +2362,7 @@ public final class SnapshotProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasFamilyName()) {
hash = (37 * hash) + FAMILY_NAME_FIELD_NUMBER;
hash = (53 * hash) + getFamilyName().hashCode();
@@ -3131,7 +3131,7 @@ public final class SnapshotProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasVersion()) {
hash = (37 * hash) + VERSION_FIELD_NUMBER;
hash = (53 * hash) + getVersion();
@@ -4146,7 +4146,7 @@ public final class SnapshotProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTableSchema()) {
hash = (37 * hash) + TABLE_SCHEMA_FIELD_NUMBER;
hash = (53 * hash) + getTableSchema().hashCode();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/TracingProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/TracingProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/TracingProtos.java
index 755bf65..f4897f3 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/TracingProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/TracingProtos.java
@@ -224,7 +224,7 @@ public final class TracingProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTraceId()) {
hash = (37 * hash) + TRACE_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/WALProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/WALProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/WALProtos.java
index db73e41..048f4b1 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/WALProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/WALProtos.java
@@ -505,7 +505,7 @@ public final class WALProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasHasCompression()) {
hash = (37 * hash) + HAS_COMPRESSION_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -1894,7 +1894,7 @@ public final class WALProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasEncodedRegionName()) {
hash = (37 * hash) + ENCODED_REGION_NAME_FIELD_NUMBER;
hash = (53 * hash) + getEncodedRegionName().hashCode();
@@ -3639,7 +3639,7 @@ public final class WALProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasFamily()) {
hash = (37 * hash) + FAMILY_FIELD_NUMBER;
hash = (53 * hash) + getFamily().hashCode();
@@ -4623,7 +4623,7 @@ public final class WALProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTableName()) {
hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER;
hash = (53 * hash) + getTableName().hashCode();
@@ -6196,7 +6196,7 @@ public final class WALProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasFamilyName()) {
hash = (37 * hash) + FAMILY_NAME_FIELD_NUMBER;
hash = (53 * hash) + getFamilyName().hashCode();
@@ -7029,7 +7029,7 @@ public final class WALProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasAction()) {
hash = (37 * hash) + ACTION_FIELD_NUMBER;
hash = (53 * hash) + action_;
@@ -8280,7 +8280,7 @@ public final class WALProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasFamilyName()) {
hash = (37 * hash) + FAMILY_NAME_FIELD_NUMBER;
hash = (53 * hash) + getFamilyName().hashCode();
@@ -9291,7 +9291,7 @@ public final class WALProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTableName()) {
hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER;
hash = (53 * hash) + getTableName().hashCode();
@@ -10727,7 +10727,7 @@ public final class WALProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasEventType()) {
hash = (37 * hash) + EVENT_TYPE_FIELD_NUMBER;
hash = (53 * hash) + eventType_;
@@ -11853,7 +11853,7 @@ public final class WALProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ZooKeeperProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ZooKeeperProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ZooKeeperProtos.java
index caafc01..f685c6b 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ZooKeeperProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ZooKeeperProtos.java
@@ -364,7 +364,7 @@ public final class ZooKeeperProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasServer()) {
hash = (37 * hash) + SERVER_FIELD_NUMBER;
hash = (53 * hash) + getServer().hashCode();
@@ -1269,7 +1269,7 @@ public final class ZooKeeperProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasMaster()) {
hash = (37 * hash) + MASTER_FIELD_NUMBER;
hash = (53 * hash) + getMaster().hashCode();
@@ -2054,7 +2054,7 @@ public final class ZooKeeperProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasStartDate()) {
hash = (37 * hash) + START_DATE_FIELD_NUMBER;
hash = (53 * hash) + getStartDate().hashCode();
@@ -2951,7 +2951,7 @@ public final class ZooKeeperProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasState()) {
hash = (37 * hash) + STATE_FIELD_NUMBER;
hash = (53 * hash) + state_;
@@ -3777,7 +3777,7 @@ public final class ZooKeeperProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasState()) {
hash = (37 * hash) + STATE_FIELD_NUMBER;
hash = (53 * hash) + state_;
@@ -4285,7 +4285,7 @@ public final class ZooKeeperProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasEnabled()) {
hash = (37 * hash) + ENABLED_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
[4/7] hbase git commit: HBASE-16780 Since move to protobuf3.1, Cells
are limited to 64MB where previous they had no limit Update internal pb to
3.2 from 3.1.; AMENDMENT -- FORGOT TO REBUILD PBs
Posted by st...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Option.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Option.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Option.java
index 86f8d4b..cfd28c9 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Option.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Option.java
@@ -94,10 +94,13 @@ public final class Option extends
private volatile java.lang.Object name_;
/**
* <pre>
- * The option's name. For example, `"java_package"`.
+ * The option's name. For protobuf built-in options (options defined in
+ * descriptor.proto), this is the short name. For example, `"map_entry"`.
+ * For custom options, it should be the fully-qualified name. For example,
+ * `"google.api.http"`.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public java.lang.String getName() {
java.lang.Object ref = name_;
@@ -113,10 +116,13 @@ public final class Option extends
}
/**
* <pre>
- * The option's name. For example, `"java_package"`.
+ * The option's name. For protobuf built-in options (options defined in
+ * descriptor.proto), this is the short name. For example, `"map_entry"`.
+ * For custom options, it should be the fully-qualified name. For example,
+ * `"google.api.http"`.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes() {
@@ -136,30 +142,39 @@ public final class Option extends
private org.apache.hadoop.hbase.shaded.com.google.protobuf.Any value_;
/**
* <pre>
- * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+ * The option's value packed in an Any message. If the value is a primitive,
+ * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+ * should be used. If the value is an enum, it should be stored as an int32
+ * value using the google.protobuf.Int32Value type.
* </pre>
*
- * <code>optional .google.protobuf.Any value = 2;</code>
+ * <code>.google.protobuf.Any value = 2;</code>
*/
public boolean hasValue() {
return value_ != null;
}
/**
* <pre>
- * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+ * The option's value packed in an Any message. If the value is a primitive,
+ * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+ * should be used. If the value is an enum, it should be stored as an int32
+ * value using the google.protobuf.Int32Value type.
* </pre>
*
- * <code>optional .google.protobuf.Any value = 2;</code>
+ * <code>.google.protobuf.Any value = 2;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.Any getValue() {
return value_ == null ? org.apache.hadoop.hbase.shaded.com.google.protobuf.Any.getDefaultInstance() : value_;
}
/**
* <pre>
- * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+ * The option's value packed in an Any message. If the value is a primitive,
+ * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+ * should be used. If the value is an enum, it should be stored as an int32
+ * value using the google.protobuf.Int32Value type.
* </pre>
*
- * <code>optional .google.protobuf.Any value = 2;</code>
+ * <code>.google.protobuf.Any value = 2;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.AnyOrBuilder getValueOrBuilder() {
return getValue();
@@ -229,7 +244,7 @@ public final class Option extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
if (hasValue()) {
@@ -472,10 +487,13 @@ public final class Option extends
private java.lang.Object name_ = "";
/**
* <pre>
- * The option's name. For example, `"java_package"`.
+ * The option's name. For protobuf built-in options (options defined in
+ * descriptor.proto), this is the short name. For example, `"map_entry"`.
+ * For custom options, it should be the fully-qualified name. For example,
+ * `"google.api.http"`.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public java.lang.String getName() {
java.lang.Object ref = name_;
@@ -491,10 +509,13 @@ public final class Option extends
}
/**
* <pre>
- * The option's name. For example, `"java_package"`.
+ * The option's name. For protobuf built-in options (options defined in
+ * descriptor.proto), this is the short name. For example, `"map_entry"`.
+ * For custom options, it should be the fully-qualified name. For example,
+ * `"google.api.http"`.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes() {
@@ -511,10 +532,13 @@ public final class Option extends
}
/**
* <pre>
- * The option's name. For example, `"java_package"`.
+ * The option's name. For protobuf built-in options (options defined in
+ * descriptor.proto), this is the short name. For example, `"map_entry"`.
+ * For custom options, it should be the fully-qualified name. For example,
+ * `"google.api.http"`.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public Builder setName(
java.lang.String value) {
@@ -528,10 +552,13 @@ public final class Option extends
}
/**
* <pre>
- * The option's name. For example, `"java_package"`.
+ * The option's name. For protobuf built-in options (options defined in
+ * descriptor.proto), this is the short name. For example, `"map_entry"`.
+ * For custom options, it should be the fully-qualified name. For example,
+ * `"google.api.http"`.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public Builder clearName() {
@@ -541,10 +568,13 @@ public final class Option extends
}
/**
* <pre>
- * The option's name. For example, `"java_package"`.
+ * The option's name. For protobuf built-in options (options defined in
+ * descriptor.proto), this is the short name. For example, `"map_entry"`.
+ * For custom options, it should be the fully-qualified name. For example,
+ * `"google.api.http"`.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public Builder setNameBytes(
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
@@ -563,20 +593,26 @@ public final class Option extends
org.apache.hadoop.hbase.shaded.com.google.protobuf.Any, org.apache.hadoop.hbase.shaded.com.google.protobuf.Any.Builder, org.apache.hadoop.hbase.shaded.com.google.protobuf.AnyOrBuilder> valueBuilder_;
/**
* <pre>
- * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+ * The option's value packed in an Any message. If the value is a primitive,
+ * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+ * should be used. If the value is an enum, it should be stored as an int32
+ * value using the google.protobuf.Int32Value type.
* </pre>
*
- * <code>optional .google.protobuf.Any value = 2;</code>
+ * <code>.google.protobuf.Any value = 2;</code>
*/
public boolean hasValue() {
return valueBuilder_ != null || value_ != null;
}
/**
* <pre>
- * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+ * The option's value packed in an Any message. If the value is a primitive,
+ * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+ * should be used. If the value is an enum, it should be stored as an int32
+ * value using the google.protobuf.Int32Value type.
* </pre>
*
- * <code>optional .google.protobuf.Any value = 2;</code>
+ * <code>.google.protobuf.Any value = 2;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.Any getValue() {
if (valueBuilder_ == null) {
@@ -587,10 +623,13 @@ public final class Option extends
}
/**
* <pre>
- * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+ * The option's value packed in an Any message. If the value is a primitive,
+ * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+ * should be used. If the value is an enum, it should be stored as an int32
+ * value using the google.protobuf.Int32Value type.
* </pre>
*
- * <code>optional .google.protobuf.Any value = 2;</code>
+ * <code>.google.protobuf.Any value = 2;</code>
*/
public Builder setValue(org.apache.hadoop.hbase.shaded.com.google.protobuf.Any value) {
if (valueBuilder_ == null) {
@@ -607,10 +646,13 @@ public final class Option extends
}
/**
* <pre>
- * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+ * The option's value packed in an Any message. If the value is a primitive,
+ * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+ * should be used. If the value is an enum, it should be stored as an int32
+ * value using the google.protobuf.Int32Value type.
* </pre>
*
- * <code>optional .google.protobuf.Any value = 2;</code>
+ * <code>.google.protobuf.Any value = 2;</code>
*/
public Builder setValue(
org.apache.hadoop.hbase.shaded.com.google.protobuf.Any.Builder builderForValue) {
@@ -625,10 +667,13 @@ public final class Option extends
}
/**
* <pre>
- * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+ * The option's value packed in an Any message. If the value is a primitive,
+ * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+ * should be used. If the value is an enum, it should be stored as an int32
+ * value using the google.protobuf.Int32Value type.
* </pre>
*
- * <code>optional .google.protobuf.Any value = 2;</code>
+ * <code>.google.protobuf.Any value = 2;</code>
*/
public Builder mergeValue(org.apache.hadoop.hbase.shaded.com.google.protobuf.Any value) {
if (valueBuilder_ == null) {
@@ -647,10 +692,13 @@ public final class Option extends
}
/**
* <pre>
- * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+ * The option's value packed in an Any message. If the value is a primitive,
+ * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+ * should be used. If the value is an enum, it should be stored as an int32
+ * value using the google.protobuf.Int32Value type.
* </pre>
*
- * <code>optional .google.protobuf.Any value = 2;</code>
+ * <code>.google.protobuf.Any value = 2;</code>
*/
public Builder clearValue() {
if (valueBuilder_ == null) {
@@ -665,10 +713,13 @@ public final class Option extends
}
/**
* <pre>
- * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+ * The option's value packed in an Any message. If the value is a primitive,
+ * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+ * should be used. If the value is an enum, it should be stored as an int32
+ * value using the google.protobuf.Int32Value type.
* </pre>
*
- * <code>optional .google.protobuf.Any value = 2;</code>
+ * <code>.google.protobuf.Any value = 2;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.Any.Builder getValueBuilder() {
@@ -677,10 +728,13 @@ public final class Option extends
}
/**
* <pre>
- * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+ * The option's value packed in an Any message. If the value is a primitive,
+ * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+ * should be used. If the value is an enum, it should be stored as an int32
+ * value using the google.protobuf.Int32Value type.
* </pre>
*
- * <code>optional .google.protobuf.Any value = 2;</code>
+ * <code>.google.protobuf.Any value = 2;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.AnyOrBuilder getValueOrBuilder() {
if (valueBuilder_ != null) {
@@ -692,10 +746,13 @@ public final class Option extends
}
/**
* <pre>
- * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+ * The option's value packed in an Any message. If the value is a primitive,
+ * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+ * should be used. If the value is an enum, it should be stored as an int32
+ * value using the google.protobuf.Int32Value type.
* </pre>
*
- * <code>optional .google.protobuf.Any value = 2;</code>
+ * <code>.google.protobuf.Any value = 2;</code>
*/
private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3<
org.apache.hadoop.hbase.shaded.com.google.protobuf.Any, org.apache.hadoop.hbase.shaded.com.google.protobuf.Any.Builder, org.apache.hadoop.hbase.shaded.com.google.protobuf.AnyOrBuilder>
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/OptionOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/OptionOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/OptionOrBuilder.java
index 20f2b8c..3fea10a 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/OptionOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/OptionOrBuilder.java
@@ -9,44 +9,59 @@ public interface OptionOrBuilder extends
/**
* <pre>
- * The option's name. For example, `"java_package"`.
+ * The option's name. For protobuf built-in options (options defined in
+ * descriptor.proto), this is the short name. For example, `"map_entry"`.
+ * For custom options, it should be the fully-qualified name. For example,
+ * `"google.api.http"`.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
java.lang.String getName();
/**
* <pre>
- * The option's name. For example, `"java_package"`.
+ * The option's name. For protobuf built-in options (options defined in
+ * descriptor.proto), this is the short name. For example, `"map_entry"`.
+ * For custom options, it should be the fully-qualified name. For example,
+ * `"google.api.http"`.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes();
/**
* <pre>
- * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+ * The option's value packed in an Any message. If the value is a primitive,
+ * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+ * should be used. If the value is an enum, it should be stored as an int32
+ * value using the google.protobuf.Int32Value type.
* </pre>
*
- * <code>optional .google.protobuf.Any value = 2;</code>
+ * <code>.google.protobuf.Any value = 2;</code>
*/
boolean hasValue();
/**
* <pre>
- * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+ * The option's value packed in an Any message. If the value is a primitive,
+ * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+ * should be used. If the value is an enum, it should be stored as an int32
+ * value using the google.protobuf.Int32Value type.
* </pre>
*
- * <code>optional .google.protobuf.Any value = 2;</code>
+ * <code>.google.protobuf.Any value = 2;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.Any getValue();
/**
* <pre>
- * The option's value. For example, `"org.apache.hadoop.hbase.shaded.com.google.protobuf"`.
+ * The option's value packed in an Any message. If the value is a primitive,
+ * the corresponding wrapper type defined in google/protobuf/wrappers.proto
+ * should be used. If the value is an enum, it should be stored as an int32
+ * value using the google.protobuf.Int32Value type.
* </pre>
*
- * <code>optional .google.protobuf.Any value = 2;</code>
+ * <code>.google.protobuf.Any value = 2;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.AnyOrBuilder getValueOrBuilder();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SmallSortedMap.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SmallSortedMap.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SmallSortedMap.java
index 2dfabd3..a24c2ce 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SmallSortedMap.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SmallSortedMap.java
@@ -197,6 +197,7 @@ class SmallSortedMap<K extends Comparable<K>, V> extends AbstractMap<K, V> {
overflowEntries.entrySet();
}
+
@Override
public int size() {
return entryList.size() + overflowEntries.size();
@@ -356,6 +357,7 @@ class SmallSortedMap<K extends Comparable<K>, V> extends AbstractMap<K, V> {
return lazyEntrySet;
}
+
/**
* @throws UnsupportedOperationException if {@link #makeImmutable()} has
* has been called.
@@ -525,6 +527,7 @@ class SmallSortedMap<K extends Comparable<K>, V> extends AbstractMap<K, V> {
}
}
+
/**
* Iterator implementation that switches from the entry array to the overflow
* entries appropriately.
@@ -617,43 +620,43 @@ class SmallSortedMap<K extends Comparable<K>, V> extends AbstractMap<K, V> {
return (Iterable<T>) ITERABLE;
}
}
-
+
@Override
public boolean equals(Object o) {
if (this == o) {
return true;
}
-
+
if (!(o instanceof SmallSortedMap)) {
return super.equals(o);
}
-
+
SmallSortedMap<?, ?> other = (SmallSortedMap<?, ?>) o;
final int size = size();
if (size != other.size()) {
return false;
}
-
+
// Best effort try to avoid allocating an entry set.
final int numArrayEntries = getNumArrayEntries();
if (numArrayEntries != other.getNumArrayEntries()) {
return entrySet().equals(other.entrySet());
}
-
+
for (int i = 0; i < numArrayEntries; i++) {
if (!getArrayEntryAt(i).equals(other.getArrayEntryAt(i))) {
return false;
}
}
-
+
if (numArrayEntries != size) {
return overflowEntries.equals(other.overflowEntries);
}
-
-
+
+
return true;
}
-
+
@Override
public int hashCode() {
int h = 0;
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContext.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContext.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContext.java
index 720fd63..ab4938c 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContext.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContext.java
@@ -85,7 +85,7 @@ public final class SourceContext extends
* protobuf element. For example: `"google/protobuf/source_context.proto"`.
* </pre>
*
- * <code>optional string file_name = 1;</code>
+ * <code>string file_name = 1;</code>
*/
public java.lang.String getFileName() {
java.lang.Object ref = fileName_;
@@ -105,7 +105,7 @@ public final class SourceContext extends
* protobuf element. For example: `"google/protobuf/source_context.proto"`.
* </pre>
*
- * <code>optional string file_name = 1;</code>
+ * <code>string file_name = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getFileNameBytes() {
@@ -173,7 +173,7 @@ public final class SourceContext extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + FILE_NAME_FIELD_NUMBER;
hash = (53 * hash) + getFileName().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
@@ -402,7 +402,7 @@ public final class SourceContext extends
* protobuf element. For example: `"google/protobuf/source_context.proto"`.
* </pre>
*
- * <code>optional string file_name = 1;</code>
+ * <code>string file_name = 1;</code>
*/
public java.lang.String getFileName() {
java.lang.Object ref = fileName_;
@@ -422,7 +422,7 @@ public final class SourceContext extends
* protobuf element. For example: `"google/protobuf/source_context.proto"`.
* </pre>
*
- * <code>optional string file_name = 1;</code>
+ * <code>string file_name = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getFileNameBytes() {
@@ -443,7 +443,7 @@ public final class SourceContext extends
* protobuf element. For example: `"google/protobuf/source_context.proto"`.
* </pre>
*
- * <code>optional string file_name = 1;</code>
+ * <code>string file_name = 1;</code>
*/
public Builder setFileName(
java.lang.String value) {
@@ -461,7 +461,7 @@ public final class SourceContext extends
* protobuf element. For example: `"google/protobuf/source_context.proto"`.
* </pre>
*
- * <code>optional string file_name = 1;</code>
+ * <code>string file_name = 1;</code>
*/
public Builder clearFileName() {
@@ -475,7 +475,7 @@ public final class SourceContext extends
* protobuf element. For example: `"google/protobuf/source_context.proto"`.
* </pre>
*
- * <code>optional string file_name = 1;</code>
+ * <code>string file_name = 1;</code>
*/
public Builder setFileNameBytes(
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContextOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContextOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContextOrBuilder.java
index 4a59bb5..c35eceb 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContextOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContextOrBuilder.java
@@ -13,7 +13,7 @@ public interface SourceContextOrBuilder extends
* protobuf element. For example: `"google/protobuf/source_context.proto"`.
* </pre>
*
- * <code>optional string file_name = 1;</code>
+ * <code>string file_name = 1;</code>
*/
java.lang.String getFileName();
/**
@@ -22,7 +22,7 @@ public interface SourceContextOrBuilder extends
* protobuf element. For example: `"google/protobuf/source_context.proto"`.
* </pre>
*
- * <code>optional string file_name = 1;</code>
+ * <code>string file_name = 1;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getFileNameBytes();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContextProto.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContextProto.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContextProto.java
index 6ee1bda..48f2e3f 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContextProto.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/SourceContextProto.java
@@ -30,9 +30,11 @@ public final class SourceContextProto {
java.lang.String[] descriptorData = {
"\n$google/protobuf/source_context.proto\022\017" +
"google.protobuf\"\"\n\rSourceContext\022\021\n\tfile" +
- "_name\030\001 \001(\tBR\n\023com.google.protobufB\022Sour" +
- "ceContextProtoP\001\242\002\003GPB\252\002\036Google.Protobuf" +
- ".WellKnownTypesb\006proto3"
+ "_name\030\001 \001(\tB\225\001\n\023com.google.protobufB\022Sou" +
+ "rceContextProtoP\001ZAgoogle.golang.org/gen" +
+ "proto/protobuf/source_context;source_con" +
+ "text\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTy" +
+ "pesb\006proto3"
};
org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/StringValue.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/StringValue.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/StringValue.java
index 70f4acf..f3e2ef6 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/StringValue.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/StringValue.java
@@ -84,7 +84,7 @@ public final class StringValue extends
* The string value.
* </pre>
*
- * <code>optional string value = 1;</code>
+ * <code>string value = 1;</code>
*/
public java.lang.String getValue() {
java.lang.Object ref = value_;
@@ -103,7 +103,7 @@ public final class StringValue extends
* The string value.
* </pre>
*
- * <code>optional string value = 1;</code>
+ * <code>string value = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getValueBytes() {
@@ -171,7 +171,7 @@ public final class StringValue extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + VALUE_FIELD_NUMBER;
hash = (53 * hash) + getValue().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
@@ -399,7 +399,7 @@ public final class StringValue extends
* The string value.
* </pre>
*
- * <code>optional string value = 1;</code>
+ * <code>string value = 1;</code>
*/
public java.lang.String getValue() {
java.lang.Object ref = value_;
@@ -418,7 +418,7 @@ public final class StringValue extends
* The string value.
* </pre>
*
- * <code>optional string value = 1;</code>
+ * <code>string value = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getValueBytes() {
@@ -438,7 +438,7 @@ public final class StringValue extends
* The string value.
* </pre>
*
- * <code>optional string value = 1;</code>
+ * <code>string value = 1;</code>
*/
public Builder setValue(
java.lang.String value) {
@@ -455,7 +455,7 @@ public final class StringValue extends
* The string value.
* </pre>
*
- * <code>optional string value = 1;</code>
+ * <code>string value = 1;</code>
*/
public Builder clearValue() {
@@ -468,7 +468,7 @@ public final class StringValue extends
* The string value.
* </pre>
*
- * <code>optional string value = 1;</code>
+ * <code>string value = 1;</code>
*/
public Builder setValueBytes(
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/StringValueOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/StringValueOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/StringValueOrBuilder.java
index 81873cd..7ac0ee8 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/StringValueOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/StringValueOrBuilder.java
@@ -12,7 +12,7 @@ public interface StringValueOrBuilder extends
* The string value.
* </pre>
*
- * <code>optional string value = 1;</code>
+ * <code>string value = 1;</code>
*/
java.lang.String getValue();
/**
@@ -20,7 +20,7 @@ public interface StringValueOrBuilder extends
* The string value.
* </pre>
*
- * <code>optional string value = 1;</code>
+ * <code>string value = 1;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getValueBytes();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Struct.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Struct.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Struct.java
index ced7eea..2607900 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Struct.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Struct.java
@@ -253,7 +253,7 @@ public final class Struct extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (!internalGetFields().getMap().isEmpty()) {
hash = (37 * hash) + FIELDS_FIELD_NUMBER;
hash = (53 * hash) + internalGetFields().hashCode();
@@ -597,7 +597,8 @@ public final class Struct extends
}
public Builder clearFields() {
- getMutableFields().clear();
+ internalGetMutableFields().getMutableMap()
+ .clear();
return this;
}
/**
@@ -611,7 +612,8 @@ public final class Struct extends
public Builder removeFields(
java.lang.String key) {
if (key == null) { throw new java.lang.NullPointerException(); }
- getMutableFields().remove(key);
+ internalGetMutableFields().getMutableMap()
+ .remove(key);
return this;
}
/**
@@ -634,7 +636,8 @@ public final class Struct extends
org.apache.hadoop.hbase.shaded.com.google.protobuf.Value value) {
if (key == null) { throw new java.lang.NullPointerException(); }
if (value == null) { throw new java.lang.NullPointerException(); }
- getMutableFields().put(key, value);
+ internalGetMutableFields().getMutableMap()
+ .put(key, value);
return this;
}
/**
@@ -647,7 +650,8 @@ public final class Struct extends
public Builder putAllFields(
java.util.Map<java.lang.String, org.apache.hadoop.hbase.shaded.com.google.protobuf.Value> values) {
- getMutableFields().putAll(values);
+ internalGetMutableFields().getMutableMap()
+ .putAll(values);
return this;
}
public final Builder setUnknownFields(
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Syntax.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Syntax.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Syntax.java
index 0e65a5d..f03d70b 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Syntax.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Syntax.java
@@ -95,8 +95,7 @@ public enum Syntax
}
public static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.EnumDescriptor
getDescriptor() {
- return org.apache.hadoop.hbase.shaded.com.google.protobuf.TypeProto.getDescriptor()
- .getEnumTypes().get(0);
+ return org.apache.hadoop.hbase.shaded.com.google.protobuf.TypeProto.getDescriptor().getEnumTypes().get(0);
}
private static final Syntax[] VALUES = values();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Timestamp.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Timestamp.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Timestamp.java
index 29c61c3..0023d50 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Timestamp.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Timestamp.java
@@ -126,7 +126,7 @@ public final class Timestamp extends
* 9999-12-31T23:59:59Z inclusive.
* </pre>
*
- * <code>optional int64 seconds = 1;</code>
+ * <code>int64 seconds = 1;</code>
*/
public long getSeconds() {
return seconds_;
@@ -142,7 +142,7 @@ public final class Timestamp extends
* inclusive.
* </pre>
*
- * <code>optional int32 nanos = 2;</code>
+ * <code>int32 nanos = 2;</code>
*/
public int getNanos() {
return nanos_;
@@ -210,7 +210,7 @@ public final class Timestamp extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + SECONDS_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
getSeconds());
@@ -483,7 +483,7 @@ public final class Timestamp extends
* 9999-12-31T23:59:59Z inclusive.
* </pre>
*
- * <code>optional int64 seconds = 1;</code>
+ * <code>int64 seconds = 1;</code>
*/
public long getSeconds() {
return seconds_;
@@ -495,7 +495,7 @@ public final class Timestamp extends
* 9999-12-31T23:59:59Z inclusive.
* </pre>
*
- * <code>optional int64 seconds = 1;</code>
+ * <code>int64 seconds = 1;</code>
*/
public Builder setSeconds(long value) {
@@ -510,7 +510,7 @@ public final class Timestamp extends
* 9999-12-31T23:59:59Z inclusive.
* </pre>
*
- * <code>optional int64 seconds = 1;</code>
+ * <code>int64 seconds = 1;</code>
*/
public Builder clearSeconds() {
@@ -528,7 +528,7 @@ public final class Timestamp extends
* inclusive.
* </pre>
*
- * <code>optional int32 nanos = 2;</code>
+ * <code>int32 nanos = 2;</code>
*/
public int getNanos() {
return nanos_;
@@ -541,7 +541,7 @@ public final class Timestamp extends
* inclusive.
* </pre>
*
- * <code>optional int32 nanos = 2;</code>
+ * <code>int32 nanos = 2;</code>
*/
public Builder setNanos(int value) {
@@ -557,7 +557,7 @@ public final class Timestamp extends
* inclusive.
* </pre>
*
- * <code>optional int32 nanos = 2;</code>
+ * <code>int32 nanos = 2;</code>
*/
public Builder clearNanos() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TimestampOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TimestampOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TimestampOrBuilder.java
index 6ec1b04..fca3c16 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TimestampOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TimestampOrBuilder.java
@@ -14,7 +14,7 @@ public interface TimestampOrBuilder extends
* 9999-12-31T23:59:59Z inclusive.
* </pre>
*
- * <code>optional int64 seconds = 1;</code>
+ * <code>int64 seconds = 1;</code>
*/
long getSeconds();
@@ -26,7 +26,7 @@ public interface TimestampOrBuilder extends
* inclusive.
* </pre>
*
- * <code>optional int32 nanos = 2;</code>
+ * <code>int32 nanos = 2;</code>
*/
int getNanos();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Type.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Type.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Type.java
index 3a0ea49..f46f351 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Type.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Type.java
@@ -143,7 +143,7 @@ public final class Type extends
* The fully qualified message name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public java.lang.String getName() {
java.lang.Object ref = name_;
@@ -162,7 +162,7 @@ public final class Type extends
* The fully qualified message name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes() {
@@ -340,7 +340,7 @@ public final class Type extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
public boolean hasSourceContext() {
return sourceContext_ != null;
@@ -350,7 +350,7 @@ public final class Type extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext getSourceContext() {
return sourceContext_ == null ? org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext.getDefaultInstance() : sourceContext_;
@@ -360,7 +360,7 @@ public final class Type extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContextOrBuilder getSourceContextOrBuilder() {
return getSourceContext();
@@ -373,7 +373,7 @@ public final class Type extends
* The source syntax.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 6;</code>
+ * <code>.google.protobuf.Syntax syntax = 6;</code>
*/
public int getSyntaxValue() {
return syntax_;
@@ -383,7 +383,7 @@ public final class Type extends
* The source syntax.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 6;</code>
+ * <code>.google.protobuf.Syntax syntax = 6;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax getSyntax() {
org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax result = org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax.valueOf(syntax_);
@@ -493,7 +493,7 @@ public final class Type extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
if (getFieldsCount() > 0) {
@@ -863,7 +863,7 @@ public final class Type extends
* The fully qualified message name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public java.lang.String getName() {
java.lang.Object ref = name_;
@@ -882,7 +882,7 @@ public final class Type extends
* The fully qualified message name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes() {
@@ -902,7 +902,7 @@ public final class Type extends
* The fully qualified message name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public Builder setName(
java.lang.String value) {
@@ -919,7 +919,7 @@ public final class Type extends
* The fully qualified message name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public Builder clearName() {
@@ -932,7 +932,7 @@ public final class Type extends
* The fully qualified message name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public Builder setNameBytes(
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
@@ -1708,7 +1708,7 @@ public final class Type extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
public boolean hasSourceContext() {
return sourceContextBuilder_ != null || sourceContext_ != null;
@@ -1718,7 +1718,7 @@ public final class Type extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext getSourceContext() {
if (sourceContextBuilder_ == null) {
@@ -1732,7 +1732,7 @@ public final class Type extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
public Builder setSourceContext(org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext value) {
if (sourceContextBuilder_ == null) {
@@ -1752,7 +1752,7 @@ public final class Type extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
public Builder setSourceContext(
org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext.Builder builderForValue) {
@@ -1770,7 +1770,7 @@ public final class Type extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
public Builder mergeSourceContext(org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext value) {
if (sourceContextBuilder_ == null) {
@@ -1792,7 +1792,7 @@ public final class Type extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
public Builder clearSourceContext() {
if (sourceContextBuilder_ == null) {
@@ -1810,7 +1810,7 @@ public final class Type extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext.Builder getSourceContextBuilder() {
@@ -1822,7 +1822,7 @@ public final class Type extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContextOrBuilder getSourceContextOrBuilder() {
if (sourceContextBuilder_ != null) {
@@ -1837,7 +1837,7 @@ public final class Type extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3<
org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext, org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext.Builder, org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContextOrBuilder>
@@ -1859,7 +1859,7 @@ public final class Type extends
* The source syntax.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 6;</code>
+ * <code>.google.protobuf.Syntax syntax = 6;</code>
*/
public int getSyntaxValue() {
return syntax_;
@@ -1869,7 +1869,7 @@ public final class Type extends
* The source syntax.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 6;</code>
+ * <code>.google.protobuf.Syntax syntax = 6;</code>
*/
public Builder setSyntaxValue(int value) {
syntax_ = value;
@@ -1881,7 +1881,7 @@ public final class Type extends
* The source syntax.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 6;</code>
+ * <code>.google.protobuf.Syntax syntax = 6;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax getSyntax() {
org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax result = org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax.valueOf(syntax_);
@@ -1892,7 +1892,7 @@ public final class Type extends
* The source syntax.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 6;</code>
+ * <code>.google.protobuf.Syntax syntax = 6;</code>
*/
public Builder setSyntax(org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax value) {
if (value == null) {
@@ -1908,7 +1908,7 @@ public final class Type extends
* The source syntax.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 6;</code>
+ * <code>.google.protobuf.Syntax syntax = 6;</code>
*/
public Builder clearSyntax() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TypeOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TypeOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TypeOrBuilder.java
index aa83b6f..fe845dd 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TypeOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TypeOrBuilder.java
@@ -12,7 +12,7 @@ public interface TypeOrBuilder extends
* The fully qualified message name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
java.lang.String getName();
/**
@@ -20,7 +20,7 @@ public interface TypeOrBuilder extends
* The fully qualified message name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes();
@@ -153,7 +153,7 @@ public interface TypeOrBuilder extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
boolean hasSourceContext();
/**
@@ -161,7 +161,7 @@ public interface TypeOrBuilder extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext getSourceContext();
/**
@@ -169,7 +169,7 @@ public interface TypeOrBuilder extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContextOrBuilder getSourceContextOrBuilder();
@@ -178,7 +178,7 @@ public interface TypeOrBuilder extends
* The source syntax.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 6;</code>
+ * <code>.google.protobuf.Syntax syntax = 6;</code>
*/
int getSyntaxValue();
/**
@@ -186,7 +186,7 @@ public interface TypeOrBuilder extends
* The source syntax.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 6;</code>
+ * <code>.google.protobuf.Syntax syntax = 6;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax getSyntax();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TypeProto.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TypeProto.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TypeProto.java
index d5733df..e7c3094 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TypeProto.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/TypeProto.java
@@ -84,9 +84,10 @@ public final class TypeProto {
"\003 \003(\0132\027.google.protobuf.Option\";\n\006Option" +
"\022\014\n\004name\030\001 \001(\t\022#\n\005value\030\002 \001(\0132\024.google.p" +
"rotobuf.Any*.\n\006Syntax\022\021\n\rSYNTAX_PROTO2\020\000" +
- "\022\021\n\rSYNTAX_PROTO3\020\001BL\n\023com.google.protob" +
- "ufB\tTypeProtoP\001\370\001\001\242\002\003GPB\252\002\036Google.Protob" +
- "uf.WellKnownTypesb\006proto3"
+ "\022\021\n\rSYNTAX_PROTO3\020\001B}\n\023com.google.protob" +
+ "ufB\tTypeProtoP\001Z/google.golang.org/genpr" +
+ "oto/protobuf/ptype;ptype\370\001\001\242\002\003GPB\252\002\036Goog" +
+ "le.Protobuf.WellKnownTypesb\006proto3"
};
org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt32Value.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt32Value.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt32Value.java
index 716cd7d..7b4dae9 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt32Value.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt32Value.java
@@ -83,7 +83,7 @@ public final class UInt32Value extends
* The uint32 value.
* </pre>
*
- * <code>optional uint32 value = 1;</code>
+ * <code>uint32 value = 1;</code>
*/
public int getValue() {
return value_;
@@ -142,7 +142,7 @@ public final class UInt32Value extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + VALUE_FIELD_NUMBER;
hash = (53 * hash) + getValue();
hash = (29 * hash) + unknownFields.hashCode();
@@ -369,7 +369,7 @@ public final class UInt32Value extends
* The uint32 value.
* </pre>
*
- * <code>optional uint32 value = 1;</code>
+ * <code>uint32 value = 1;</code>
*/
public int getValue() {
return value_;
@@ -379,7 +379,7 @@ public final class UInt32Value extends
* The uint32 value.
* </pre>
*
- * <code>optional uint32 value = 1;</code>
+ * <code>uint32 value = 1;</code>
*/
public Builder setValue(int value) {
@@ -392,7 +392,7 @@ public final class UInt32Value extends
* The uint32 value.
* </pre>
*
- * <code>optional uint32 value = 1;</code>
+ * <code>uint32 value = 1;</code>
*/
public Builder clearValue() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt32ValueOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt32ValueOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt32ValueOrBuilder.java
index d52f0e0..ad0d537 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt32ValueOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt32ValueOrBuilder.java
@@ -12,7 +12,7 @@ public interface UInt32ValueOrBuilder extends
* The uint32 value.
* </pre>
*
- * <code>optional uint32 value = 1;</code>
+ * <code>uint32 value = 1;</code>
*/
int getValue();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt64Value.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt64Value.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt64Value.java
index 7ed4029..578a6ff 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt64Value.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt64Value.java
@@ -83,7 +83,7 @@ public final class UInt64Value extends
* The uint64 value.
* </pre>
*
- * <code>optional uint64 value = 1;</code>
+ * <code>uint64 value = 1;</code>
*/
public long getValue() {
return value_;
@@ -142,7 +142,7 @@ public final class UInt64Value extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + VALUE_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
getValue());
@@ -370,7 +370,7 @@ public final class UInt64Value extends
* The uint64 value.
* </pre>
*
- * <code>optional uint64 value = 1;</code>
+ * <code>uint64 value = 1;</code>
*/
public long getValue() {
return value_;
@@ -380,7 +380,7 @@ public final class UInt64Value extends
* The uint64 value.
* </pre>
*
- * <code>optional uint64 value = 1;</code>
+ * <code>uint64 value = 1;</code>
*/
public Builder setValue(long value) {
@@ -393,7 +393,7 @@ public final class UInt64Value extends
* The uint64 value.
* </pre>
*
- * <code>optional uint64 value = 1;</code>
+ * <code>uint64 value = 1;</code>
*/
public Builder clearValue() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt64ValueOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt64ValueOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt64ValueOrBuilder.java
index bbdc59a..5f65674 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt64ValueOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UInt64ValueOrBuilder.java
@@ -12,7 +12,7 @@ public interface UInt64ValueOrBuilder extends
* The uint64 value.
* </pre>
*
- * <code>optional uint64 value = 1;</code>
+ * <code>uint64 value = 1;</code>
*/
long getValue();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UnknownFieldSet.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UnknownFieldSet.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UnknownFieldSet.java
index 47b9e12..148a3dd 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UnknownFieldSet.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UnknownFieldSet.java
@@ -31,7 +31,6 @@
package org.apache.hadoop.hbase.shaded.com.google.protobuf;
import org.apache.hadoop.hbase.shaded.com.google.protobuf.AbstractMessageLite.Builder.LimitedInputStream;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@@ -39,6 +38,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.ListIterator;
import java.util.Map;
import java.util.TreeMap;
@@ -58,7 +58,9 @@ import java.util.TreeMap;
*/
public final class UnknownFieldSet implements MessageLite {
- private UnknownFieldSet() {}
+ private UnknownFieldSet() {
+ fields = null;
+ }
/** Create a new {@link Builder}. */
public static Builder newBuilder() {
@@ -82,16 +84,18 @@ public final class UnknownFieldSet implements MessageLite {
return defaultInstance;
}
private static final UnknownFieldSet defaultInstance =
- new UnknownFieldSet(Collections.<Integer, Field>emptyMap());
+ new UnknownFieldSet(Collections.<Integer, Field>emptyMap(),
+ Collections.<Integer, Field>emptyMap());
/**
* Construct an {@code UnknownFieldSet} around the given map. The map is
* expected to be immutable.
*/
- private UnknownFieldSet(final Map<Integer, Field> fields) {
+ private UnknownFieldSet(final Map<Integer, Field> fields,
+ final Map<Integer, Field> fieldsDescending) {
this.fields = fields;
}
- private Map<Integer, Field> fields;
+ private final Map<Integer, Field> fields;
@Override
@@ -224,10 +228,8 @@ public final class UnknownFieldSet implements MessageLite {
}
}
- /**
- * Get the number of bytes required to encode this set using
- * {@code MessageSet} wire format.
- */
+
+ /** Get the number of bytes required to encode this set using {@code MessageSet} wire format. */
public int getSerializedSizeAsMessageSet() {
int result = 0;
for (final Map.Entry<Integer, Field> entry : fields.entrySet()) {
@@ -343,12 +345,13 @@ public final class UnknownFieldSet implements MessageLite {
*/
@Override
public UnknownFieldSet build() {
- getFieldBuilder(0); // Force lastField to be built.
+ getFieldBuilder(0); // Force lastField to be built.
final UnknownFieldSet result;
if (fields.isEmpty()) {
result = getDefaultInstance();
} else {
- result = new UnknownFieldSet(Collections.unmodifiableMap(fields));
+ Map<Integer, Field> descendingFields = null;
+ result = new UnknownFieldSet(Collections.unmodifiableMap(fields), descendingFields);
}
fields = null;
return result;
@@ -363,8 +366,9 @@ public final class UnknownFieldSet implements MessageLite {
@Override
public Builder clone() {
getFieldBuilder(0); // Force lastField to be built.
+ Map<Integer, Field> descendingFields = null;
return UnknownFieldSet.newBuilder().mergeFrom(
- new UnknownFieldSet(fields));
+ new UnknownFieldSet(fields, descendingFields));
}
@Override
@@ -841,9 +845,10 @@ public final class UnknownFieldSet implements MessageLite {
}
}
+
/**
- * Get the number of bytes required to encode this field, including field
- * number, using {@code MessageSet} wire format.
+ * Get the number of bytes required to encode this field, including field number, using {@code
+ * MessageSet} wire format.
*/
public int getSerializedSizeAsMessageSetExtension(final int fieldNumber) {
int result = 0;
@@ -1022,7 +1027,7 @@ public final class UnknownFieldSet implements MessageLite {
} catch (InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(builder.buildPartial());
} catch (IOException e) {
- throw new InvalidProtocolBufferException(e.getMessage())
+ throw new InvalidProtocolBufferException(e)
.setUnfinishedMessage(builder.buildPartial());
}
return builder.buildPartial();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UnknownFieldSetLite.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UnknownFieldSetLite.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UnknownFieldSetLite.java
index e622519..faa4c30 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UnknownFieldSetLite.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/UnknownFieldSetLite.java
@@ -176,6 +176,42 @@ public final class UnknownFieldSetLite {
}
/**
+ * Serializes the set and writes it to {@code output} using {@code MessageSet} wire format.
+ *
+ * <p>For use by generated code only.
+ */
+ public void writeAsMessageSetTo(CodedOutputStream output) throws IOException {
+ for (int i = 0; i < count; i++) {
+ int fieldNumber = WireFormat.getTagFieldNumber(tags[i]);
+ output.writeRawMessageSetExtension(fieldNumber, (ByteString) objects[i]);
+ }
+ }
+
+
+ /**
+ * Get the number of bytes required to encode this field, including field number, using {@code
+ * MessageSet} wire format.
+ */
+ public int getSerializedSizeAsMessageSet() {
+ int size = memoizedSerializedSize;
+ if (size != -1) {
+ return size;
+ }
+
+ size = 0;
+ for (int i = 0; i < count; i++) {
+ int tag = tags[i];
+ int fieldNumber = WireFormat.getTagFieldNumber(tag);
+ size += CodedOutputStream.computeRawMessageSetExtensionSize(
+ fieldNumber, (ByteString) objects[i]);
+ }
+
+ memoizedSerializedSize = size;
+
+ return size;
+ }
+
+ /**
* Get the number of bytes required to encode this set.
*
* <p>For use by generated code only.
@@ -216,6 +252,24 @@ public final class UnknownFieldSetLite {
return size;
}
+
+ private static boolean equals(int[] tags1, int[] tags2, int count) {
+ for (int i = 0; i < count; ++i) {
+ if (tags1[i] != tags2[i]) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ private static boolean equals(Object[] objects1, Object[] objects2, int count) {
+ for (int i = 0; i < count; ++i) {
+ if (!objects1[i].equals(objects2[i])) {
+ return false;
+ }
+ }
+ return true;
+ }
@Override
public boolean equals(Object obj) {
@@ -233,9 +287,8 @@ public final class UnknownFieldSetLite {
UnknownFieldSetLite other = (UnknownFieldSetLite) obj;
if (count != other.count
- // TODO(dweis): Only have to compare up to count but at worst 2x worse than we need to do.
- || !Arrays.equals(tags, other.tags)
- || !Arrays.deepEquals(objects, other.objects)) {
+ || !equals(tags, other.tags, count)
+ || !equals(objects, other.objects, count)) {
return false;
}
@@ -268,7 +321,8 @@ public final class UnknownFieldSetLite {
}
}
- private void storeField(int tag, Object value) {
+ // Package private for unsafe experimental runtime.
+ void storeField(int tag, Object value) {
ensureCapacity();
tags[count] = tag;
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Value.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Value.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Value.java
index 72fd69f..593043b 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Value.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Value.java
@@ -175,7 +175,7 @@ public final class Value extends
* Represents a null value.
* </pre>
*
- * <code>optional .google.protobuf.NullValue null_value = 1;</code>
+ * <code>.google.protobuf.NullValue null_value = 1;</code>
*/
public int getNullValueValue() {
if (kindCase_ == 1) {
@@ -188,7 +188,7 @@ public final class Value extends
* Represents a null value.
* </pre>
*
- * <code>optional .google.protobuf.NullValue null_value = 1;</code>
+ * <code>.google.protobuf.NullValue null_value = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.NullValue getNullValue() {
if (kindCase_ == 1) {
@@ -205,7 +205,7 @@ public final class Value extends
* Represents a double value.
* </pre>
*
- * <code>optional double number_value = 2;</code>
+ * <code>double number_value = 2;</code>
*/
public double getNumberValue() {
if (kindCase_ == 2) {
@@ -220,7 +220,7 @@ public final class Value extends
* Represents a string value.
* </pre>
*
- * <code>optional string string_value = 3;</code>
+ * <code>string string_value = 3;</code>
*/
public java.lang.String getStringValue() {
java.lang.Object ref = "";
@@ -244,7 +244,7 @@ public final class Value extends
* Represents a string value.
* </pre>
*
- * <code>optional string string_value = 3;</code>
+ * <code>string string_value = 3;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getStringValueBytes() {
@@ -271,7 +271,7 @@ public final class Value extends
* Represents a boolean value.
* </pre>
*
- * <code>optional bool bool_value = 4;</code>
+ * <code>bool bool_value = 4;</code>
*/
public boolean getBoolValue() {
if (kindCase_ == 4) {
@@ -286,7 +286,7 @@ public final class Value extends
* Represents a structured value.
* </pre>
*
- * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+ * <code>.google.protobuf.Struct struct_value = 5;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.Struct getStructValue() {
if (kindCase_ == 5) {
@@ -299,7 +299,7 @@ public final class Value extends
* Represents a structured value.
* </pre>
*
- * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+ * <code>.google.protobuf.Struct struct_value = 5;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.StructOrBuilder getStructValueOrBuilder() {
if (kindCase_ == 5) {
@@ -314,7 +314,7 @@ public final class Value extends
* Represents a repeated `Value`.
* </pre>
*
- * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+ * <code>.google.protobuf.ListValue list_value = 6;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValue getListValue() {
if (kindCase_ == 6) {
@@ -327,7 +327,7 @@ public final class Value extends
* Represents a repeated `Value`.
* </pre>
*
- * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+ * <code>.google.protobuf.ListValue list_value = 6;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValueOrBuilder getListValueOrBuilder() {
if (kindCase_ == 6) {
@@ -458,7 +458,7 @@ public final class Value extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
switch (kindCase_) {
case 1:
hash = (37 * hash) + NULL_VALUE_FIELD_NUMBER;
@@ -784,7 +784,7 @@ public final class Value extends
* Represents a null value.
* </pre>
*
- * <code>optional .google.protobuf.NullValue null_value = 1;</code>
+ * <code>.google.protobuf.NullValue null_value = 1;</code>
*/
public int getNullValueValue() {
if (kindCase_ == 1) {
@@ -797,7 +797,7 @@ public final class Value extends
* Represents a null value.
* </pre>
*
- * <code>optional .google.protobuf.NullValue null_value = 1;</code>
+ * <code>.google.protobuf.NullValue null_value = 1;</code>
*/
public Builder setNullValueValue(int value) {
kindCase_ = 1;
@@ -810,7 +810,7 @@ public final class Value extends
* Represents a null value.
* </pre>
*
- * <code>optional .google.protobuf.NullValue null_value = 1;</code>
+ * <code>.google.protobuf.NullValue null_value = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.NullValue getNullValue() {
if (kindCase_ == 1) {
@@ -825,7 +825,7 @@ public final class Value extends
* Represents a null value.
* </pre>
*
- * <code>optional .google.protobuf.NullValue null_value = 1;</code>
+ * <code>.google.protobuf.NullValue null_value = 1;</code>
*/
public Builder setNullValue(org.apache.hadoop.hbase.shaded.com.google.protobuf.NullValue value) {
if (value == null) {
@@ -841,7 +841,7 @@ public final class Value extends
* Represents a null value.
* </pre>
*
- * <code>optional .google.protobuf.NullValue null_value = 1;</code>
+ * <code>.google.protobuf.NullValue null_value = 1;</code>
*/
public Builder clearNullValue() {
if (kindCase_ == 1) {
@@ -857,7 +857,7 @@ public final class Value extends
* Represents a double value.
* </pre>
*
- * <code>optional double number_value = 2;</code>
+ * <code>double number_value = 2;</code>
*/
public double getNumberValue() {
if (kindCase_ == 2) {
@@ -870,7 +870,7 @@ public final class Value extends
* Represents a double value.
* </pre>
*
- * <code>optional double number_value = 2;</code>
+ * <code>double number_value = 2;</code>
*/
public Builder setNumberValue(double value) {
kindCase_ = 2;
@@ -883,7 +883,7 @@ public final class Value extends
* Represents a double value.
* </pre>
*
- * <code>optional double number_value = 2;</code>
+ * <code>double number_value = 2;</code>
*/
public Builder clearNumberValue() {
if (kindCase_ == 2) {
@@ -899,7 +899,7 @@ public final class Value extends
* Represents a string value.
* </pre>
*
- * <code>optional string string_value = 3;</code>
+ * <code>string string_value = 3;</code>
*/
public java.lang.String getStringValue() {
java.lang.Object ref = "";
@@ -923,7 +923,7 @@ public final class Value extends
* Represents a string value.
* </pre>
*
- * <code>optional string string_value = 3;</code>
+ * <code>string string_value = 3;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getStringValueBytes() {
@@ -948,7 +948,7 @@ public final class Value extends
* Represents a string value.
* </pre>
*
- * <code>optional string string_value = 3;</code>
+ * <code>string string_value = 3;</code>
*/
public Builder setStringValue(
java.lang.String value) {
@@ -965,7 +965,7 @@ public final class Value extends
* Represents a string value.
* </pre>
*
- * <code>optional string string_value = 3;</code>
+ * <code>string string_value = 3;</code>
*/
public Builder clearStringValue() {
if (kindCase_ == 3) {
@@ -980,7 +980,7 @@ public final class Value extends
* Represents a string value.
* </pre>
*
- * <code>optional string string_value = 3;</code>
+ * <code>string string_value = 3;</code>
*/
public Builder setStringValueBytes(
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
@@ -999,7 +999,7 @@ public final class Value extends
* Represents a boolean value.
* </pre>
*
- * <code>optional bool bool_value = 4;</code>
+ * <code>bool bool_value = 4;</code>
*/
public boolean getBoolValue() {
if (kindCase_ == 4) {
@@ -1012,7 +1012,7 @@ public final class Value extends
* Represents a boolean value.
* </pre>
*
- * <code>optional bool bool_value = 4;</code>
+ * <code>bool bool_value = 4;</code>
*/
public Builder setBoolValue(boolean value) {
kindCase_ = 4;
@@ -1025,7 +1025,7 @@ public final class Value extends
* Represents a boolean value.
* </pre>
*
- * <code>optional bool bool_value = 4;</code>
+ * <code>bool bool_value = 4;</code>
*/
public Builder clearBoolValue() {
if (kindCase_ == 4) {
@@ -1043,7 +1043,7 @@ public final class Value extends
* Represents a structured value.
* </pre>
*
- * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+ * <code>.google.protobuf.Struct struct_value = 5;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.Struct getStructValue() {
if (structValueBuilder_ == null) {
@@ -1063,7 +1063,7 @@ public final class Value extends
* Represents a structured value.
* </pre>
*
- * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+ * <code>.google.protobuf.Struct struct_value = 5;</code>
*/
public Builder setStructValue(org.apache.hadoop.hbase.shaded.com.google.protobuf.Struct value) {
if (structValueBuilder_ == null) {
@@ -1083,7 +1083,7 @@ public final class Value extends
* Represents a structured value.
* </pre>
*
- * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+ * <code>.google.protobuf.Struct struct_value = 5;</code>
*/
public Builder setStructValue(
org.apache.hadoop.hbase.shaded.com.google.protobuf.Struct.Builder builderForValue) {
@@ -1101,7 +1101,7 @@ public final class Value extends
* Represents a structured value.
* </pre>
*
- * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+ * <code>.google.protobuf.Struct struct_value = 5;</code>
*/
public Builder mergeStructValue(org.apache.hadoop.hbase.shaded.com.google.protobuf.Struct value) {
if (structValueBuilder_ == null) {
@@ -1127,7 +1127,7 @@ public final class Value extends
* Represents a structured value.
* </pre>
*
- * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+ * <code>.google.protobuf.Struct struct_value = 5;</code>
*/
public Builder clearStructValue() {
if (structValueBuilder_ == null) {
@@ -1150,7 +1150,7 @@ public final class Value extends
* Represents a structured value.
* </pre>
*
- * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+ * <code>.google.protobuf.Struct struct_value = 5;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.Struct.Builder getStructValueBuilder() {
return getStructValueFieldBuilder().getBuilder();
@@ -1160,7 +1160,7 @@ public final class Value extends
* Represents a structured value.
* </pre>
*
- * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+ * <code>.google.protobuf.Struct struct_value = 5;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.StructOrBuilder getStructValueOrBuilder() {
if ((kindCase_ == 5) && (structValueBuilder_ != null)) {
@@ -1177,7 +1177,7 @@ public final class Value extends
* Represents a structured value.
* </pre>
*
- * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+ * <code>.google.protobuf.Struct struct_value = 5;</code>
*/
private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3<
org.apache.hadoop.hbase.shaded.com.google.protobuf.Struct, org.apache.hadoop.hbase.shaded.com.google.protobuf.Struct.Builder, org.apache.hadoop.hbase.shaded.com.google.protobuf.StructOrBuilder>
@@ -1205,7 +1205,7 @@ public final class Value extends
* Represents a repeated `Value`.
* </pre>
*
- * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+ * <code>.google.protobuf.ListValue list_value = 6;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValue getListValue() {
if (listValueBuilder_ == null) {
@@ -1225,7 +1225,7 @@ public final class Value extends
* Represents a repeated `Value`.
* </pre>
*
- * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+ * <code>.google.protobuf.ListValue list_value = 6;</code>
*/
public Builder setListValue(org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValue value) {
if (listValueBuilder_ == null) {
@@ -1245,7 +1245,7 @@ public final class Value extends
* Represents a repeated `Value`.
* </pre>
*
- * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+ * <code>.google.protobuf.ListValue list_value = 6;</code>
*/
public Builder setListValue(
org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValue.Builder builderForValue) {
@@ -1263,7 +1263,7 @@ public final class Value extends
* Represents a repeated `Value`.
* </pre>
*
- * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+ * <code>.google.protobuf.ListValue list_value = 6;</code>
*/
public Builder mergeListValue(org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValue value) {
if (listValueBuilder_ == null) {
@@ -1289,7 +1289,7 @@ public final class Value extends
* Represents a repeated `Value`.
* </pre>
*
- * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+ * <code>.google.protobuf.ListValue list_value = 6;</code>
*/
public Builder clearListValue() {
if (listValueBuilder_ == null) {
@@ -1312,7 +1312,7 @@ public final class Value extends
* Represents a repeated `Value`.
* </pre>
*
- * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+ * <code>.google.protobuf.ListValue list_value = 6;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValue.Builder getListValueBuilder() {
return getListValueFieldBuilder().getBuilder();
@@ -1322,7 +1322,7 @@ public final class Value extends
* Represents a repeated `Value`.
* </pre>
*
- * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+ * <code>.google.protobuf.ListValue list_value = 6;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValueOrBuilder getListValueOrBuilder() {
if ((kindCase_ == 6) && (listValueBuilder_ != null)) {
@@ -1339,7 +1339,7 @@ public final class Value extends
* Represents a repeated `Value`.
* </pre>
*
- * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+ * <code>.google.protobuf.ListValue list_value = 6;</code>
*/
private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3<
org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValue, org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValue.Builder, org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValueOrBuilder>
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ValueOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ValueOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ValueOrBuilder.java
index 630afb0..32d390f 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ValueOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ValueOrBuilder.java
@@ -12,7 +12,7 @@ public interface ValueOrBuilder extends
* Represents a null value.
* </pre>
*
- * <code>optional .google.protobuf.NullValue null_value = 1;</code>
+ * <code>.google.protobuf.NullValue null_value = 1;</code>
*/
int getNullValueValue();
/**
@@ -20,7 +20,7 @@ public interface ValueOrBuilder extends
* Represents a null value.
* </pre>
*
- * <code>optional .google.protobuf.NullValue null_value = 1;</code>
+ * <code>.google.protobuf.NullValue null_value = 1;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.NullValue getNullValue();
@@ -29,7 +29,7 @@ public interface ValueOrBuilder extends
* Represents a double value.
* </pre>
*
- * <code>optional double number_value = 2;</code>
+ * <code>double number_value = 2;</code>
*/
double getNumberValue();
@@ -38,7 +38,7 @@ public interface ValueOrBuilder extends
* Represents a string value.
* </pre>
*
- * <code>optional string string_value = 3;</code>
+ * <code>string string_value = 3;</code>
*/
java.lang.String getStringValue();
/**
@@ -46,7 +46,7 @@ public interface ValueOrBuilder extends
* Represents a string value.
* </pre>
*
- * <code>optional string string_value = 3;</code>
+ * <code>string string_value = 3;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getStringValueBytes();
@@ -56,7 +56,7 @@ public interface ValueOrBuilder extends
* Represents a boolean value.
* </pre>
*
- * <code>optional bool bool_value = 4;</code>
+ * <code>bool bool_value = 4;</code>
*/
boolean getBoolValue();
@@ -65,7 +65,7 @@ public interface ValueOrBuilder extends
* Represents a structured value.
* </pre>
*
- * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+ * <code>.google.protobuf.Struct struct_value = 5;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.Struct getStructValue();
/**
@@ -73,7 +73,7 @@ public interface ValueOrBuilder extends
* Represents a structured value.
* </pre>
*
- * <code>optional .google.protobuf.Struct struct_value = 5;</code>
+ * <code>.google.protobuf.Struct struct_value = 5;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.StructOrBuilder getStructValueOrBuilder();
@@ -82,7 +82,7 @@ public interface ValueOrBuilder extends
* Represents a repeated `Value`.
* </pre>
*
- * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+ * <code>.google.protobuf.ListValue list_value = 6;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValue getListValue();
/**
@@ -90,7 +90,7 @@ public interface ValueOrBuilder extends
* Represents a repeated `Value`.
* </pre>
*
- * <code>optional .google.protobuf.ListValue list_value = 6;</code>
+ * <code>.google.protobuf.ListValue list_value = 6;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.ListValueOrBuilder getListValueOrBuilder();
[6/7] hbase git commit: HBASE-16780 Since move to protobuf3.1, Cells
are limited to 64MB where previous they had no limit Update internal pb to
3.2 from 3.1.; AMENDMENT -- FORGOT TO REBUILD PBs
Posted by st...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DescriptorProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DescriptorProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DescriptorProtos.java
index 99dfec2..0468e6c 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DescriptorProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DescriptorProtos.java
@@ -223,7 +223,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getFileCount() > 0) {
hash = (37 * hash) + FILE_FIELD_NUMBER;
hash = (53 * hash) + getFileList().hashCode();
@@ -2062,7 +2062,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasName()) {
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
@@ -5283,7 +5283,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasStart()) {
hash = (37 * hash) + START_FIELD_NUMBER;
hash = (53 * hash) + getStart();
@@ -5874,7 +5874,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasStart()) {
hash = (37 * hash) + START_FIELD_NUMBER;
hash = (53 * hash) + getStart();
@@ -6803,7 +6803,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasName()) {
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
@@ -9930,6 +9930,9 @@ public final class DescriptorProtos {
/**
* <pre>
* Tag-delimited aggregate.
+ * Group type is deprecated and not supported in proto3. However, Proto3
+ * implementations should still be able to parse the group wire format and
+ * treat group fields as unknown fields.
* </pre>
*
* <code>TYPE_GROUP = 10;</code>
@@ -10039,6 +10042,9 @@ public final class DescriptorProtos {
/**
* <pre>
* Tag-delimited aggregate.
+ * Group type is deprecated and not supported in proto3. However, Proto3
+ * implementations should still be able to parse the group wire format and
+ * treat group fields as unknown fields.
* </pre>
*
* <code>TYPE_GROUP = 10;</code>
@@ -10193,10 +10199,6 @@ public final class DescriptorProtos {
*/
LABEL_REQUIRED(2),
/**
- * <pre>
- * TODO(sanjay): Should we add LABEL_MAP?
- * </pre>
- *
* <code>LABEL_REPEATED = 3;</code>
*/
LABEL_REPEATED(3),
@@ -10215,10 +10217,6 @@ public final class DescriptorProtos {
*/
public static final int LABEL_REQUIRED_VALUE = 2;
/**
- * <pre>
- * TODO(sanjay): Should we add LABEL_MAP?
- * </pre>
- *
* <code>LABEL_REPEATED = 3;</code>
*/
public static final int LABEL_REPEATED_VALUE = 3;
@@ -10854,7 +10852,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasName()) {
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
@@ -12376,7 +12374,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasName()) {
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
@@ -13225,7 +13223,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasName()) {
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
@@ -14320,7 +14318,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasName()) {
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
@@ -15214,7 +15212,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasName()) {
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
@@ -16561,7 +16559,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasName()) {
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
@@ -17744,6 +17742,41 @@ public final class DescriptorProtos {
/**
* <pre>
+ * By default Swift generators will take the proto package and CamelCase it
+ * replacing '.' with underscore and use that to prefix the types/symbols
+ * defined. When this options is provided, they will use this value instead
+ * to prefix the types/symbols defined.
+ * </pre>
+ *
+ * <code>optional string swift_prefix = 39;</code>
+ */
+ boolean hasSwiftPrefix();
+ /**
+ * <pre>
+ * By default Swift generators will take the proto package and CamelCase it
+ * replacing '.' with underscore and use that to prefix the types/symbols
+ * defined. When this options is provided, they will use this value instead
+ * to prefix the types/symbols defined.
+ * </pre>
+ *
+ * <code>optional string swift_prefix = 39;</code>
+ */
+ java.lang.String getSwiftPrefix();
+ /**
+ * <pre>
+ * By default Swift generators will take the proto package and CamelCase it
+ * replacing '.' with underscore and use that to prefix the types/symbols
+ * defined. When this options is provided, they will use this value instead
+ * to prefix the types/symbols defined.
+ * </pre>
+ *
+ * <code>optional string swift_prefix = 39;</code>
+ */
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
+ getSwiftPrefixBytes();
+
+ /**
+ * <pre>
* The parser stores options it doesn't recognize here. See above.
* </pre>
*
@@ -17813,6 +17846,7 @@ public final class DescriptorProtos {
ccEnableArenas_ = false;
objcClassPrefix_ = "";
csharpNamespace_ = "";
+ swiftPrefix_ = "";
uninterpretedOption_ = java.util.Collections.emptyList();
}
@@ -17925,10 +17959,16 @@ public final class DescriptorProtos {
csharpNamespace_ = bs;
break;
}
+ case 314: {
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString bs = input.readBytes();
+ bitField0_ |= 0x00004000;
+ swiftPrefix_ = bs;
+ break;
+ }
case 7994: {
- if (!((mutable_bitField0_ & 0x00004000) == 0x00004000)) {
+ if (!((mutable_bitField0_ & 0x00008000) == 0x00008000)) {
uninterpretedOption_ = new java.util.ArrayList<org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.UninterpretedOption>();
- mutable_bitField0_ |= 0x00004000;
+ mutable_bitField0_ |= 0x00008000;
}
uninterpretedOption_.add(
input.readMessage(org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.UninterpretedOption.PARSER, extensionRegistry));
@@ -17942,7 +17982,7 @@ public final class DescriptorProtos {
throw new org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException(
e).setUnfinishedMessage(this);
} finally {
- if (((mutable_bitField0_ & 0x00004000) == 0x00004000)) {
+ if (((mutable_bitField0_ & 0x00008000) == 0x00008000)) {
uninterpretedOption_ = java.util.Collections.unmodifiableList(uninterpretedOption_);
}
this.unknownFields = unknownFields.build();
@@ -18623,6 +18663,69 @@ public final class DescriptorProtos {
}
}
+ public static final int SWIFT_PREFIX_FIELD_NUMBER = 39;
+ private volatile java.lang.Object swiftPrefix_;
+ /**
+ * <pre>
+ * By default Swift generators will take the proto package and CamelCase it
+ * replacing '.' with underscore and use that to prefix the types/symbols
+ * defined. When this options is provided, they will use this value instead
+ * to prefix the types/symbols defined.
+ * </pre>
+ *
+ * <code>optional string swift_prefix = 39;</code>
+ */
+ public boolean hasSwiftPrefix() {
+ return ((bitField0_ & 0x00004000) == 0x00004000);
+ }
+ /**
+ * <pre>
+ * By default Swift generators will take the proto package and CamelCase it
+ * replacing '.' with underscore and use that to prefix the types/symbols
+ * defined. When this options is provided, they will use this value instead
+ * to prefix the types/symbols defined.
+ * </pre>
+ *
+ * <code>optional string swift_prefix = 39;</code>
+ */
+ public java.lang.String getSwiftPrefix() {
+ java.lang.Object ref = swiftPrefix_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString bs =
+ (org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ swiftPrefix_ = s;
+ }
+ return s;
+ }
+ }
+ /**
+ * <pre>
+ * By default Swift generators will take the proto package and CamelCase it
+ * replacing '.' with underscore and use that to prefix the types/symbols
+ * defined. When this options is provided, they will use this value instead
+ * to prefix the types/symbols defined.
+ * </pre>
+ *
+ * <code>optional string swift_prefix = 39;</code>
+ */
+ public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
+ getSwiftPrefixBytes() {
+ java.lang.Object ref = swiftPrefix_;
+ if (ref instanceof java.lang.String) {
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString b =
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ swiftPrefix_ = b;
+ return b;
+ } else {
+ return (org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString) ref;
+ }
+ }
+
public static final int UNINTERPRETED_OPTION_FIELD_NUMBER = 999;
private java.util.List<org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.UninterpretedOption> uninterpretedOption_;
/**
@@ -18745,6 +18848,9 @@ public final class DescriptorProtos {
if (((bitField0_ & 0x00002000) == 0x00002000)) {
org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.writeString(output, 37, csharpNamespace_);
}
+ if (((bitField0_ & 0x00004000) == 0x00004000)) {
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.writeString(output, 39, swiftPrefix_);
+ }
for (int i = 0; i < uninterpretedOption_.size(); i++) {
output.writeMessage(999, uninterpretedOption_.get(i));
}
@@ -18808,6 +18914,9 @@ public final class DescriptorProtos {
if (((bitField0_ & 0x00002000) == 0x00002000)) {
size += org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.computeStringSize(37, csharpNamespace_);
}
+ if (((bitField0_ & 0x00004000) == 0x00004000)) {
+ size += org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.computeStringSize(39, swiftPrefix_);
+ }
for (int i = 0; i < uninterpretedOption_.size(); i++) {
size += org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream
.computeMessageSize(999, uninterpretedOption_.get(i));
@@ -18899,6 +19008,11 @@ public final class DescriptorProtos {
result = result && getCsharpNamespace()
.equals(other.getCsharpNamespace());
}
+ result = result && (hasSwiftPrefix() == other.hasSwiftPrefix());
+ if (hasSwiftPrefix()) {
+ result = result && getSwiftPrefix()
+ .equals(other.getSwiftPrefix());
+ }
result = result && getUninterpretedOptionList()
.equals(other.getUninterpretedOptionList());
result = result && unknownFields.equals(other.unknownFields);
@@ -18913,7 +19027,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasJavaPackage()) {
hash = (37 * hash) + JAVA_PACKAGE_FIELD_NUMBER;
hash = (53 * hash) + getJavaPackage().hashCode();
@@ -18978,6 +19092,10 @@ public final class DescriptorProtos {
hash = (37 * hash) + CSHARP_NAMESPACE_FIELD_NUMBER;
hash = (53 * hash) + getCsharpNamespace().hashCode();
}
+ if (hasSwiftPrefix()) {
+ hash = (37 * hash) + SWIFT_PREFIX_FIELD_NUMBER;
+ hash = (53 * hash) + getSwiftPrefix().hashCode();
+ }
if (getUninterpretedOptionCount() > 0) {
hash = (37 * hash) + UNINTERPRETED_OPTION_FIELD_NUMBER;
hash = (53 * hash) + getUninterpretedOptionList().hashCode();
@@ -19131,9 +19249,11 @@ public final class DescriptorProtos {
bitField0_ = (bitField0_ & ~0x00001000);
csharpNamespace_ = "";
bitField0_ = (bitField0_ & ~0x00002000);
+ swiftPrefix_ = "";
+ bitField0_ = (bitField0_ & ~0x00004000);
if (uninterpretedOptionBuilder_ == null) {
uninterpretedOption_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00004000);
+ bitField0_ = (bitField0_ & ~0x00008000);
} else {
uninterpretedOptionBuilder_.clear();
}
@@ -19217,10 +19337,14 @@ public final class DescriptorProtos {
to_bitField0_ |= 0x00002000;
}
result.csharpNamespace_ = csharpNamespace_;
+ if (((from_bitField0_ & 0x00004000) == 0x00004000)) {
+ to_bitField0_ |= 0x00004000;
+ }
+ result.swiftPrefix_ = swiftPrefix_;
if (uninterpretedOptionBuilder_ == null) {
- if (((bitField0_ & 0x00004000) == 0x00004000)) {
+ if (((bitField0_ & 0x00008000) == 0x00008000)) {
uninterpretedOption_ = java.util.Collections.unmodifiableList(uninterpretedOption_);
- bitField0_ = (bitField0_ & ~0x00004000);
+ bitField0_ = (bitField0_ & ~0x00008000);
}
result.uninterpretedOption_ = uninterpretedOption_;
} else {
@@ -19343,11 +19467,16 @@ public final class DescriptorProtos {
csharpNamespace_ = other.csharpNamespace_;
onChanged();
}
+ if (other.hasSwiftPrefix()) {
+ bitField0_ |= 0x00004000;
+ swiftPrefix_ = other.swiftPrefix_;
+ onChanged();
+ }
if (uninterpretedOptionBuilder_ == null) {
if (!other.uninterpretedOption_.isEmpty()) {
if (uninterpretedOption_.isEmpty()) {
uninterpretedOption_ = other.uninterpretedOption_;
- bitField0_ = (bitField0_ & ~0x00004000);
+ bitField0_ = (bitField0_ & ~0x00008000);
} else {
ensureUninterpretedOptionIsMutable();
uninterpretedOption_.addAll(other.uninterpretedOption_);
@@ -19360,7 +19489,7 @@ public final class DescriptorProtos {
uninterpretedOptionBuilder_.dispose();
uninterpretedOptionBuilder_ = null;
uninterpretedOption_ = other.uninterpretedOption_;
- bitField0_ = (bitField0_ & ~0x00004000);
+ bitField0_ = (bitField0_ & ~0x00008000);
uninterpretedOptionBuilder_ =
org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
getUninterpretedOptionFieldBuilder() : null;
@@ -20454,12 +20583,130 @@ public final class DescriptorProtos {
return this;
}
+ private java.lang.Object swiftPrefix_ = "";
+ /**
+ * <pre>
+ * By default Swift generators will take the proto package and CamelCase it
+ * replacing '.' with underscore and use that to prefix the types/symbols
+ * defined. When this options is provided, they will use this value instead
+ * to prefix the types/symbols defined.
+ * </pre>
+ *
+ * <code>optional string swift_prefix = 39;</code>
+ */
+ public boolean hasSwiftPrefix() {
+ return ((bitField0_ & 0x00004000) == 0x00004000);
+ }
+ /**
+ * <pre>
+ * By default Swift generators will take the proto package and CamelCase it
+ * replacing '.' with underscore and use that to prefix the types/symbols
+ * defined. When this options is provided, they will use this value instead
+ * to prefix the types/symbols defined.
+ * </pre>
+ *
+ * <code>optional string swift_prefix = 39;</code>
+ */
+ public java.lang.String getSwiftPrefix() {
+ java.lang.Object ref = swiftPrefix_;
+ if (!(ref instanceof java.lang.String)) {
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString bs =
+ (org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ swiftPrefix_ = s;
+ }
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * <pre>
+ * By default Swift generators will take the proto package and CamelCase it
+ * replacing '.' with underscore and use that to prefix the types/symbols
+ * defined. When this options is provided, they will use this value instead
+ * to prefix the types/symbols defined.
+ * </pre>
+ *
+ * <code>optional string swift_prefix = 39;</code>
+ */
+ public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
+ getSwiftPrefixBytes() {
+ java.lang.Object ref = swiftPrefix_;
+ if (ref instanceof String) {
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString b =
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ swiftPrefix_ = b;
+ return b;
+ } else {
+ return (org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * <pre>
+ * By default Swift generators will take the proto package and CamelCase it
+ * replacing '.' with underscore and use that to prefix the types/symbols
+ * defined. When this options is provided, they will use this value instead
+ * to prefix the types/symbols defined.
+ * </pre>
+ *
+ * <code>optional string swift_prefix = 39;</code>
+ */
+ public Builder setSwiftPrefix(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ bitField0_ |= 0x00004000;
+ swiftPrefix_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * <pre>
+ * By default Swift generators will take the proto package and CamelCase it
+ * replacing '.' with underscore and use that to prefix the types/symbols
+ * defined. When this options is provided, they will use this value instead
+ * to prefix the types/symbols defined.
+ * </pre>
+ *
+ * <code>optional string swift_prefix = 39;</code>
+ */
+ public Builder clearSwiftPrefix() {
+ bitField0_ = (bitField0_ & ~0x00004000);
+ swiftPrefix_ = getDefaultInstance().getSwiftPrefix();
+ onChanged();
+ return this;
+ }
+ /**
+ * <pre>
+ * By default Swift generators will take the proto package and CamelCase it
+ * replacing '.' with underscore and use that to prefix the types/symbols
+ * defined. When this options is provided, they will use this value instead
+ * to prefix the types/symbols defined.
+ * </pre>
+ *
+ * <code>optional string swift_prefix = 39;</code>
+ */
+ public Builder setSwiftPrefixBytes(
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ bitField0_ |= 0x00004000;
+ swiftPrefix_ = value;
+ onChanged();
+ return this;
+ }
+
private java.util.List<org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.UninterpretedOption> uninterpretedOption_ =
java.util.Collections.emptyList();
private void ensureUninterpretedOptionIsMutable() {
- if (!((bitField0_ & 0x00004000) == 0x00004000)) {
+ if (!((bitField0_ & 0x00008000) == 0x00008000)) {
uninterpretedOption_ = new java.util.ArrayList<org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.UninterpretedOption>(uninterpretedOption_);
- bitField0_ |= 0x00004000;
+ bitField0_ |= 0x00008000;
}
}
@@ -20653,7 +20900,7 @@ public final class DescriptorProtos {
public Builder clearUninterpretedOption() {
if (uninterpretedOptionBuilder_ == null) {
uninterpretedOption_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00004000);
+ bitField0_ = (bitField0_ & ~0x00008000);
onChanged();
} else {
uninterpretedOptionBuilder_.clear();
@@ -20758,7 +21005,7 @@ public final class DescriptorProtos {
uninterpretedOptionBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.RepeatedFieldBuilderV3<
org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.UninterpretedOption, org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.UninterpretedOption.Builder, org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.UninterpretedOptionOrBuilder>(
uninterpretedOption_,
- ((bitField0_ & 0x00004000) == 0x00004000),
+ ((bitField0_ & 0x00008000) == 0x00008000),
getParentForChildren(),
isClean());
uninterpretedOption_ = null;
@@ -21448,7 +21695,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasMessageSetWireFormat()) {
hash = (37 * hash) + MESSAGE_SET_WIRE_FORMAT_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -23505,7 +23752,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasCtype()) {
hash = (37 * hash) + CTYPE_FIELD_NUMBER;
hash = (53 * hash) + ctype_;
@@ -24957,7 +25204,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getUninterpretedOptionCount() > 0) {
hash = (37 * hash) + UNINTERPRETED_OPTION_FIELD_NUMBER;
hash = (53 * hash) + getUninterpretedOptionList().hashCode();
@@ -25998,7 +26245,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasAllowAlias()) {
hash = (37 * hash) + ALLOW_ALIAS_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -27119,7 +27366,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasDeprecated()) {
hash = (37 * hash) + DEPRECATED_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -28174,7 +28421,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasDeprecated()) {
hash = (37 * hash) + DEPRECATED_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -28930,6 +29177,15 @@ public final class DescriptorProtos {
boolean getDeprecated();
/**
+ * <code>optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];</code>
+ */
+ boolean hasIdempotencyLevel();
+ /**
+ * <code>optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];</code>
+ */
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.MethodOptions.IdempotencyLevel getIdempotencyLevel();
+
+ /**
* <pre>
* The parser stores options it doesn't recognize here. See above.
* </pre>
@@ -28987,6 +29243,7 @@ public final class DescriptorProtos {
}
private MethodOptions() {
deprecated_ = false;
+ idempotencyLevel_ = 0;
uninterpretedOption_ = java.util.Collections.emptyList();
}
@@ -29023,10 +29280,21 @@ public final class DescriptorProtos {
deprecated_ = input.readBool();
break;
}
+ case 272: {
+ int rawValue = input.readEnum();
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.MethodOptions.IdempotencyLevel value = org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.MethodOptions.IdempotencyLevel.valueOf(rawValue);
+ if (value == null) {
+ unknownFields.mergeVarintField(34, rawValue);
+ } else {
+ bitField0_ |= 0x00000002;
+ idempotencyLevel_ = rawValue;
+ }
+ break;
+ }
case 7994: {
- if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+ if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
uninterpretedOption_ = new java.util.ArrayList<org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.UninterpretedOption>();
- mutable_bitField0_ |= 0x00000002;
+ mutable_bitField0_ |= 0x00000004;
}
uninterpretedOption_.add(
input.readMessage(org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.UninterpretedOption.PARSER, extensionRegistry));
@@ -29040,7 +29308,7 @@ public final class DescriptorProtos {
throw new org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException(
e).setUnfinishedMessage(this);
} finally {
- if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
+ if (((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
uninterpretedOption_ = java.util.Collections.unmodifiableList(uninterpretedOption_);
}
this.unknownFields = unknownFields.build();
@@ -29059,6 +29327,127 @@ public final class DescriptorProtos {
org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.MethodOptions.class, org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.MethodOptions.Builder.class);
}
+ /**
+ * <pre>
+ * Is this method side-effect-free (or safe in HTTP parlance), or idempotent,
+ * or neither? HTTP based RPC implementation may choose GET verb for safe
+ * methods, and PUT verb for idempotent methods instead of the default POST.
+ * </pre>
+ *
+ * Protobuf enum {@code google.protobuf.MethodOptions.IdempotencyLevel}
+ */
+ public enum IdempotencyLevel
+ implements org.apache.hadoop.hbase.shaded.com.google.protobuf.ProtocolMessageEnum {
+ /**
+ * <code>IDEMPOTENCY_UNKNOWN = 0;</code>
+ */
+ IDEMPOTENCY_UNKNOWN(0),
+ /**
+ * <pre>
+ * implies idempotent
+ * </pre>
+ *
+ * <code>NO_SIDE_EFFECTS = 1;</code>
+ */
+ NO_SIDE_EFFECTS(1),
+ /**
+ * <pre>
+ * idempotent, but may have side effects
+ * </pre>
+ *
+ * <code>IDEMPOTENT = 2;</code>
+ */
+ IDEMPOTENT(2),
+ ;
+
+ /**
+ * <code>IDEMPOTENCY_UNKNOWN = 0;</code>
+ */
+ public static final int IDEMPOTENCY_UNKNOWN_VALUE = 0;
+ /**
+ * <pre>
+ * implies idempotent
+ * </pre>
+ *
+ * <code>NO_SIDE_EFFECTS = 1;</code>
+ */
+ public static final int NO_SIDE_EFFECTS_VALUE = 1;
+ /**
+ * <pre>
+ * idempotent, but may have side effects
+ * </pre>
+ *
+ * <code>IDEMPOTENT = 2;</code>
+ */
+ public static final int IDEMPOTENT_VALUE = 2;
+
+
+ public final int getNumber() {
+ return value;
+ }
+
+ /**
+ * @deprecated Use {@link #forNumber(int)} instead.
+ */
+ @java.lang.Deprecated
+ public static IdempotencyLevel valueOf(int value) {
+ return forNumber(value);
+ }
+
+ public static IdempotencyLevel forNumber(int value) {
+ switch (value) {
+ case 0: return IDEMPOTENCY_UNKNOWN;
+ case 1: return NO_SIDE_EFFECTS;
+ case 2: return IDEMPOTENT;
+ default: return null;
+ }
+ }
+
+ public static org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.EnumLiteMap<IdempotencyLevel>
+ internalGetValueMap() {
+ return internalValueMap;
+ }
+ private static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.EnumLiteMap<
+ IdempotencyLevel> internalValueMap =
+ new org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.EnumLiteMap<IdempotencyLevel>() {
+ public IdempotencyLevel findValueByNumber(int number) {
+ return IdempotencyLevel.forNumber(number);
+ }
+ };
+
+ public final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.EnumValueDescriptor
+ getValueDescriptor() {
+ return getDescriptor().getValues().get(ordinal());
+ }
+ public final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.EnumDescriptor
+ getDescriptorForType() {
+ return getDescriptor();
+ }
+ public static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.EnumDescriptor
+ getDescriptor() {
+ return org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.MethodOptions.getDescriptor().getEnumTypes().get(0);
+ }
+
+ private static final IdempotencyLevel[] VALUES = values();
+
+ public static IdempotencyLevel valueOf(
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.EnumValueDescriptor desc) {
+ if (desc.getType() != getDescriptor()) {
+ throw new java.lang.IllegalArgumentException(
+ "EnumValueDescriptor is not for this type.");
+ }
+ return VALUES[desc.getIndex()];
+ }
+
+ private final int value;
+
+ private IdempotencyLevel(int value) {
+ this.value = value;
+ }
+
+ // @@protoc_insertion_point(enum_scope:google.protobuf.MethodOptions.IdempotencyLevel)
+ }
+
private int bitField0_;
public static final int DEPRECATED_FIELD_NUMBER = 33;
private boolean deprecated_;
@@ -29089,6 +29478,22 @@ public final class DescriptorProtos {
return deprecated_;
}
+ public static final int IDEMPOTENCY_LEVEL_FIELD_NUMBER = 34;
+ private int idempotencyLevel_;
+ /**
+ * <code>optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];</code>
+ */
+ public boolean hasIdempotencyLevel() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ /**
+ * <code>optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];</code>
+ */
+ public org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.MethodOptions.IdempotencyLevel getIdempotencyLevel() {
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.MethodOptions.IdempotencyLevel result = org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.MethodOptions.IdempotencyLevel.valueOf(idempotencyLevel_);
+ return result == null ? org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.MethodOptions.IdempotencyLevel.IDEMPOTENCY_UNKNOWN : result;
+ }
+
public static final int UNINTERPRETED_OPTION_FIELD_NUMBER = 999;
private java.util.List<org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.UninterpretedOption> uninterpretedOption_;
/**
@@ -29172,6 +29577,9 @@ public final class DescriptorProtos {
if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeBool(33, deprecated_);
}
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeEnum(34, idempotencyLevel_);
+ }
for (int i = 0; i < uninterpretedOption_.size(); i++) {
output.writeMessage(999, uninterpretedOption_.get(i));
}
@@ -29188,6 +29596,10 @@ public final class DescriptorProtos {
size += org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream
.computeBoolSize(33, deprecated_);
}
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ size += org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream
+ .computeEnumSize(34, idempotencyLevel_);
+ }
for (int i = 0; i < uninterpretedOption_.size(); i++) {
size += org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream
.computeMessageSize(999, uninterpretedOption_.get(i));
@@ -29215,6 +29627,10 @@ public final class DescriptorProtos {
result = result && (getDeprecated()
== other.getDeprecated());
}
+ result = result && (hasIdempotencyLevel() == other.hasIdempotencyLevel());
+ if (hasIdempotencyLevel()) {
+ result = result && idempotencyLevel_ == other.idempotencyLevel_;
+ }
result = result && getUninterpretedOptionList()
.equals(other.getUninterpretedOptionList());
result = result && unknownFields.equals(other.unknownFields);
@@ -29229,12 +29645,16 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasDeprecated()) {
hash = (37 * hash) + DEPRECATED_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
getDeprecated());
}
+ if (hasIdempotencyLevel()) {
+ hash = (37 * hash) + IDEMPOTENCY_LEVEL_FIELD_NUMBER;
+ hash = (53 * hash) + idempotencyLevel_;
+ }
if (getUninterpretedOptionCount() > 0) {
hash = (37 * hash) + UNINTERPRETED_OPTION_FIELD_NUMBER;
hash = (53 * hash) + getUninterpretedOptionList().hashCode();
@@ -29362,9 +29782,11 @@ public final class DescriptorProtos {
super.clear();
deprecated_ = false;
bitField0_ = (bitField0_ & ~0x00000001);
+ idempotencyLevel_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000002);
if (uninterpretedOptionBuilder_ == null) {
uninterpretedOption_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000002);
+ bitField0_ = (bitField0_ & ~0x00000004);
} else {
uninterpretedOptionBuilder_.clear();
}
@@ -29396,10 +29818,14 @@ public final class DescriptorProtos {
to_bitField0_ |= 0x00000001;
}
result.deprecated_ = deprecated_;
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ result.idempotencyLevel_ = idempotencyLevel_;
if (uninterpretedOptionBuilder_ == null) {
- if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
uninterpretedOption_ = java.util.Collections.unmodifiableList(uninterpretedOption_);
- bitField0_ = (bitField0_ & ~0x00000002);
+ bitField0_ = (bitField0_ & ~0x00000004);
}
result.uninterpretedOption_ = uninterpretedOption_;
} else {
@@ -29473,11 +29899,14 @@ public final class DescriptorProtos {
if (other.hasDeprecated()) {
setDeprecated(other.getDeprecated());
}
+ if (other.hasIdempotencyLevel()) {
+ setIdempotencyLevel(other.getIdempotencyLevel());
+ }
if (uninterpretedOptionBuilder_ == null) {
if (!other.uninterpretedOption_.isEmpty()) {
if (uninterpretedOption_.isEmpty()) {
uninterpretedOption_ = other.uninterpretedOption_;
- bitField0_ = (bitField0_ & ~0x00000002);
+ bitField0_ = (bitField0_ & ~0x00000004);
} else {
ensureUninterpretedOptionIsMutable();
uninterpretedOption_.addAll(other.uninterpretedOption_);
@@ -29490,7 +29919,7 @@ public final class DescriptorProtos {
uninterpretedOptionBuilder_.dispose();
uninterpretedOptionBuilder_ = null;
uninterpretedOption_ = other.uninterpretedOption_;
- bitField0_ = (bitField0_ & ~0x00000002);
+ bitField0_ = (bitField0_ & ~0x00000004);
uninterpretedOptionBuilder_ =
org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.alwaysUseFieldBuilders ?
getUninterpretedOptionFieldBuilder() : null;
@@ -29596,12 +30025,48 @@ public final class DescriptorProtos {
return this;
}
+ private int idempotencyLevel_ = 0;
+ /**
+ * <code>optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];</code>
+ */
+ public boolean hasIdempotencyLevel() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ /**
+ * <code>optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];</code>
+ */
+ public org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.MethodOptions.IdempotencyLevel getIdempotencyLevel() {
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.MethodOptions.IdempotencyLevel result = org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.MethodOptions.IdempotencyLevel.valueOf(idempotencyLevel_);
+ return result == null ? org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.MethodOptions.IdempotencyLevel.IDEMPOTENCY_UNKNOWN : result;
+ }
+ /**
+ * <code>optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];</code>
+ */
+ public Builder setIdempotencyLevel(org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.MethodOptions.IdempotencyLevel value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ bitField0_ |= 0x00000002;
+ idempotencyLevel_ = value.getNumber();
+ onChanged();
+ return this;
+ }
+ /**
+ * <code>optional .google.protobuf.MethodOptions.IdempotencyLevel idempotency_level = 34 [default = IDEMPOTENCY_UNKNOWN];</code>
+ */
+ public Builder clearIdempotencyLevel() {
+ bitField0_ = (bitField0_ & ~0x00000002);
+ idempotencyLevel_ = 0;
+ onChanged();
+ return this;
+ }
+
private java.util.List<org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.UninterpretedOption> uninterpretedOption_ =
java.util.Collections.emptyList();
private void ensureUninterpretedOptionIsMutable() {
- if (!((bitField0_ & 0x00000002) == 0x00000002)) {
+ if (!((bitField0_ & 0x00000004) == 0x00000004)) {
uninterpretedOption_ = new java.util.ArrayList<org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.UninterpretedOption>(uninterpretedOption_);
- bitField0_ |= 0x00000002;
+ bitField0_ |= 0x00000004;
}
}
@@ -29795,7 +30260,7 @@ public final class DescriptorProtos {
public Builder clearUninterpretedOption() {
if (uninterpretedOptionBuilder_ == null) {
uninterpretedOption_ = java.util.Collections.emptyList();
- bitField0_ = (bitField0_ & ~0x00000002);
+ bitField0_ = (bitField0_ & ~0x00000004);
onChanged();
} else {
uninterpretedOptionBuilder_.clear();
@@ -29900,7 +30365,7 @@ public final class DescriptorProtos {
uninterpretedOptionBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.RepeatedFieldBuilderV3<
org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.UninterpretedOption, org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.UninterpretedOption.Builder, org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.UninterpretedOptionOrBuilder>(
uninterpretedOption_,
- ((bitField0_ & 0x00000002) == 0x00000002),
+ ((bitField0_ & 0x00000004) == 0x00000004),
getParentForChildren(),
isClean());
uninterpretedOption_ = null;
@@ -30439,7 +30904,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasNamePart()) {
hash = (37 * hash) + NAME_PART_FIELD_NUMBER;
hash = (53 * hash) + getNamePart().hashCode();
@@ -31180,7 +31645,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getNameCount() > 0) {
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getNameList().hashCode();
@@ -33406,7 +33871,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getPathCount() > 0) {
hash = (37 * hash) + PATH_FIELD_NUMBER;
hash = (53 * hash) + getPathList().hashCode();
@@ -34906,7 +35371,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getLocationCount() > 0) {
hash = (37 * hash) + LOCATION_FIELD_NUMBER;
hash = (53 * hash) + getLocationList().hashCode();
@@ -36845,7 +37310,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getPathCount() > 0) {
hash = (37 * hash) + PATH_FIELD_NUMBER;
hash = (53 * hash) + getPathList().hashCode();
@@ -37593,7 +38058,7 @@ public final class DescriptorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getAnnotationCount() > 0) {
hash = (37 * hash) + ANNOTATION_FIELD_NUMBER;
hash = (53 * hash) + getAnnotationList().hashCode();
@@ -38433,7 +38898,7 @@ public final class DescriptorProtos {
"\n\013output_type\030\003 \001(\t\022/\n\007options\030\004 \001(\0132\036.g" +
"oogle.protobuf.MethodOptions\022\037\n\020client_s" +
"treaming\030\005 \001(\010:\005false\022\037\n\020server_streamin" +
- "g\030\006 \001(\010:\005false\"\204\005\n\013FileOptions\022\024\n\014java_p" +
+ "g\030\006 \001(\010:\005false\"\232\005\n\013FileOptions\022\024\n\014java_p" +
"ackage\030\001 \001(\t\022\034\n\024java_outer_classname\030\010 \001" +
"(\t\022\"\n\023java_multiple_files\030\n \001(\010:\005false\022)" +
"\n\035java_generate_equals_and_hash\030\024 \001(\010B\002\030" +
@@ -38445,62 +38910,68 @@ public final class DescriptorProtos {
"\005false\022\"\n\023py_generic_services\030\022 \001(\010:\005fal" +
"se\022\031\n\ndeprecated\030\027 \001(\010:\005false\022\037\n\020cc_enab" +
"le_arenas\030\037 \001(\010:\005false\022\031\n\021objc_class_pre" +
- "fix\030$ \001(\t\022\030\n\020csharp_namespace\030% \001(\t\022C\n\024u" +
- "ninterpreted_option\030\347\007 \003(\0132$.google.prot" +
- "obuf.UninterpretedOption\":\n\014OptimizeMode",
- "\022\t\n\005SPEED\020\001\022\r\n\tCODE_SIZE\020\002\022\020\n\014LITE_RUNTI" +
- "ME\020\003*\t\010\350\007\020\200\200\200\200\002J\004\010&\020\'\"\354\001\n\016MessageOptions" +
- "\022&\n\027message_set_wire_format\030\001 \001(\010:\005false" +
- "\022.\n\037no_standard_descriptor_accessor\030\002 \001(" +
- "\010:\005false\022\031\n\ndeprecated\030\003 \001(\010:\005false\022\021\n\tm" +
- "ap_entry\030\007 \001(\010\022C\n\024uninterpreted_option\030\347" +
- "\007 \003(\0132$.google.protobuf.UninterpretedOpt" +
- "ion*\t\010\350\007\020\200\200\200\200\002J\004\010\010\020\t\"\236\003\n\014FieldOptions\022:\n" +
- "\005ctype\030\001 \001(\0162#.google.protobuf.FieldOpti" +
- "ons.CType:\006STRING\022\016\n\006packed\030\002 \001(\010\022?\n\006jst",
- "ype\030\006 \001(\0162$.google.protobuf.FieldOptions" +
- ".JSType:\tJS_NORMAL\022\023\n\004lazy\030\005 \001(\010:\005false\022" +
- "\031\n\ndeprecated\030\003 \001(\010:\005false\022\023\n\004weak\030\n \001(\010" +
- ":\005false\022C\n\024uninterpreted_option\030\347\007 \003(\0132$" +
- ".google.protobuf.UninterpretedOption\"/\n\005" +
- "CType\022\n\n\006STRING\020\000\022\010\n\004CORD\020\001\022\020\n\014STRING_PI" +
- "ECE\020\002\"5\n\006JSType\022\r\n\tJS_NORMAL\020\000\022\r\n\tJS_STR" +
- "ING\020\001\022\r\n\tJS_NUMBER\020\002*\t\010\350\007\020\200\200\200\200\002J\004\010\004\020\005\"^\n" +
- "\014OneofOptions\022C\n\024uninterpreted_option\030\347\007" +
- " \003(\0132$.google.protobuf.UninterpretedOpti",
- "on*\t\010\350\007\020\200\200\200\200\002\"\215\001\n\013EnumOptions\022\023\n\013allow_a" +
- "lias\030\002 \001(\010\022\031\n\ndeprecated\030\003 \001(\010:\005false\022C\n" +
- "\024uninterpreted_option\030\347\007 \003(\0132$.google.pr" +
- "otobuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\"}\n" +
- "\020EnumValueOptions\022\031\n\ndeprecated\030\001 \001(\010:\005f" +
- "alse\022C\n\024uninterpreted_option\030\347\007 \003(\0132$.go" +
- "ogle.protobuf.UninterpretedOption*\t\010\350\007\020\200" +
- "\200\200\200\002\"{\n\016ServiceOptions\022\031\n\ndeprecated\030! \001" +
- "(\010:\005false\022C\n\024uninterpreted_option\030\347\007 \003(\013" +
- "2$.google.protobuf.UninterpretedOption*\t",
- "\010\350\007\020\200\200\200\200\002\"z\n\rMethodOptions\022\031\n\ndeprecated" +
- "\030! \001(\010:\005false\022C\n\024uninterpreted_option\030\347\007" +
+ "fix\030$ \001(\t\022\030\n\020csharp_namespace\030% \001(\t\022\024\n\014s" +
+ "wift_prefix\030\' \001(\t\022C\n\024uninterpreted_optio" +
+ "n\030\347\007 \003(\0132$.google.protobuf.Uninterpreted",
+ "Option\":\n\014OptimizeMode\022\t\n\005SPEED\020\001\022\r\n\tCOD" +
+ "E_SIZE\020\002\022\020\n\014LITE_RUNTIME\020\003*\t\010\350\007\020\200\200\200\200\002J\004\010" +
+ "&\020\'\"\354\001\n\016MessageOptions\022&\n\027message_set_wi" +
+ "re_format\030\001 \001(\010:\005false\022.\n\037no_standard_de" +
+ "scriptor_accessor\030\002 \001(\010:\005false\022\031\n\ndeprec" +
+ "ated\030\003 \001(\010:\005false\022\021\n\tmap_entry\030\007 \001(\010\022C\n\024" +
+ "uninterpreted_option\030\347\007 \003(\0132$.google.pro" +
+ "tobuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002J\004\010\010" +
+ "\020\t\"\236\003\n\014FieldOptions\022:\n\005ctype\030\001 \001(\0162#.goo" +
+ "gle.protobuf.FieldOptions.CType:\006STRING\022",
+ "\016\n\006packed\030\002 \001(\010\022?\n\006jstype\030\006 \001(\0162$.google" +
+ ".protobuf.FieldOptions.JSType:\tJS_NORMAL" +
+ "\022\023\n\004lazy\030\005 \001(\010:\005false\022\031\n\ndeprecated\030\003 \001(" +
+ "\010:\005false\022\023\n\004weak\030\n \001(\010:\005false\022C\n\024uninter" +
+ "preted_option\030\347\007 \003(\0132$.google.protobuf.U" +
+ "ninterpretedOption\"/\n\005CType\022\n\n\006STRING\020\000\022" +
+ "\010\n\004CORD\020\001\022\020\n\014STRING_PIECE\020\002\"5\n\006JSType\022\r\n" +
+ "\tJS_NORMAL\020\000\022\r\n\tJS_STRING\020\001\022\r\n\tJS_NUMBER" +
+ "\020\002*\t\010\350\007\020\200\200\200\200\002J\004\010\004\020\005\"^\n\014OneofOptions\022C\n\024u" +
+ "ninterpreted_option\030\347\007 \003(\0132$.google.prot",
+ "obuf.UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\"\215\001\n\013" +
+ "EnumOptions\022\023\n\013allow_alias\030\002 \001(\010\022\031\n\ndepr" +
+ "ecated\030\003 \001(\010:\005false\022C\n\024uninterpreted_opt" +
+ "ion\030\347\007 \003(\0132$.google.protobuf.Uninterpret" +
+ "edOption*\t\010\350\007\020\200\200\200\200\002\"}\n\020EnumValueOptions\022" +
+ "\031\n\ndeprecated\030\001 \001(\010:\005false\022C\n\024uninterpre" +
+ "ted_option\030\347\007 \003(\0132$.google.protobuf.Unin" +
+ "terpretedOption*\t\010\350\007\020\200\200\200\200\002\"{\n\016ServiceOpt" +
+ "ions\022\031\n\ndeprecated\030! \001(\010:\005false\022C\n\024unint" +
+ "erpreted_option\030\347\007 \003(\0132$.google.protobuf",
+ ".UninterpretedOption*\t\010\350\007\020\200\200\200\200\002\"\255\002\n\rMeth" +
+ "odOptions\022\031\n\ndeprecated\030! \001(\010:\005false\022_\n\021" +
+ "idempotency_level\030\" \001(\0162/.google.protobu" +
+ "f.MethodOptions.IdempotencyLevel:\023IDEMPO" +
+ "TENCY_UNKNOWN\022C\n\024uninterpreted_option\030\347\007" +
" \003(\0132$.google.protobuf.UninterpretedOpti" +
- "on*\t\010\350\007\020\200\200\200\200\002\"\236\002\n\023UninterpretedOption\022;\n" +
- "\004name\030\002 \003(\0132-.google.protobuf.Uninterpre" +
- "tedOption.NamePart\022\030\n\020identifier_value\030\003" +
- " \001(\t\022\032\n\022positive_int_value\030\004 \001(\004\022\032\n\022nega" +
- "tive_int_value\030\005 \001(\003\022\024\n\014double_value\030\006 \001" +
- "(\001\022\024\n\014string_value\030\007 \001(\014\022\027\n\017aggregate_va" +
- "lue\030\010 \001(\t\0323\n\010NamePart\022\021\n\tname_part\030\001 \002(\t",
- "\022\024\n\014is_extension\030\002 \002(\010\"\325\001\n\016SourceCodeInf" +
- "o\022:\n\010location\030\001 \003(\0132(.google.protobuf.So" +
- "urceCodeInfo.Location\032\206\001\n\010Location\022\020\n\004pa" +
- "th\030\001 \003(\005B\002\020\001\022\020\n\004span\030\002 \003(\005B\002\020\001\022\030\n\020leadin" +
- "g_comments\030\003 \001(\t\022\031\n\021trailing_comments\030\004 " +
- "\001(\t\022!\n\031leading_detached_comments\030\006 \003(\t\"\247" +
- "\001\n\021GeneratedCodeInfo\022A\n\nannotation\030\001 \003(\013" +
- "2-.google.protobuf.GeneratedCodeInfo.Ann" +
- "otation\032O\n\nAnnotation\022\020\n\004path\030\001 \003(\005B\002\020\001\022" +
- "\023\n\013source_file\030\002 \001(\t\022\r\n\005begin\030\003 \001(\005\022\013\n\003e",
- "nd\030\004 \001(\005BX\n\023com.google.protobufB\020Descrip" +
- "torProtosH\001Z\ndescriptor\242\002\003GPB\252\002\032Google.P" +
- "rotobuf.Reflection"
+ "on\"P\n\020IdempotencyLevel\022\027\n\023IDEMPOTENCY_UN" +
+ "KNOWN\020\000\022\023\n\017NO_SIDE_EFFECTS\020\001\022\016\n\nIDEMPOTE" +
+ "NT\020\002*\t\010\350\007\020\200\200\200\200\002\"\236\002\n\023UninterpretedOption\022" +
+ ";\n\004name\030\002 \003(\0132-.google.protobuf.Uninterp",
+ "retedOption.NamePart\022\030\n\020identifier_value" +
+ "\030\003 \001(\t\022\032\n\022positive_int_value\030\004 \001(\004\022\032\n\022ne" +
+ "gative_int_value\030\005 \001(\003\022\024\n\014double_value\030\006" +
+ " \001(\001\022\024\n\014string_value\030\007 \001(\014\022\027\n\017aggregate_" +
+ "value\030\010 \001(\t\0323\n\010NamePart\022\021\n\tname_part\030\001 \002" +
+ "(\t\022\024\n\014is_extension\030\002 \002(\010\"\325\001\n\016SourceCodeI" +
+ "nfo\022:\n\010location\030\001 \003(\0132(.google.protobuf." +
+ "SourceCodeInfo.Location\032\206\001\n\010Location\022\020\n\004" +
+ "path\030\001 \003(\005B\002\020\001\022\020\n\004span\030\002 \003(\005B\002\020\001\022\030\n\020lead" +
+ "ing_comments\030\003 \001(\t\022\031\n\021trailing_comments\030",
+ "\004 \001(\t\022!\n\031leading_detached_comments\030\006 \003(\t" +
+ "\"\247\001\n\021GeneratedCodeInfo\022A\n\nannotation\030\001 \003" +
+ "(\0132-.google.protobuf.GeneratedCodeInfo.A" +
+ "nnotation\032O\n\nAnnotation\022\020\n\004path\030\001 \003(\005B\002\020" +
+ "\001\022\023\n\013source_file\030\002 \001(\t\022\r\n\005begin\030\003 \001(\005\022\013\n" +
+ "\003end\030\004 \001(\005B\214\001\n\023com.google.protobufB\020Desc" +
+ "riptorProtosH\001Z>github.com/golang/protob" +
+ "uf/protoc-gen-go/descriptor;descriptor\242\002" +
+ "\003GPB\252\002\032Google.Protobuf.Reflection"
};
org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
@@ -38585,7 +39056,7 @@ public final class DescriptorProtos {
internal_static_google_protobuf_FileOptions_fieldAccessorTable = new
org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_google_protobuf_FileOptions_descriptor,
- new java.lang.String[] { "JavaPackage", "JavaOuterClassname", "JavaMultipleFiles", "JavaGenerateEqualsAndHash", "JavaStringCheckUtf8", "OptimizeFor", "GoPackage", "CcGenericServices", "JavaGenericServices", "PyGenericServices", "Deprecated", "CcEnableArenas", "ObjcClassPrefix", "CsharpNamespace", "UninterpretedOption", });
+ new java.lang.String[] { "JavaPackage", "JavaOuterClassname", "JavaMultipleFiles", "JavaGenerateEqualsAndHash", "JavaStringCheckUtf8", "OptimizeFor", "GoPackage", "CcGenericServices", "JavaGenericServices", "PyGenericServices", "Deprecated", "CcEnableArenas", "ObjcClassPrefix", "CsharpNamespace", "SwiftPrefix", "UninterpretedOption", });
internal_static_google_protobuf_MessageOptions_descriptor =
getDescriptor().getMessageTypes().get(10);
internal_static_google_protobuf_MessageOptions_fieldAccessorTable = new
@@ -38627,7 +39098,7 @@ public final class DescriptorProtos {
internal_static_google_protobuf_MethodOptions_fieldAccessorTable = new
org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_google_protobuf_MethodOptions_descriptor,
- new java.lang.String[] { "Deprecated", "UninterpretedOption", });
+ new java.lang.String[] { "Deprecated", "IdempotencyLevel", "UninterpretedOption", });
internal_static_google_protobuf_UninterpretedOption_descriptor =
getDescriptor().getMessageTypes().get(17);
internal_static_google_protobuf_UninterpretedOption_fieldAccessorTable = new
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Descriptors.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Descriptors.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Descriptors.java
index abc46b1..62ccd19 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Descriptors.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Descriptors.java
@@ -2123,7 +2123,7 @@ public final class Descriptors {
// Can't happen, because addPackage() only fails when the name
// conflicts with a non-package, but we have not yet added any
// non-packages at this point.
- assert false;
+ throw new AssertionError(e);
}
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DoubleValue.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DoubleValue.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DoubleValue.java
index 2450436..98a0ecc 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DoubleValue.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DoubleValue.java
@@ -83,7 +83,7 @@ public final class DoubleValue extends
* The double value.
* </pre>
*
- * <code>optional double value = 1;</code>
+ * <code>double value = 1;</code>
*/
public double getValue() {
return value_;
@@ -144,7 +144,7 @@ public final class DoubleValue extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + VALUE_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
java.lang.Double.doubleToLongBits(getValue()));
@@ -372,7 +372,7 @@ public final class DoubleValue extends
* The double value.
* </pre>
*
- * <code>optional double value = 1;</code>
+ * <code>double value = 1;</code>
*/
public double getValue() {
return value_;
@@ -382,7 +382,7 @@ public final class DoubleValue extends
* The double value.
* </pre>
*
- * <code>optional double value = 1;</code>
+ * <code>double value = 1;</code>
*/
public Builder setValue(double value) {
@@ -395,7 +395,7 @@ public final class DoubleValue extends
* The double value.
* </pre>
*
- * <code>optional double value = 1;</code>
+ * <code>double value = 1;</code>
*/
public Builder clearValue() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DoubleValueOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DoubleValueOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DoubleValueOrBuilder.java
index 5bd1a3f..180fa50 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DoubleValueOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DoubleValueOrBuilder.java
@@ -12,7 +12,7 @@ public interface DoubleValueOrBuilder extends
* The double value.
* </pre>
*
- * <code>optional double value = 1;</code>
+ * <code>double value = 1;</code>
*/
double getValue();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Duration.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Duration.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Duration.java
index a675f7b..c6736ef 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Duration.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Duration.java
@@ -124,7 +124,7 @@ public final class Duration extends
* to +315,576,000,000 inclusive.
* </pre>
*
- * <code>optional int64 seconds = 1;</code>
+ * <code>int64 seconds = 1;</code>
*/
public long getSeconds() {
return seconds_;
@@ -142,7 +142,7 @@ public final class Duration extends
* to +999,999,999 inclusive.
* </pre>
*
- * <code>optional int32 nanos = 2;</code>
+ * <code>int32 nanos = 2;</code>
*/
public int getNanos() {
return nanos_;
@@ -210,7 +210,7 @@ public final class Duration extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + SECONDS_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
getSeconds());
@@ -481,7 +481,7 @@ public final class Duration extends
* to +315,576,000,000 inclusive.
* </pre>
*
- * <code>optional int64 seconds = 1;</code>
+ * <code>int64 seconds = 1;</code>
*/
public long getSeconds() {
return seconds_;
@@ -492,7 +492,7 @@ public final class Duration extends
* to +315,576,000,000 inclusive.
* </pre>
*
- * <code>optional int64 seconds = 1;</code>
+ * <code>int64 seconds = 1;</code>
*/
public Builder setSeconds(long value) {
@@ -506,7 +506,7 @@ public final class Duration extends
* to +315,576,000,000 inclusive.
* </pre>
*
- * <code>optional int64 seconds = 1;</code>
+ * <code>int64 seconds = 1;</code>
*/
public Builder clearSeconds() {
@@ -526,7 +526,7 @@ public final class Duration extends
* to +999,999,999 inclusive.
* </pre>
*
- * <code>optional int32 nanos = 2;</code>
+ * <code>int32 nanos = 2;</code>
*/
public int getNanos() {
return nanos_;
@@ -541,7 +541,7 @@ public final class Duration extends
* to +999,999,999 inclusive.
* </pre>
*
- * <code>optional int32 nanos = 2;</code>
+ * <code>int32 nanos = 2;</code>
*/
public Builder setNanos(int value) {
@@ -559,7 +559,7 @@ public final class Duration extends
* to +999,999,999 inclusive.
* </pre>
*
- * <code>optional int32 nanos = 2;</code>
+ * <code>int32 nanos = 2;</code>
*/
public Builder clearNanos() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DurationOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DurationOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DurationOrBuilder.java
index 245f6b9..9c19aae 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DurationOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DurationOrBuilder.java
@@ -13,7 +13,7 @@ public interface DurationOrBuilder extends
* to +315,576,000,000 inclusive.
* </pre>
*
- * <code>optional int64 seconds = 1;</code>
+ * <code>int64 seconds = 1;</code>
*/
long getSeconds();
@@ -27,7 +27,7 @@ public interface DurationOrBuilder extends
* to +999,999,999 inclusive.
* </pre>
*
- * <code>optional int32 nanos = 2;</code>
+ * <code>int32 nanos = 2;</code>
*/
int getNanos();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DynamicMessage.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DynamicMessage.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DynamicMessage.java
index 110f2a9..13bccd6 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DynamicMessage.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/DynamicMessage.java
@@ -297,7 +297,7 @@ public final class DynamicMessage extends AbstractMessage {
} catch (InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(builder.buildPartial());
} catch (IOException e) {
- throw new InvalidProtocolBufferException(e.getMessage())
+ throw new InvalidProtocolBufferException(e)
.setUnfinishedMessage(builder.buildPartial());
}
return builder.buildPartial();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Empty.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Empty.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Empty.java
index de6d523..61f1574 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Empty.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Empty.java
@@ -118,7 +118,7 @@ public final class Empty extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Enum.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Enum.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Enum.java
index 6355bb3..3d2a206 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Enum.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Enum.java
@@ -130,7 +130,7 @@ public final class Enum extends
* Enum type name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public java.lang.String getName() {
java.lang.Object ref = name_;
@@ -149,7 +149,7 @@ public final class Enum extends
* Enum type name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes() {
@@ -282,7 +282,7 @@ public final class Enum extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 4;</code>
+ * <code>.google.protobuf.SourceContext source_context = 4;</code>
*/
public boolean hasSourceContext() {
return sourceContext_ != null;
@@ -292,7 +292,7 @@ public final class Enum extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 4;</code>
+ * <code>.google.protobuf.SourceContext source_context = 4;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext getSourceContext() {
return sourceContext_ == null ? org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext.getDefaultInstance() : sourceContext_;
@@ -302,7 +302,7 @@ public final class Enum extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 4;</code>
+ * <code>.google.protobuf.SourceContext source_context = 4;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContextOrBuilder getSourceContextOrBuilder() {
return getSourceContext();
@@ -315,7 +315,7 @@ public final class Enum extends
* The source syntax.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 5;</code>
+ * <code>.google.protobuf.Syntax syntax = 5;</code>
*/
public int getSyntaxValue() {
return syntax_;
@@ -325,7 +325,7 @@ public final class Enum extends
* The source syntax.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 5;</code>
+ * <code>.google.protobuf.Syntax syntax = 5;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax getSyntax() {
org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax result = org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax.valueOf(syntax_);
@@ -422,7 +422,7 @@ public final class Enum extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
if (getEnumvalueCount() > 0) {
@@ -771,7 +771,7 @@ public final class Enum extends
* Enum type name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public java.lang.String getName() {
java.lang.Object ref = name_;
@@ -790,7 +790,7 @@ public final class Enum extends
* Enum type name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes() {
@@ -810,7 +810,7 @@ public final class Enum extends
* Enum type name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public Builder setName(
java.lang.String value) {
@@ -827,7 +827,7 @@ public final class Enum extends
* Enum type name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public Builder clearName() {
@@ -840,7 +840,7 @@ public final class Enum extends
* Enum type name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public Builder setNameBytes(
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
@@ -1486,7 +1486,7 @@ public final class Enum extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 4;</code>
+ * <code>.google.protobuf.SourceContext source_context = 4;</code>
*/
public boolean hasSourceContext() {
return sourceContextBuilder_ != null || sourceContext_ != null;
@@ -1496,7 +1496,7 @@ public final class Enum extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 4;</code>
+ * <code>.google.protobuf.SourceContext source_context = 4;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext getSourceContext() {
if (sourceContextBuilder_ == null) {
@@ -1510,7 +1510,7 @@ public final class Enum extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 4;</code>
+ * <code>.google.protobuf.SourceContext source_context = 4;</code>
*/
public Builder setSourceContext(org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext value) {
if (sourceContextBuilder_ == null) {
@@ -1530,7 +1530,7 @@ public final class Enum extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 4;</code>
+ * <code>.google.protobuf.SourceContext source_context = 4;</code>
*/
public Builder setSourceContext(
org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext.Builder builderForValue) {
@@ -1548,7 +1548,7 @@ public final class Enum extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 4;</code>
+ * <code>.google.protobuf.SourceContext source_context = 4;</code>
*/
public Builder mergeSourceContext(org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext value) {
if (sourceContextBuilder_ == null) {
@@ -1570,7 +1570,7 @@ public final class Enum extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 4;</code>
+ * <code>.google.protobuf.SourceContext source_context = 4;</code>
*/
public Builder clearSourceContext() {
if (sourceContextBuilder_ == null) {
@@ -1588,7 +1588,7 @@ public final class Enum extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 4;</code>
+ * <code>.google.protobuf.SourceContext source_context = 4;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext.Builder getSourceContextBuilder() {
@@ -1600,7 +1600,7 @@ public final class Enum extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 4;</code>
+ * <code>.google.protobuf.SourceContext source_context = 4;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContextOrBuilder getSourceContextOrBuilder() {
if (sourceContextBuilder_ != null) {
@@ -1615,7 +1615,7 @@ public final class Enum extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 4;</code>
+ * <code>.google.protobuf.SourceContext source_context = 4;</code>
*/
private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3<
org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext, org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext.Builder, org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContextOrBuilder>
@@ -1637,7 +1637,7 @@ public final class Enum extends
* The source syntax.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 5;</code>
+ * <code>.google.protobuf.Syntax syntax = 5;</code>
*/
public int getSyntaxValue() {
return syntax_;
@@ -1647,7 +1647,7 @@ public final class Enum extends
* The source syntax.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 5;</code>
+ * <code>.google.protobuf.Syntax syntax = 5;</code>
*/
public Builder setSyntaxValue(int value) {
syntax_ = value;
@@ -1659,7 +1659,7 @@ public final class Enum extends
* The source syntax.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 5;</code>
+ * <code>.google.protobuf.Syntax syntax = 5;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax getSyntax() {
org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax result = org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax.valueOf(syntax_);
@@ -1670,7 +1670,7 @@ public final class Enum extends
* The source syntax.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 5;</code>
+ * <code>.google.protobuf.Syntax syntax = 5;</code>
*/
public Builder setSyntax(org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax value) {
if (value == null) {
@@ -1686,7 +1686,7 @@ public final class Enum extends
* The source syntax.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 5;</code>
+ * <code>.google.protobuf.Syntax syntax = 5;</code>
*/
public Builder clearSyntax() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/EnumOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/EnumOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/EnumOrBuilder.java
index af5e01e..6e2d7d4 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/EnumOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/EnumOrBuilder.java
@@ -12,7 +12,7 @@ public interface EnumOrBuilder extends
* Enum type name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
java.lang.String getName();
/**
@@ -20,7 +20,7 @@ public interface EnumOrBuilder extends
* Enum type name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes();
@@ -118,7 +118,7 @@ public interface EnumOrBuilder extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 4;</code>
+ * <code>.google.protobuf.SourceContext source_context = 4;</code>
*/
boolean hasSourceContext();
/**
@@ -126,7 +126,7 @@ public interface EnumOrBuilder extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 4;</code>
+ * <code>.google.protobuf.SourceContext source_context = 4;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext getSourceContext();
/**
@@ -134,7 +134,7 @@ public interface EnumOrBuilder extends
* The source context.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 4;</code>
+ * <code>.google.protobuf.SourceContext source_context = 4;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContextOrBuilder getSourceContextOrBuilder();
@@ -143,7 +143,7 @@ public interface EnumOrBuilder extends
* The source syntax.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 5;</code>
+ * <code>.google.protobuf.Syntax syntax = 5;</code>
*/
int getSyntaxValue();
/**
@@ -151,7 +151,7 @@ public interface EnumOrBuilder extends
* The source syntax.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 5;</code>
+ * <code>.google.protobuf.Syntax syntax = 5;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax getSyntax();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/EnumValue.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/EnumValue.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/EnumValue.java
index 83771f5..a0a9d49 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/EnumValue.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/EnumValue.java
@@ -103,7 +103,7 @@ public final class EnumValue extends
* Enum value name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public java.lang.String getName() {
java.lang.Object ref = name_;
@@ -122,7 +122,7 @@ public final class EnumValue extends
* Enum value name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes() {
@@ -145,7 +145,7 @@ public final class EnumValue extends
* Enum value number.
* </pre>
*
- * <code>optional int32 number = 2;</code>
+ * <code>int32 number = 2;</code>
*/
public int getNumber() {
return number_;
@@ -276,7 +276,7 @@ public final class EnumValue extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
hash = (37 * hash) + NUMBER_FIELD_NUMBER;
@@ -561,7 +561,7 @@ public final class EnumValue extends
* Enum value name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public java.lang.String getName() {
java.lang.Object ref = name_;
@@ -580,7 +580,7 @@ public final class EnumValue extends
* Enum value name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes() {
@@ -600,7 +600,7 @@ public final class EnumValue extends
* Enum value name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public Builder setName(
java.lang.String value) {
@@ -617,7 +617,7 @@ public final class EnumValue extends
* Enum value name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public Builder clearName() {
@@ -630,7 +630,7 @@ public final class EnumValue extends
* Enum value name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public Builder setNameBytes(
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
@@ -650,7 +650,7 @@ public final class EnumValue extends
* Enum value number.
* </pre>
*
- * <code>optional int32 number = 2;</code>
+ * <code>int32 number = 2;</code>
*/
public int getNumber() {
return number_;
@@ -660,7 +660,7 @@ public final class EnumValue extends
* Enum value number.
* </pre>
*
- * <code>optional int32 number = 2;</code>
+ * <code>int32 number = 2;</code>
*/
public Builder setNumber(int value) {
@@ -673,7 +673,7 @@ public final class EnumValue extends
* Enum value number.
* </pre>
*
- * <code>optional int32 number = 2;</code>
+ * <code>int32 number = 2;</code>
*/
public Builder clearNumber() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/EnumValueOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/EnumValueOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/EnumValueOrBuilder.java
index a6b9e7a..22523d7 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/EnumValueOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/EnumValueOrBuilder.java
@@ -12,7 +12,7 @@ public interface EnumValueOrBuilder extends
* Enum value name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
java.lang.String getName();
/**
@@ -20,7 +20,7 @@ public interface EnumValueOrBuilder extends
* Enum value name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes();
@@ -30,7 +30,7 @@ public interface EnumValueOrBuilder extends
* Enum value number.
* </pre>
*
- * <code>optional int32 number = 2;</code>
+ * <code>int32 number = 2;</code>
*/
int getNumber();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ExtensionRegistry.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ExtensionRegistry.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ExtensionRegistry.java
index 3bc5977..c15eafd 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ExtensionRegistry.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ExtensionRegistry.java
@@ -32,7 +32,6 @@ package org.apache.hadoop.hbase.shaded.com.google.protobuf;
import org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.Descriptor;
import org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FieldDescriptor;
-
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
[5/7] hbase git commit: HBASE-16780 Since move to protobuf3.1, Cells
are limited to 64MB where previous they had no limit Update internal pb to
3.2 from 3.1.; AMENDMENT -- FORGOT TO REBUILD PBs
Posted by st...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ExtensionRegistryLite.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ExtensionRegistryLite.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ExtensionRegistryLite.java
index 878e46a..9bf452a 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ExtensionRegistryLite.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ExtensionRegistryLite.java
@@ -105,9 +105,9 @@ public class ExtensionRegistryLite {
/**
* Construct a new, empty instance.
- *
- * <p>
- * This may be an {@code ExtensionRegistry} if the full (non-Lite) proto libraries are available.
+ *
+ * <p>This may be an {@code ExtensionRegistry} if the full (non-Lite) proto libraries are
+ * available.
*/
public static ExtensionRegistryLite newInstance() {
return ExtensionRegistryFactory.create();
@@ -121,6 +121,7 @@ public class ExtensionRegistryLite {
return ExtensionRegistryFactory.createEmpty();
}
+
/** Returns an unmodifiable view of the registry. */
public ExtensionRegistryLite getUnmodifiable() {
return new ExtensionRegistryLite(this);
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Field.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Field.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Field.java
index 15951b3..d33fd75 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Field.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Field.java
@@ -709,7 +709,7 @@ public final class Field extends
* The field type.
* </pre>
*
- * <code>optional .google.protobuf.Field.Kind kind = 1;</code>
+ * <code>.google.protobuf.Field.Kind kind = 1;</code>
*/
public int getKindValue() {
return kind_;
@@ -719,7 +719,7 @@ public final class Field extends
* The field type.
* </pre>
*
- * <code>optional .google.protobuf.Field.Kind kind = 1;</code>
+ * <code>.google.protobuf.Field.Kind kind = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.Field.Kind getKind() {
org.apache.hadoop.hbase.shaded.com.google.protobuf.Field.Kind result = org.apache.hadoop.hbase.shaded.com.google.protobuf.Field.Kind.valueOf(kind_);
@@ -733,7 +733,7 @@ public final class Field extends
* The field cardinality.
* </pre>
*
- * <code>optional .google.protobuf.Field.Cardinality cardinality = 2;</code>
+ * <code>.google.protobuf.Field.Cardinality cardinality = 2;</code>
*/
public int getCardinalityValue() {
return cardinality_;
@@ -743,7 +743,7 @@ public final class Field extends
* The field cardinality.
* </pre>
*
- * <code>optional .google.protobuf.Field.Cardinality cardinality = 2;</code>
+ * <code>.google.protobuf.Field.Cardinality cardinality = 2;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.Field.Cardinality getCardinality() {
org.apache.hadoop.hbase.shaded.com.google.protobuf.Field.Cardinality result = org.apache.hadoop.hbase.shaded.com.google.protobuf.Field.Cardinality.valueOf(cardinality_);
@@ -757,7 +757,7 @@ public final class Field extends
* The field number.
* </pre>
*
- * <code>optional int32 number = 3;</code>
+ * <code>int32 number = 3;</code>
*/
public int getNumber() {
return number_;
@@ -770,7 +770,7 @@ public final class Field extends
* The field name.
* </pre>
*
- * <code>optional string name = 4;</code>
+ * <code>string name = 4;</code>
*/
public java.lang.String getName() {
java.lang.Object ref = name_;
@@ -789,7 +789,7 @@ public final class Field extends
* The field name.
* </pre>
*
- * <code>optional string name = 4;</code>
+ * <code>string name = 4;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes() {
@@ -813,7 +813,7 @@ public final class Field extends
* types. Example: `"type.googleapis.org.apache.hadoop.hbase.shaded.com.google.protobuf.Timestamp"`.
* </pre>
*
- * <code>optional string type_url = 6;</code>
+ * <code>string type_url = 6;</code>
*/
public java.lang.String getTypeUrl() {
java.lang.Object ref = typeUrl_;
@@ -833,7 +833,7 @@ public final class Field extends
* types. Example: `"type.googleapis.org.apache.hadoop.hbase.shaded.com.google.protobuf.Timestamp"`.
* </pre>
*
- * <code>optional string type_url = 6;</code>
+ * <code>string type_url = 6;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getTypeUrlBytes() {
@@ -857,7 +857,7 @@ public final class Field extends
* types. The first type has index 1; zero means the type is not in the list.
* </pre>
*
- * <code>optional int32 oneof_index = 7;</code>
+ * <code>int32 oneof_index = 7;</code>
*/
public int getOneofIndex() {
return oneofIndex_;
@@ -870,7 +870,7 @@ public final class Field extends
* Whether to use alternative packed wire representation.
* </pre>
*
- * <code>optional bool packed = 8;</code>
+ * <code>bool packed = 8;</code>
*/
public boolean getPacked() {
return packed_;
@@ -938,7 +938,7 @@ public final class Field extends
* The field JSON name.
* </pre>
*
- * <code>optional string json_name = 10;</code>
+ * <code>string json_name = 10;</code>
*/
public java.lang.String getJsonName() {
java.lang.Object ref = jsonName_;
@@ -957,7 +957,7 @@ public final class Field extends
* The field JSON name.
* </pre>
*
- * <code>optional string json_name = 10;</code>
+ * <code>string json_name = 10;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getJsonNameBytes() {
@@ -980,7 +980,7 @@ public final class Field extends
* The string value of the default value of this field. Proto2 syntax only.
* </pre>
*
- * <code>optional string default_value = 11;</code>
+ * <code>string default_value = 11;</code>
*/
public java.lang.String getDefaultValue() {
java.lang.Object ref = defaultValue_;
@@ -999,7 +999,7 @@ public final class Field extends
* The string value of the default value of this field. Proto2 syntax only.
* </pre>
*
- * <code>optional string default_value = 11;</code>
+ * <code>string default_value = 11;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getDefaultValueBytes() {
@@ -1143,7 +1143,7 @@ public final class Field extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + KIND_FIELD_NUMBER;
hash = (53 * hash) + kind_;
hash = (37 * hash) + CARDINALITY_FIELD_NUMBER;
@@ -1488,7 +1488,7 @@ public final class Field extends
* The field type.
* </pre>
*
- * <code>optional .google.protobuf.Field.Kind kind = 1;</code>
+ * <code>.google.protobuf.Field.Kind kind = 1;</code>
*/
public int getKindValue() {
return kind_;
@@ -1498,7 +1498,7 @@ public final class Field extends
* The field type.
* </pre>
*
- * <code>optional .google.protobuf.Field.Kind kind = 1;</code>
+ * <code>.google.protobuf.Field.Kind kind = 1;</code>
*/
public Builder setKindValue(int value) {
kind_ = value;
@@ -1510,7 +1510,7 @@ public final class Field extends
* The field type.
* </pre>
*
- * <code>optional .google.protobuf.Field.Kind kind = 1;</code>
+ * <code>.google.protobuf.Field.Kind kind = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.Field.Kind getKind() {
org.apache.hadoop.hbase.shaded.com.google.protobuf.Field.Kind result = org.apache.hadoop.hbase.shaded.com.google.protobuf.Field.Kind.valueOf(kind_);
@@ -1521,7 +1521,7 @@ public final class Field extends
* The field type.
* </pre>
*
- * <code>optional .google.protobuf.Field.Kind kind = 1;</code>
+ * <code>.google.protobuf.Field.Kind kind = 1;</code>
*/
public Builder setKind(org.apache.hadoop.hbase.shaded.com.google.protobuf.Field.Kind value) {
if (value == null) {
@@ -1537,7 +1537,7 @@ public final class Field extends
* The field type.
* </pre>
*
- * <code>optional .google.protobuf.Field.Kind kind = 1;</code>
+ * <code>.google.protobuf.Field.Kind kind = 1;</code>
*/
public Builder clearKind() {
@@ -1552,7 +1552,7 @@ public final class Field extends
* The field cardinality.
* </pre>
*
- * <code>optional .google.protobuf.Field.Cardinality cardinality = 2;</code>
+ * <code>.google.protobuf.Field.Cardinality cardinality = 2;</code>
*/
public int getCardinalityValue() {
return cardinality_;
@@ -1562,7 +1562,7 @@ public final class Field extends
* The field cardinality.
* </pre>
*
- * <code>optional .google.protobuf.Field.Cardinality cardinality = 2;</code>
+ * <code>.google.protobuf.Field.Cardinality cardinality = 2;</code>
*/
public Builder setCardinalityValue(int value) {
cardinality_ = value;
@@ -1574,7 +1574,7 @@ public final class Field extends
* The field cardinality.
* </pre>
*
- * <code>optional .google.protobuf.Field.Cardinality cardinality = 2;</code>
+ * <code>.google.protobuf.Field.Cardinality cardinality = 2;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.Field.Cardinality getCardinality() {
org.apache.hadoop.hbase.shaded.com.google.protobuf.Field.Cardinality result = org.apache.hadoop.hbase.shaded.com.google.protobuf.Field.Cardinality.valueOf(cardinality_);
@@ -1585,7 +1585,7 @@ public final class Field extends
* The field cardinality.
* </pre>
*
- * <code>optional .google.protobuf.Field.Cardinality cardinality = 2;</code>
+ * <code>.google.protobuf.Field.Cardinality cardinality = 2;</code>
*/
public Builder setCardinality(org.apache.hadoop.hbase.shaded.com.google.protobuf.Field.Cardinality value) {
if (value == null) {
@@ -1601,7 +1601,7 @@ public final class Field extends
* The field cardinality.
* </pre>
*
- * <code>optional .google.protobuf.Field.Cardinality cardinality = 2;</code>
+ * <code>.google.protobuf.Field.Cardinality cardinality = 2;</code>
*/
public Builder clearCardinality() {
@@ -1616,7 +1616,7 @@ public final class Field extends
* The field number.
* </pre>
*
- * <code>optional int32 number = 3;</code>
+ * <code>int32 number = 3;</code>
*/
public int getNumber() {
return number_;
@@ -1626,7 +1626,7 @@ public final class Field extends
* The field number.
* </pre>
*
- * <code>optional int32 number = 3;</code>
+ * <code>int32 number = 3;</code>
*/
public Builder setNumber(int value) {
@@ -1639,7 +1639,7 @@ public final class Field extends
* The field number.
* </pre>
*
- * <code>optional int32 number = 3;</code>
+ * <code>int32 number = 3;</code>
*/
public Builder clearNumber() {
@@ -1654,7 +1654,7 @@ public final class Field extends
* The field name.
* </pre>
*
- * <code>optional string name = 4;</code>
+ * <code>string name = 4;</code>
*/
public java.lang.String getName() {
java.lang.Object ref = name_;
@@ -1673,7 +1673,7 @@ public final class Field extends
* The field name.
* </pre>
*
- * <code>optional string name = 4;</code>
+ * <code>string name = 4;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes() {
@@ -1693,7 +1693,7 @@ public final class Field extends
* The field name.
* </pre>
*
- * <code>optional string name = 4;</code>
+ * <code>string name = 4;</code>
*/
public Builder setName(
java.lang.String value) {
@@ -1710,7 +1710,7 @@ public final class Field extends
* The field name.
* </pre>
*
- * <code>optional string name = 4;</code>
+ * <code>string name = 4;</code>
*/
public Builder clearName() {
@@ -1723,7 +1723,7 @@ public final class Field extends
* The field name.
* </pre>
*
- * <code>optional string name = 4;</code>
+ * <code>string name = 4;</code>
*/
public Builder setNameBytes(
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
@@ -1744,7 +1744,7 @@ public final class Field extends
* types. Example: `"type.googleapis.org.apache.hadoop.hbase.shaded.com.google.protobuf.Timestamp"`.
* </pre>
*
- * <code>optional string type_url = 6;</code>
+ * <code>string type_url = 6;</code>
*/
public java.lang.String getTypeUrl() {
java.lang.Object ref = typeUrl_;
@@ -1764,7 +1764,7 @@ public final class Field extends
* types. Example: `"type.googleapis.org.apache.hadoop.hbase.shaded.com.google.protobuf.Timestamp"`.
* </pre>
*
- * <code>optional string type_url = 6;</code>
+ * <code>string type_url = 6;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getTypeUrlBytes() {
@@ -1785,7 +1785,7 @@ public final class Field extends
* types. Example: `"type.googleapis.org.apache.hadoop.hbase.shaded.com.google.protobuf.Timestamp"`.
* </pre>
*
- * <code>optional string type_url = 6;</code>
+ * <code>string type_url = 6;</code>
*/
public Builder setTypeUrl(
java.lang.String value) {
@@ -1803,7 +1803,7 @@ public final class Field extends
* types. Example: `"type.googleapis.org.apache.hadoop.hbase.shaded.com.google.protobuf.Timestamp"`.
* </pre>
*
- * <code>optional string type_url = 6;</code>
+ * <code>string type_url = 6;</code>
*/
public Builder clearTypeUrl() {
@@ -1817,7 +1817,7 @@ public final class Field extends
* types. Example: `"type.googleapis.org.apache.hadoop.hbase.shaded.com.google.protobuf.Timestamp"`.
* </pre>
*
- * <code>optional string type_url = 6;</code>
+ * <code>string type_url = 6;</code>
*/
public Builder setTypeUrlBytes(
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
@@ -1838,7 +1838,7 @@ public final class Field extends
* types. The first type has index 1; zero means the type is not in the list.
* </pre>
*
- * <code>optional int32 oneof_index = 7;</code>
+ * <code>int32 oneof_index = 7;</code>
*/
public int getOneofIndex() {
return oneofIndex_;
@@ -1849,7 +1849,7 @@ public final class Field extends
* types. The first type has index 1; zero means the type is not in the list.
* </pre>
*
- * <code>optional int32 oneof_index = 7;</code>
+ * <code>int32 oneof_index = 7;</code>
*/
public Builder setOneofIndex(int value) {
@@ -1863,7 +1863,7 @@ public final class Field extends
* types. The first type has index 1; zero means the type is not in the list.
* </pre>
*
- * <code>optional int32 oneof_index = 7;</code>
+ * <code>int32 oneof_index = 7;</code>
*/
public Builder clearOneofIndex() {
@@ -1878,7 +1878,7 @@ public final class Field extends
* Whether to use alternative packed wire representation.
* </pre>
*
- * <code>optional bool packed = 8;</code>
+ * <code>bool packed = 8;</code>
*/
public boolean getPacked() {
return packed_;
@@ -1888,7 +1888,7 @@ public final class Field extends
* Whether to use alternative packed wire representation.
* </pre>
*
- * <code>optional bool packed = 8;</code>
+ * <code>bool packed = 8;</code>
*/
public Builder setPacked(boolean value) {
@@ -1901,7 +1901,7 @@ public final class Field extends
* Whether to use alternative packed wire representation.
* </pre>
*
- * <code>optional bool packed = 8;</code>
+ * <code>bool packed = 8;</code>
*/
public Builder clearPacked() {
@@ -2228,7 +2228,7 @@ public final class Field extends
* The field JSON name.
* </pre>
*
- * <code>optional string json_name = 10;</code>
+ * <code>string json_name = 10;</code>
*/
public java.lang.String getJsonName() {
java.lang.Object ref = jsonName_;
@@ -2247,7 +2247,7 @@ public final class Field extends
* The field JSON name.
* </pre>
*
- * <code>optional string json_name = 10;</code>
+ * <code>string json_name = 10;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getJsonNameBytes() {
@@ -2267,7 +2267,7 @@ public final class Field extends
* The field JSON name.
* </pre>
*
- * <code>optional string json_name = 10;</code>
+ * <code>string json_name = 10;</code>
*/
public Builder setJsonName(
java.lang.String value) {
@@ -2284,7 +2284,7 @@ public final class Field extends
* The field JSON name.
* </pre>
*
- * <code>optional string json_name = 10;</code>
+ * <code>string json_name = 10;</code>
*/
public Builder clearJsonName() {
@@ -2297,7 +2297,7 @@ public final class Field extends
* The field JSON name.
* </pre>
*
- * <code>optional string json_name = 10;</code>
+ * <code>string json_name = 10;</code>
*/
public Builder setJsonNameBytes(
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
@@ -2317,7 +2317,7 @@ public final class Field extends
* The string value of the default value of this field. Proto2 syntax only.
* </pre>
*
- * <code>optional string default_value = 11;</code>
+ * <code>string default_value = 11;</code>
*/
public java.lang.String getDefaultValue() {
java.lang.Object ref = defaultValue_;
@@ -2336,7 +2336,7 @@ public final class Field extends
* The string value of the default value of this field. Proto2 syntax only.
* </pre>
*
- * <code>optional string default_value = 11;</code>
+ * <code>string default_value = 11;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getDefaultValueBytes() {
@@ -2356,7 +2356,7 @@ public final class Field extends
* The string value of the default value of this field. Proto2 syntax only.
* </pre>
*
- * <code>optional string default_value = 11;</code>
+ * <code>string default_value = 11;</code>
*/
public Builder setDefaultValue(
java.lang.String value) {
@@ -2373,7 +2373,7 @@ public final class Field extends
* The string value of the default value of this field. Proto2 syntax only.
* </pre>
*
- * <code>optional string default_value = 11;</code>
+ * <code>string default_value = 11;</code>
*/
public Builder clearDefaultValue() {
@@ -2386,7 +2386,7 @@ public final class Field extends
* The string value of the default value of this field. Proto2 syntax only.
* </pre>
*
- * <code>optional string default_value = 11;</code>
+ * <code>string default_value = 11;</code>
*/
public Builder setDefaultValueBytes(
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FieldMask.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FieldMask.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FieldMask.java
index 9c311e4..df42bca 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FieldMask.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FieldMask.java
@@ -336,7 +336,7 @@ public final class FieldMask extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getPathsCount() > 0) {
hash = (37 * hash) + PATHS_FIELD_NUMBER;
hash = (53 * hash) + getPathsList().hashCode();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FieldMaskProto.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FieldMaskProto.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FieldMaskProto.java
index 711e94f..4e978bf 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FieldMaskProto.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FieldMaskProto.java
@@ -30,9 +30,10 @@ public final class FieldMaskProto {
java.lang.String[] descriptorData = {
"\n google/protobuf/field_mask.proto\022\017goog" +
"le.protobuf\"\032\n\tFieldMask\022\r\n\005paths\030\001 \003(\tB" +
- "N\n\023com.google.protobufB\016FieldMaskProtoP\001" +
- "\242\002\003GPB\252\002\036Google.Protobuf.WellKnownTypesb" +
- "\006proto3"
+ "\211\001\n\023com.google.protobufB\016FieldMaskProtoP" +
+ "\001Z9google.golang.org/genproto/protobuf/f" +
+ "ield_mask;field_mask\242\002\003GPB\252\002\036Google.Prot" +
+ "obuf.WellKnownTypesb\006proto3"
};
org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FieldOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FieldOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FieldOrBuilder.java
index 238e17a..1bd3ada 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FieldOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FieldOrBuilder.java
@@ -12,7 +12,7 @@ public interface FieldOrBuilder extends
* The field type.
* </pre>
*
- * <code>optional .google.protobuf.Field.Kind kind = 1;</code>
+ * <code>.google.protobuf.Field.Kind kind = 1;</code>
*/
int getKindValue();
/**
@@ -20,7 +20,7 @@ public interface FieldOrBuilder extends
* The field type.
* </pre>
*
- * <code>optional .google.protobuf.Field.Kind kind = 1;</code>
+ * <code>.google.protobuf.Field.Kind kind = 1;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.Field.Kind getKind();
@@ -29,7 +29,7 @@ public interface FieldOrBuilder extends
* The field cardinality.
* </pre>
*
- * <code>optional .google.protobuf.Field.Cardinality cardinality = 2;</code>
+ * <code>.google.protobuf.Field.Cardinality cardinality = 2;</code>
*/
int getCardinalityValue();
/**
@@ -37,7 +37,7 @@ public interface FieldOrBuilder extends
* The field cardinality.
* </pre>
*
- * <code>optional .google.protobuf.Field.Cardinality cardinality = 2;</code>
+ * <code>.google.protobuf.Field.Cardinality cardinality = 2;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.Field.Cardinality getCardinality();
@@ -46,7 +46,7 @@ public interface FieldOrBuilder extends
* The field number.
* </pre>
*
- * <code>optional int32 number = 3;</code>
+ * <code>int32 number = 3;</code>
*/
int getNumber();
@@ -55,7 +55,7 @@ public interface FieldOrBuilder extends
* The field name.
* </pre>
*
- * <code>optional string name = 4;</code>
+ * <code>string name = 4;</code>
*/
java.lang.String getName();
/**
@@ -63,7 +63,7 @@ public interface FieldOrBuilder extends
* The field name.
* </pre>
*
- * <code>optional string name = 4;</code>
+ * <code>string name = 4;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes();
@@ -74,7 +74,7 @@ public interface FieldOrBuilder extends
* types. Example: `"type.googleapis.org.apache.hadoop.hbase.shaded.com.google.protobuf.Timestamp"`.
* </pre>
*
- * <code>optional string type_url = 6;</code>
+ * <code>string type_url = 6;</code>
*/
java.lang.String getTypeUrl();
/**
@@ -83,7 +83,7 @@ public interface FieldOrBuilder extends
* types. Example: `"type.googleapis.org.apache.hadoop.hbase.shaded.com.google.protobuf.Timestamp"`.
* </pre>
*
- * <code>optional string type_url = 6;</code>
+ * <code>string type_url = 6;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getTypeUrlBytes();
@@ -94,7 +94,7 @@ public interface FieldOrBuilder extends
* types. The first type has index 1; zero means the type is not in the list.
* </pre>
*
- * <code>optional int32 oneof_index = 7;</code>
+ * <code>int32 oneof_index = 7;</code>
*/
int getOneofIndex();
@@ -103,7 +103,7 @@ public interface FieldOrBuilder extends
* Whether to use alternative packed wire representation.
* </pre>
*
- * <code>optional bool packed = 8;</code>
+ * <code>bool packed = 8;</code>
*/
boolean getPacked();
@@ -156,7 +156,7 @@ public interface FieldOrBuilder extends
* The field JSON name.
* </pre>
*
- * <code>optional string json_name = 10;</code>
+ * <code>string json_name = 10;</code>
*/
java.lang.String getJsonName();
/**
@@ -164,7 +164,7 @@ public interface FieldOrBuilder extends
* The field JSON name.
* </pre>
*
- * <code>optional string json_name = 10;</code>
+ * <code>string json_name = 10;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getJsonNameBytes();
@@ -174,7 +174,7 @@ public interface FieldOrBuilder extends
* The string value of the default value of this field. Proto2 syntax only.
* </pre>
*
- * <code>optional string default_value = 11;</code>
+ * <code>string default_value = 11;</code>
*/
java.lang.String getDefaultValue();
/**
@@ -182,7 +182,7 @@ public interface FieldOrBuilder extends
* The string value of the default value of this field. Proto2 syntax only.
* </pre>
*
- * <code>optional string default_value = 11;</code>
+ * <code>string default_value = 11;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getDefaultValueBytes();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FieldSet.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FieldSet.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FieldSet.java
index 36a74ed..a1bf553 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FieldSet.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FieldSet.java
@@ -220,6 +220,7 @@ final class FieldSet<FieldDescriptorType extends
return fields.entrySet().iterator();
}
+
/**
* Useful for implementing
* {@link Message#hasField(Descriptors.FieldDescriptor)}.
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FloatValue.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FloatValue.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FloatValue.java
index 656ebb6..f3315c8 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FloatValue.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FloatValue.java
@@ -83,7 +83,7 @@ public final class FloatValue extends
* The float value.
* </pre>
*
- * <code>optional float value = 1;</code>
+ * <code>float value = 1;</code>
*/
public float getValue() {
return value_;
@@ -144,7 +144,7 @@ public final class FloatValue extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + VALUE_FIELD_NUMBER;
hash = (53 * hash) + java.lang.Float.floatToIntBits(
getValue());
@@ -372,7 +372,7 @@ public final class FloatValue extends
* The float value.
* </pre>
*
- * <code>optional float value = 1;</code>
+ * <code>float value = 1;</code>
*/
public float getValue() {
return value_;
@@ -382,7 +382,7 @@ public final class FloatValue extends
* The float value.
* </pre>
*
- * <code>optional float value = 1;</code>
+ * <code>float value = 1;</code>
*/
public Builder setValue(float value) {
@@ -395,7 +395,7 @@ public final class FloatValue extends
* The float value.
* </pre>
*
- * <code>optional float value = 1;</code>
+ * <code>float value = 1;</code>
*/
public Builder clearValue() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FloatValueOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FloatValueOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FloatValueOrBuilder.java
index db330e8..a5302d7 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FloatValueOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/FloatValueOrBuilder.java
@@ -12,7 +12,7 @@ public interface FloatValueOrBuilder extends
* The float value.
* </pre>
*
- * <code>optional float value = 1;</code>
+ * <code>float value = 1;</code>
*/
float getValue();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/GeneratedMessageLite.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/GeneratedMessageLite.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/GeneratedMessageLite.java
index 057100b..584eba1 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/GeneratedMessageLite.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/GeneratedMessageLite.java
@@ -39,7 +39,6 @@ import org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.IntList;
import org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.LongList;
import org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.ProtobufList;
import org.apache.hadoop.hbase.shaded.com.google.protobuf.WireFormat.FieldType;
-
import java.io.IOException;
import java.io.InputStream;
import java.io.ObjectStreamException;
@@ -479,7 +478,6 @@ public abstract class GeneratedMessageLite<
CodedInputStream input,
ExtensionRegistryLite extensionRegistry,
int tag) throws IOException {
- int wireType = WireFormat.getTagWireType(tag);
int fieldNumber = WireFormat.getTagFieldNumber(tag);
// TODO(dweis): How much bytecode would be saved by not requiring the generated code to
@@ -487,6 +485,17 @@ public abstract class GeneratedMessageLite<
GeneratedExtension<MessageType, ?> extension = extensionRegistry.findLiteExtensionByNumber(
defaultInstance, fieldNumber);
+ return parseExtension(input, extensionRegistry, extension, tag, fieldNumber);
+ }
+
+ private boolean parseExtension(
+ CodedInputStream input,
+ ExtensionRegistryLite extensionRegistry,
+ GeneratedExtension<?, ?> extension,
+ int tag,
+ int fieldNumber)
+ throws IOException {
+ int wireType = WireFormat.getTagWireType(tag);
boolean unknown = false;
boolean packed = false;
if (extension == null) {
@@ -508,7 +517,7 @@ public abstract class GeneratedMessageLite<
if (unknown) { // Unknown field or wrong wire type. Skip.
return parseUnknownField(tag, input);
}
-
+
if (packed) {
int length = input.readRawVarint32();
int limit = input.pushLimit(length);
@@ -587,9 +596,147 @@ public abstract class GeneratedMessageLite<
extension.singularToFieldSetType(value));
}
}
-
return true;
}
+
+ /**
+ * Parse an unknown field or an extension. For use by generated code only.
+ *
+ * <p>For use by generated code only.
+ *
+ * @return {@code true} unless the tag is an end-group tag.
+ */
+ protected <MessageType extends MessageLite> boolean parseUnknownFieldAsMessageSet(
+ MessageType defaultInstance,
+ CodedInputStream input,
+ ExtensionRegistryLite extensionRegistry,
+ int tag)
+ throws IOException {
+
+ if (tag == WireFormat.MESSAGE_SET_ITEM_TAG) {
+ mergeMessageSetExtensionFromCodedStream(defaultInstance, input, extensionRegistry);
+ return true;
+ }
+
+ // TODO(dweis): Do we really want to support non message set wire format in message sets?
+ // Full runtime does... So we do for now.
+ int wireType = WireFormat.getTagWireType(tag);
+ if (wireType == WireFormat.WIRETYPE_LENGTH_DELIMITED) {
+ return parseUnknownField(defaultInstance, input, extensionRegistry, tag);
+ } else {
+ // TODO(dweis): Should we throw on invalid input? Full runtime does not...
+ return input.skipField(tag);
+ }
+ }
+
+ /**
+ * Merges the message set from the input stream; requires message set wire format.
+ *
+ * @param defaultInstance the default instance of the containing message we are parsing in
+ * @param input the stream to parse from
+ * @param extensionRegistry the registry to use when parsing
+ */
+ private <MessageType extends MessageLite> void mergeMessageSetExtensionFromCodedStream(
+ MessageType defaultInstance,
+ CodedInputStream input,
+ ExtensionRegistryLite extensionRegistry)
+ throws IOException {
+ // The wire format for MessageSet is:
+ // message MessageSet {
+ // repeated group Item = 1 {
+ // required int32 typeId = 2;
+ // required bytes message = 3;
+ // }
+ // }
+ // "typeId" is the extension's field number. The extension can only be
+ // a message type, where "message" contains the encoded bytes of that
+ // message.
+ //
+ // In practice, we will probably never see a MessageSet item in which
+ // the message appears before the type ID, or where either field does not
+ // appear exactly once. However, in theory such cases are valid, so we
+ // should be prepared to accept them.
+
+ int typeId = 0;
+ ByteString rawBytes = null; // If we encounter "message" before "typeId"
+ GeneratedExtension<?, ?> extension = null;
+
+ // Read bytes from input, if we get it's type first then parse it eagerly,
+ // otherwise we store the raw bytes in a local variable.
+ while (true) {
+ final int tag = input.readTag();
+ if (tag == 0) {
+ break;
+ }
+
+ if (tag == WireFormat.MESSAGE_SET_TYPE_ID_TAG) {
+ typeId = input.readUInt32();
+ if (typeId != 0) {
+ extension = extensionRegistry.findLiteExtensionByNumber(defaultInstance, typeId);
+ }
+
+ } else if (tag == WireFormat.MESSAGE_SET_MESSAGE_TAG) {
+ if (typeId != 0) {
+ if (extension != null) {
+ // We already know the type, so we can parse directly from the
+ // input with no copying. Hooray!
+ eagerlyMergeMessageSetExtension(input, extension, extensionRegistry, typeId);
+ rawBytes = null;
+ continue;
+ }
+ }
+ // We haven't seen a type ID yet or we want parse message lazily.
+ rawBytes = input.readBytes();
+
+ } else { // Unknown tag. Skip it.
+ if (!input.skipField(tag)) {
+ break; // End of group
+ }
+ }
+ }
+ input.checkLastTagWas(WireFormat.MESSAGE_SET_ITEM_END_TAG);
+
+ // Process the raw bytes.
+ if (rawBytes != null && typeId != 0) { // Zero is not a valid type ID.
+ if (extension != null) { // We known the type
+ mergeMessageSetExtensionFromBytes(rawBytes, extensionRegistry, extension);
+ } else { // We don't know how to parse this. Ignore it.
+ if (rawBytes != null) {
+ mergeLengthDelimitedField(typeId, rawBytes);
+ }
+ }
+ }
+ }
+
+ private void eagerlyMergeMessageSetExtension(
+ CodedInputStream input,
+ GeneratedExtension<?, ?> extension,
+ ExtensionRegistryLite extensionRegistry,
+ int typeId)
+ throws IOException {
+ int fieldNumber = typeId;
+ int tag = WireFormat.makeTag(typeId, WireFormat.WIRETYPE_LENGTH_DELIMITED);
+ parseExtension(input, extensionRegistry, extension, tag, fieldNumber);
+ }
+
+ private void mergeMessageSetExtensionFromBytes(
+ ByteString rawBytes,
+ ExtensionRegistryLite extensionRegistry,
+ GeneratedExtension<?, ?> extension)
+ throws IOException {
+ MessageLite.Builder subBuilder = null;
+ MessageLite existingValue = (MessageLite) extensions.getField(extension.descriptor);
+ if (existingValue != null) {
+ subBuilder = existingValue.toBuilder();
+ }
+ if (subBuilder == null) {
+ subBuilder = extension.getMessageDefaultInstance().newBuilderForType();
+ }
+ rawBytes.newCodedInput().readMessage(subBuilder, extensionRegistry);
+ MessageLite value = subBuilder.build();
+
+ extensions.setField(extension.descriptor, extension.singularToFieldSetType(value));
+ }
private void verifyExtensionContainingType(
final GeneratedExtension<MessageType, ?> extension) {
@@ -807,14 +954,6 @@ public abstract class GeneratedMessageLite<
return instance.getExtension(extension, index);
}
- // This is implemented here only to work around an apparent bug in the
- // Java compiler and/or build system. See bug #1898463. The mere presence
- // of this dummy clone() implementation makes it go away.
- @Override
- public BuilderType clone() {
- return super.clone();
- }
-
/** Set the value of an extension. */
public final <Type> BuilderType setExtension(
final ExtensionLite<MessageType, Type> extension,
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/GeneratedMessageV3.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/GeneratedMessageV3.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/GeneratedMessageV3.java
index fe92e6f..cc815fc 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/GeneratedMessageV3.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/GeneratedMessageV3.java
@@ -36,6 +36,16 @@ import org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.EnumValueD
import org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FieldDescriptor;
import org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FileDescriptor;
import org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.OneofDescriptor;
+// In opensource protobuf, we have versioned this GeneratedMessageV3 class to GeneratedMessageV3V3 and
+// in the future may have GeneratedMessageV3V4 etc. This allows us to change some aspects of this
+// class without breaking binary compatibility with old generated code that still subclasses
+// the old GeneratedMessageV3 class. To allow these different GeneratedMessageV3V? classes to
+// interoperate (e.g., a GeneratedMessageV3V3 object has a message extension field whose class
+// type is GeneratedMessageV3V4), these classes still share a common parent class AbstarctMessage
+// and are using the same GeneratedMessage.GeneratedExtension class for extension definitions.
+// Since this class becomes GeneratedMessageV3V? in opensource, we have to add an import here
+// to be able to use GeneratedMessage.GeneratedExtension. The GeneratedExtension definition in
+// this file is also excluded from opensource to avoid conflict.
import org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessage.GeneratedExtension;
import java.io.IOException;
@@ -1207,14 +1217,6 @@ public abstract class GeneratedMessageV3 extends AbstractMessage
return super.clear();
}
- // This is implemented here only to work around an apparent bug in the
- // Java compiler and/or build system. See bug #1898463. The mere presence
- // of this clone() implementation makes it go away.
- @Override
- public BuilderType clone() {
- return super.clone();
- }
-
private void ensureExtensionsIsMutable() {
if (extensions.isImmutable()) {
extensions = extensions.clone();
@@ -1610,6 +1612,7 @@ public abstract class GeneratedMessageV3 extends AbstractMessage
FieldDescriptor getDescriptor();
}
+
// =================================================================
/** Calls Class.getMethod and throws a RuntimeException if it fails. */
@@ -1705,11 +1708,6 @@ public abstract class GeneratedMessageV3 extends AbstractMessage
initialized = false;
}
- private boolean isMapFieldEnabled(FieldDescriptor field) {
- boolean result = true;
- return result;
- }
-
/**
* Ensures the field accessors are initialized. This method is thread-safe.
*
@@ -1733,7 +1731,7 @@ public abstract class GeneratedMessageV3 extends AbstractMessage
}
if (field.isRepeated()) {
if (field.getJavaType() == FieldDescriptor.JavaType.MESSAGE) {
- if (field.isMapField() && isMapFieldEnabled(field)) {
+ if (field.isMapField()) {
fields[i] = new MapFieldAccessor(
field, camelCaseNames[i], messageClass, builderClass);
} else {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Int32Value.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Int32Value.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Int32Value.java
index 89db936..476b086 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Int32Value.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Int32Value.java
@@ -83,7 +83,7 @@ public final class Int32Value extends
* The int32 value.
* </pre>
*
- * <code>optional int32 value = 1;</code>
+ * <code>int32 value = 1;</code>
*/
public int getValue() {
return value_;
@@ -142,7 +142,7 @@ public final class Int32Value extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + VALUE_FIELD_NUMBER;
hash = (53 * hash) + getValue();
hash = (29 * hash) + unknownFields.hashCode();
@@ -369,7 +369,7 @@ public final class Int32Value extends
* The int32 value.
* </pre>
*
- * <code>optional int32 value = 1;</code>
+ * <code>int32 value = 1;</code>
*/
public int getValue() {
return value_;
@@ -379,7 +379,7 @@ public final class Int32Value extends
* The int32 value.
* </pre>
*
- * <code>optional int32 value = 1;</code>
+ * <code>int32 value = 1;</code>
*/
public Builder setValue(int value) {
@@ -392,7 +392,7 @@ public final class Int32Value extends
* The int32 value.
* </pre>
*
- * <code>optional int32 value = 1;</code>
+ * <code>int32 value = 1;</code>
*/
public Builder clearValue() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Int32ValueOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Int32ValueOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Int32ValueOrBuilder.java
index df1eb5f..f7b0b25 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Int32ValueOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Int32ValueOrBuilder.java
@@ -12,7 +12,7 @@ public interface Int32ValueOrBuilder extends
* The int32 value.
* </pre>
*
- * <code>optional int32 value = 1;</code>
+ * <code>int32 value = 1;</code>
*/
int getValue();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Int64Value.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Int64Value.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Int64Value.java
index 7ab34ff..fce2b73 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Int64Value.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Int64Value.java
@@ -83,7 +83,7 @@ public final class Int64Value extends
* The int64 value.
* </pre>
*
- * <code>optional int64 value = 1;</code>
+ * <code>int64 value = 1;</code>
*/
public long getValue() {
return value_;
@@ -142,7 +142,7 @@ public final class Int64Value extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + VALUE_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
getValue());
@@ -370,7 +370,7 @@ public final class Int64Value extends
* The int64 value.
* </pre>
*
- * <code>optional int64 value = 1;</code>
+ * <code>int64 value = 1;</code>
*/
public long getValue() {
return value_;
@@ -380,7 +380,7 @@ public final class Int64Value extends
* The int64 value.
* </pre>
*
- * <code>optional int64 value = 1;</code>
+ * <code>int64 value = 1;</code>
*/
public Builder setValue(long value) {
@@ -393,7 +393,7 @@ public final class Int64Value extends
* The int64 value.
* </pre>
*
- * <code>optional int64 value = 1;</code>
+ * <code>int64 value = 1;</code>
*/
public Builder clearValue() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Int64ValueOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Int64ValueOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Int64ValueOrBuilder.java
index 8cbe470..291f5ed 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Int64ValueOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Int64ValueOrBuilder.java
@@ -12,7 +12,7 @@ public interface Int64ValueOrBuilder extends
* The int64 value.
* </pre>
*
- * <code>optional int64 value = 1;</code>
+ * <code>int64 value = 1;</code>
*/
long getValue();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/LazyFieldLite.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/LazyFieldLite.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/LazyFieldLite.java
index 4d4ac16..91b70e0 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/LazyFieldLite.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/LazyFieldLite.java
@@ -284,29 +284,8 @@ public class LazyFieldLite {
return;
}
- // At this point we have two fully parsed messages. We can't merge directly from one to the
- // other because only generated builder code contains methods to mergeFrom another parsed
- // message. We have to serialize one instance and then merge the bytes into the other. This may
- // drop extensions from one of the messages if one of the values had an extension set on it
- // directly.
- //
- // To mitigate this we prefer serializing a message that has an extension registry, and
- // therefore a chance that all extensions set on it are in that registry.
- //
- // NOTE: The check for other.extensionRegistry not being null must come first because at this
- // point in time if other.extensionRegistry is not null then this.extensionRegistry will not be
- // null either.
- if (other.extensionRegistry != null) {
- setValue(mergeValueAndBytes(this.value, other.toByteString(), other.extensionRegistry));
- return;
- } else if (this.extensionRegistry != null) {
- setValue(mergeValueAndBytes(other.value, this.toByteString(), this.extensionRegistry));
- return;
- } else {
- // All extensions from the other message will be dropped because we have no registry.
- setValue(mergeValueAndBytes(this.value, other.toByteString(), EMPTY_REGISTRY));
- return;
- }
+ // At this point we have two fully parsed messages.
+ setValue(this.value.toBuilder().mergeFrom(other.value).build());
}
/**
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ListValue.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ListValue.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ListValue.java
index 560130d..4ddc71b 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ListValue.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ListValue.java
@@ -191,7 +191,7 @@ public final class ListValue extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getValuesCount() > 0) {
hash = (37 * hash) + VALUES_FIELD_NUMBER;
hash = (53 * hash) + getValuesList().hashCode();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MapEntry.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MapEntry.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MapEntry.java
index addc980..d586cc7 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MapEntry.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MapEntry.java
@@ -109,7 +109,7 @@ public final class MapEntry<K, V> extends AbstractMessage {
} catch (InvalidProtocolBufferException e) {
throw e.setUnfinishedMessage(this);
} catch (IOException e) {
- throw new InvalidProtocolBufferException(e.getMessage()).setUnfinishedMessage(this);
+ throw new InvalidProtocolBufferException(e).setUnfinishedMessage(this);
}
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MapFieldLite.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MapFieldLite.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MapFieldLite.java
index 414a34e..761c4ce 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MapFieldLite.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MapFieldLite.java
@@ -58,7 +58,7 @@ public final class MapFieldLite<K, V> extends LinkedHashMap<K, V> {
}
@SuppressWarnings({"rawtypes", "unchecked"})
- private static final MapFieldLite EMPTY_MAP_FIELD = new MapFieldLite(Collections.emptyMap());
+ private static final MapFieldLite EMPTY_MAP_FIELD = new MapFieldLite();
static {
EMPTY_MAP_FIELD.makeImmutable();
}
@@ -83,7 +83,7 @@ public final class MapFieldLite<K, V> extends LinkedHashMap<K, V> {
@Override public void clear() {
ensureMutable();
- clear();
+ super.clear();
}
@Override public V put(K key, V value) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MessageLiteToString.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MessageLiteToString.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MessageLiteToString.java
index 51ff83a..eea6db5 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MessageLiteToString.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MessageLiteToString.java
@@ -95,7 +95,7 @@ final class MessageLiteToString {
// Try to reflectively get the value and toString() the field as if it were repeated. This
// only works if the method names have not be proguarded out or renamed.
Method listMethod = nameToNoArgMethod.get("get" + suffix);
- if (listMethod != null) {
+ if (listMethod != null && listMethod.getReturnType().equals(List.class)) {
printField(
buffer,
indent,
@@ -115,7 +115,7 @@ final class MessageLiteToString {
// Heuristic to skip bytes based accessors for string fields.
continue;
}
-
+
String camelCase = suffix.substring(0, 1).toLowerCase() + suffix.substring(1);
// Try to reflectively get the value and toString() the field as if it were optional. This
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Method.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Method.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Method.java
index 5af69eb..32e8b35 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Method.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Method.java
@@ -130,7 +130,7 @@ public final class Method extends
* The simple name of this method.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public java.lang.String getName() {
java.lang.Object ref = name_;
@@ -149,7 +149,7 @@ public final class Method extends
* The simple name of this method.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes() {
@@ -172,7 +172,7 @@ public final class Method extends
* A URL of the input message type.
* </pre>
*
- * <code>optional string request_type_url = 2;</code>
+ * <code>string request_type_url = 2;</code>
*/
public java.lang.String getRequestTypeUrl() {
java.lang.Object ref = requestTypeUrl_;
@@ -191,7 +191,7 @@ public final class Method extends
* A URL of the input message type.
* </pre>
*
- * <code>optional string request_type_url = 2;</code>
+ * <code>string request_type_url = 2;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getRequestTypeUrlBytes() {
@@ -214,7 +214,7 @@ public final class Method extends
* If true, the request is streamed.
* </pre>
*
- * <code>optional bool request_streaming = 3;</code>
+ * <code>bool request_streaming = 3;</code>
*/
public boolean getRequestStreaming() {
return requestStreaming_;
@@ -227,7 +227,7 @@ public final class Method extends
* The URL of the output message type.
* </pre>
*
- * <code>optional string response_type_url = 4;</code>
+ * <code>string response_type_url = 4;</code>
*/
public java.lang.String getResponseTypeUrl() {
java.lang.Object ref = responseTypeUrl_;
@@ -246,7 +246,7 @@ public final class Method extends
* The URL of the output message type.
* </pre>
*
- * <code>optional string response_type_url = 4;</code>
+ * <code>string response_type_url = 4;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getResponseTypeUrlBytes() {
@@ -269,7 +269,7 @@ public final class Method extends
* If true, the response is streamed.
* </pre>
*
- * <code>optional bool response_streaming = 5;</code>
+ * <code>bool response_streaming = 5;</code>
*/
public boolean getResponseStreaming() {
return responseStreaming_;
@@ -337,7 +337,7 @@ public final class Method extends
* The source syntax of this method.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 7;</code>
+ * <code>.google.protobuf.Syntax syntax = 7;</code>
*/
public int getSyntaxValue() {
return syntax_;
@@ -347,7 +347,7 @@ public final class Method extends
* The source syntax of this method.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 7;</code>
+ * <code>.google.protobuf.Syntax syntax = 7;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax getSyntax() {
org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax result = org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax.valueOf(syntax_);
@@ -457,7 +457,7 @@ public final class Method extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
hash = (37 * hash) + REQUEST_TYPE_URL_FIELD_NUMBER;
@@ -778,7 +778,7 @@ public final class Method extends
* The simple name of this method.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public java.lang.String getName() {
java.lang.Object ref = name_;
@@ -797,7 +797,7 @@ public final class Method extends
* The simple name of this method.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes() {
@@ -817,7 +817,7 @@ public final class Method extends
* The simple name of this method.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public Builder setName(
java.lang.String value) {
@@ -834,7 +834,7 @@ public final class Method extends
* The simple name of this method.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public Builder clearName() {
@@ -847,7 +847,7 @@ public final class Method extends
* The simple name of this method.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public Builder setNameBytes(
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
@@ -867,7 +867,7 @@ public final class Method extends
* A URL of the input message type.
* </pre>
*
- * <code>optional string request_type_url = 2;</code>
+ * <code>string request_type_url = 2;</code>
*/
public java.lang.String getRequestTypeUrl() {
java.lang.Object ref = requestTypeUrl_;
@@ -886,7 +886,7 @@ public final class Method extends
* A URL of the input message type.
* </pre>
*
- * <code>optional string request_type_url = 2;</code>
+ * <code>string request_type_url = 2;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getRequestTypeUrlBytes() {
@@ -906,7 +906,7 @@ public final class Method extends
* A URL of the input message type.
* </pre>
*
- * <code>optional string request_type_url = 2;</code>
+ * <code>string request_type_url = 2;</code>
*/
public Builder setRequestTypeUrl(
java.lang.String value) {
@@ -923,7 +923,7 @@ public final class Method extends
* A URL of the input message type.
* </pre>
*
- * <code>optional string request_type_url = 2;</code>
+ * <code>string request_type_url = 2;</code>
*/
public Builder clearRequestTypeUrl() {
@@ -936,7 +936,7 @@ public final class Method extends
* A URL of the input message type.
* </pre>
*
- * <code>optional string request_type_url = 2;</code>
+ * <code>string request_type_url = 2;</code>
*/
public Builder setRequestTypeUrlBytes(
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
@@ -956,7 +956,7 @@ public final class Method extends
* If true, the request is streamed.
* </pre>
*
- * <code>optional bool request_streaming = 3;</code>
+ * <code>bool request_streaming = 3;</code>
*/
public boolean getRequestStreaming() {
return requestStreaming_;
@@ -966,7 +966,7 @@ public final class Method extends
* If true, the request is streamed.
* </pre>
*
- * <code>optional bool request_streaming = 3;</code>
+ * <code>bool request_streaming = 3;</code>
*/
public Builder setRequestStreaming(boolean value) {
@@ -979,7 +979,7 @@ public final class Method extends
* If true, the request is streamed.
* </pre>
*
- * <code>optional bool request_streaming = 3;</code>
+ * <code>bool request_streaming = 3;</code>
*/
public Builder clearRequestStreaming() {
@@ -994,7 +994,7 @@ public final class Method extends
* The URL of the output message type.
* </pre>
*
- * <code>optional string response_type_url = 4;</code>
+ * <code>string response_type_url = 4;</code>
*/
public java.lang.String getResponseTypeUrl() {
java.lang.Object ref = responseTypeUrl_;
@@ -1013,7 +1013,7 @@ public final class Method extends
* The URL of the output message type.
* </pre>
*
- * <code>optional string response_type_url = 4;</code>
+ * <code>string response_type_url = 4;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getResponseTypeUrlBytes() {
@@ -1033,7 +1033,7 @@ public final class Method extends
* The URL of the output message type.
* </pre>
*
- * <code>optional string response_type_url = 4;</code>
+ * <code>string response_type_url = 4;</code>
*/
public Builder setResponseTypeUrl(
java.lang.String value) {
@@ -1050,7 +1050,7 @@ public final class Method extends
* The URL of the output message type.
* </pre>
*
- * <code>optional string response_type_url = 4;</code>
+ * <code>string response_type_url = 4;</code>
*/
public Builder clearResponseTypeUrl() {
@@ -1063,7 +1063,7 @@ public final class Method extends
* The URL of the output message type.
* </pre>
*
- * <code>optional string response_type_url = 4;</code>
+ * <code>string response_type_url = 4;</code>
*/
public Builder setResponseTypeUrlBytes(
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
@@ -1083,7 +1083,7 @@ public final class Method extends
* If true, the response is streamed.
* </pre>
*
- * <code>optional bool response_streaming = 5;</code>
+ * <code>bool response_streaming = 5;</code>
*/
public boolean getResponseStreaming() {
return responseStreaming_;
@@ -1093,7 +1093,7 @@ public final class Method extends
* If true, the response is streamed.
* </pre>
*
- * <code>optional bool response_streaming = 5;</code>
+ * <code>bool response_streaming = 5;</code>
*/
public Builder setResponseStreaming(boolean value) {
@@ -1106,7 +1106,7 @@ public final class Method extends
* If true, the response is streamed.
* </pre>
*
- * <code>optional bool response_streaming = 5;</code>
+ * <code>bool response_streaming = 5;</code>
*/
public Builder clearResponseStreaming() {
@@ -1433,7 +1433,7 @@ public final class Method extends
* The source syntax of this method.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 7;</code>
+ * <code>.google.protobuf.Syntax syntax = 7;</code>
*/
public int getSyntaxValue() {
return syntax_;
@@ -1443,7 +1443,7 @@ public final class Method extends
* The source syntax of this method.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 7;</code>
+ * <code>.google.protobuf.Syntax syntax = 7;</code>
*/
public Builder setSyntaxValue(int value) {
syntax_ = value;
@@ -1455,7 +1455,7 @@ public final class Method extends
* The source syntax of this method.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 7;</code>
+ * <code>.google.protobuf.Syntax syntax = 7;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax getSyntax() {
org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax result = org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax.valueOf(syntax_);
@@ -1466,7 +1466,7 @@ public final class Method extends
* The source syntax of this method.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 7;</code>
+ * <code>.google.protobuf.Syntax syntax = 7;</code>
*/
public Builder setSyntax(org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax value) {
if (value == null) {
@@ -1482,7 +1482,7 @@ public final class Method extends
* The source syntax of this method.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 7;</code>
+ * <code>.google.protobuf.Syntax syntax = 7;</code>
*/
public Builder clearSyntax() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MethodOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MethodOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MethodOrBuilder.java
index b40776c..12819df 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MethodOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MethodOrBuilder.java
@@ -12,7 +12,7 @@ public interface MethodOrBuilder extends
* The simple name of this method.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
java.lang.String getName();
/**
@@ -20,7 +20,7 @@ public interface MethodOrBuilder extends
* The simple name of this method.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes();
@@ -30,7 +30,7 @@ public interface MethodOrBuilder extends
* A URL of the input message type.
* </pre>
*
- * <code>optional string request_type_url = 2;</code>
+ * <code>string request_type_url = 2;</code>
*/
java.lang.String getRequestTypeUrl();
/**
@@ -38,7 +38,7 @@ public interface MethodOrBuilder extends
* A URL of the input message type.
* </pre>
*
- * <code>optional string request_type_url = 2;</code>
+ * <code>string request_type_url = 2;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getRequestTypeUrlBytes();
@@ -48,7 +48,7 @@ public interface MethodOrBuilder extends
* If true, the request is streamed.
* </pre>
*
- * <code>optional bool request_streaming = 3;</code>
+ * <code>bool request_streaming = 3;</code>
*/
boolean getRequestStreaming();
@@ -57,7 +57,7 @@ public interface MethodOrBuilder extends
* The URL of the output message type.
* </pre>
*
- * <code>optional string response_type_url = 4;</code>
+ * <code>string response_type_url = 4;</code>
*/
java.lang.String getResponseTypeUrl();
/**
@@ -65,7 +65,7 @@ public interface MethodOrBuilder extends
* The URL of the output message type.
* </pre>
*
- * <code>optional string response_type_url = 4;</code>
+ * <code>string response_type_url = 4;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getResponseTypeUrlBytes();
@@ -75,7 +75,7 @@ public interface MethodOrBuilder extends
* If true, the response is streamed.
* </pre>
*
- * <code>optional bool response_streaming = 5;</code>
+ * <code>bool response_streaming = 5;</code>
*/
boolean getResponseStreaming();
@@ -128,7 +128,7 @@ public interface MethodOrBuilder extends
* The source syntax of this method.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 7;</code>
+ * <code>.google.protobuf.Syntax syntax = 7;</code>
*/
int getSyntaxValue();
/**
@@ -136,7 +136,7 @@ public interface MethodOrBuilder extends
* The source syntax of this method.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 7;</code>
+ * <code>.google.protobuf.Syntax syntax = 7;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax getSyntax();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Mixin.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Mixin.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Mixin.java
index 0d9fe46..5dd6be6 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Mixin.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Mixin.java
@@ -150,7 +150,7 @@ public final class Mixin extends
* The fully qualified name of the API which is included.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public java.lang.String getName() {
java.lang.Object ref = name_;
@@ -169,7 +169,7 @@ public final class Mixin extends
* The fully qualified name of the API which is included.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes() {
@@ -193,7 +193,7 @@ public final class Mixin extends
* are rooted.
* </pre>
*
- * <code>optional string root = 2;</code>
+ * <code>string root = 2;</code>
*/
public java.lang.String getRoot() {
java.lang.Object ref = root_;
@@ -213,7 +213,7 @@ public final class Mixin extends
* are rooted.
* </pre>
*
- * <code>optional string root = 2;</code>
+ * <code>string root = 2;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getRootBytes() {
@@ -289,7 +289,7 @@ public final class Mixin extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
hash = (37 * hash) + ROOT_FIELD_NUMBER;
@@ -585,7 +585,7 @@ public final class Mixin extends
* The fully qualified name of the API which is included.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public java.lang.String getName() {
java.lang.Object ref = name_;
@@ -604,7 +604,7 @@ public final class Mixin extends
* The fully qualified name of the API which is included.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes() {
@@ -624,7 +624,7 @@ public final class Mixin extends
* The fully qualified name of the API which is included.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public Builder setName(
java.lang.String value) {
@@ -641,7 +641,7 @@ public final class Mixin extends
* The fully qualified name of the API which is included.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public Builder clearName() {
@@ -654,7 +654,7 @@ public final class Mixin extends
* The fully qualified name of the API which is included.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public Builder setNameBytes(
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
@@ -675,7 +675,7 @@ public final class Mixin extends
* are rooted.
* </pre>
*
- * <code>optional string root = 2;</code>
+ * <code>string root = 2;</code>
*/
public java.lang.String getRoot() {
java.lang.Object ref = root_;
@@ -695,7 +695,7 @@ public final class Mixin extends
* are rooted.
* </pre>
*
- * <code>optional string root = 2;</code>
+ * <code>string root = 2;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getRootBytes() {
@@ -716,7 +716,7 @@ public final class Mixin extends
* are rooted.
* </pre>
*
- * <code>optional string root = 2;</code>
+ * <code>string root = 2;</code>
*/
public Builder setRoot(
java.lang.String value) {
@@ -734,7 +734,7 @@ public final class Mixin extends
* are rooted.
* </pre>
*
- * <code>optional string root = 2;</code>
+ * <code>string root = 2;</code>
*/
public Builder clearRoot() {
@@ -748,7 +748,7 @@ public final class Mixin extends
* are rooted.
* </pre>
*
- * <code>optional string root = 2;</code>
+ * <code>string root = 2;</code>
*/
public Builder setRootBytes(
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MixinOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MixinOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MixinOrBuilder.java
index 8d9311f..99e31c6 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MixinOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/MixinOrBuilder.java
@@ -12,7 +12,7 @@ public interface MixinOrBuilder extends
* The fully qualified name of the API which is included.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
java.lang.String getName();
/**
@@ -20,7 +20,7 @@ public interface MixinOrBuilder extends
* The fully qualified name of the API which is included.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes();
@@ -31,7 +31,7 @@ public interface MixinOrBuilder extends
* are rooted.
* </pre>
*
- * <code>optional string root = 2;</code>
+ * <code>string root = 2;</code>
*/
java.lang.String getRoot();
/**
@@ -40,7 +40,7 @@ public interface MixinOrBuilder extends
* are rooted.
* </pre>
*
- * <code>optional string root = 2;</code>
+ * <code>string root = 2;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getRootBytes();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/NullValue.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/NullValue.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/NullValue.java
index 38762a4..6cedb68 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/NullValue.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/NullValue.java
@@ -80,8 +80,7 @@ public enum NullValue
}
public static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.EnumDescriptor
getDescriptor() {
- return org.apache.hadoop.hbase.shaded.com.google.protobuf.StructProto.getDescriptor()
- .getEnumTypes().get(0);
+ return org.apache.hadoop.hbase.shaded.com.google.protobuf.StructProto.getDescriptor().getEnumTypes().get(0);
}
private static final NullValue[] VALUES = values();
[3/7] hbase git commit: HBASE-16780 Since move to protobuf3.1, Cells
are limited to 64MB where previous they had no limit Update internal pb to
3.2 from 3.1.; AMENDMENT -- FORGOT TO REBUILD PBs
Posted by st...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/compiler/PluginProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/compiler/PluginProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/compiler/PluginProtos.java
index 42627bd..71975c2 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/compiler/PluginProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/compiler/PluginProtos.java
@@ -14,6 +14,879 @@ public final class PluginProtos {
registerAllExtensions(
(org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite) registry);
}
+ public interface VersionOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:google.protobuf.compiler.Version)
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.MessageOrBuilder {
+
+ /**
+ * <code>optional int32 major = 1;</code>
+ */
+ boolean hasMajor();
+ /**
+ * <code>optional int32 major = 1;</code>
+ */
+ int getMajor();
+
+ /**
+ * <code>optional int32 minor = 2;</code>
+ */
+ boolean hasMinor();
+ /**
+ * <code>optional int32 minor = 2;</code>
+ */
+ int getMinor();
+
+ /**
+ * <code>optional int32 patch = 3;</code>
+ */
+ boolean hasPatch();
+ /**
+ * <code>optional int32 patch = 3;</code>
+ */
+ int getPatch();
+
+ /**
+ * <pre>
+ * A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
+ * be empty for mainline stable releases.
+ * </pre>
+ *
+ * <code>optional string suffix = 4;</code>
+ */
+ boolean hasSuffix();
+ /**
+ * <pre>
+ * A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
+ * be empty for mainline stable releases.
+ * </pre>
+ *
+ * <code>optional string suffix = 4;</code>
+ */
+ java.lang.String getSuffix();
+ /**
+ * <pre>
+ * A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
+ * be empty for mainline stable releases.
+ * </pre>
+ *
+ * <code>optional string suffix = 4;</code>
+ */
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
+ getSuffixBytes();
+ }
+ /**
+ * <pre>
+ * The version number of protocol compiler.
+ * </pre>
+ *
+ * Protobuf type {@code google.protobuf.compiler.Version}
+ */
+ public static final class Version extends
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3 implements
+ // @@protoc_insertion_point(message_implements:google.protobuf.compiler.Version)
+ VersionOrBuilder {
+ // Use Version.newBuilder() to construct.
+ private Version(org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
+ super(builder);
+ }
+ private Version() {
+ major_ = 0;
+ minor_ = 0;
+ patch_ = 0;
+ suffix_ = "";
+ }
+
+ @java.lang.Override
+ public final org.apache.hadoop.hbase.shaded.com.google.protobuf.UnknownFieldSet
+ getUnknownFields() {
+ return this.unknownFields;
+ }
+ private Version(
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream input,
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException {
+ this();
+ int mutable_bitField0_ = 0;
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.UnknownFieldSet.Builder unknownFields =
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.UnknownFieldSet.newBuilder();
+ try {
+ boolean done = false;
+ while (!done) {
+ int tag = input.readTag();
+ switch (tag) {
+ case 0:
+ done = true;
+ break;
+ default: {
+ if (!parseUnknownField(input, unknownFields,
+ extensionRegistry, tag)) {
+ done = true;
+ }
+ break;
+ }
+ case 8: {
+ bitField0_ |= 0x00000001;
+ major_ = input.readInt32();
+ break;
+ }
+ case 16: {
+ bitField0_ |= 0x00000002;
+ minor_ = input.readInt32();
+ break;
+ }
+ case 24: {
+ bitField0_ |= 0x00000004;
+ patch_ = input.readInt32();
+ break;
+ }
+ case 34: {
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString bs = input.readBytes();
+ bitField0_ |= 0x00000008;
+ suffix_ = bs;
+ break;
+ }
+ }
+ }
+ } catch (org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException e) {
+ throw e.setUnfinishedMessage(this);
+ } catch (java.io.IOException e) {
+ throw new org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException(
+ e).setUnfinishedMessage(this);
+ } finally {
+ this.unknownFields = unknownFields.build();
+ makeExtensionsImmutable();
+ }
+ }
+ public static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.internal_static_google_protobuf_compiler_Version_descriptor;
+ }
+
+ protected org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.internal_static_google_protobuf_compiler_Version_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version.class, org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version.Builder.class);
+ }
+
+ private int bitField0_;
+ public static final int MAJOR_FIELD_NUMBER = 1;
+ private int major_;
+ /**
+ * <code>optional int32 major = 1;</code>
+ */
+ public boolean hasMajor() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ /**
+ * <code>optional int32 major = 1;</code>
+ */
+ public int getMajor() {
+ return major_;
+ }
+
+ public static final int MINOR_FIELD_NUMBER = 2;
+ private int minor_;
+ /**
+ * <code>optional int32 minor = 2;</code>
+ */
+ public boolean hasMinor() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ /**
+ * <code>optional int32 minor = 2;</code>
+ */
+ public int getMinor() {
+ return minor_;
+ }
+
+ public static final int PATCH_FIELD_NUMBER = 3;
+ private int patch_;
+ /**
+ * <code>optional int32 patch = 3;</code>
+ */
+ public boolean hasPatch() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * <code>optional int32 patch = 3;</code>
+ */
+ public int getPatch() {
+ return patch_;
+ }
+
+ public static final int SUFFIX_FIELD_NUMBER = 4;
+ private volatile java.lang.Object suffix_;
+ /**
+ * <pre>
+ * A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
+ * be empty for mainline stable releases.
+ * </pre>
+ *
+ * <code>optional string suffix = 4;</code>
+ */
+ public boolean hasSuffix() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * <pre>
+ * A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
+ * be empty for mainline stable releases.
+ * </pre>
+ *
+ * <code>optional string suffix = 4;</code>
+ */
+ public java.lang.String getSuffix() {
+ java.lang.Object ref = suffix_;
+ if (ref instanceof java.lang.String) {
+ return (java.lang.String) ref;
+ } else {
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString bs =
+ (org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ suffix_ = s;
+ }
+ return s;
+ }
+ }
+ /**
+ * <pre>
+ * A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
+ * be empty for mainline stable releases.
+ * </pre>
+ *
+ * <code>optional string suffix = 4;</code>
+ */
+ public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
+ getSuffixBytes() {
+ java.lang.Object ref = suffix_;
+ if (ref instanceof java.lang.String) {
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString b =
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ suffix_ = b;
+ return b;
+ } else {
+ return (org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString) ref;
+ }
+ }
+
+ private byte memoizedIsInitialized = -1;
+ public final boolean isInitialized() {
+ byte isInitialized = memoizedIsInitialized;
+ if (isInitialized == 1) return true;
+ if (isInitialized == 0) return false;
+
+ memoizedIsInitialized = 1;
+ return true;
+ }
+
+ public void writeTo(org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream output)
+ throws java.io.IOException {
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ output.writeInt32(1, major_);
+ }
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeInt32(2, minor_);
+ }
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ output.writeInt32(3, patch_);
+ }
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.writeString(output, 4, suffix_);
+ }
+ unknownFields.writeTo(output);
+ }
+
+ public int getSerializedSize() {
+ int size = memoizedSize;
+ if (size != -1) return size;
+
+ size = 0;
+ if (((bitField0_ & 0x00000001) == 0x00000001)) {
+ size += org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream
+ .computeInt32Size(1, major_);
+ }
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ size += org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream
+ .computeInt32Size(2, minor_);
+ }
+ if (((bitField0_ & 0x00000004) == 0x00000004)) {
+ size += org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream
+ .computeInt32Size(3, patch_);
+ }
+ if (((bitField0_ & 0x00000008) == 0x00000008)) {
+ size += org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.computeStringSize(4, suffix_);
+ }
+ size += unknownFields.getSerializedSize();
+ memoizedSize = size;
+ return size;
+ }
+
+ private static final long serialVersionUID = 0L;
+ @java.lang.Override
+ public boolean equals(final java.lang.Object obj) {
+ if (obj == this) {
+ return true;
+ }
+ if (!(obj instanceof org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version)) {
+ return super.equals(obj);
+ }
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version other = (org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version) obj;
+
+ boolean result = true;
+ result = result && (hasMajor() == other.hasMajor());
+ if (hasMajor()) {
+ result = result && (getMajor()
+ == other.getMajor());
+ }
+ result = result && (hasMinor() == other.hasMinor());
+ if (hasMinor()) {
+ result = result && (getMinor()
+ == other.getMinor());
+ }
+ result = result && (hasPatch() == other.hasPatch());
+ if (hasPatch()) {
+ result = result && (getPatch()
+ == other.getPatch());
+ }
+ result = result && (hasSuffix() == other.hasSuffix());
+ if (hasSuffix()) {
+ result = result && getSuffix()
+ .equals(other.getSuffix());
+ }
+ result = result && unknownFields.equals(other.unknownFields);
+ return result;
+ }
+
+ @java.lang.Override
+ public int hashCode() {
+ if (memoizedHashCode != 0) {
+ return memoizedHashCode;
+ }
+ int hash = 41;
+ hash = (19 * hash) + getDescriptor().hashCode();
+ if (hasMajor()) {
+ hash = (37 * hash) + MAJOR_FIELD_NUMBER;
+ hash = (53 * hash) + getMajor();
+ }
+ if (hasMinor()) {
+ hash = (37 * hash) + MINOR_FIELD_NUMBER;
+ hash = (53 * hash) + getMinor();
+ }
+ if (hasPatch()) {
+ hash = (37 * hash) + PATCH_FIELD_NUMBER;
+ hash = (53 * hash) + getPatch();
+ }
+ if (hasSuffix()) {
+ hash = (37 * hash) + SUFFIX_FIELD_NUMBER;
+ hash = (53 * hash) + getSuffix().hashCode();
+ }
+ hash = (29 * hash) + unknownFields.hashCode();
+ memoizedHashCode = hash;
+ return hash;
+ }
+
+ public static org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version parseFrom(
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString data)
+ throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version parseFrom(
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString data,
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version parseFrom(byte[] data)
+ throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data);
+ }
+ public static org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version parseFrom(
+ byte[] data,
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException {
+ return PARSER.parseFrom(data, extensionRegistry);
+ }
+ public static org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version parseFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input);
+ }
+ public static org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version parseFrom(
+ java.io.InputStream input,
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+ public static org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version parseDelimitedFrom(java.io.InputStream input)
+ throws java.io.IOException {
+ return org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3
+ .parseDelimitedWithIOException(PARSER, input);
+ }
+ public static org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version parseDelimitedFrom(
+ java.io.InputStream input,
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3
+ .parseDelimitedWithIOException(PARSER, input, extensionRegistry);
+ }
+ public static org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version parseFrom(
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream input)
+ throws java.io.IOException {
+ return org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input);
+ }
+ public static org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version parseFrom(
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream input,
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ return org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3
+ .parseWithIOException(PARSER, input, extensionRegistry);
+ }
+
+ public Builder newBuilderForType() { return newBuilder(); }
+ public static Builder newBuilder() {
+ return DEFAULT_INSTANCE.toBuilder();
+ }
+ public static Builder newBuilder(org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version prototype) {
+ return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype);
+ }
+ public Builder toBuilder() {
+ return this == DEFAULT_INSTANCE
+ ? new Builder() : new Builder().mergeFrom(this);
+ }
+
+ @java.lang.Override
+ protected Builder newBuilderForType(
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ Builder builder = new Builder(parent);
+ return builder;
+ }
+ /**
+ * <pre>
+ * The version number of protocol compiler.
+ * </pre>
+ *
+ * Protobuf type {@code google.protobuf.compiler.Version}
+ */
+ public static final class Builder extends
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:google.protobuf.compiler.Version)
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.VersionOrBuilder {
+ public static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.Descriptor
+ getDescriptor() {
+ return org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.internal_static_google_protobuf_compiler_Version_descriptor;
+ }
+
+ protected org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internalGetFieldAccessorTable() {
+ return org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.internal_static_google_protobuf_compiler_Version_fieldAccessorTable
+ .ensureFieldAccessorsInitialized(
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version.class, org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version.Builder.class);
+ }
+
+ // Construct using org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version.newBuilder()
+ private Builder() {
+ maybeForceBuilderInitialization();
+ }
+
+ private Builder(
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.BuilderParent parent) {
+ super(parent);
+ maybeForceBuilderInitialization();
+ }
+ private void maybeForceBuilderInitialization() {
+ if (org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3
+ .alwaysUseFieldBuilders) {
+ }
+ }
+ public Builder clear() {
+ super.clear();
+ major_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000001);
+ minor_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000002);
+ patch_ = 0;
+ bitField0_ = (bitField0_ & ~0x00000004);
+ suffix_ = "";
+ bitField0_ = (bitField0_ & ~0x00000008);
+ return this;
+ }
+
+ public org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.Descriptor
+ getDescriptorForType() {
+ return org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.internal_static_google_protobuf_compiler_Version_descriptor;
+ }
+
+ public org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version getDefaultInstanceForType() {
+ return org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version.getDefaultInstance();
+ }
+
+ public org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version build() {
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version result = buildPartial();
+ if (!result.isInitialized()) {
+ throw newUninitializedMessageException(result);
+ }
+ return result;
+ }
+
+ public org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version buildPartial() {
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version result = new org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version(this);
+ int from_bitField0_ = bitField0_;
+ int to_bitField0_ = 0;
+ if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
+ to_bitField0_ |= 0x00000001;
+ }
+ result.major_ = major_;
+ if (((from_bitField0_ & 0x00000002) == 0x00000002)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ result.minor_ = minor_;
+ if (((from_bitField0_ & 0x00000004) == 0x00000004)) {
+ to_bitField0_ |= 0x00000004;
+ }
+ result.patch_ = patch_;
+ if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+ to_bitField0_ |= 0x00000008;
+ }
+ result.suffix_ = suffix_;
+ result.bitField0_ = to_bitField0_;
+ onBuilt();
+ return result;
+ }
+
+ public Builder clone() {
+ return (Builder) super.clone();
+ }
+ public Builder setField(
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FieldDescriptor field,
+ Object value) {
+ return (Builder) super.setField(field, value);
+ }
+ public Builder clearField(
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FieldDescriptor field) {
+ return (Builder) super.clearField(field);
+ }
+ public Builder clearOneof(
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.OneofDescriptor oneof) {
+ return (Builder) super.clearOneof(oneof);
+ }
+ public Builder setRepeatedField(
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FieldDescriptor field,
+ int index, Object value) {
+ return (Builder) super.setRepeatedField(field, index, value);
+ }
+ public Builder addRepeatedField(
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FieldDescriptor field,
+ Object value) {
+ return (Builder) super.addRepeatedField(field, value);
+ }
+ public Builder mergeFrom(org.apache.hadoop.hbase.shaded.com.google.protobuf.Message other) {
+ if (other instanceof org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version) {
+ return mergeFrom((org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version)other);
+ } else {
+ super.mergeFrom(other);
+ return this;
+ }
+ }
+
+ public Builder mergeFrom(org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version other) {
+ if (other == org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version.getDefaultInstance()) return this;
+ if (other.hasMajor()) {
+ setMajor(other.getMajor());
+ }
+ if (other.hasMinor()) {
+ setMinor(other.getMinor());
+ }
+ if (other.hasPatch()) {
+ setPatch(other.getPatch());
+ }
+ if (other.hasSuffix()) {
+ bitField0_ |= 0x00000008;
+ suffix_ = other.suffix_;
+ onChanged();
+ }
+ this.mergeUnknownFields(other.unknownFields);
+ onChanged();
+ return this;
+ }
+
+ public final boolean isInitialized() {
+ return true;
+ }
+
+ public Builder mergeFrom(
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream input,
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws java.io.IOException {
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version parsedMessage = null;
+ try {
+ parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
+ } catch (org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException e) {
+ parsedMessage = (org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version) e.getUnfinishedMessage();
+ throw e.unwrapIOException();
+ } finally {
+ if (parsedMessage != null) {
+ mergeFrom(parsedMessage);
+ }
+ }
+ return this;
+ }
+ private int bitField0_;
+
+ private int major_ ;
+ /**
+ * <code>optional int32 major = 1;</code>
+ */
+ public boolean hasMajor() {
+ return ((bitField0_ & 0x00000001) == 0x00000001);
+ }
+ /**
+ * <code>optional int32 major = 1;</code>
+ */
+ public int getMajor() {
+ return major_;
+ }
+ /**
+ * <code>optional int32 major = 1;</code>
+ */
+ public Builder setMajor(int value) {
+ bitField0_ |= 0x00000001;
+ major_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * <code>optional int32 major = 1;</code>
+ */
+ public Builder clearMajor() {
+ bitField0_ = (bitField0_ & ~0x00000001);
+ major_ = 0;
+ onChanged();
+ return this;
+ }
+
+ private int minor_ ;
+ /**
+ * <code>optional int32 minor = 2;</code>
+ */
+ public boolean hasMinor() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ /**
+ * <code>optional int32 minor = 2;</code>
+ */
+ public int getMinor() {
+ return minor_;
+ }
+ /**
+ * <code>optional int32 minor = 2;</code>
+ */
+ public Builder setMinor(int value) {
+ bitField0_ |= 0x00000002;
+ minor_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * <code>optional int32 minor = 2;</code>
+ */
+ public Builder clearMinor() {
+ bitField0_ = (bitField0_ & ~0x00000002);
+ minor_ = 0;
+ onChanged();
+ return this;
+ }
+
+ private int patch_ ;
+ /**
+ * <code>optional int32 patch = 3;</code>
+ */
+ public boolean hasPatch() {
+ return ((bitField0_ & 0x00000004) == 0x00000004);
+ }
+ /**
+ * <code>optional int32 patch = 3;</code>
+ */
+ public int getPatch() {
+ return patch_;
+ }
+ /**
+ * <code>optional int32 patch = 3;</code>
+ */
+ public Builder setPatch(int value) {
+ bitField0_ |= 0x00000004;
+ patch_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * <code>optional int32 patch = 3;</code>
+ */
+ public Builder clearPatch() {
+ bitField0_ = (bitField0_ & ~0x00000004);
+ patch_ = 0;
+ onChanged();
+ return this;
+ }
+
+ private java.lang.Object suffix_ = "";
+ /**
+ * <pre>
+ * A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
+ * be empty for mainline stable releases.
+ * </pre>
+ *
+ * <code>optional string suffix = 4;</code>
+ */
+ public boolean hasSuffix() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * <pre>
+ * A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
+ * be empty for mainline stable releases.
+ * </pre>
+ *
+ * <code>optional string suffix = 4;</code>
+ */
+ public java.lang.String getSuffix() {
+ java.lang.Object ref = suffix_;
+ if (!(ref instanceof java.lang.String)) {
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString bs =
+ (org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString) ref;
+ java.lang.String s = bs.toStringUtf8();
+ if (bs.isValidUtf8()) {
+ suffix_ = s;
+ }
+ return s;
+ } else {
+ return (java.lang.String) ref;
+ }
+ }
+ /**
+ * <pre>
+ * A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
+ * be empty for mainline stable releases.
+ * </pre>
+ *
+ * <code>optional string suffix = 4;</code>
+ */
+ public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
+ getSuffixBytes() {
+ java.lang.Object ref = suffix_;
+ if (ref instanceof String) {
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString b =
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString.copyFromUtf8(
+ (java.lang.String) ref);
+ suffix_ = b;
+ return b;
+ } else {
+ return (org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString) ref;
+ }
+ }
+ /**
+ * <pre>
+ * A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
+ * be empty for mainline stable releases.
+ * </pre>
+ *
+ * <code>optional string suffix = 4;</code>
+ */
+ public Builder setSuffix(
+ java.lang.String value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ bitField0_ |= 0x00000008;
+ suffix_ = value;
+ onChanged();
+ return this;
+ }
+ /**
+ * <pre>
+ * A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
+ * be empty for mainline stable releases.
+ * </pre>
+ *
+ * <code>optional string suffix = 4;</code>
+ */
+ public Builder clearSuffix() {
+ bitField0_ = (bitField0_ & ~0x00000008);
+ suffix_ = getDefaultInstance().getSuffix();
+ onChanged();
+ return this;
+ }
+ /**
+ * <pre>
+ * A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
+ * be empty for mainline stable releases.
+ * </pre>
+ *
+ * <code>optional string suffix = 4;</code>
+ */
+ public Builder setSuffixBytes(
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ bitField0_ |= 0x00000008;
+ suffix_ = value;
+ onChanged();
+ return this;
+ }
+ public final Builder setUnknownFields(
+ final org.apache.hadoop.hbase.shaded.com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.setUnknownFields(unknownFields);
+ }
+
+ public final Builder mergeUnknownFields(
+ final org.apache.hadoop.hbase.shaded.com.google.protobuf.UnknownFieldSet unknownFields) {
+ return super.mergeUnknownFields(unknownFields);
+ }
+
+
+ // @@protoc_insertion_point(builder_scope:google.protobuf.compiler.Version)
+ }
+
+ // @@protoc_insertion_point(class_scope:google.protobuf.compiler.Version)
+ private static final org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version DEFAULT_INSTANCE;
+ static {
+ DEFAULT_INSTANCE = new org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version();
+ }
+
+ public static org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version getDefaultInstance() {
+ return DEFAULT_INSTANCE;
+ }
+
+ @java.lang.Deprecated public static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Parser<Version>
+ PARSER = new org.apache.hadoop.hbase.shaded.com.google.protobuf.AbstractParser<Version>() {
+ public Version parsePartialFrom(
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedInputStream input,
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws org.apache.hadoop.hbase.shaded.com.google.protobuf.InvalidProtocolBufferException {
+ return new Version(input, extensionRegistry);
+ }
+ };
+
+ public static org.apache.hadoop.hbase.shaded.com.google.protobuf.Parser<Version> parser() {
+ return PARSER;
+ }
+
+ @java.lang.Override
+ public org.apache.hadoop.hbase.shaded.com.google.protobuf.Parser<Version> getParserForType() {
+ return PARSER;
+ }
+
+ public org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version getDefaultInstanceForType() {
+ return DEFAULT_INSTANCE;
+ }
+
+ }
+
public interface CodeGeneratorRequestOrBuilder extends
// @@protoc_insertion_point(interface_extends:google.protobuf.compiler.CodeGeneratorRequest)
org.apache.hadoop.hbase.shaded.com.google.protobuf.MessageOrBuilder {
@@ -175,6 +1048,31 @@ public final class PluginProtos {
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.FileDescriptorProtoOrBuilder getProtoFileOrBuilder(
int index);
+
+ /**
+ * <pre>
+ * The version number of protocol compiler.
+ * </pre>
+ *
+ * <code>optional .google.protobuf.compiler.Version compiler_version = 3;</code>
+ */
+ boolean hasCompilerVersion();
+ /**
+ * <pre>
+ * The version number of protocol compiler.
+ * </pre>
+ *
+ * <code>optional .google.protobuf.compiler.Version compiler_version = 3;</code>
+ */
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version getCompilerVersion();
+ /**
+ * <pre>
+ * The version number of protocol compiler.
+ * </pre>
+ *
+ * <code>optional .google.protobuf.compiler.Version compiler_version = 3;</code>
+ */
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.VersionOrBuilder getCompilerVersionOrBuilder();
}
/**
* <pre>
@@ -240,6 +1138,19 @@ public final class PluginProtos {
parameter_ = bs;
break;
}
+ case 26: {
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version.Builder subBuilder = null;
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ subBuilder = compilerVersion_.toBuilder();
+ }
+ compilerVersion_ = input.readMessage(org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version.PARSER, extensionRegistry);
+ if (subBuilder != null) {
+ subBuilder.mergeFrom(compilerVersion_);
+ compilerVersion_ = subBuilder.buildPartial();
+ }
+ bitField0_ |= 0x00000002;
+ break;
+ }
case 122: {
if (!((mutable_bitField0_ & 0x00000004) == 0x00000004)) {
protoFile_ = new java.util.ArrayList<org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.FileDescriptorProto>();
@@ -487,6 +1398,39 @@ public final class PluginProtos {
return protoFile_.get(index);
}
+ public static final int COMPILER_VERSION_FIELD_NUMBER = 3;
+ private org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version compilerVersion_;
+ /**
+ * <pre>
+ * The version number of protocol compiler.
+ * </pre>
+ *
+ * <code>optional .google.protobuf.compiler.Version compiler_version = 3;</code>
+ */
+ public boolean hasCompilerVersion() {
+ return ((bitField0_ & 0x00000002) == 0x00000002);
+ }
+ /**
+ * <pre>
+ * The version number of protocol compiler.
+ * </pre>
+ *
+ * <code>optional .google.protobuf.compiler.Version compiler_version = 3;</code>
+ */
+ public org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version getCompilerVersion() {
+ return compilerVersion_ == null ? org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version.getDefaultInstance() : compilerVersion_;
+ }
+ /**
+ * <pre>
+ * The version number of protocol compiler.
+ * </pre>
+ *
+ * <code>optional .google.protobuf.compiler.Version compiler_version = 3;</code>
+ */
+ public org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.VersionOrBuilder getCompilerVersionOrBuilder() {
+ return compilerVersion_ == null ? org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version.getDefaultInstance() : compilerVersion_;
+ }
+
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized;
@@ -511,6 +1455,9 @@ public final class PluginProtos {
if (((bitField0_ & 0x00000001) == 0x00000001)) {
org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.writeString(output, 2, parameter_);
}
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ output.writeMessage(3, getCompilerVersion());
+ }
for (int i = 0; i < protoFile_.size(); i++) {
output.writeMessage(15, protoFile_.get(i));
}
@@ -533,6 +1480,10 @@ public final class PluginProtos {
if (((bitField0_ & 0x00000001) == 0x00000001)) {
size += org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.computeStringSize(2, parameter_);
}
+ if (((bitField0_ & 0x00000002) == 0x00000002)) {
+ size += org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream
+ .computeMessageSize(3, getCompilerVersion());
+ }
for (int i = 0; i < protoFile_.size(); i++) {
size += org.apache.hadoop.hbase.shaded.com.google.protobuf.CodedOutputStream
.computeMessageSize(15, protoFile_.get(i));
@@ -563,6 +1514,11 @@ public final class PluginProtos {
}
result = result && getProtoFileList()
.equals(other.getProtoFileList());
+ result = result && (hasCompilerVersion() == other.hasCompilerVersion());
+ if (hasCompilerVersion()) {
+ result = result && getCompilerVersion()
+ .equals(other.getCompilerVersion());
+ }
result = result && unknownFields.equals(other.unknownFields);
return result;
}
@@ -573,7 +1529,7 @@ public final class PluginProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getFileToGenerateCount() > 0) {
hash = (37 * hash) + FILE_TO_GENERATE_FIELD_NUMBER;
hash = (53 * hash) + getFileToGenerateList().hashCode();
@@ -586,6 +1542,10 @@ public final class PluginProtos {
hash = (37 * hash) + PROTO_FILE_FIELD_NUMBER;
hash = (53 * hash) + getProtoFileList().hashCode();
}
+ if (hasCompilerVersion()) {
+ hash = (37 * hash) + COMPILER_VERSION_FIELD_NUMBER;
+ hash = (53 * hash) + getCompilerVersion().hashCode();
+ }
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -705,6 +1665,7 @@ public final class PluginProtos {
if (org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3
.alwaysUseFieldBuilders) {
getProtoFileFieldBuilder();
+ getCompilerVersionFieldBuilder();
}
}
public Builder clear() {
@@ -719,6 +1680,12 @@ public final class PluginProtos {
} else {
protoFileBuilder_.clear();
}
+ if (compilerVersionBuilder_ == null) {
+ compilerVersion_ = null;
+ } else {
+ compilerVersionBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000008);
return this;
}
@@ -761,6 +1728,14 @@ public final class PluginProtos {
} else {
result.protoFile_ = protoFileBuilder_.build();
}
+ if (((from_bitField0_ & 0x00000008) == 0x00000008)) {
+ to_bitField0_ |= 0x00000002;
+ }
+ if (compilerVersionBuilder_ == null) {
+ result.compilerVersion_ = compilerVersion_;
+ } else {
+ result.compilerVersion_ = compilerVersionBuilder_.build();
+ }
result.bitField0_ = to_bitField0_;
onBuilt();
return result;
@@ -844,6 +1819,9 @@ public final class PluginProtos {
}
}
}
+ if (other.hasCompilerVersion()) {
+ mergeCompilerVersion(other.getCompilerVersion());
+ }
this.mergeUnknownFields(other.unknownFields);
onChanged();
return this;
@@ -1597,6 +2575,160 @@ public final class PluginProtos {
}
return protoFileBuilder_;
}
+
+ private org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version compilerVersion_ = null;
+ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3<
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version, org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version.Builder, org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.VersionOrBuilder> compilerVersionBuilder_;
+ /**
+ * <pre>
+ * The version number of protocol compiler.
+ * </pre>
+ *
+ * <code>optional .google.protobuf.compiler.Version compiler_version = 3;</code>
+ */
+ public boolean hasCompilerVersion() {
+ return ((bitField0_ & 0x00000008) == 0x00000008);
+ }
+ /**
+ * <pre>
+ * The version number of protocol compiler.
+ * </pre>
+ *
+ * <code>optional .google.protobuf.compiler.Version compiler_version = 3;</code>
+ */
+ public org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version getCompilerVersion() {
+ if (compilerVersionBuilder_ == null) {
+ return compilerVersion_ == null ? org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version.getDefaultInstance() : compilerVersion_;
+ } else {
+ return compilerVersionBuilder_.getMessage();
+ }
+ }
+ /**
+ * <pre>
+ * The version number of protocol compiler.
+ * </pre>
+ *
+ * <code>optional .google.protobuf.compiler.Version compiler_version = 3;</code>
+ */
+ public Builder setCompilerVersion(org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version value) {
+ if (compilerVersionBuilder_ == null) {
+ if (value == null) {
+ throw new NullPointerException();
+ }
+ compilerVersion_ = value;
+ onChanged();
+ } else {
+ compilerVersionBuilder_.setMessage(value);
+ }
+ bitField0_ |= 0x00000008;
+ return this;
+ }
+ /**
+ * <pre>
+ * The version number of protocol compiler.
+ * </pre>
+ *
+ * <code>optional .google.protobuf.compiler.Version compiler_version = 3;</code>
+ */
+ public Builder setCompilerVersion(
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version.Builder builderForValue) {
+ if (compilerVersionBuilder_ == null) {
+ compilerVersion_ = builderForValue.build();
+ onChanged();
+ } else {
+ compilerVersionBuilder_.setMessage(builderForValue.build());
+ }
+ bitField0_ |= 0x00000008;
+ return this;
+ }
+ /**
+ * <pre>
+ * The version number of protocol compiler.
+ * </pre>
+ *
+ * <code>optional .google.protobuf.compiler.Version compiler_version = 3;</code>
+ */
+ public Builder mergeCompilerVersion(org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version value) {
+ if (compilerVersionBuilder_ == null) {
+ if (((bitField0_ & 0x00000008) == 0x00000008) &&
+ compilerVersion_ != null &&
+ compilerVersion_ != org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version.getDefaultInstance()) {
+ compilerVersion_ =
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version.newBuilder(compilerVersion_).mergeFrom(value).buildPartial();
+ } else {
+ compilerVersion_ = value;
+ }
+ onChanged();
+ } else {
+ compilerVersionBuilder_.mergeFrom(value);
+ }
+ bitField0_ |= 0x00000008;
+ return this;
+ }
+ /**
+ * <pre>
+ * The version number of protocol compiler.
+ * </pre>
+ *
+ * <code>optional .google.protobuf.compiler.Version compiler_version = 3;</code>
+ */
+ public Builder clearCompilerVersion() {
+ if (compilerVersionBuilder_ == null) {
+ compilerVersion_ = null;
+ onChanged();
+ } else {
+ compilerVersionBuilder_.clear();
+ }
+ bitField0_ = (bitField0_ & ~0x00000008);
+ return this;
+ }
+ /**
+ * <pre>
+ * The version number of protocol compiler.
+ * </pre>
+ *
+ * <code>optional .google.protobuf.compiler.Version compiler_version = 3;</code>
+ */
+ public org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version.Builder getCompilerVersionBuilder() {
+ bitField0_ |= 0x00000008;
+ onChanged();
+ return getCompilerVersionFieldBuilder().getBuilder();
+ }
+ /**
+ * <pre>
+ * The version number of protocol compiler.
+ * </pre>
+ *
+ * <code>optional .google.protobuf.compiler.Version compiler_version = 3;</code>
+ */
+ public org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.VersionOrBuilder getCompilerVersionOrBuilder() {
+ if (compilerVersionBuilder_ != null) {
+ return compilerVersionBuilder_.getMessageOrBuilder();
+ } else {
+ return compilerVersion_ == null ?
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version.getDefaultInstance() : compilerVersion_;
+ }
+ }
+ /**
+ * <pre>
+ * The version number of protocol compiler.
+ * </pre>
+ *
+ * <code>optional .google.protobuf.compiler.Version compiler_version = 3;</code>
+ */
+ private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3<
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version, org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version.Builder, org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.VersionOrBuilder>
+ getCompilerVersionFieldBuilder() {
+ if (compilerVersionBuilder_ == null) {
+ compilerVersionBuilder_ = new org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3<
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version, org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.Version.Builder, org.apache.hadoop.hbase.shaded.com.google.protobuf.compiler.PluginProtos.VersionOrBuilder>(
+ getCompilerVersion(),
+ getParentForChildren(),
+ isClean());
+ compilerVersion_ = null;
+ }
+ return compilerVersionBuilder_;
+ }
public final Builder setUnknownFields(
final org.apache.hadoop.hbase.shaded.com.google.protobuf.UnknownFieldSet unknownFields) {
return super.setUnknownFields(unknownFields);
@@ -2470,7 +3602,7 @@ public final class PluginProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasName()) {
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
@@ -3501,7 +4633,7 @@ public final class PluginProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasError()) {
hash = (37 * hash) + ERROR_FIELD_NUMBER;
hash = (53 * hash) + getError().hashCode();
@@ -4204,6 +5336,11 @@ public final class PluginProtos {
}
private static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.Descriptor
+ internal_static_google_protobuf_compiler_Version_descriptor;
+ private static final
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
+ internal_static_google_protobuf_compiler_Version_fieldAccessorTable;
+ private static final org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.Descriptor
internal_static_google_protobuf_compiler_CodeGeneratorRequest_descriptor;
private static final
org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
@@ -4229,16 +5366,19 @@ public final class PluginProtos {
java.lang.String[] descriptorData = {
"\n%google/protobuf/compiler/plugin.proto\022" +
"\030google.protobuf.compiler\032 google/protob" +
- "uf/descriptor.proto\"}\n\024CodeGeneratorRequ" +
- "est\022\030\n\020file_to_generate\030\001 \003(\t\022\021\n\tparamet" +
- "er\030\002 \001(\t\0228\n\nproto_file\030\017 \003(\0132$.google.pr" +
- "otobuf.FileDescriptorProto\"\252\001\n\025CodeGener" +
- "atorResponse\022\r\n\005error\030\001 \001(\t\022B\n\004file\030\017 \003(" +
- "\01324.google.protobuf.compiler.CodeGenerat" +
- "orResponse.File\032>\n\004File\022\014\n\004name\030\001 \001(\t\022\027\n" +
- "\017insertion_point\030\002 \001(\t\022\017\n\007content\030\017 \001(\tB",
- "7\n\034com.google.protobuf.compilerB\014PluginP" +
- "rotosZ\tplugin_go"
+ "uf/descriptor.proto\"F\n\007Version\022\r\n\005major\030" +
+ "\001 \001(\005\022\r\n\005minor\030\002 \001(\005\022\r\n\005patch\030\003 \001(\005\022\016\n\006s" +
+ "uffix\030\004 \001(\t\"\272\001\n\024CodeGeneratorRequest\022\030\n\020" +
+ "file_to_generate\030\001 \003(\t\022\021\n\tparameter\030\002 \001(" +
+ "\t\0228\n\nproto_file\030\017 \003(\0132$.google.protobuf." +
+ "FileDescriptorProto\022;\n\020compiler_version\030" +
+ "\003 \001(\0132!.google.protobuf.compiler.Version" +
+ "\"\252\001\n\025CodeGeneratorResponse\022\r\n\005error\030\001 \001(",
+ "\t\022B\n\004file\030\017 \003(\01324.google.protobuf.compil" +
+ "er.CodeGeneratorResponse.File\032>\n\004File\022\014\n" +
+ "\004name\030\001 \001(\t\022\027\n\017insertion_point\030\002 \001(\t\022\017\n\007" +
+ "content\030\017 \001(\tB7\n\034com.google.protobuf.com" +
+ "pilerB\014PluginProtosZ\tplugin_go"
};
org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
@@ -4253,14 +5393,20 @@ public final class PluginProtos {
new org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FileDescriptor[] {
org.apache.hadoop.hbase.shaded.com.google.protobuf.DescriptorProtos.getDescriptor(),
}, assigner);
- internal_static_google_protobuf_compiler_CodeGeneratorRequest_descriptor =
+ internal_static_google_protobuf_compiler_Version_descriptor =
getDescriptor().getMessageTypes().get(0);
+ internal_static_google_protobuf_compiler_Version_fieldAccessorTable = new
+ org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+ internal_static_google_protobuf_compiler_Version_descriptor,
+ new java.lang.String[] { "Major", "Minor", "Patch", "Suffix", });
+ internal_static_google_protobuf_compiler_CodeGeneratorRequest_descriptor =
+ getDescriptor().getMessageTypes().get(1);
internal_static_google_protobuf_compiler_CodeGeneratorRequest_fieldAccessorTable = new
org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_google_protobuf_compiler_CodeGeneratorRequest_descriptor,
- new java.lang.String[] { "FileToGenerate", "Parameter", "ProtoFile", });
+ new java.lang.String[] { "FileToGenerate", "Parameter", "ProtoFile", "CompilerVersion", });
internal_static_google_protobuf_compiler_CodeGeneratorResponse_descriptor =
- getDescriptor().getMessageTypes().get(1);
+ getDescriptor().getMessageTypes().get(2);
internal_static_google_protobuf_compiler_CodeGeneratorResponse_fieldAccessorTable = new
org.apache.hadoop.hbase.shaded.com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
internal_static_google_protobuf_compiler_CodeGeneratorResponse_descriptor,
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/ipc/protobuf/generated/TestProcedureProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/ipc/protobuf/generated/TestProcedureProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/ipc/protobuf/generated/TestProcedureProtos.java
index 2e78905..46e9c01 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/ipc/protobuf/generated/TestProcedureProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/ipc/protobuf/generated/TestProcedureProtos.java
@@ -210,7 +210,7 @@ public final class TestProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTableName()) {
hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER;
hash = (53 * hash) + getTableName().hashCode();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/ipc/protobuf/generated/TestProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/ipc/protobuf/generated/TestProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/ipc/protobuf/generated/TestProtos.java
index 36a15c9..a30032d 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/ipc/protobuf/generated/TestProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/ipc/protobuf/generated/TestProtos.java
@@ -130,7 +130,7 @@ public final class TestProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -503,7 +503,7 @@ public final class TestProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -956,7 +956,7 @@ public final class TestProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasMessage()) {
hash = (37 * hash) + MESSAGE_FIELD_NUMBER;
hash = (53 * hash) + getMessage().hashCode();
@@ -1507,7 +1507,7 @@ public final class TestProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasMessage()) {
hash = (37 * hash) + MESSAGE_FIELD_NUMBER;
hash = (53 * hash) + getMessage().hashCode();
@@ -2026,7 +2026,7 @@ public final class TestProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasMs()) {
hash = (37 * hash) + MS_FIELD_NUMBER;
hash = (53 * hash) + getMs();
@@ -2531,7 +2531,7 @@ public final class TestProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasAddr()) {
hash = (37 * hash) + ADDR_FIELD_NUMBER;
hash = (53 * hash) + getAddr().hashCode();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java
index b4bd84d..703de38 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/AdminProtos.java
@@ -241,7 +241,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegion()) {
hash = (37 * hash) + REGION_FIELD_NUMBER;
hash = (53 * hash) + getRegion().hashCode();
@@ -1077,7 +1077,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegionInfo()) {
hash = (37 * hash) + REGION_INFO_FIELD_NUMBER;
hash = (53 * hash) + getRegionInfo().hashCode();
@@ -1831,7 +1831,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegion()) {
hash = (37 * hash) + REGION_FIELD_NUMBER;
hash = (53 * hash) + getRegion().hashCode();
@@ -2528,7 +2528,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getStoreFileCount() > 0) {
hash = (37 * hash) + STORE_FILE_FIELD_NUMBER;
hash = (53 * hash) + getStoreFileList().hashCode();
@@ -3017,7 +3017,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -3478,7 +3478,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getRegionInfoCount() > 0) {
hash = (37 * hash) + REGION_INFO_FIELD_NUMBER;
hash = (53 * hash) + getRegionInfoList().hashCode();
@@ -4553,7 +4553,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegion()) {
hash = (37 * hash) + REGION_FIELD_NUMBER;
hash = (53 * hash) + getRegion().hashCode();
@@ -5526,7 +5526,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getOpenInfoCount() > 0) {
hash = (37 * hash) + OPEN_INFO_FIELD_NUMBER;
hash = (53 * hash) + getOpenInfoList().hashCode();
@@ -6512,7 +6512,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getOpeningStateCount() > 0) {
hash = (37 * hash) + OPENING_STATE_FIELD_NUMBER;
hash = (53 * hash) + openingState_.hashCode();
@@ -7051,7 +7051,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegionInfo()) {
hash = (37 * hash) + REGIONINFO_FIELD_NUMBER;
hash = (53 * hash) + getRegionInfo().hashCode();
@@ -7574,7 +7574,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -8229,7 +8229,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegion()) {
hash = (37 * hash) + REGION_FIELD_NUMBER;
hash = (53 * hash) + getRegion().hashCode();
@@ -9104,7 +9104,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasClosed()) {
hash = (37 * hash) + CLOSED_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -9624,7 +9624,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getRegionCount() > 0) {
hash = (37 * hash) + REGION_FIELD_NUMBER;
hash = (53 * hash) + getRegionList().hashCode();
@@ -10344,7 +10344,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasClosed()) {
hash = (37 * hash) + CLOSED_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -10946,7 +10946,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegion()) {
hash = (37 * hash) + REGION_FIELD_NUMBER;
hash = (53 * hash) + getRegion().hashCode();
@@ -11716,7 +11716,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasLastFlushTime()) {
hash = (37 * hash) + LAST_FLUSH_TIME_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -12354,7 +12354,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegion()) {
hash = (37 * hash) + REGION_FIELD_NUMBER;
hash = (53 * hash) + getRegion().hashCode();
@@ -12934,7 +12934,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -13467,7 +13467,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegion()) {
hash = (37 * hash) + REGION_FIELD_NUMBER;
hash = (53 * hash) + getRegion().hashCode();
@@ -14091,7 +14091,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -14727,7 +14727,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegion()) {
hash = (37 * hash) + REGION_FIELD_NUMBER;
hash = (53 * hash) + getRegion().hashCode();
@@ -15522,7 +15522,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getUpdateInfoCount() > 0) {
hash = (37 * hash) + UPDATE_INFO_FIELD_NUMBER;
hash = (53 * hash) + getUpdateInfoList().hashCode();
@@ -16232,7 +16232,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasResponse()) {
hash = (37 * hash) + RESPONSE_FIELD_NUMBER;
hash = (53 * hash) + getResponse();
@@ -16882,7 +16882,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasKey()) {
hash = (37 * hash) + KEY_FIELD_NUMBER;
hash = (53 * hash) + getKey().hashCode();
@@ -17923,7 +17923,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getEntryCount() > 0) {
hash = (37 * hash) + ENTRY_FIELD_NUMBER;
hash = (53 * hash) + getEntryList().hashCode();
@@ -18871,7 +18871,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -19244,7 +19244,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -19708,7 +19708,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getRegionToFlushCount() > 0) {
hash = (37 * hash) + REGION_TO_FLUSH_FIELD_NUMBER;
hash = (53 * hash) + getRegionToFlushList().hashCode();
@@ -20289,7 +20289,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasReason()) {
hash = (37 * hash) + REASON_FIELD_NUMBER;
hash = (53 * hash) + getReason().hashCode();
@@ -20760,7 +20760,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -21133,7 +21133,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -21617,7 +21617,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasServerName()) {
hash = (37 * hash) + SERVER_NAME_FIELD_NUMBER;
hash = (53 * hash) + getServerName().hashCode();
@@ -22254,7 +22254,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasServerInfo()) {
hash = (37 * hash) + SERVER_INFO_FIELD_NUMBER;
hash = (53 * hash) + getServerInfo().hashCode();
@@ -22777,7 +22777,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -23150,7 +23150,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -23590,7 +23590,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTableName()) {
hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER;
hash = (53 * hash) + getTableName().hashCode();
@@ -24200,7 +24200,7 @@ public final class AdminProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getRegionLoadsCount() > 0) {
hash = (37 * hash) + REGION_LOADS_FIELD_NUMBER;
hash = (53 * hash) + getRegionLoadsList().hashCode();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/BackupProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/BackupProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/BackupProtos.java
index 4cad101..0271777 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/BackupProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/BackupProtos.java
@@ -334,7 +334,7 @@ public final class BackupProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasServerName()) {
hash = (37 * hash) + SERVER_NAME_FIELD_NUMBER;
hash = (53 * hash) + getServerName().hashCode();
@@ -1067,7 +1067,7 @@ public final class BackupProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTableName()) {
hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER;
hash = (53 * hash) + getTableName().hashCode();
@@ -2434,7 +2434,7 @@ public final class BackupProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasBackupId()) {
hash = (37 * hash) + BACKUP_ID_FIELD_NUMBER;
hash = (53 * hash) + getBackupId().hashCode();
@@ -4158,7 +4158,7 @@ public final class BackupProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTableName()) {
hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER;
hash = (53 * hash) + getTableName().hashCode();
@@ -5690,7 +5690,7 @@ public final class BackupProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasBackupId()) {
hash = (37 * hash) + BACKUP_ID_FIELD_NUMBER;
hash = (53 * hash) + getBackupId().hashCode();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/CellProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/CellProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/CellProtos.java
index 60ca467..e1d7121 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/CellProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/CellProtos.java
@@ -576,7 +576,7 @@ public final class CellProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRow()) {
hash = (37 * hash) + ROW_FIELD_NUMBER;
hash = (53 * hash) + getRow().hashCode();
@@ -1613,7 +1613,7 @@ public final class CellProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRow()) {
hash = (37 * hash) + ROW_FIELD_NUMBER;
hash = (53 * hash) + getRow().hashCode();
[2/7] hbase git commit: HBASE-16780 Since move to protobuf3.1, Cells
are limited to 64MB where previous they had no limit Update internal pb to
3.2 from 3.1.; AMENDMENT -- FORGOT TO REBUILD PBs
Posted by st...@apache.org.
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ClientProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ClientProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ClientProtos.java
index 47ab440..a5f81e6 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ClientProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ClientProtos.java
@@ -305,7 +305,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getLabelCount() > 0) {
hash = (37 * hash) + LABEL_FIELD_NUMBER;
hash = (53 * hash) + getLabelList().hashCode();
@@ -884,7 +884,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasExpression()) {
hash = (37 * hash) + EXPRESSION_FIELD_NUMBER;
hash = (53 * hash) + getExpression().hashCode();
@@ -1474,7 +1474,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasFamily()) {
hash = (37 * hash) + FAMILY_FIELD_NUMBER;
hash = (53 * hash) + getFamily().hashCode();
@@ -2776,7 +2776,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRow()) {
hash = (37 * hash) + ROW_FIELD_NUMBER;
hash = (53 * hash) + getRow().hashCode();
@@ -5132,7 +5132,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getCellCount() > 0) {
hash = (37 * hash) + CELL_FIELD_NUMBER;
hash = (53 * hash) + getCellList().hashCode();
@@ -6313,7 +6313,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegion()) {
hash = (37 * hash) + REGION_FIELD_NUMBER;
hash = (53 * hash) + getRegion().hashCode();
@@ -7048,7 +7048,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasResult()) {
hash = (37 * hash) + RESULT_FIELD_NUMBER;
hash = (53 * hash) + getResult().hashCode();
@@ -7831,7 +7831,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRow()) {
hash = (37 * hash) + ROW_FIELD_NUMBER;
hash = (53 * hash) + getRow().hashCode();
@@ -9553,7 +9553,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasQualifier()) {
hash = (37 * hash) + QUALIFIER_FIELD_NUMBER;
hash = (53 * hash) + getQualifier().hashCode();
@@ -10176,7 +10176,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasFamily()) {
hash = (37 * hash) + FAMILY_FIELD_NUMBER;
hash = (53 * hash) + getFamily().hashCode();
@@ -11150,7 +11150,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRow()) {
hash = (37 * hash) + ROW_FIELD_NUMBER;
hash = (53 * hash) + getRow().hashCode();
@@ -12875,7 +12875,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegion()) {
hash = (37 * hash) + REGION_FIELD_NUMBER;
hash = (53 * hash) + getRegion().hashCode();
@@ -13864,7 +13864,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasResult()) {
hash = (37 * hash) + RESULT_FIELD_NUMBER;
hash = (53 * hash) + getResult().hashCode();
@@ -15723,7 +15723,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getColumnCount() > 0) {
hash = (37 * hash) + COLUMN_FIELD_NUMBER;
hash = (53 * hash) + getColumnList().hashCode();
@@ -18654,7 +18654,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegion()) {
hash = (37 * hash) + REGION_FIELD_NUMBER;
hash = (53 * hash) + getRegion().hashCode();
@@ -20639,7 +20639,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getCellsPerResultCount() > 0) {
hash = (37 * hash) + CELLS_PER_RESULT_FIELD_NUMBER;
hash = (53 * hash) + getCellsPerResultList().hashCode();
@@ -22663,7 +22663,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasFamily()) {
hash = (37 * hash) + FAMILY_FIELD_NUMBER;
hash = (53 * hash) + getFamily().hashCode();
@@ -23348,7 +23348,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegion()) {
hash = (37 * hash) + REGION_FIELD_NUMBER;
hash = (53 * hash) + getRegion().hashCode();
@@ -24539,7 +24539,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasLoaded()) {
hash = (37 * hash) + LOADED_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -25199,7 +25199,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasIdentifier()) {
hash = (37 * hash) + IDENTIFIER_FIELD_NUMBER;
hash = (53 * hash) + getIdentifier().hashCode();
@@ -25988,7 +25988,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTableName()) {
hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER;
hash = (53 * hash) + getTableName().hashCode();
@@ -26736,7 +26736,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasBulkToken()) {
hash = (37 * hash) + BULK_TOKEN_FIELD_NUMBER;
hash = (53 * hash) + getBulkToken().hashCode();
@@ -27352,7 +27352,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasBulkToken()) {
hash = (37 * hash) + BULK_TOKEN_FIELD_NUMBER;
hash = (53 * hash) + getBulkToken().hashCode();
@@ -27968,7 +27968,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -28591,7 +28591,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRow()) {
hash = (37 * hash) + ROW_FIELD_NUMBER;
hash = (53 * hash) + getRow().hashCode();
@@ -29325,7 +29325,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasValue()) {
hash = (37 * hash) + VALUE_FIELD_NUMBER;
hash = (53 * hash) + getValue().hashCode();
@@ -29983,7 +29983,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegion()) {
hash = (37 * hash) + REGION_FIELD_NUMBER;
hash = (53 * hash) + getRegion().hashCode();
@@ -30788,7 +30788,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegion()) {
hash = (37 * hash) + REGION_FIELD_NUMBER;
hash = (53 * hash) + getRegion().hashCode();
@@ -31720,7 +31720,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasIndex()) {
hash = (37 * hash) + INDEX_FIELD_NUMBER;
hash = (53 * hash) + getIndex();
@@ -32820,7 +32820,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegion()) {
hash = (37 * hash) + REGION_FIELD_NUMBER;
hash = (53 * hash) + getRegion().hashCode();
@@ -33885,7 +33885,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasMemstoreLoad()) {
hash = (37 * hash) + MEMSTORELOAD_FIELD_NUMBER;
hash = (53 * hash) + getMemstoreLoad();
@@ -34622,7 +34622,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getRegionCount() > 0) {
hash = (37 * hash) + REGION_FIELD_NUMBER;
hash = (53 * hash) + getRegionList().hashCode();
@@ -35941,7 +35941,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasIndex()) {
hash = (37 * hash) + INDEX_FIELD_NUMBER;
hash = (53 * hash) + getIndex();
@@ -37215,7 +37215,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getResultOrExceptionCount() > 0) {
hash = (37 * hash) + RESULTOREXCEPTION_FIELD_NUMBER;
hash = (53 * hash) + getResultOrExceptionList().hashCode();
@@ -38274,7 +38274,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getRegionActionCount() > 0) {
hash = (37 * hash) + REGIONACTION_FIELD_NUMBER;
hash = (53 * hash) + getRegionActionList().hashCode();
@@ -39354,7 +39354,7 @@ public final class ClientProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getRegionActionResultCount() > 0) {
hash = (37 * hash) + REGIONACTIONRESULT_FIELD_NUMBER;
hash = (53 * hash) + getRegionActionResultList().hashCode();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ClusterIdProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ClusterIdProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ClusterIdProtos.java
index 326f217..83f3281 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ClusterIdProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ClusterIdProtos.java
@@ -240,7 +240,7 @@ public final class ClusterIdProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasClusterId()) {
hash = (37 * hash) + CLUSTER_ID_FIELD_NUMBER;
hash = (53 * hash) + getClusterId().hashCode();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ClusterStatusProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ClusterStatusProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ClusterStatusProtos.java
index 97c6d05..4f67ecf 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ClusterStatusProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ClusterStatusProtos.java
@@ -622,7 +622,7 @@ public final class ClusterStatusProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegionInfo()) {
hash = (37 * hash) + REGION_INFO_FIELD_NUMBER;
hash = (53 * hash) + getRegionInfo().hashCode();
@@ -1379,7 +1379,7 @@ public final class ClusterStatusProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasSpec()) {
hash = (37 * hash) + SPEC_FIELD_NUMBER;
hash = (53 * hash) + getSpec().hashCode();
@@ -2147,7 +2147,7 @@ public final class ClusterStatusProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasFamilyName()) {
hash = (37 * hash) + FAMILY_NAME_FIELD_NUMBER;
hash = (53 * hash) + getFamilyName().hashCode();
@@ -2770,7 +2770,7 @@ public final class ClusterStatusProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasLastFlushedSequenceId()) {
hash = (37 * hash) + LAST_FLUSHED_SEQUENCE_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -4701,7 +4701,7 @@ public final class ClusterStatusProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegionSpecifier()) {
hash = (37 * hash) + REGION_SPECIFIER_FIELD_NUMBER;
hash = (53 * hash) + getRegionSpecifier().hashCode();
@@ -6762,7 +6762,7 @@ public final class ClusterStatusProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasAgeOfLastAppliedOp()) {
hash = (37 * hash) + AGEOFLASTAPPLIEDOP_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -7501,7 +7501,7 @@ public final class ClusterStatusProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasPeerID()) {
hash = (37 * hash) + PEERID_FIELD_NUMBER;
hash = (53 * hash) + getPeerID().hashCode();
@@ -9119,7 +9119,7 @@ public final class ClusterStatusProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasNumberOfRequests()) {
hash = (37 * hash) + NUMBER_OF_REQUESTS_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -11442,7 +11442,7 @@ public final class ClusterStatusProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasServer()) {
hash = (37 * hash) + SERVER_FIELD_NUMBER;
hash = (53 * hash) + getServer().hashCode();
@@ -12785,7 +12785,7 @@ public final class ClusterStatusProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasHbaseVersion()) {
hash = (37 * hash) + HBASE_VERSION_FIELD_NUMBER;
hash = (53 * hash) + getHbaseVersion().hashCode();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ComparatorProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ComparatorProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ComparatorProtos.java
index 1c6c373..dd3faed 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ComparatorProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ComparatorProtos.java
@@ -252,7 +252,7 @@ public final class ComparatorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasName()) {
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
@@ -815,7 +815,7 @@ public final class ComparatorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasValue()) {
hash = (37 * hash) + VALUE_FIELD_NUMBER;
hash = (53 * hash) + getValue().hashCode();
@@ -1305,7 +1305,7 @@ public final class ComparatorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasComparable()) {
hash = (37 * hash) + COMPARABLE_FIELD_NUMBER;
hash = (53 * hash) + getComparable().hashCode();
@@ -1890,7 +1890,7 @@ public final class ComparatorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasComparable()) {
hash = (37 * hash) + COMPARABLE_FIELD_NUMBER;
hash = (53 * hash) + getComparable().hashCode();
@@ -2475,7 +2475,7 @@ public final class ComparatorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasComparable()) {
hash = (37 * hash) + COMPARABLE_FIELD_NUMBER;
hash = (53 * hash) + getComparable().hashCode();
@@ -3211,7 +3211,7 @@ public final class ComparatorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasComparable()) {
hash = (37 * hash) + COMPARABLE_FIELD_NUMBER;
hash = (53 * hash) + getComparable().hashCode();
@@ -3783,7 +3783,7 @@ public final class ComparatorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -4434,7 +4434,7 @@ public final class ComparatorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasPattern()) {
hash = (37 * hash) + PATTERN_FIELD_NUMBER;
hash = (53 * hash) + getPattern().hashCode();
@@ -5218,7 +5218,7 @@ public final class ComparatorProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasSubstr()) {
hash = (37 * hash) + SUBSTR_FIELD_NUMBER;
hash = (53 * hash) + getSubstr().hashCode();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/EncryptionProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/EncryptionProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/EncryptionProtos.java
index b195b5a..eb48984 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/EncryptionProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/EncryptionProtos.java
@@ -386,7 +386,7 @@ public final class EncryptionProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasAlgorithm()) {
hash = (37 * hash) + ALGORITHM_FIELD_NUMBER;
hash = (53 * hash) + getAlgorithm().hashCode();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ErrorHandlingProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ErrorHandlingProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ErrorHandlingProtos.java
index ccb7e86..64e439a 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ErrorHandlingProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/ErrorHandlingProtos.java
@@ -402,7 +402,7 @@ public final class ErrorHandlingProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasDeclaringClass()) {
hash = (37 * hash) + DECLARING_CLASS_FIELD_NUMBER;
hash = (53 * hash) + getDeclaringClass().hashCode();
@@ -1384,7 +1384,7 @@ public final class ErrorHandlingProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasClassName()) {
hash = (37 * hash) + CLASS_NAME_FIELD_NUMBER;
hash = (53 * hash) + getClassName().hashCode();
@@ -2426,7 +2426,7 @@ public final class ErrorHandlingProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasSource()) {
hash = (37 * hash) + SOURCE_FIELD_NUMBER;
hash = (53 * hash) + getSource().hashCode();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/FSProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/FSProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/FSProtos.java
index cbe92ca..d34c110 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/FSProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/FSProtos.java
@@ -215,7 +215,7 @@ public final class FSProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasVersion()) {
hash = (37 * hash) + VERSION_FIELD_NUMBER;
hash = (53 * hash) + getVersion().hashCode();
@@ -886,7 +886,7 @@ public final class FSProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasSplitkey()) {
hash = (37 * hash) + SPLITKEY_FIELD_NUMBER;
hash = (53 * hash) + getSplitkey().hashCode();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/FilterProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/FilterProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/FilterProtos.java
index b329e45..a462d04 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/FilterProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/FilterProtos.java
@@ -252,7 +252,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasName()) {
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
@@ -819,7 +819,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasLimit()) {
hash = (37 * hash) + LIMIT_FIELD_NUMBER;
hash = (53 * hash) + getLimit();
@@ -1376,7 +1376,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasLimit()) {
hash = (37 * hash) + LIMIT_FIELD_NUMBER;
hash = (53 * hash) + getLimit();
@@ -1942,7 +1942,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasPrefix()) {
hash = (37 * hash) + PREFIX_FIELD_NUMBER;
hash = (53 * hash) + getPrefix().hashCode();
@@ -2540,7 +2540,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasMinColumn()) {
hash = (37 * hash) + MIN_COLUMN_FIELD_NUMBER;
hash = (53 * hash) + getMinColumn().hashCode();
@@ -3224,7 +3224,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasCompareOp()) {
hash = (37 * hash) + COMPARE_OP_FIELD_NUMBER;
hash = (53 * hash) + compareOp_;
@@ -3993,7 +3993,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasCompareFilter()) {
hash = (37 * hash) + COMPARE_FILTER_FIELD_NUMBER;
hash = (53 * hash) + getCompareFilter().hashCode();
@@ -4727,7 +4727,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasCompareFilter()) {
hash = (37 * hash) + COMPARE_FILTER_FIELD_NUMBER;
hash = (53 * hash) + getCompareFilter().hashCode();
@@ -5481,7 +5481,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasOperator()) {
hash = (37 * hash) + OPERATOR_FIELD_NUMBER;
hash = (53 * hash) + operator_;
@@ -6270,7 +6270,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasFilter()) {
hash = (37 * hash) + FILTER_FIELD_NUMBER;
hash = (53 * hash) + getFilter().hashCode();
@@ -6793,7 +6793,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -7228,7 +7228,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getQualifiersCount() > 0) {
hash = (37 * hash) + QUALIFIERS_FIELD_NUMBER;
hash = (53 * hash) + getQualifiersList().hashCode();
@@ -7784,7 +7784,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getFuzzyKeysDataCount() > 0) {
hash = (37 * hash) + FUZZY_KEYS_DATA_FIELD_NUMBER;
hash = (53 * hash) + getFuzzyKeysDataList().hashCode();
@@ -8494,7 +8494,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasStopRowKey()) {
hash = (37 * hash) + STOP_ROW_KEY_FIELD_NUMBER;
hash = (53 * hash) + getStopRowKey().hashCode();
@@ -8967,7 +8967,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasLenAsVal()) {
hash = (37 * hash) + LEN_AS_VAL_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
@@ -9455,7 +9455,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getSortedPrefixesCount() > 0) {
hash = (37 * hash) + SORTED_PREFIXES_FIELD_NUMBER;
hash = (53 * hash) + getSortedPrefixesList().hashCode();
@@ -9971,7 +9971,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasPageSize()) {
hash = (37 * hash) + PAGE_SIZE_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -10441,7 +10441,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasPrefix()) {
hash = (37 * hash) + PREFIX_FIELD_NUMBER;
hash = (53 * hash) + getPrefix().hashCode();
@@ -10935,7 +10935,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasCompareFilter()) {
hash = (37 * hash) + COMPARE_FILTER_FIELD_NUMBER;
hash = (53 * hash) + getCompareFilter().hashCode();
@@ -11508,7 +11508,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasChance()) {
hash = (37 * hash) + CHANCE_FIELD_NUMBER;
hash = (53 * hash) + java.lang.Float.floatToIntBits(
@@ -12003,7 +12003,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasCompareFilter()) {
hash = (37 * hash) + COMPARE_FILTER_FIELD_NUMBER;
hash = (53 * hash) + getCompareFilter().hashCode();
@@ -12595,7 +12595,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasSingleColumnValueFilter()) {
hash = (37 * hash) + SINGLE_COLUMN_VALUE_FILTER_FIELD_NUMBER;
hash = (53 * hash) + getSingleColumnValueFilter().hashCode();
@@ -13407,7 +13407,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasColumnFamily()) {
hash = (37 * hash) + COLUMN_FAMILY_FIELD_NUMBER;
hash = (53 * hash) + getColumnFamily().hashCode();
@@ -14239,7 +14239,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasFilter()) {
hash = (37 * hash) + FILTER_FIELD_NUMBER;
hash = (53 * hash) + getFilter().hashCode();
@@ -14891,7 +14891,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getTimestampsCount() > 0) {
hash = (37 * hash) + TIMESTAMPS_FIELD_NUMBER;
hash = (53 * hash) + getTimestampsList().hashCode();
@@ -15470,7 +15470,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasCompareFilter()) {
hash = (37 * hash) + COMPARE_FILTER_FIELD_NUMBER;
hash = (53 * hash) + getCompareFilter().hashCode();
@@ -16062,7 +16062,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasFilter()) {
hash = (37 * hash) + FILTER_FIELD_NUMBER;
hash = (53 * hash) + getFilter().hashCode();
@@ -16585,7 +16585,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -17128,7 +17128,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasStartRow()) {
hash = (37 * hash) + START_ROW_FIELD_NUMBER;
hash = (53 * hash) + getStartRow().hashCode();
@@ -17775,7 +17775,7 @@ public final class FilterProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getRowRangeListCount() > 0) {
hash = (37 * hash) + ROW_RANGE_LIST_FIELD_NUMBER;
hash = (53 * hash) + getRowRangeListList().hashCode();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/HBaseProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/HBaseProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/HBaseProtos.java
index 0617426..5ed1187 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/HBaseProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/HBaseProtos.java
@@ -503,7 +503,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasNamespace()) {
hash = (37 * hash) + NAMESPACE_FIELD_NUMBER;
hash = (53 * hash) + getNamespace().hashCode();
@@ -1321,7 +1321,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasTableName()) {
hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER;
hash = (53 * hash) + getTableName().hashCode();
@@ -2908,7 +2908,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasState()) {
hash = (37 * hash) + STATE_FIELD_NUMBER;
hash = (53 * hash) + state_;
@@ -3585,7 +3585,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasName()) {
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
@@ -4931,7 +4931,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasRegionId()) {
hash = (37 * hash) + REGION_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -5834,7 +5834,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getFavoredNodeCount() > 0) {
hash = (37 * hash) + FAVORED_NODE_FIELD_NUMBER;
hash = (53 * hash) + getFavoredNodeList().hashCode();
@@ -6719,7 +6719,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasType()) {
hash = (37 * hash) + TYPE_FIELD_NUMBER;
hash = (53 * hash) + type_;
@@ -7301,7 +7301,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasFrom()) {
hash = (37 * hash) + FROM_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -7893,7 +7893,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasColumnFamily()) {
hash = (37 * hash) + COLUMN_FAMILY_FIELD_NUMBER;
hash = (53 * hash) + getColumnFamily().hashCode();
@@ -8637,7 +8637,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasHostName()) {
hash = (37 * hash) + HOST_NAME_FIELD_NUMBER;
hash = (53 * hash) + getHostName().hashCode();
@@ -9284,7 +9284,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasName()) {
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
@@ -9913,7 +9913,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasName()) {
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
@@ -10600,7 +10600,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasName()) {
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
@@ -11213,7 +11213,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasFirst()) {
hash = (37 * hash) + FIRST_FIELD_NUMBER;
hash = (53 * hash) + getFirst().hashCode();
@@ -11810,7 +11810,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasName()) {
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
@@ -12812,7 +12812,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasName()) {
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
@@ -13970,7 +13970,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasSignature()) {
hash = (37 * hash) + SIGNATURE_FIELD_NUMBER;
hash = (53 * hash) + getSignature().hashCode();
@@ -14922,7 +14922,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
@@ -15343,7 +15343,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasLongMsg()) {
hash = (37 * hash) + LONG_MSG_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -15819,7 +15819,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasDoubleMsg()) {
hash = (37 * hash) + DOUBLE_MSG_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -16293,7 +16293,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasBigdecimalMsg()) {
hash = (37 * hash) + BIGDECIMAL_MSG_FIELD_NUMBER;
hash = (53 * hash) + getBigdecimalMsg().hashCode();
@@ -16815,7 +16815,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasLeastSigBits()) {
hash = (37 * hash) + LEAST_SIG_BITS_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -17425,7 +17425,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasName()) {
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
@@ -18702,7 +18702,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasVersion()) {
hash = (37 * hash) + VERSION_FIELD_NUMBER;
hash = (53 * hash) + getVersion().hashCode();
@@ -19851,7 +19851,7 @@ public final class HBaseProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasInfoPort()) {
hash = (37 * hash) + INFOPORT_FIELD_NUMBER;
hash = (53 * hash) + getInfoPort();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/HFileProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/HFileProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/HFileProtos.java
index 00e7080..1de62a2 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/HFileProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/HFileProtos.java
@@ -222,7 +222,7 @@ public final class HFileProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getMapEntryCount() > 0) {
hash = (37 * hash) + MAP_ENTRY_FIELD_NUMBER;
hash = (53 * hash) + getMapEntryList().hashCode();
@@ -1476,7 +1476,7 @@ public final class HFileProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasFileInfoOffset()) {
hash = (37 * hash) + FILE_INFO_OFFSET_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/LoadBalancerProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/LoadBalancerProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/LoadBalancerProtos.java
index 0b941d8..fd83795 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/LoadBalancerProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/LoadBalancerProtos.java
@@ -174,7 +174,7 @@ public final class LoadBalancerProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasBalancerOn()) {
hash = (37 * hash) + BALANCER_ON_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/LockServiceProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/LockServiceProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/LockServiceProtos.java
index 577b680..6dbf9b2 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/LockServiceProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/LockServiceProtos.java
@@ -658,7 +658,7 @@ public final class LockServiceProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasLockType()) {
hash = (37 * hash) + LOCK_TYPE_FIELD_NUMBER;
hash = (53 * hash) + lockType_;
@@ -1845,7 +1845,7 @@ public final class LockServiceProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasProcId()) {
hash = (37 * hash) + PROC_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -2361,7 +2361,7 @@ public final class LockServiceProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasProcId()) {
hash = (37 * hash) + PROC_ID_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashLong(
@@ -3035,7 +3035,7 @@ public final class LockServiceProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasLockStatus()) {
hash = (37 * hash) + LOCK_STATUS_FIELD_NUMBER;
hash = (53 * hash) + lockStatus_;
@@ -3921,7 +3921,7 @@ public final class LockServiceProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasLockType()) {
hash = (37 * hash) + LOCK_TYPE_FIELD_NUMBER;
hash = (53 * hash) + lockType_;
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MapReduceProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MapReduceProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MapReduceProtos.java
index 09605a2..cc06b3b 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MapReduceProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MapReduceProtos.java
@@ -212,7 +212,7 @@ public final class MapReduceProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getMetricsCount() > 0) {
hash = (37 * hash) + METRICS_FIELD_NUMBER;
hash = (53 * hash) + getMetricsList().hashCode();
@@ -1079,7 +1079,7 @@ public final class MapReduceProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (getLocationsCount() > 0) {
hash = (37 * hash) + LOCATIONS_FIELD_NUMBER;
hash = (53 * hash) + getLocationsList().hashCode();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MasterProcedureProtos.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MasterProcedureProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MasterProcedureProtos.java
index f4f6a8c..3f8a65b 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MasterProcedureProtos.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/MasterProcedureProtos.java
@@ -2548,7 +2548,7 @@ public final class MasterProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasUserInfo()) {
hash = (37 * hash) + USER_INFO_FIELD_NUMBER;
hash = (53 * hash) + getUserInfo().hashCode();
@@ -3755,7 +3755,7 @@ public final class MasterProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasUserInfo()) {
hash = (37 * hash) + USER_INFO_FIELD_NUMBER;
hash = (53 * hash) + getUserInfo().hashCode();
@@ -4950,7 +4950,7 @@ public final class MasterProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasUserInfo()) {
hash = (37 * hash) + USER_INFO_FIELD_NUMBER;
hash = (53 * hash) + getUserInfo().hashCode();
@@ -6326,7 +6326,7 @@ public final class MasterProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasUserInfo()) {
hash = (37 * hash) + USER_INFO_FIELD_NUMBER;
hash = (53 * hash) + getUserInfo().hashCode();
@@ -7355,7 +7355,7 @@ public final class MasterProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasNamespaceDescriptor()) {
hash = (37 * hash) + NAMESPACE_DESCRIPTOR_FIELD_NUMBER;
hash = (53 * hash) + getNamespaceDescriptor().hashCode();
@@ -8012,7 +8012,7 @@ public final class MasterProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasNamespaceDescriptor()) {
hash = (37 * hash) + NAMESPACE_DESCRIPTOR_FIELD_NUMBER;
hash = (53 * hash) + getNamespaceDescriptor().hashCode();
@@ -8825,7 +8825,7 @@ public final class MasterProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasNamespaceName()) {
hash = (37 * hash) + NAMESPACE_NAME_FIELD_NUMBER;
hash = (53 * hash) + getNamespaceName().hashCode();
@@ -9709,7 +9709,7 @@ public final class MasterProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasUserInfo()) {
hash = (37 * hash) + USER_INFO_FIELD_NUMBER;
hash = (53 * hash) + getUserInfo().hashCode();
@@ -10937,7 +10937,7 @@ public final class MasterProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasUserInfo()) {
hash = (37 * hash) + USER_INFO_FIELD_NUMBER;
hash = (53 * hash) + getUserInfo().hashCode();
@@ -12144,7 +12144,7 @@ public final class MasterProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasUserInfo()) {
hash = (37 * hash) + USER_INFO_FIELD_NUMBER;
hash = (53 * hash) + getUserInfo().hashCode();
@@ -13191,7 +13191,7 @@ public final class MasterProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasUserInfo()) {
hash = (37 * hash) + USER_INFO_FIELD_NUMBER;
hash = (53 * hash) + getUserInfo().hashCode();
@@ -14091,7 +14091,7 @@ public final class MasterProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasUserInfo()) {
hash = (37 * hash) + USER_INFO_FIELD_NUMBER;
hash = (53 * hash) + getUserInfo().hashCode();
@@ -15045,7 +15045,7 @@ public final class MasterProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasParentRegionName()) {
hash = (37 * hash) + PARENT_REGION_NAME_FIELD_NUMBER;
hash = (53 * hash) + getParentRegionName().hashCode();
@@ -16081,7 +16081,7 @@ public final class MasterProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasUserInfo()) {
hash = (37 * hash) + USER_INFO_FIELD_NUMBER;
hash = (53 * hash) + getUserInfo().hashCode();
@@ -18029,7 +18029,7 @@ public final class MasterProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasUserInfo()) {
hash = (37 * hash) + USER_INFO_FIELD_NUMBER;
hash = (53 * hash) + getUserInfo().hashCode();
@@ -20273,7 +20273,7 @@ public final class MasterProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasUserInfo()) {
hash = (37 * hash) + USER_INFO_FIELD_NUMBER;
hash = (53 * hash) + getUserInfo().hashCode();
@@ -21502,7 +21502,7 @@ public final class MasterProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasUserInfo()) {
hash = (37 * hash) + USER_INFO_FIELD_NUMBER;
hash = (53 * hash) + getUserInfo().hashCode();
@@ -22831,7 +22831,7 @@ public final class MasterProcedureProtos {
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
if (hasServerName()) {
hash = (37 * hash) + SERVER_NAME_FIELD_NUMBER;
hash = (53 * hash) + getServerName().hashCode();
[7/7] hbase git commit: HBASE-16780 Since move to protobuf3.1, Cells
are limited to 64MB where previous they had no limit Update internal pb to
3.2 from 3.1.; AMENDMENT -- FORGOT TO REBUILD PBs
Posted by st...@apache.org.
HBASE-16780 Since move to protobuf3.1, Cells are limited to 64MB where previous they had no limit Update internal pb to 3.2 from 3.1.; AMENDMENT -- FORGOT TO REBUILD PBs
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/e916b79d
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/e916b79d
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/e916b79d
Branch: refs/heads/master
Commit: e916b79db58bb9be806a833b2c0e675f1136c15a
Parents: 73e1bcd
Author: Michael Stack <st...@apache.org>
Authored: Mon Apr 3 15:26:11 2017 -0700
Committer: Michael Stack <st...@apache.org>
Committed: Mon Apr 3 15:26:11 2017 -0700
----------------------------------------------------------------------
.../google/protobuf/AbstractMessageLite.java | 1 -
.../com/google/protobuf/AbstractParser.java | 2 +-
.../hbase/shaded/com/google/protobuf/Any.java | 26 +-
.../com/google/protobuf/AnyOrBuilder.java | 6 +-
.../hbase/shaded/com/google/protobuf/Api.java | 68 +-
.../com/google/protobuf/ApiOrBuilder.java | 18 +-
.../shaded/com/google/protobuf/ApiProto.java | 7 +-
.../shaded/com/google/protobuf/BoolValue.java | 10 +-
.../com/google/protobuf/BoolValueOrBuilder.java | 2 +-
.../com/google/protobuf/ByteBufferWriter.java | 50 +-
.../shaded/com/google/protobuf/ByteString.java | 18 +-
.../shaded/com/google/protobuf/BytesValue.java | 10 +-
.../google/protobuf/BytesValueOrBuilder.java | 2 +-
.../com/google/protobuf/CodedInputStream.java | 7 +-
.../com/google/protobuf/DescriptorProtos.java | 701 +++++++++--
.../shaded/com/google/protobuf/Descriptors.java | 2 +-
.../shaded/com/google/protobuf/DoubleValue.java | 10 +-
.../google/protobuf/DoubleValueOrBuilder.java | 2 +-
.../shaded/com/google/protobuf/Duration.java | 18 +-
.../com/google/protobuf/DurationOrBuilder.java | 4 +-
.../com/google/protobuf/DynamicMessage.java | 2 +-
.../hbase/shaded/com/google/protobuf/Empty.java | 2 +-
.../hbase/shaded/com/google/protobuf/Enum.java | 54 +-
.../com/google/protobuf/EnumOrBuilder.java | 14 +-
.../shaded/com/google/protobuf/EnumValue.java | 24 +-
.../com/google/protobuf/EnumValueOrBuilder.java | 6 +-
.../com/google/protobuf/ExtensionRegistry.java | 1 -
.../google/protobuf/ExtensionRegistryLite.java | 7 +-
.../hbase/shaded/com/google/protobuf/Field.java | 110 +-
.../shaded/com/google/protobuf/FieldMask.java | 2 +-
.../com/google/protobuf/FieldMaskProto.java | 7 +-
.../com/google/protobuf/FieldOrBuilder.java | 30 +-
.../shaded/com/google/protobuf/FieldSet.java | 1 +
.../shaded/com/google/protobuf/FloatValue.java | 10 +-
.../google/protobuf/FloatValueOrBuilder.java | 2 +-
.../google/protobuf/GeneratedMessageLite.java | 163 ++-
.../com/google/protobuf/GeneratedMessageV3.java | 26 +-
.../shaded/com/google/protobuf/Int32Value.java | 10 +-
.../google/protobuf/Int32ValueOrBuilder.java | 2 +-
.../shaded/com/google/protobuf/Int64Value.java | 10 +-
.../google/protobuf/Int64ValueOrBuilder.java | 2 +-
.../com/google/protobuf/LazyFieldLite.java | 25 +-
.../shaded/com/google/protobuf/ListValue.java | 2 +-
.../shaded/com/google/protobuf/MapEntry.java | 2 +-
.../com/google/protobuf/MapFieldLite.java | 4 +-
.../google/protobuf/MessageLiteToString.java | 4 +-
.../shaded/com/google/protobuf/Method.java | 74 +-
.../com/google/protobuf/MethodOrBuilder.java | 20 +-
.../hbase/shaded/com/google/protobuf/Mixin.java | 30 +-
.../com/google/protobuf/MixinOrBuilder.java | 8 +-
.../shaded/com/google/protobuf/NullValue.java | 3 +-
.../shaded/com/google/protobuf/Option.java | 135 +-
.../com/google/protobuf/OptionOrBuilder.java | 35 +-
.../com/google/protobuf/SmallSortedMap.java | 21 +-
.../com/google/protobuf/SourceContext.java | 16 +-
.../google/protobuf/SourceContextOrBuilder.java | 4 +-
.../com/google/protobuf/SourceContextProto.java | 8 +-
.../shaded/com/google/protobuf/StringValue.java | 16 +-
.../google/protobuf/StringValueOrBuilder.java | 4 +-
.../shaded/com/google/protobuf/Struct.java | 14 +-
.../shaded/com/google/protobuf/Syntax.java | 3 +-
.../shaded/com/google/protobuf/Timestamp.java | 18 +-
.../com/google/protobuf/TimestampOrBuilder.java | 4 +-
.../hbase/shaded/com/google/protobuf/Type.java | 54 +-
.../com/google/protobuf/TypeOrBuilder.java | 14 +-
.../shaded/com/google/protobuf/TypeProto.java | 7 +-
.../shaded/com/google/protobuf/UInt32Value.java | 10 +-
.../google/protobuf/UInt32ValueOrBuilder.java | 2 +-
.../shaded/com/google/protobuf/UInt64Value.java | 10 +-
.../google/protobuf/UInt64ValueOrBuilder.java | 2 +-
.../com/google/protobuf/UnknownFieldSet.java | 35 +-
.../google/protobuf/UnknownFieldSetLite.java | 62 +-
.../hbase/shaded/com/google/protobuf/Value.java | 86 +-
.../com/google/protobuf/ValueOrBuilder.java | 20 +-
.../google/protobuf/compiler/PluginProtos.java | 1178 +++++++++++++++++-
.../protobuf/generated/TestProcedureProtos.java | 2 +-
.../ipc/protobuf/generated/TestProtos.java | 12 +-
.../shaded/protobuf/generated/AdminProtos.java | 76 +-
.../shaded/protobuf/generated/BackupProtos.java | 10 +-
.../shaded/protobuf/generated/CellProtos.java | 4 +-
.../shaded/protobuf/generated/ClientProtos.java | 72 +-
.../protobuf/generated/ClusterIdProtos.java | 2 +-
.../protobuf/generated/ClusterStatusProtos.java | 20 +-
.../protobuf/generated/ComparatorProtos.java | 18 +-
.../protobuf/generated/EncryptionProtos.java | 2 +-
.../protobuf/generated/ErrorHandlingProtos.java | 6 +-
.../shaded/protobuf/generated/FSProtos.java | 4 +-
.../shaded/protobuf/generated/FilterProtos.java | 60 +-
.../shaded/protobuf/generated/HBaseProtos.java | 50 +-
.../shaded/protobuf/generated/HFileProtos.java | 4 +-
.../protobuf/generated/LoadBalancerProtos.java | 2 +-
.../protobuf/generated/LockServiceProtos.java | 10 +-
.../protobuf/generated/MapReduceProtos.java | 4 +-
.../generated/MasterProcedureProtos.java | 36 +-
.../shaded/protobuf/generated/MasterProtos.java | 246 ++--
.../protobuf/generated/ProcedureProtos.java | 16 +-
.../shaded/protobuf/generated/QuotaProtos.java | 10 +-
.../shaded/protobuf/generated/RPCProtos.java | 16 +-
.../generated/RegionNormalizerProtos.java | 2 +-
.../generated/RegionServerStatusProtos.java | 26 +-
.../protobuf/generated/ReplicationProtos.java | 38 +-
.../protobuf/generated/SnapshotProtos.java | 10 +-
.../protobuf/generated/TracingProtos.java | 2 +-
.../shaded/protobuf/generated/WALProtos.java | 20 +-
.../protobuf/generated/ZooKeeperProtos.java | 12 +-
105 files changed, 3043 insertions(+), 1128 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/AbstractMessageLite.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/AbstractMessageLite.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/AbstractMessageLite.java
index c294f10..e5b87f0 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/AbstractMessageLite.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/AbstractMessageLite.java
@@ -48,7 +48,6 @@ public abstract class AbstractMessageLite<
BuilderType extends AbstractMessageLite.Builder<MessageType, BuilderType>>
implements MessageLite {
protected int memoizedHashCode = 0;
-
@Override
public ByteString toByteString() {
try {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/AbstractParser.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/AbstractParser.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/AbstractParser.java
index 42924cd..5fe6a22 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/AbstractParser.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/AbstractParser.java
@@ -232,7 +232,7 @@ public abstract class AbstractParser<MessageType extends MessageLite>
}
size = CodedInputStream.readRawVarint32(firstByte, input);
} catch (IOException e) {
- throw new InvalidProtocolBufferException(e.getMessage());
+ throw new InvalidProtocolBufferException(e);
}
InputStream limitedInput = new LimitedInputStream(input, size);
return parsePartialFrom(limitedInput, extensionRegistry);
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Any.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Any.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Any.java
index eba424a..bf8e852 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Any.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Any.java
@@ -160,7 +160,7 @@ public final class Any extends
}
/**
- * Packs a message uisng the given type URL prefix. The type URL will
+ * Packs a message using the given type URL prefix. The type URL will
* be constructed by concatenating the message type's full name to the
* prefix with an optional "/" separator if the prefix doesn't end
* with "/" already.
@@ -225,7 +225,7 @@ public final class Any extends
* used with implementation specific semantics.
* </pre>
*
- * <code>optional string type_url = 1;</code>
+ * <code>string type_url = 1;</code>
*/
public java.lang.String getTypeUrl() {
java.lang.Object ref = typeUrl_;
@@ -261,7 +261,7 @@ public final class Any extends
* used with implementation specific semantics.
* </pre>
*
- * <code>optional string type_url = 1;</code>
+ * <code>string type_url = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getTypeUrlBytes() {
@@ -284,7 +284,7 @@ public final class Any extends
* Must be a valid serialized protocol buffer of the above specified type.
* </pre>
*
- * <code>optional bytes value = 2;</code>
+ * <code>bytes value = 2;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString getValue() {
return value_;
@@ -351,7 +351,7 @@ public final class Any extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + TYPE_URL_FIELD_NUMBER;
hash = (53 * hash) + getTypeUrl().hashCode();
hash = (37 * hash) + VALUE_FIELD_NUMBER;
@@ -657,7 +657,7 @@ public final class Any extends
* used with implementation specific semantics.
* </pre>
*
- * <code>optional string type_url = 1;</code>
+ * <code>string type_url = 1;</code>
*/
public java.lang.String getTypeUrl() {
java.lang.Object ref = typeUrl_;
@@ -693,7 +693,7 @@ public final class Any extends
* used with implementation specific semantics.
* </pre>
*
- * <code>optional string type_url = 1;</code>
+ * <code>string type_url = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getTypeUrlBytes() {
@@ -730,7 +730,7 @@ public final class Any extends
* used with implementation specific semantics.
* </pre>
*
- * <code>optional string type_url = 1;</code>
+ * <code>string type_url = 1;</code>
*/
public Builder setTypeUrl(
java.lang.String value) {
@@ -764,7 +764,7 @@ public final class Any extends
* used with implementation specific semantics.
* </pre>
*
- * <code>optional string type_url = 1;</code>
+ * <code>string type_url = 1;</code>
*/
public Builder clearTypeUrl() {
@@ -794,7 +794,7 @@ public final class Any extends
* used with implementation specific semantics.
* </pre>
*
- * <code>optional string type_url = 1;</code>
+ * <code>string type_url = 1;</code>
*/
public Builder setTypeUrlBytes(
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
@@ -814,7 +814,7 @@ public final class Any extends
* Must be a valid serialized protocol buffer of the above specified type.
* </pre>
*
- * <code>optional bytes value = 2;</code>
+ * <code>bytes value = 2;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString getValue() {
return value_;
@@ -824,7 +824,7 @@ public final class Any extends
* Must be a valid serialized protocol buffer of the above specified type.
* </pre>
*
- * <code>optional bytes value = 2;</code>
+ * <code>bytes value = 2;</code>
*/
public Builder setValue(org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
if (value == null) {
@@ -840,7 +840,7 @@ public final class Any extends
* Must be a valid serialized protocol buffer of the above specified type.
* </pre>
*
- * <code>optional bytes value = 2;</code>
+ * <code>bytes value = 2;</code>
*/
public Builder clearValue() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/AnyOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/AnyOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/AnyOrBuilder.java
index f22f47a..80981c8 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/AnyOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/AnyOrBuilder.java
@@ -29,7 +29,7 @@ public interface AnyOrBuilder extends
* used with implementation specific semantics.
* </pre>
*
- * <code>optional string type_url = 1;</code>
+ * <code>string type_url = 1;</code>
*/
java.lang.String getTypeUrl();
/**
@@ -54,7 +54,7 @@ public interface AnyOrBuilder extends
* used with implementation specific semantics.
* </pre>
*
- * <code>optional string type_url = 1;</code>
+ * <code>string type_url = 1;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getTypeUrlBytes();
@@ -64,7 +64,7 @@ public interface AnyOrBuilder extends
* Must be a valid serialized protocol buffer of the above specified type.
* </pre>
*
- * <code>optional bytes value = 2;</code>
+ * <code>bytes value = 2;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString getValue();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Api.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Api.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Api.java
index ea15b40..3265158 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Api.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/Api.java
@@ -151,7 +151,7 @@ public final class Api extends
* followed by the api's simple name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public java.lang.String getName() {
java.lang.Object ref = name_;
@@ -171,7 +171,7 @@ public final class Api extends
* followed by the api's simple name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes() {
@@ -321,7 +321,7 @@ public final class Api extends
* experimental, none-GA apis.
* </pre>
*
- * <code>optional string version = 4;</code>
+ * <code>string version = 4;</code>
*/
public java.lang.String getVersion() {
java.lang.Object ref = version_;
@@ -357,7 +357,7 @@ public final class Api extends
* experimental, none-GA apis.
* </pre>
*
- * <code>optional string version = 4;</code>
+ * <code>string version = 4;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getVersionBytes() {
@@ -381,7 +381,7 @@ public final class Api extends
* message.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
public boolean hasSourceContext() {
return sourceContext_ != null;
@@ -392,7 +392,7 @@ public final class Api extends
* message.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext getSourceContext() {
return sourceContext_ == null ? org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext.getDefaultInstance() : sourceContext_;
@@ -403,7 +403,7 @@ public final class Api extends
* message.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContextOrBuilder getSourceContextOrBuilder() {
return getSourceContext();
@@ -471,7 +471,7 @@ public final class Api extends
* The source syntax of the service.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 7;</code>
+ * <code>.google.protobuf.Syntax syntax = 7;</code>
*/
public int getSyntaxValue() {
return syntax_;
@@ -481,7 +481,7 @@ public final class Api extends
* The source syntax of the service.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 7;</code>
+ * <code>.google.protobuf.Syntax syntax = 7;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax getSyntax() {
org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax result = org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax.valueOf(syntax_);
@@ -595,7 +595,7 @@ public final class Api extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + NAME_FIELD_NUMBER;
hash = (53 * hash) + getName().hashCode();
if (getMethodsCount() > 0) {
@@ -1000,7 +1000,7 @@ public final class Api extends
* followed by the api's simple name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public java.lang.String getName() {
java.lang.Object ref = name_;
@@ -1020,7 +1020,7 @@ public final class Api extends
* followed by the api's simple name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes() {
@@ -1041,7 +1041,7 @@ public final class Api extends
* followed by the api's simple name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public Builder setName(
java.lang.String value) {
@@ -1059,7 +1059,7 @@ public final class Api extends
* followed by the api's simple name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public Builder clearName() {
@@ -1073,7 +1073,7 @@ public final class Api extends
* followed by the api's simple name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
public Builder setNameBytes(
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
@@ -1734,7 +1734,7 @@ public final class Api extends
* experimental, none-GA apis.
* </pre>
*
- * <code>optional string version = 4;</code>
+ * <code>string version = 4;</code>
*/
public java.lang.String getVersion() {
java.lang.Object ref = version_;
@@ -1770,7 +1770,7 @@ public final class Api extends
* experimental, none-GA apis.
* </pre>
*
- * <code>optional string version = 4;</code>
+ * <code>string version = 4;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getVersionBytes() {
@@ -1807,7 +1807,7 @@ public final class Api extends
* experimental, none-GA apis.
* </pre>
*
- * <code>optional string version = 4;</code>
+ * <code>string version = 4;</code>
*/
public Builder setVersion(
java.lang.String value) {
@@ -1841,7 +1841,7 @@ public final class Api extends
* experimental, none-GA apis.
* </pre>
*
- * <code>optional string version = 4;</code>
+ * <code>string version = 4;</code>
*/
public Builder clearVersion() {
@@ -1871,7 +1871,7 @@ public final class Api extends
* experimental, none-GA apis.
* </pre>
*
- * <code>optional string version = 4;</code>
+ * <code>string version = 4;</code>
*/
public Builder setVersionBytes(
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
@@ -1894,7 +1894,7 @@ public final class Api extends
* message.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
public boolean hasSourceContext() {
return sourceContextBuilder_ != null || sourceContext_ != null;
@@ -1905,7 +1905,7 @@ public final class Api extends
* message.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext getSourceContext() {
if (sourceContextBuilder_ == null) {
@@ -1920,7 +1920,7 @@ public final class Api extends
* message.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
public Builder setSourceContext(org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext value) {
if (sourceContextBuilder_ == null) {
@@ -1941,7 +1941,7 @@ public final class Api extends
* message.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
public Builder setSourceContext(
org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext.Builder builderForValue) {
@@ -1960,7 +1960,7 @@ public final class Api extends
* message.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
public Builder mergeSourceContext(org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext value) {
if (sourceContextBuilder_ == null) {
@@ -1983,7 +1983,7 @@ public final class Api extends
* message.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
public Builder clearSourceContext() {
if (sourceContextBuilder_ == null) {
@@ -2002,7 +2002,7 @@ public final class Api extends
* message.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext.Builder getSourceContextBuilder() {
@@ -2015,7 +2015,7 @@ public final class Api extends
* message.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContextOrBuilder getSourceContextOrBuilder() {
if (sourceContextBuilder_ != null) {
@@ -2031,7 +2031,7 @@ public final class Api extends
* message.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
private org.apache.hadoop.hbase.shaded.com.google.protobuf.SingleFieldBuilderV3<
org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext, org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext.Builder, org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContextOrBuilder>
@@ -2365,7 +2365,7 @@ public final class Api extends
* The source syntax of the service.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 7;</code>
+ * <code>.google.protobuf.Syntax syntax = 7;</code>
*/
public int getSyntaxValue() {
return syntax_;
@@ -2375,7 +2375,7 @@ public final class Api extends
* The source syntax of the service.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 7;</code>
+ * <code>.google.protobuf.Syntax syntax = 7;</code>
*/
public Builder setSyntaxValue(int value) {
syntax_ = value;
@@ -2387,7 +2387,7 @@ public final class Api extends
* The source syntax of the service.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 7;</code>
+ * <code>.google.protobuf.Syntax syntax = 7;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax getSyntax() {
org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax result = org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax.valueOf(syntax_);
@@ -2398,7 +2398,7 @@ public final class Api extends
* The source syntax of the service.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 7;</code>
+ * <code>.google.protobuf.Syntax syntax = 7;</code>
*/
public Builder setSyntax(org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax value) {
if (value == null) {
@@ -2414,7 +2414,7 @@ public final class Api extends
* The source syntax of the service.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 7;</code>
+ * <code>.google.protobuf.Syntax syntax = 7;</code>
*/
public Builder clearSyntax() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ApiOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ApiOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ApiOrBuilder.java
index 5aea779..b8b7030 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ApiOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ApiOrBuilder.java
@@ -13,7 +13,7 @@ public interface ApiOrBuilder extends
* followed by the api's simple name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
java.lang.String getName();
/**
@@ -22,7 +22,7 @@ public interface ApiOrBuilder extends
* followed by the api's simple name.
* </pre>
*
- * <code>optional string name = 1;</code>
+ * <code>string name = 1;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getNameBytes();
@@ -137,7 +137,7 @@ public interface ApiOrBuilder extends
* experimental, none-GA apis.
* </pre>
*
- * <code>optional string version = 4;</code>
+ * <code>string version = 4;</code>
*/
java.lang.String getVersion();
/**
@@ -162,7 +162,7 @@ public interface ApiOrBuilder extends
* experimental, none-GA apis.
* </pre>
*
- * <code>optional string version = 4;</code>
+ * <code>string version = 4;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString
getVersionBytes();
@@ -173,7 +173,7 @@ public interface ApiOrBuilder extends
* message.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
boolean hasSourceContext();
/**
@@ -182,7 +182,7 @@ public interface ApiOrBuilder extends
* message.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContext getSourceContext();
/**
@@ -191,7 +191,7 @@ public interface ApiOrBuilder extends
* message.
* </pre>
*
- * <code>optional .google.protobuf.SourceContext source_context = 5;</code>
+ * <code>.google.protobuf.SourceContext source_context = 5;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.SourceContextOrBuilder getSourceContextOrBuilder();
@@ -244,7 +244,7 @@ public interface ApiOrBuilder extends
* The source syntax of the service.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 7;</code>
+ * <code>.google.protobuf.Syntax syntax = 7;</code>
*/
int getSyntaxValue();
/**
@@ -252,7 +252,7 @@ public interface ApiOrBuilder extends
* The source syntax of the service.
* </pre>
*
- * <code>optional .google.protobuf.Syntax syntax = 7;</code>
+ * <code>.google.protobuf.Syntax syntax = 7;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.Syntax getSyntax();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ApiProto.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ApiProto.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ApiProto.java
index 4eb312a..817e07d 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ApiProto.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ApiProto.java
@@ -53,9 +53,10 @@ public final class ApiProto {
"esponse_streaming\030\005 \001(\010\022(\n\007options\030\006 \003(\013" +
"2\027.google.protobuf.Option\022\'\n\006syntax\030\007 \001(" +
"\0162\027.google.protobuf.Syntax\"#\n\005Mixin\022\014\n\004n" +
- "ame\030\001 \001(\t\022\014\n\004root\030\002 \001(\tBH\n\023com.google.pr" +
- "otobufB\010ApiProtoP\001\242\002\003GPB\252\002\036Google.Protob" +
- "uf.WellKnownTypesb\006proto3"
+ "ame\030\001 \001(\t\022\014\n\004root\030\002 \001(\tBu\n\023com.google.pr" +
+ "otobufB\010ApiProtoP\001Z+google.golang.org/ge" +
+ "nproto/protobuf/api;api\242\002\003GPB\252\002\036Google.P" +
+ "rotobuf.WellKnownTypesb\006proto3"
};
org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new org.apache.hadoop.hbase.shaded.com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/BoolValue.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/BoolValue.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/BoolValue.java
index 6e9895f..a2dbe4a 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/BoolValue.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/BoolValue.java
@@ -83,7 +83,7 @@ public final class BoolValue extends
* The bool value.
* </pre>
*
- * <code>optional bool value = 1;</code>
+ * <code>bool value = 1;</code>
*/
public boolean getValue() {
return value_;
@@ -142,7 +142,7 @@ public final class BoolValue extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + VALUE_FIELD_NUMBER;
hash = (53 * hash) + org.apache.hadoop.hbase.shaded.com.google.protobuf.Internal.hashBoolean(
getValue());
@@ -370,7 +370,7 @@ public final class BoolValue extends
* The bool value.
* </pre>
*
- * <code>optional bool value = 1;</code>
+ * <code>bool value = 1;</code>
*/
public boolean getValue() {
return value_;
@@ -380,7 +380,7 @@ public final class BoolValue extends
* The bool value.
* </pre>
*
- * <code>optional bool value = 1;</code>
+ * <code>bool value = 1;</code>
*/
public Builder setValue(boolean value) {
@@ -393,7 +393,7 @@ public final class BoolValue extends
* The bool value.
* </pre>
*
- * <code>optional bool value = 1;</code>
+ * <code>bool value = 1;</code>
*/
public Builder clearValue() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/BoolValueOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/BoolValueOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/BoolValueOrBuilder.java
index e1d4e75..c1d3b5f 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/BoolValueOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/BoolValueOrBuilder.java
@@ -12,7 +12,7 @@ public interface BoolValueOrBuilder extends
* The bool value.
* </pre>
*
- * <code>optional bool value = 1;</code>
+ * <code>bool value = 1;</code>
*/
boolean getValue();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ByteBufferWriter.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ByteBufferWriter.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ByteBufferWriter.java
index 906c216..553243a 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ByteBufferWriter.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ByteBufferWriter.java
@@ -33,11 +33,12 @@ package org.apache.hadoop.hbase.shaded.com.google.protobuf;
import static java.lang.Math.max;
import static java.lang.Math.min;
-import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.lang.ref.SoftReference;
+import java.lang.reflect.Field;
import java.nio.ByteBuffer;
+import java.nio.channels.WritableByteChannel;
/**
* Utility class to provide efficient writing of {@link ByteBuffer}s to {@link OutputStream}s.
@@ -75,6 +76,12 @@ final class ByteBufferWriter {
new ThreadLocal<SoftReference<byte[]>>();
/**
+ * This is a hack for GAE, where {@code FileOutputStream} is unavailable.
+ */
+ private static final Class<?> FILE_OUTPUT_STREAM_CLASS = safeGetClass("java.io.FileOutputStream");
+ private static final long CHANNEL_FIELD_OFFSET = getChannelFieldOffset(FILE_OUTPUT_STREAM_CLASS);
+
+ /**
* For testing purposes only. Clears the cached buffer to force a new allocation on the next
* invocation.
*/
@@ -93,10 +100,7 @@ final class ByteBufferWriter {
// Optimized write for array-backed buffers.
// Note that we're taking the risk that a malicious OutputStream could modify the array.
output.write(buffer.array(), buffer.arrayOffset() + buffer.position(), buffer.remaining());
- } else if (output instanceof FileOutputStream) {
- // Use a channel to write out the ByteBuffer. This will automatically empty the buffer.
- ((FileOutputStream) output).getChannel().write(buffer);
- } else {
+ } else if (!writeToChannel(buffer, output)){
// Read all of the data from the buffer to an array.
// TODO(nathanmittler): Consider performance improvements for other "known" stream types.
final byte[] array = getOrCreateBuffer(buffer.remaining());
@@ -142,4 +146,40 @@ final class ByteBufferWriter {
private static void setBuffer(byte[] value) {
BUFFER.set(new SoftReference<byte[]>(value));
}
+
+ private static boolean writeToChannel(ByteBuffer buffer, OutputStream output) throws IOException {
+ if (CHANNEL_FIELD_OFFSET >= 0 && FILE_OUTPUT_STREAM_CLASS.isInstance(output)) {
+ // Use a channel to write out the ByteBuffer. This will automatically empty the buffer.
+ WritableByteChannel channel = null;
+ try {
+ channel = (WritableByteChannel) UnsafeUtil.getObject(output, CHANNEL_FIELD_OFFSET);
+ } catch (ClassCastException e) {
+ // Absorb.
+ }
+ if (channel != null) {
+ channel.write(buffer);
+ return true;
+ }
+ }
+ return false;
+ }
+
+ private static Class<?> safeGetClass(String className) {
+ try {
+ return Class.forName(className);
+ } catch (ClassNotFoundException e) {
+ return null;
+ }
+ }
+ private static long getChannelFieldOffset(Class<?> clazz) {
+ try {
+ if (clazz != null && UnsafeUtil.hasUnsafeArrayOperations()) {
+ Field field = clazz.getDeclaredField("channel");
+ return UnsafeUtil.objectFieldOffset(field);
+ }
+ } catch (Throwable e) {
+ // Absorb
+ }
+ return -1;
+ }
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ByteString.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ByteString.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ByteString.java
index ebfa7fa..f673ee3 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ByteString.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/ByteString.java
@@ -51,14 +51,12 @@ import java.util.List;
import java.util.NoSuchElementException;
/**
- * Immutable sequence of bytes. Substring is supported by sharing the reference
- * to the immutable underlying bytes. Concatenation is likewise supported
- * without copying (long strings) by building a tree of pieces in
- * {@link RopeByteString}.
- * <p>
- * Like {@link String}, the contents of a {@link ByteString} can never be
- * observed to change, not even in the presence of a data race or incorrect
- * API usage in the client code.
+ * Immutable sequence of bytes. Substring is supported by sharing the reference to the immutable
+ * underlying bytes. Concatenation is likewise supported without copying (long strings) by building
+ * a tree of pieces in {@link RopeByteString}.
+ *
+ * <p>Like {@link String}, the contents of a {@link ByteString} can never be observed to change, not
+ * even in the presence of a data race or incorrect API usage in the client code.
*
* @author crazybob@google.com Bob Lee
* @author kenton@google.com Kenton Varda
@@ -572,7 +570,9 @@ public abstract class ByteString implements Iterable<Byte>, Serializable {
// Create a balanced concatenation of the next "length" elements from the
// iterable.
private static ByteString balancedConcat(Iterator<ByteString> iterator, int length) {
- assert length >= 1;
+ if (length < 1) {
+ throw new IllegalArgumentException(String.format("length (%s) must be >= 1", length));
+ }
ByteString result;
if (length == 1) {
result = iterator.next();
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/BytesValue.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/BytesValue.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/BytesValue.java
index 4349b0d..ecfbcc1 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/BytesValue.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/BytesValue.java
@@ -83,7 +83,7 @@ public final class BytesValue extends
* The bytes value.
* </pre>
*
- * <code>optional bytes value = 1;</code>
+ * <code>bytes value = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString getValue() {
return value_;
@@ -142,7 +142,7 @@ public final class BytesValue extends
return memoizedHashCode;
}
int hash = 41;
- hash = (19 * hash) + getDescriptorForType().hashCode();
+ hash = (19 * hash) + getDescriptor().hashCode();
hash = (37 * hash) + VALUE_FIELD_NUMBER;
hash = (53 * hash) + getValue().hashCode();
hash = (29 * hash) + unknownFields.hashCode();
@@ -369,7 +369,7 @@ public final class BytesValue extends
* The bytes value.
* </pre>
*
- * <code>optional bytes value = 1;</code>
+ * <code>bytes value = 1;</code>
*/
public org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString getValue() {
return value_;
@@ -379,7 +379,7 @@ public final class BytesValue extends
* The bytes value.
* </pre>
*
- * <code>optional bytes value = 1;</code>
+ * <code>bytes value = 1;</code>
*/
public Builder setValue(org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString value) {
if (value == null) {
@@ -395,7 +395,7 @@ public final class BytesValue extends
* The bytes value.
* </pre>
*
- * <code>optional bytes value = 1;</code>
+ * <code>bytes value = 1;</code>
*/
public Builder clearValue() {
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/BytesValueOrBuilder.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/BytesValueOrBuilder.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/BytesValueOrBuilder.java
index 9511406..3f90289 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/BytesValueOrBuilder.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/BytesValueOrBuilder.java
@@ -12,7 +12,7 @@ public interface BytesValueOrBuilder extends
* The bytes value.
* </pre>
*
- * <code>optional bytes value = 1;</code>
+ * <code>bytes value = 1;</code>
*/
org.apache.hadoop.hbase.shaded.com.google.protobuf.ByteString getValue();
}
http://git-wip-us.apache.org/repos/asf/hbase/blob/e916b79d/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/CodedInputStream.java
----------------------------------------------------------------------
diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/CodedInputStream.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/CodedInputStream.java
index 0bff626..23cc1a4 100644
--- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/CodedInputStream.java
+++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/com/google/protobuf/CodedInputStream.java
@@ -60,7 +60,8 @@ import java.util.List;
public abstract class CodedInputStream {
private static final int DEFAULT_BUFFER_SIZE = 4096;
private static final int DEFAULT_RECURSION_LIMIT = 100;
- private static final int DEFAULT_SIZE_LIMIT = 64 << 20; // 64MB
+ // Integer.MAX_VALUE == 0x7FFFFFF == INT_MAX from limits.h
+ private static final int DEFAULT_SIZE_LIMIT = Integer.MAX_VALUE;
/** Visible for subclasses. See setRecursionLimit() */
int recursionDepth;
@@ -2767,9 +2768,9 @@ public abstract class CodedInputStream {
throw InvalidProtocolBufferException.negativeSize();
}
- // Verify that the message size so far has not exceeded sizeLimit.
+ // Integer-overflow-conscious check that the message size so far has not exceeded sizeLimit.
int currentMessageSize = totalBytesRetired + pos + size;
- if (currentMessageSize > sizeLimit) {
+ if (currentMessageSize - sizeLimit > 0) {
throw InvalidProtocolBufferException.sizeLimitExceeded();
}