HBASE-16567 Upgrade to protobuf-3.1.x Regenerate all protos in this module with protoc3. Redo ByteStringer to use new pb3.1.0 unsafebytesutil instead of HBaseZeroCopyByteString
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/b4a729ed Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/b4a729ed Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/b4a729ed Branch: refs/heads/HBASE-16264 Commit: b4a729ed027621a062c4a1ad9c50d81e6fdd8758 Parents: 17d4b70 Author: stack <st...@apache.org> Authored: Thu Sep 29 14:57:45 2016 -0700 Committer: stack <st...@apache.org> Committed: Thu Sep 29 14:57:45 2016 -0700 ---------------------------------------------------------------------- hbase-protocol-shaded/pom.xml | 8 +- .../protobuf/HBaseZeroCopyByteString.java | 77 - .../protobuf/generated/TestProcedureProtos.java | 290 +- .../ipc/protobuf/generated/TestProtos.java | 1417 +- .../generated/TestRpcServiceProtos.java | 27 +- .../shaded/protobuf/generated/AdminProtos.java | 9459 +++--- .../shaded/protobuf/generated/CellProtos.java | 657 +- .../shaded/protobuf/generated/ClientProtos.java | 11869 +++---- .../protobuf/generated/ClusterIdProtos.java | 322 +- .../protobuf/generated/ClusterStatusProtos.java | 4554 +-- .../protobuf/generated/ComparatorProtos.java | 2338 +- .../protobuf/generated/EncryptionProtos.java | 288 +- .../protobuf/generated/ErrorHandlingProtos.java | 908 +- .../shaded/protobuf/generated/FSProtos.java | 568 +- .../shaded/protobuf/generated/FilterProtos.java | 7403 +++-- .../shaded/protobuf/generated/HBaseProtos.java | 7025 +++-- .../shaded/protobuf/generated/HFileProtos.java | 602 +- .../protobuf/generated/LoadBalancerProtos.java | 249 +- .../protobuf/generated/MapReduceProtos.java | 575 +- .../generated/MasterProcedureProtos.java | 6021 ++-- .../shaded/protobuf/generated/MasterProtos.java | 27544 ++++++++++------- .../protobuf/generated/ProcedureProtos.java | 2629 +- .../shaded/protobuf/generated/QuotaProtos.java | 1597 +- .../shaded/protobuf/generated/RPCProtos.java | 2423 +- .../generated/RegionNormalizerProtos.java | 249 +- .../generated/RegionServerStatusProtos.java | 3785 ++- .../protobuf/generated/SnapshotProtos.java | 1489 +- .../protobuf/generated/TracingProtos.java | 265 +- .../shaded/protobuf/generated/WALProtos.java | 3886 +-- .../protobuf/generated/ZooKeeperProtos.java | 3587 ++- .../hadoop/hbase/shaded/util/ByteStringer.java | 29 +- 31 files changed, 56460 insertions(+), 45680 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/b4a729ed/hbase-protocol-shaded/pom.xml ---------------------------------------------------------------------- diff --git a/hbase-protocol-shaded/pom.xml b/hbase-protocol-shaded/pom.xml index 46f5087..1bd0aa6 100644 --- a/hbase-protocol-shaded/pom.xml +++ b/hbase-protocol-shaded/pom.xml @@ -33,6 +33,9 @@ <properties> <maven.javadoc.skip>true</maven.javadoc.skip> + <!--Version of protobuf that hbase uses internally (we shade our pb) + --> + <internal.protobuf.version>3.1.0</internal.protobuf.version> </properties> <build> @@ -197,7 +200,7 @@ <dependency> <groupId>com.google.protobuf</groupId> <artifactId>protobuf-java</artifactId> - <version>2.5.0</version> + <version>${internal.protobuf.version}</version> </dependency> <dependency> <groupId>commons-logging</groupId> @@ -230,6 +233,9 @@ <plugin> <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-maven-plugins</artifactId> + <configuration> + <protocVersion>${internal.protobuf.version}</protocVersion> + </configuration> <executions> <execution> <id>compile-protoc</id> http://git-wip-us.apache.org/repos/asf/hbase/blob/b4a729ed/hbase-protocol-shaded/src/main/java/com/google/protobuf/HBaseZeroCopyByteString.java ---------------------------------------------------------------------- diff --git a/hbase-protocol-shaded/src/main/java/com/google/protobuf/HBaseZeroCopyByteString.java b/hbase-protocol-shaded/src/main/java/com/google/protobuf/HBaseZeroCopyByteString.java deleted file mode 100644 index 8be8ff4..0000000 --- a/hbase-protocol-shaded/src/main/java/com/google/protobuf/HBaseZeroCopyByteString.java +++ /dev/null @@ -1,77 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.google.protobuf; // This is a lie. - -/** - * Helper class to extract byte arrays from {@link ByteString} without copy. - * <p> - * Without this protobufs would force us to copy every single byte array out - * of the objects de-serialized from the wire (which already do one copy, on - * top of the copies the JVM does to go from kernel buffer to C buffer and - * from C buffer to JVM buffer). - * - * @since 0.96.1 - */ -// This will go away when we go to pb3.0.0. Meantime there are two instances of this class... one -// in this module and another over in hbase-protocol. They are different in that one is shaded and -// the other is not so could be problematic while the two versions exist! -public final class HBaseZeroCopyByteString extends LiteralByteString { - // Gotten from AsyncHBase code base with permission. - /** Private constructor so this class cannot be instantiated. */ - private HBaseZeroCopyByteString() { - super(null); - throw new UnsupportedOperationException("Should never be here."); - } - - /** - * Wraps a byte array in a {@link ByteString} without copying it. - * @param array array to be wrapped - * @return wrapped array - */ - public static ByteString wrap(final byte[] array) { - return new LiteralByteString(array); - } - - /** - * Wraps a subset of a byte array in a {@link ByteString} without copying it. - * @param array array to be wrapped - * @param offset from - * @param length length - * @return wrapped array - */ - public static ByteString wrap(final byte[] array, int offset, int length) { - return new BoundedByteString(array, offset, length); - } - - // TODO: - // ZeroCopyLiteralByteString.wrap(this.buf, 0, this.count); - - /** - * Extracts the byte array from the given {@link ByteString} without copy. - * @param buf A buffer from which to extract the array. This buffer must be - * actually an instance of a {@code LiteralByteString}. - * @return byte[] representation - */ - public static byte[] zeroCopyGetBytes(final ByteString buf) { - if (buf instanceof LiteralByteString) { - return ((LiteralByteString) buf).bytes; - } - throw new UnsupportedOperationException("Need a LiteralByteString, got a " - + buf.getClass().getName()); - } -} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/hbase/blob/b4a729ed/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/ipc/protobuf/generated/TestProcedureProtos.java ---------------------------------------------------------------------- diff --git a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/ipc/protobuf/generated/TestProcedureProtos.java b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/ipc/protobuf/generated/TestProcedureProtos.java index baf4e64..641bde3 100644 --- a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/ipc/protobuf/generated/TestProcedureProtos.java +++ b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/ipc/protobuf/generated/TestProcedureProtos.java @@ -6,12 +6,18 @@ package org.apache.hadoop.hbase.shaded.ipc.protobuf.generated; public final class TestProcedureProtos { private TestProcedureProtos() {} public static void registerAllExtensions( + com.google.protobuf.ExtensionRegistryLite registry) { + } + + public static void registerAllExtensions( com.google.protobuf.ExtensionRegistry registry) { + registerAllExtensions( + (com.google.protobuf.ExtensionRegistryLite) registry); } - public interface TestTableDDLStateDataOrBuilder - extends com.google.protobuf.MessageOrBuilder { + public interface TestTableDDLStateDataOrBuilder extends + // @@protoc_insertion_point(interface_extends:TestTableDDLStateData) + com.google.protobuf.MessageOrBuilder { - // required string table_name = 1; /** * <code>required string table_name = 1;</code> */ @@ -29,36 +35,28 @@ public final class TestProcedureProtos { /** * Protobuf type {@code TestTableDDLStateData} */ - public static final class TestTableDDLStateData extends - com.google.protobuf.GeneratedMessage - implements TestTableDDLStateDataOrBuilder { + public static final class TestTableDDLStateData extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:TestTableDDLStateData) + TestTableDDLStateDataOrBuilder { // Use TestTableDDLStateData.newBuilder() to construct. - private TestTableDDLStateData(com.google.protobuf.GeneratedMessage.Builder<?> builder) { + private TestTableDDLStateData(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) { super(builder); - this.unknownFields = builder.getUnknownFields(); - } - private TestTableDDLStateData(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } - - private static final TestTableDDLStateData defaultInstance; - public static TestTableDDLStateData getDefaultInstance() { - return defaultInstance; } - - public TestTableDDLStateData getDefaultInstanceForType() { - return defaultInstance; + private TestTableDDLStateData() { + tableName_ = ""; } - private final com.google.protobuf.UnknownFieldSet unknownFields; @java.lang.Override public final com.google.protobuf.UnknownFieldSet - getUnknownFields() { + getUnknownFields() { return this.unknownFields; } private TestTableDDLStateData( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws com.google.protobuf.InvalidProtocolBufferException { - initFields(); + this(); int mutable_bitField0_ = 0; com.google.protobuf.UnknownFieldSet.Builder unknownFields = com.google.protobuf.UnknownFieldSet.newBuilder(); @@ -78,8 +76,9 @@ public final class TestProcedureProtos { break; } case 10: { + com.google.protobuf.ByteString bs = input.readBytes(); bitField0_ |= 0x00000001; - tableName_ = input.readBytes(); + tableName_ = bs; break; } } @@ -88,7 +87,7 @@ public final class TestProcedureProtos { throw e.setUnfinishedMessage(this); } catch (java.io.IOException e) { throw new com.google.protobuf.InvalidProtocolBufferException( - e.getMessage()).setUnfinishedMessage(this); + e).setUnfinishedMessage(this); } finally { this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); @@ -99,32 +98,16 @@ public final class TestProcedureProtos { return org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.internal_static_TestTableDDLStateData_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.internal_static_TestTableDDLStateData_fieldAccessorTable .ensureFieldAccessorsInitialized( org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.TestTableDDLStateData.class, org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.TestTableDDLStateData.Builder.class); } - public static com.google.protobuf.Parser<TestTableDDLStateData> PARSER = - new com.google.protobuf.AbstractParser<TestTableDDLStateData>() { - public TestTableDDLStateData parsePartialFrom( - com.google.protobuf.CodedInputStream input, - com.google.protobuf.ExtensionRegistryLite extensionRegistry) - throws com.google.protobuf.InvalidProtocolBufferException { - return new TestTableDDLStateData(input, extensionRegistry); - } - }; - - @java.lang.Override - public com.google.protobuf.Parser<TestTableDDLStateData> getParserForType() { - return PARSER; - } - private int bitField0_; - // required string table_name = 1; public static final int TABLE_NAME_FIELD_NUMBER = 1; - private java.lang.Object tableName_; + private volatile java.lang.Object tableName_; /** * <code>required string table_name = 1;</code> */ @@ -165,13 +148,11 @@ public final class TestProcedureProtos { } } - private void initFields() { - tableName_ = ""; - } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { byte isInitialized = memoizedIsInitialized; - if (isInitialized != -1) return isInitialized == 1; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; if (!hasTableName()) { memoizedIsInitialized = 0; @@ -183,33 +164,60 @@ public final class TestProcedureProtos { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { - getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getTableNameBytes()); + com.google.protobuf.GeneratedMessageV3.writeString(output, 1, tableName_); } - getUnknownFields().writeTo(output); + unknownFields.writeTo(output); } - private int memoizedSerializedSize = -1; public int getSerializedSize() { - int size = memoizedSerializedSize; + int size = memoizedSize; if (size != -1) return size; size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, getTableNameBytes()); + size += com.google.protobuf.GeneratedMessageV3.computeStringSize(1, tableName_); } - size += getUnknownFields().getSerializedSize(); - memoizedSerializedSize = size; + size += unknownFields.getSerializedSize(); + memoizedSize = size; return size; } private static final long serialVersionUID = 0L; @java.lang.Override - protected java.lang.Object writeReplace() - throws java.io.ObjectStreamException { - return super.writeReplace(); + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.TestTableDDLStateData)) { + return super.equals(obj); + } + org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.TestTableDDLStateData other = (org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.TestTableDDLStateData) obj; + + boolean result = true; + result = result && (hasTableName() == other.hasTableName()); + if (hasTableName()) { + result = result && getTableName() + .equals(other.getTableName()); + } + result = result && unknownFields.equals(other.unknownFields); + return result; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptorForType().hashCode(); + if (hasTableName()) { + hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER; + hash = (53 * hash) + getTableName().hashCode(); + } + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; } public static org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.TestTableDDLStateData parseFrom( @@ -235,46 +243,57 @@ public final class TestProcedureProtos { } public static org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.TestTableDDLStateData parseFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.TestTableDDLStateData parseFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } public static org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.TestTableDDLStateData parseDelimitedFrom(java.io.InputStream input) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); } public static org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.TestTableDDLStateData parseDelimitedFrom( java.io.InputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseDelimitedFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); } public static org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.TestTableDDLStateData parseFrom( com.google.protobuf.CodedInputStream input) throws java.io.IOException { - return PARSER.parseFrom(input); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); } public static org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.TestTableDDLStateData parseFrom( com.google.protobuf.CodedInputStream input, com.google.protobuf.ExtensionRegistryLite extensionRegistry) throws java.io.IOException { - return PARSER.parseFrom(input, extensionRegistry); + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); } - public static Builder newBuilder() { return Builder.create(); } public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } public static Builder newBuilder(org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.TestTableDDLStateData prototype) { - return newBuilder().mergeFrom(prototype); + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); } - public Builder toBuilder() { return newBuilder(this); } @java.lang.Override protected Builder newBuilderForType( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { Builder builder = new Builder(parent); return builder; } @@ -282,14 +301,15 @@ public final class TestProcedureProtos { * Protobuf type {@code TestTableDDLStateData} */ public static final class Builder extends - com.google.protobuf.GeneratedMessage.Builder<Builder> - implements org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.TestTableDDLStateDataOrBuilder { + com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements + // @@protoc_insertion_point(builder_implements:TestTableDDLStateData) + org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.TestTableDDLStateDataOrBuilder { public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() { return org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.internal_static_TestTableDDLStateData_descriptor; } - protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internalGetFieldAccessorTable() { return org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.internal_static_TestTableDDLStateData_fieldAccessorTable .ensureFieldAccessorsInitialized( @@ -302,18 +322,15 @@ public final class TestProcedureProtos { } private Builder( - com.google.protobuf.GeneratedMessage.BuilderParent parent) { + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { super(parent); maybeForceBuilderInitialization(); } private void maybeForceBuilderInitialization() { - if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { } } - private static Builder create() { - return new Builder(); - } - public Builder clear() { super.clear(); tableName_ = ""; @@ -321,10 +338,6 @@ public final class TestProcedureProtos { return this; } - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - public com.google.protobuf.Descriptors.Descriptor getDescriptorForType() { return org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.internal_static_TestTableDDLStateData_descriptor; @@ -355,6 +368,32 @@ public final class TestProcedureProtos { return result; } + public Builder clone() { + return (Builder) super.clone(); + } + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + Object value) { + return (Builder) super.setField(field, value); + } + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return (Builder) super.clearField(field); + } + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return (Builder) super.clearOneof(oneof); + } + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, Object value) { + return (Builder) super.setRepeatedField(field, index, value); + } + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + Object value) { + return (Builder) super.addRepeatedField(field, value); + } public Builder mergeFrom(com.google.protobuf.Message other) { if (other instanceof org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.TestTableDDLStateData) { return mergeFrom((org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.TestTableDDLStateData)other); @@ -371,13 +410,13 @@ public final class TestProcedureProtos { tableName_ = other.tableName_; onChanged(); } - this.mergeUnknownFields(other.getUnknownFields()); + this.mergeUnknownFields(other.unknownFields); + onChanged(); return this; } public final boolean isInitialized() { if (!hasTableName()) { - return false; } return true; @@ -392,7 +431,7 @@ public final class TestProcedureProtos { parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); } catch (com.google.protobuf.InvalidProtocolBufferException e) { parsedMessage = (org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.TestTableDDLStateData) e.getUnfinishedMessage(); - throw e; + throw e.unwrapIOException(); } finally { if (parsedMessage != null) { mergeFrom(parsedMessage); @@ -402,7 +441,6 @@ public final class TestProcedureProtos { } private int bitField0_; - // required string table_name = 1; private java.lang.Object tableName_ = ""; /** * <code>required string table_name = 1;</code> @@ -416,9 +454,12 @@ public final class TestProcedureProtos { public java.lang.String getTableName() { java.lang.Object ref = tableName_; if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - tableName_ = s; + com.google.protobuf.ByteString bs = + (com.google.protobuf.ByteString) ref; + java.lang.String s = bs.toStringUtf8(); + if (bs.isValidUtf8()) { + tableName_ = s; + } return s; } else { return (java.lang.String) ref; @@ -475,29 +516,66 @@ public final class TestProcedureProtos { onChanged(); return this; } + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + // @@protoc_insertion_point(builder_scope:TestTableDDLStateData) } + // @@protoc_insertion_point(class_scope:TestTableDDLStateData) + private static final org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.TestTableDDLStateData DEFAULT_INSTANCE; static { - defaultInstance = new TestTableDDLStateData(true); - defaultInstance.initFields(); + DEFAULT_INSTANCE = new org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.TestTableDDLStateData(); + } + + public static org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.TestTableDDLStateData getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + @java.lang.Deprecated public static final com.google.protobuf.Parser<TestTableDDLStateData> + PARSER = new com.google.protobuf.AbstractParser<TestTableDDLStateData>() { + public TestTableDDLStateData parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new TestTableDDLStateData(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser<TestTableDDLStateData> parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser<TestTableDDLStateData> getParserForType() { + return PARSER; + } + + public org.apache.hadoop.hbase.shaded.ipc.protobuf.generated.TestProcedureProtos.TestTableDDLStateData getDefaultInstanceForType() { + return DEFAULT_INSTANCE; } - // @@protoc_insertion_point(class_scope:TestTableDDLStateData) } - private static com.google.protobuf.Descriptors.Descriptor + private static final com.google.protobuf.Descriptors.Descriptor internal_static_TestTableDDLStateData_descriptor; - private static - com.google.protobuf.GeneratedMessage.FieldAccessorTable + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_TestTableDDLStateData_fieldAccessorTable; public static com.google.protobuf.Descriptors.FileDescriptor getDescriptor() { return descriptor; } - private static com.google.protobuf.Descriptors.FileDescriptor + private static com.google.protobuf.Descriptors.FileDescriptor descriptor; static { java.lang.String[] descriptorData = { @@ -507,23 +585,23 @@ public final class TestProcedureProtos { "tedB\023TestProcedureProtos\210\001\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = - new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { - public com.google.protobuf.ExtensionRegistry assignDescriptors( - com.google.protobuf.Descriptors.FileDescriptor root) { - descriptor = root; - internal_static_TestTableDDLStateData_descriptor = - getDescriptor().getMessageTypes().get(0); - internal_static_TestTableDDLStateData_fieldAccessorTable = new - com.google.protobuf.GeneratedMessage.FieldAccessorTable( - internal_static_TestTableDDLStateData_descriptor, - new java.lang.String[] { "TableName", }); - return null; - } - }; + new com.google.protobuf.Descriptors.FileDescriptor. InternalDescriptorAssigner() { + public com.google.protobuf.ExtensionRegistry assignDescriptors( + com.google.protobuf.Descriptors.FileDescriptor root) { + descriptor = root; + return null; + } + }; com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, new com.google.protobuf.Descriptors.FileDescriptor[] { }, assigner); + internal_static_TestTableDDLStateData_descriptor = + getDescriptor().getMessageTypes().get(0); + internal_static_TestTableDDLStateData_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_TestTableDDLStateData_descriptor, + new java.lang.String[] { "TableName", }); } // @@protoc_insertion_point(outer_class_scope)
