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:06 UTC
[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
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();