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/hbase-12439 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 crazy...@google.com Bob Lee * @author ken...@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(); }