http://git-wip-us.apache.org/repos/asf/hbase/blob/b4a729ed/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/CellProtos.java
----------------------------------------------------------------------
diff --git
a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/CellProtos.java
b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/CellProtos.java
index 5b86b1d..f049d50 100644
---
a/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/CellProtos.java
+++
b/hbase-protocol-shaded/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/generated/CellProtos.java
@@ -6,46 +6,52 @@ package org.apache.hadoop.hbase.shaded.protobuf.generated;
public final class CellProtos {
private CellProtos() {}
public static void registerAllExtensions(
+ com.google.protobuf.ExtensionRegistryLite registry) {
+ }
+
+ public static void registerAllExtensions(
com.google.protobuf.ExtensionRegistry registry) {
+ registerAllExtensions(
+ (com.google.protobuf.ExtensionRegistryLite) registry);
}
/**
- * Protobuf enum {@code hbase.pb.CellType}
- *
* <pre>
**
* The type of the key in a Cell
* </pre>
+ *
+ * Protobuf enum {@code hbase.pb.CellType}
*/
public enum CellType
implements com.google.protobuf.ProtocolMessageEnum {
/**
* <code>MINIMUM = 0;</code>
*/
- MINIMUM(0, 0),
+ MINIMUM(0),
/**
* <code>PUT = 4;</code>
*/
- PUT(1, 4),
+ PUT(4),
/**
* <code>DELETE = 8;</code>
*/
- DELETE(2, 8),
+ DELETE(8),
/**
* <code>DELETE_COLUMN = 12;</code>
*/
- DELETE_COLUMN(3, 12),
+ DELETE_COLUMN(12),
/**
* <code>DELETE_FAMILY = 14;</code>
*/
- DELETE_FAMILY(4, 14),
+ DELETE_FAMILY(14),
/**
- * <code>MAXIMUM = 255;</code>
- *
* <pre>
* MAXIMUM is used when searching; you look from maximum on down.
* </pre>
+ *
+ * <code>MAXIMUM = 255;</code>
*/
- MAXIMUM(5, 255),
+ MAXIMUM(255),
;
/**
@@ -69,18 +75,28 @@ public final class CellProtos {
*/
public static final int DELETE_FAMILY_VALUE = 14;
/**
- * <code>MAXIMUM = 255;</code>
- *
* <pre>
* MAXIMUM is used when searching; you look from maximum on down.
* </pre>
+ *
+ * <code>MAXIMUM = 255;</code>
*/
public static final int MAXIMUM_VALUE = 255;
- public final int getNumber() { return value; }
+ public final int getNumber() {
+ return value;
+ }
+ /**
+ * @deprecated Use {@link #forNumber(int)} instead.
+ */
+ @java.lang.Deprecated
public static CellType valueOf(int value) {
+ return forNumber(value);
+ }
+
+ public static CellType forNumber(int value) {
switch (value) {
case 0: return MINIMUM;
case 4: return PUT;
@@ -96,17 +112,17 @@ public final class CellProtos {
internalGetValueMap() {
return internalValueMap;
}
- private static com.google.protobuf.Internal.EnumLiteMap<CellType>
- internalValueMap =
+ private static final com.google.protobuf.Internal.EnumLiteMap<
+ CellType> internalValueMap =
new com.google.protobuf.Internal.EnumLiteMap<CellType>() {
public CellType findValueByNumber(int number) {
- return CellType.valueOf(number);
+ return CellType.forNumber(number);
}
};
public final com.google.protobuf.Descriptors.EnumValueDescriptor
getValueDescriptor() {
- return getDescriptor().getValues().get(index);
+ return getDescriptor().getValues().get(ordinal());
}
public final com.google.protobuf.Descriptors.EnumDescriptor
getDescriptorForType() {
@@ -128,21 +144,19 @@ public final class CellProtos {
return VALUES[desc.getIndex()];
}
- private final int index;
private final int value;
- private CellType(int index, int value) {
- this.index = index;
+ private CellType(int value) {
this.value = value;
}
// @@protoc_insertion_point(enum_scope:hbase.pb.CellType)
}
- public interface CellOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface CellOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:hbase.pb.Cell)
+ com.google.protobuf.MessageOrBuilder {
- // optional bytes row = 1;
/**
* <code>optional bytes row = 1;</code>
*/
@@ -152,7 +166,6 @@ public final class CellProtos {
*/
com.google.protobuf.ByteString getRow();
- // optional bytes family = 2;
/**
* <code>optional bytes family = 2;</code>
*/
@@ -162,7 +175,6 @@ public final class CellProtos {
*/
com.google.protobuf.ByteString getFamily();
- // optional bytes qualifier = 3;
/**
* <code>optional bytes qualifier = 3;</code>
*/
@@ -172,7 +184,6 @@ public final class CellProtos {
*/
com.google.protobuf.ByteString getQualifier();
- // optional uint64 timestamp = 4;
/**
* <code>optional uint64 timestamp = 4;</code>
*/
@@ -182,7 +193,6 @@ public final class CellProtos {
*/
long getTimestamp();
- // optional .hbase.pb.CellType cell_type = 5;
/**
* <code>optional .hbase.pb.CellType cell_type = 5;</code>
*/
@@ -192,7 +202,6 @@ public final class CellProtos {
*/
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType
getCellType();
- // optional bytes value = 6;
/**
* <code>optional bytes value = 6;</code>
*/
@@ -202,7 +211,6 @@ public final class CellProtos {
*/
com.google.protobuf.ByteString getValue();
- // optional bytes tags = 7;
/**
* <code>optional bytes tags = 7;</code>
*/
@@ -213,43 +221,41 @@ public final class CellProtos {
com.google.protobuf.ByteString getTags();
}
/**
- * Protobuf type {@code hbase.pb.Cell}
- *
* <pre>
**
* Protocol buffer version of Cell.
* </pre>
+ *
+ * Protobuf type {@code hbase.pb.Cell}
*/
- public static final class Cell extends
- com.google.protobuf.GeneratedMessage
- implements CellOrBuilder {
+ public static final class Cell extends
+ com.google.protobuf.GeneratedMessageV3 implements
+ // @@protoc_insertion_point(message_implements:hbase.pb.Cell)
+ CellOrBuilder {
// Use Cell.newBuilder() to construct.
- private Cell(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private Cell(com.google.protobuf.GeneratedMessageV3.Builder<?> builder) {
super(builder);
- this.unknownFields = builder.getUnknownFields();
- }
- private Cell(boolean noInit) { this.unknownFields =
com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
- private static final Cell defaultInstance;
- public static Cell getDefaultInstance() {
- return defaultInstance;
}
-
- public Cell getDefaultInstanceForType() {
- return defaultInstance;
+ private Cell() {
+ row_ = com.google.protobuf.ByteString.EMPTY;
+ family_ = com.google.protobuf.ByteString.EMPTY;
+ qualifier_ = com.google.protobuf.ByteString.EMPTY;
+ timestamp_ = 0L;
+ cellType_ = 0;
+ value_ = com.google.protobuf.ByteString.EMPTY;
+ tags_ = com.google.protobuf.ByteString.EMPTY;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
public final com.google.protobuf.UnknownFieldSet
- getUnknownFields() {
+ getUnknownFields() {
return this.unknownFields;
}
private Cell(
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();
@@ -295,7 +301,7 @@ public final class CellProtos {
unknownFields.mergeVarintField(5, rawValue);
} else {
bitField0_ |= 0x00000010;
- cellType_ = value;
+ cellType_ = rawValue;
}
break;
}
@@ -315,7 +321,7 @@ public final class CellProtos {
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();
@@ -326,30 +332,14 @@ public final class CellProtos {
return
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.internal_static_hbase_pb_Cell_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
return
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.internal_static_hbase_pb_Cell_fieldAccessorTable
.ensureFieldAccessorsInitialized(
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.Cell.class,
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.Cell.Builder.class);
}
- public static com.google.protobuf.Parser<Cell> PARSER =
- new com.google.protobuf.AbstractParser<Cell>() {
- public Cell parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return new Cell(input, extensionRegistry);
- }
- };
-
- @java.lang.Override
- public com.google.protobuf.Parser<Cell> getParserForType() {
- return PARSER;
- }
-
private int bitField0_;
- // optional bytes row = 1;
public static final int ROW_FIELD_NUMBER = 1;
private com.google.protobuf.ByteString row_;
/**
@@ -365,7 +355,6 @@ public final class CellProtos {
return row_;
}
- // optional bytes family = 2;
public static final int FAMILY_FIELD_NUMBER = 2;
private com.google.protobuf.ByteString family_;
/**
@@ -381,7 +370,6 @@ public final class CellProtos {
return family_;
}
- // optional bytes qualifier = 3;
public static final int QUALIFIER_FIELD_NUMBER = 3;
private com.google.protobuf.ByteString qualifier_;
/**
@@ -397,7 +385,6 @@ public final class CellProtos {
return qualifier_;
}
- // optional uint64 timestamp = 4;
public static final int TIMESTAMP_FIELD_NUMBER = 4;
private long timestamp_;
/**
@@ -413,9 +400,8 @@ public final class CellProtos {
return timestamp_;
}
- // optional .hbase.pb.CellType cell_type = 5;
public static final int CELL_TYPE_FIELD_NUMBER = 5;
- private
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType cellType_;
+ private int cellType_;
/**
* <code>optional .hbase.pb.CellType cell_type = 5;</code>
*/
@@ -426,10 +412,10 @@ public final class CellProtos {
* <code>optional .hbase.pb.CellType cell_type = 5;</code>
*/
public
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType
getCellType() {
- return cellType_;
+ org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType
result =
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType.valueOf(cellType_);
+ return result == null ?
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType.MINIMUM :
result;
}
- // optional bytes value = 6;
public static final int VALUE_FIELD_NUMBER = 6;
private com.google.protobuf.ByteString value_;
/**
@@ -445,7 +431,6 @@ public final class CellProtos {
return value_;
}
- // optional bytes tags = 7;
public static final int TAGS_FIELD_NUMBER = 7;
private com.google.protobuf.ByteString tags_;
/**
@@ -461,19 +446,11 @@ public final class CellProtos {
return tags_;
}
- private void initFields() {
- row_ = com.google.protobuf.ByteString.EMPTY;
- family_ = com.google.protobuf.ByteString.EMPTY;
- qualifier_ = com.google.protobuf.ByteString.EMPTY;
- timestamp_ = 0L;
- cellType_ =
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType.MINIMUM;
- value_ = com.google.protobuf.ByteString.EMPTY;
- tags_ = com.google.protobuf.ByteString.EMPTY;
- }
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;
memoizedIsInitialized = 1;
return true;
@@ -481,7 +458,6 @@ public final class CellProtos {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
- getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeBytes(1, row_);
}
@@ -495,7 +471,7 @@ public final class CellProtos {
output.writeUInt64(4, timestamp_);
}
if (((bitField0_ & 0x00000010) == 0x00000010)) {
- output.writeEnum(5, cellType_.getNumber());
+ output.writeEnum(5, cellType_);
}
if (((bitField0_ & 0x00000020) == 0x00000020)) {
output.writeBytes(6, value_);
@@ -503,12 +479,11 @@ public final class CellProtos {
if (((bitField0_ & 0x00000040) == 0x00000040)) {
output.writeBytes(7, tags_);
}
- 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;
@@ -530,7 +505,7 @@ public final class CellProtos {
}
if (((bitField0_ & 0x00000010) == 0x00000010)) {
size += com.google.protobuf.CodedOutputStream
- .computeEnumSize(5, cellType_.getNumber());
+ .computeEnumSize(5, cellType_);
}
if (((bitField0_ & 0x00000020) == 0x00000020)) {
size += com.google.protobuf.CodedOutputStream
@@ -540,19 +515,13 @@ public final class CellProtos {
size += com.google.protobuf.CodedOutputStream
.computeBytesSize(7, tags_);
}
- 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();
- }
-
- @java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
@@ -585,8 +554,7 @@ public final class CellProtos {
}
result = result && (hasCellType() == other.hasCellType());
if (hasCellType()) {
- result = result &&
- (getCellType() == other.getCellType());
+ result = result && cellType_ == other.cellType_;
}
result = result && (hasValue() == other.hasValue());
if (hasValue()) {
@@ -598,12 +566,10 @@ public final class CellProtos {
result = result && getTags()
.equals(other.getTags());
}
- result = result &&
- getUnknownFields().equals(other.getUnknownFields());
+ result = result && unknownFields.equals(other.unknownFields);
return result;
}
- private int memoizedHashCode = 0;
@java.lang.Override
public int hashCode() {
if (memoizedHashCode != 0) {
@@ -625,11 +591,12 @@ public final class CellProtos {
}
if (hasTimestamp()) {
hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER;
- hash = (53 * hash) + hashLong(getTimestamp());
+ hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+ getTimestamp());
}
if (hasCellType()) {
hash = (37 * hash) + CELL_TYPE_FIELD_NUMBER;
- hash = (53 * hash) + hashEnum(getCellType());
+ hash = (53 * hash) + cellType_;
}
if (hasValue()) {
hash = (37 * hash) + VALUE_FIELD_NUMBER;
@@ -639,7 +606,7 @@ public final class CellProtos {
hash = (37 * hash) + TAGS_FIELD_NUMBER;
hash = (53 * hash) + getTags().hashCode();
}
- hash = (29 * hash) + getUnknownFields().hashCode();
+ hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
}
@@ -667,66 +634,78 @@ public final class CellProtos {
}
public static
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.Cell
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.protobuf.generated.CellProtos.Cell 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.protobuf.generated.CellProtos.Cell
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.protobuf.generated.CellProtos.Cell
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.protobuf.generated.CellProtos.Cell 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.protobuf.generated.CellProtos.Cell 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.protobuf.generated.CellProtos.Cell
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;
}
/**
- * Protobuf type {@code hbase.pb.Cell}
- *
* <pre>
**
* Protocol buffer version of Cell.
* </pre>
+ *
+ * Protobuf type {@code hbase.pb.Cell}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellOrBuilder {
+ com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:hbase.pb.Cell)
+
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.internal_static_hbase_pb_Cell_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
return
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.internal_static_hbase_pb_Cell_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -739,18 +718,15 @@ public final class CellProtos {
}
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();
row_ = com.google.protobuf.ByteString.EMPTY;
@@ -761,7 +737,7 @@ public final class CellProtos {
bitField0_ = (bitField0_ & ~0x00000004);
timestamp_ = 0L;
bitField0_ = (bitField0_ & ~0x00000008);
- cellType_ =
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType.MINIMUM;
+ cellType_ = 0;
bitField0_ = (bitField0_ & ~0x00000010);
value_ = com.google.protobuf.ByteString.EMPTY;
bitField0_ = (bitField0_ & ~0x00000020);
@@ -770,10 +746,6 @@ public final class CellProtos {
return this;
}
- public Builder clone() {
- return create().mergeFrom(buildPartial());
- }
-
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.internal_static_hbase_pb_Cell_descriptor;
@@ -828,6 +800,32 @@ public final class CellProtos {
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.protobuf.generated.CellProtos.Cell) {
return
mergeFrom((org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.Cell)other);
@@ -860,7 +858,8 @@ public final class CellProtos {
if (other.hasTags()) {
setTags(other.getTags());
}
- this.mergeUnknownFields(other.getUnknownFields());
+ this.mergeUnknownFields(other.unknownFields);
+ onChanged();
return this;
}
@@ -877,7 +876,7 @@ public final class CellProtos {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
parsedMessage =
(org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.Cell)
e.getUnfinishedMessage();
- throw e;
+ throw e.unwrapIOException();
} finally {
if (parsedMessage != null) {
mergeFrom(parsedMessage);
@@ -887,7 +886,6 @@ public final class CellProtos {
}
private int bitField0_;
- // optional bytes row = 1;
private com.google.protobuf.ByteString row_ =
com.google.protobuf.ByteString.EMPTY;
/**
* <code>optional bytes row = 1;</code>
@@ -923,7 +921,6 @@ public final class CellProtos {
return this;
}
- // optional bytes family = 2;
private com.google.protobuf.ByteString family_ =
com.google.protobuf.ByteString.EMPTY;
/**
* <code>optional bytes family = 2;</code>
@@ -959,7 +956,6 @@ public final class CellProtos {
return this;
}
- // optional bytes qualifier = 3;
private com.google.protobuf.ByteString qualifier_ =
com.google.protobuf.ByteString.EMPTY;
/**
* <code>optional bytes qualifier = 3;</code>
@@ -995,7 +991,6 @@ public final class CellProtos {
return this;
}
- // optional uint64 timestamp = 4;
private long timestamp_ ;
/**
* <code>optional uint64 timestamp = 4;</code>
@@ -1028,8 +1023,7 @@ public final class CellProtos {
return this;
}
- // optional .hbase.pb.CellType cell_type = 5;
- private
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType cellType_
= org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType.MINIMUM;
+ private int cellType_ = 0;
/**
* <code>optional .hbase.pb.CellType cell_type = 5;</code>
*/
@@ -1040,7 +1034,8 @@ public final class CellProtos {
* <code>optional .hbase.pb.CellType cell_type = 5;</code>
*/
public
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType
getCellType() {
- return cellType_;
+ org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType
result =
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType.valueOf(cellType_);
+ return result == null ?
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType.MINIMUM :
result;
}
/**
* <code>optional .hbase.pb.CellType cell_type = 5;</code>
@@ -1050,7 +1045,7 @@ public final class CellProtos {
throw new NullPointerException();
}
bitField0_ |= 0x00000010;
- cellType_ = value;
+ cellType_ = value.getNumber();
onChanged();
return this;
}
@@ -1059,12 +1054,11 @@ public final class CellProtos {
*/
public Builder clearCellType() {
bitField0_ = (bitField0_ & ~0x00000010);
- cellType_ =
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType.MINIMUM;
+ cellType_ = 0;
onChanged();
return this;
}
- // optional bytes value = 6;
private com.google.protobuf.ByteString value_ =
com.google.protobuf.ByteString.EMPTY;
/**
* <code>optional bytes value = 6;</code>
@@ -1100,7 +1094,6 @@ public final class CellProtos {
return this;
}
- // optional bytes tags = 7;
private com.google.protobuf.ByteString tags_ =
com.google.protobuf.ByteString.EMPTY;
/**
* <code>optional bytes tags = 7;</code>
@@ -1135,22 +1128,59 @@ public final class CellProtos {
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:hbase.pb.Cell)
}
+ // @@protoc_insertion_point(class_scope:hbase.pb.Cell)
+ private static final
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.Cell
DEFAULT_INSTANCE;
static {
- defaultInstance = new Cell(true);
- defaultInstance.initFields();
+ DEFAULT_INSTANCE = new
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.Cell();
+ }
+
+ public static
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.Cell
getDefaultInstance() {
+ return DEFAULT_INSTANCE;
+ }
+
+ @java.lang.Deprecated public static final com.google.protobuf.Parser<Cell>
+ PARSER = new com.google.protobuf.AbstractParser<Cell>() {
+ public Cell parsePartialFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return new Cell(input, extensionRegistry);
+ }
+ };
+
+ public static com.google.protobuf.Parser<Cell> parser() {
+ return PARSER;
+ }
+
+ @java.lang.Override
+ public com.google.protobuf.Parser<Cell> getParserForType() {
+ return PARSER;
+ }
+
+ public org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.Cell
getDefaultInstanceForType() {
+ return DEFAULT_INSTANCE;
}
- // @@protoc_insertion_point(class_scope:hbase.pb.Cell)
}
- public interface KeyValueOrBuilder
- extends com.google.protobuf.MessageOrBuilder {
+ public interface KeyValueOrBuilder extends
+ // @@protoc_insertion_point(interface_extends:hbase.pb.KeyValue)
+ com.google.protobuf.MessageOrBuilder {
- // required bytes row = 1;
/**
* <code>required bytes row = 1;</code>
*/
@@ -1160,7 +1190,6 @@ public final class CellProtos {
*/
com.google.protobuf.ByteString getRow();
- // required bytes family = 2;
/**
* <code>required bytes family = 2;</code>
*/
@@ -1170,7 +1199,6 @@ public final class CellProtos {
*/
com.google.protobuf.ByteString getFamily();
- // required bytes qualifier = 3;
/**
* <code>required bytes qualifier = 3;</code>
*/
@@ -1180,7 +1208,6 @@ public final class CellProtos {
*/
com.google.protobuf.ByteString getQualifier();
- // optional uint64 timestamp = 4;
/**
* <code>optional uint64 timestamp = 4;</code>
*/
@@ -1190,7 +1217,6 @@ public final class CellProtos {
*/
long getTimestamp();
- // optional .hbase.pb.CellType key_type = 5;
/**
* <code>optional .hbase.pb.CellType key_type = 5;</code>
*/
@@ -1200,7 +1226,6 @@ public final class CellProtos {
*/
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType
getKeyType();
- // optional bytes value = 6;
/**
* <code>optional bytes value = 6;</code>
*/
@@ -1210,7 +1235,6 @@ public final class CellProtos {
*/
com.google.protobuf.ByteString getValue();
- // optional bytes tags = 7;
/**
* <code>optional bytes tags = 7;</code>
*/
@@ -1221,44 +1245,42 @@ public final class CellProtos {
com.google.protobuf.ByteString getTags();
}
/**
- * Protobuf type {@code hbase.pb.KeyValue}
- *
* <pre>
**
* Protocol buffer version of KeyValue.
* It doesn't have those transient parameters
* </pre>
+ *
+ * Protobuf type {@code hbase.pb.KeyValue}
*/
- public static final class KeyValue extends
- com.google.protobuf.GeneratedMessage
- implements KeyValueOrBuilder {
+ public static final class KeyValue extends
+ com.google.protobuf.GeneratedMessageV3 implements
+ // @@protoc_insertion_point(message_implements:hbase.pb.KeyValue)
+ KeyValueOrBuilder {
// Use KeyValue.newBuilder() to construct.
- private KeyValue(com.google.protobuf.GeneratedMessage.Builder<?> builder) {
+ private KeyValue(com.google.protobuf.GeneratedMessageV3.Builder<?>
builder) {
super(builder);
- this.unknownFields = builder.getUnknownFields();
- }
- private KeyValue(boolean noInit) { this.unknownFields =
com.google.protobuf.UnknownFieldSet.getDefaultInstance(); }
-
- private static final KeyValue defaultInstance;
- public static KeyValue getDefaultInstance() {
- return defaultInstance;
}
-
- public KeyValue getDefaultInstanceForType() {
- return defaultInstance;
+ private KeyValue() {
+ row_ = com.google.protobuf.ByteString.EMPTY;
+ family_ = com.google.protobuf.ByteString.EMPTY;
+ qualifier_ = com.google.protobuf.ByteString.EMPTY;
+ timestamp_ = 0L;
+ keyType_ = 0;
+ value_ = com.google.protobuf.ByteString.EMPTY;
+ tags_ = com.google.protobuf.ByteString.EMPTY;
}
- private final com.google.protobuf.UnknownFieldSet unknownFields;
@java.lang.Override
public final com.google.protobuf.UnknownFieldSet
- getUnknownFields() {
+ getUnknownFields() {
return this.unknownFields;
}
private KeyValue(
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();
@@ -1304,7 +1326,7 @@ public final class CellProtos {
unknownFields.mergeVarintField(5, rawValue);
} else {
bitField0_ |= 0x00000010;
- keyType_ = value;
+ keyType_ = rawValue;
}
break;
}
@@ -1324,7 +1346,7 @@ public final class CellProtos {
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();
@@ -1335,30 +1357,14 @@ public final class CellProtos {
return
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.internal_static_hbase_pb_KeyValue_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
return
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.internal_static_hbase_pb_KeyValue_fieldAccessorTable
.ensureFieldAccessorsInitialized(
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.KeyValue.class,
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.KeyValue.Builder.class);
}
- public static com.google.protobuf.Parser<KeyValue> PARSER =
- new com.google.protobuf.AbstractParser<KeyValue>() {
- public KeyValue parsePartialFrom(
- com.google.protobuf.CodedInputStream input,
- com.google.protobuf.ExtensionRegistryLite extensionRegistry)
- throws com.google.protobuf.InvalidProtocolBufferException {
- return new KeyValue(input, extensionRegistry);
- }
- };
-
- @java.lang.Override
- public com.google.protobuf.Parser<KeyValue> getParserForType() {
- return PARSER;
- }
-
private int bitField0_;
- // required bytes row = 1;
public static final int ROW_FIELD_NUMBER = 1;
private com.google.protobuf.ByteString row_;
/**
@@ -1374,7 +1380,6 @@ public final class CellProtos {
return row_;
}
- // required bytes family = 2;
public static final int FAMILY_FIELD_NUMBER = 2;
private com.google.protobuf.ByteString family_;
/**
@@ -1390,7 +1395,6 @@ public final class CellProtos {
return family_;
}
- // required bytes qualifier = 3;
public static final int QUALIFIER_FIELD_NUMBER = 3;
private com.google.protobuf.ByteString qualifier_;
/**
@@ -1406,7 +1410,6 @@ public final class CellProtos {
return qualifier_;
}
- // optional uint64 timestamp = 4;
public static final int TIMESTAMP_FIELD_NUMBER = 4;
private long timestamp_;
/**
@@ -1422,9 +1425,8 @@ public final class CellProtos {
return timestamp_;
}
- // optional .hbase.pb.CellType key_type = 5;
public static final int KEY_TYPE_FIELD_NUMBER = 5;
- private
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType keyType_;
+ private int keyType_;
/**
* <code>optional .hbase.pb.CellType key_type = 5;</code>
*/
@@ -1435,10 +1437,10 @@ public final class CellProtos {
* <code>optional .hbase.pb.CellType key_type = 5;</code>
*/
public
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType
getKeyType() {
- return keyType_;
+ org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType
result =
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType.valueOf(keyType_);
+ return result == null ?
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType.MINIMUM :
result;
}
- // optional bytes value = 6;
public static final int VALUE_FIELD_NUMBER = 6;
private com.google.protobuf.ByteString value_;
/**
@@ -1454,7 +1456,6 @@ public final class CellProtos {
return value_;
}
- // optional bytes tags = 7;
public static final int TAGS_FIELD_NUMBER = 7;
private com.google.protobuf.ByteString tags_;
/**
@@ -1470,19 +1471,11 @@ public final class CellProtos {
return tags_;
}
- private void initFields() {
- row_ = com.google.protobuf.ByteString.EMPTY;
- family_ = com.google.protobuf.ByteString.EMPTY;
- qualifier_ = com.google.protobuf.ByteString.EMPTY;
- timestamp_ = 0L;
- keyType_ =
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType.MINIMUM;
- value_ = com.google.protobuf.ByteString.EMPTY;
- tags_ = com.google.protobuf.ByteString.EMPTY;
- }
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 (!hasRow()) {
memoizedIsInitialized = 0;
@@ -1502,7 +1495,6 @@ public final class CellProtos {
public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException {
- getSerializedSize();
if (((bitField0_ & 0x00000001) == 0x00000001)) {
output.writeBytes(1, row_);
}
@@ -1516,7 +1508,7 @@ public final class CellProtos {
output.writeUInt64(4, timestamp_);
}
if (((bitField0_ & 0x00000010) == 0x00000010)) {
- output.writeEnum(5, keyType_.getNumber());
+ output.writeEnum(5, keyType_);
}
if (((bitField0_ & 0x00000020) == 0x00000020)) {
output.writeBytes(6, value_);
@@ -1524,12 +1516,11 @@ public final class CellProtos {
if (((bitField0_ & 0x00000040) == 0x00000040)) {
output.writeBytes(7, tags_);
}
- 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;
@@ -1551,7 +1542,7 @@ public final class CellProtos {
}
if (((bitField0_ & 0x00000010) == 0x00000010)) {
size += com.google.protobuf.CodedOutputStream
- .computeEnumSize(5, keyType_.getNumber());
+ .computeEnumSize(5, keyType_);
}
if (((bitField0_ & 0x00000020) == 0x00000020)) {
size += com.google.protobuf.CodedOutputStream
@@ -1561,19 +1552,13 @@ public final class CellProtos {
size += com.google.protobuf.CodedOutputStream
.computeBytesSize(7, tags_);
}
- 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();
- }
-
- @java.lang.Override
public boolean equals(final java.lang.Object obj) {
if (obj == this) {
return true;
@@ -1606,8 +1591,7 @@ public final class CellProtos {
}
result = result && (hasKeyType() == other.hasKeyType());
if (hasKeyType()) {
- result = result &&
- (getKeyType() == other.getKeyType());
+ result = result && keyType_ == other.keyType_;
}
result = result && (hasValue() == other.hasValue());
if (hasValue()) {
@@ -1619,12 +1603,10 @@ public final class CellProtos {
result = result && getTags()
.equals(other.getTags());
}
- result = result &&
- getUnknownFields().equals(other.getUnknownFields());
+ result = result && unknownFields.equals(other.unknownFields);
return result;
}
- private int memoizedHashCode = 0;
@java.lang.Override
public int hashCode() {
if (memoizedHashCode != 0) {
@@ -1646,11 +1628,12 @@ public final class CellProtos {
}
if (hasTimestamp()) {
hash = (37 * hash) + TIMESTAMP_FIELD_NUMBER;
- hash = (53 * hash) + hashLong(getTimestamp());
+ hash = (53 * hash) + com.google.protobuf.Internal.hashLong(
+ getTimestamp());
}
if (hasKeyType()) {
hash = (37 * hash) + KEY_TYPE_FIELD_NUMBER;
- hash = (53 * hash) + hashEnum(getKeyType());
+ hash = (53 * hash) + keyType_;
}
if (hasValue()) {
hash = (37 * hash) + VALUE_FIELD_NUMBER;
@@ -1660,7 +1643,7 @@ public final class CellProtos {
hash = (37 * hash) + TAGS_FIELD_NUMBER;
hash = (53 * hash) + getTags().hashCode();
}
- hash = (29 * hash) + getUnknownFields().hashCode();
+ hash = (29 * hash) + unknownFields.hashCode();
memoizedHashCode = hash;
return hash;
}
@@ -1688,67 +1671,79 @@ public final class CellProtos {
}
public static
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.KeyValue
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.protobuf.generated.CellProtos.KeyValue 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.protobuf.generated.CellProtos.KeyValue
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.protobuf.generated.CellProtos.KeyValue
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.protobuf.generated.CellProtos.KeyValue 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.protobuf.generated.CellProtos.KeyValue 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.protobuf.generated.CellProtos.KeyValue
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;
}
/**
- * Protobuf type {@code hbase.pb.KeyValue}
- *
* <pre>
**
* Protocol buffer version of KeyValue.
* It doesn't have those transient parameters
* </pre>
+ *
+ * Protobuf type {@code hbase.pb.KeyValue}
*/
public static final class Builder extends
- com.google.protobuf.GeneratedMessage.Builder<Builder>
- implements
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.KeyValueOrBuilder {
+ com.google.protobuf.GeneratedMessageV3.Builder<Builder> implements
+ // @@protoc_insertion_point(builder_implements:hbase.pb.KeyValue)
+
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.KeyValueOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
return
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.internal_static_hbase_pb_KeyValue_descriptor;
}
- protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internalGetFieldAccessorTable() {
return
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.internal_static_hbase_pb_KeyValue_fieldAccessorTable
.ensureFieldAccessorsInitialized(
@@ -1761,18 +1756,15 @@ public final class CellProtos {
}
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();
row_ = com.google.protobuf.ByteString.EMPTY;
@@ -1783,7 +1775,7 @@ public final class CellProtos {
bitField0_ = (bitField0_ & ~0x00000004);
timestamp_ = 0L;
bitField0_ = (bitField0_ & ~0x00000008);
- keyType_ =
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType.MINIMUM;
+ keyType_ = 0;
bitField0_ = (bitField0_ & ~0x00000010);
value_ = com.google.protobuf.ByteString.EMPTY;
bitField0_ = (bitField0_ & ~0x00000020);
@@ -1792,10 +1784,6 @@ public final class CellProtos {
return this;
}
- public Builder clone() {
- return create().mergeFrom(buildPartial());
- }
-
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
return
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.internal_static_hbase_pb_KeyValue_descriptor;
@@ -1850,6 +1838,32 @@ public final class CellProtos {
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.protobuf.generated.CellProtos.KeyValue) {
return
mergeFrom((org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.KeyValue)other);
@@ -1882,21 +1896,19 @@ public final class CellProtos {
if (other.hasTags()) {
setTags(other.getTags());
}
- this.mergeUnknownFields(other.getUnknownFields());
+ this.mergeUnknownFields(other.unknownFields);
+ onChanged();
return this;
}
public final boolean isInitialized() {
if (!hasRow()) {
-
return false;
}
if (!hasFamily()) {
-
return false;
}
if (!hasQualifier()) {
-
return false;
}
return true;
@@ -1911,7 +1923,7 @@ public final class CellProtos {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
parsedMessage =
(org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.KeyValue)
e.getUnfinishedMessage();
- throw e;
+ throw e.unwrapIOException();
} finally {
if (parsedMessage != null) {
mergeFrom(parsedMessage);
@@ -1921,7 +1933,6 @@ public final class CellProtos {
}
private int bitField0_;
- // required bytes row = 1;
private com.google.protobuf.ByteString row_ =
com.google.protobuf.ByteString.EMPTY;
/**
* <code>required bytes row = 1;</code>
@@ -1957,7 +1968,6 @@ public final class CellProtos {
return this;
}
- // required bytes family = 2;
private com.google.protobuf.ByteString family_ =
com.google.protobuf.ByteString.EMPTY;
/**
* <code>required bytes family = 2;</code>
@@ -1993,7 +2003,6 @@ public final class CellProtos {
return this;
}
- // required bytes qualifier = 3;
private com.google.protobuf.ByteString qualifier_ =
com.google.protobuf.ByteString.EMPTY;
/**
* <code>required bytes qualifier = 3;</code>
@@ -2029,7 +2038,6 @@ public final class CellProtos {
return this;
}
- // optional uint64 timestamp = 4;
private long timestamp_ ;
/**
* <code>optional uint64 timestamp = 4;</code>
@@ -2062,8 +2070,7 @@ public final class CellProtos {
return this;
}
- // optional .hbase.pb.CellType key_type = 5;
- private
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType keyType_
= org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType.MINIMUM;
+ private int keyType_ = 0;
/**
* <code>optional .hbase.pb.CellType key_type = 5;</code>
*/
@@ -2074,7 +2081,8 @@ public final class CellProtos {
* <code>optional .hbase.pb.CellType key_type = 5;</code>
*/
public
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType
getKeyType() {
- return keyType_;
+ org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType
result =
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType.valueOf(keyType_);
+ return result == null ?
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType.MINIMUM :
result;
}
/**
* <code>optional .hbase.pb.CellType key_type = 5;</code>
@@ -2084,7 +2092,7 @@ public final class CellProtos {
throw new NullPointerException();
}
bitField0_ |= 0x00000010;
- keyType_ = value;
+ keyType_ = value.getNumber();
onChanged();
return this;
}
@@ -2093,12 +2101,11 @@ public final class CellProtos {
*/
public Builder clearKeyType() {
bitField0_ = (bitField0_ & ~0x00000010);
- keyType_ =
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.CellType.MINIMUM;
+ keyType_ = 0;
onChanged();
return this;
}
- // optional bytes value = 6;
private com.google.protobuf.ByteString value_ =
com.google.protobuf.ByteString.EMPTY;
/**
* <code>optional bytes value = 6;</code>
@@ -2134,7 +2141,6 @@ public final class CellProtos {
return this;
}
- // optional bytes tags = 7;
private com.google.protobuf.ByteString tags_ =
com.google.protobuf.ByteString.EMPTY;
/**
* <code>optional bytes tags = 7;</code>
@@ -2169,34 +2175,71 @@ public final class CellProtos {
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:hbase.pb.KeyValue)
}
+ // @@protoc_insertion_point(class_scope:hbase.pb.KeyValue)
+ private static final
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.KeyValue
DEFAULT_INSTANCE;
static {
- defaultInstance = new KeyValue(true);
- defaultInstance.initFields();
+ DEFAULT_INSTANCE = new
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.KeyValue();
+ }
+
+ public static
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.KeyValue
getDefaultInstance() {
+ return DEFAULT_INSTANCE;
+ }
+
+ @java.lang.Deprecated public static final
com.google.protobuf.Parser<KeyValue>
+ PARSER = new com.google.protobuf.AbstractParser<KeyValue>() {
+ public KeyValue parsePartialFrom(
+ com.google.protobuf.CodedInputStream input,
+ com.google.protobuf.ExtensionRegistryLite extensionRegistry)
+ throws com.google.protobuf.InvalidProtocolBufferException {
+ return new KeyValue(input, extensionRegistry);
+ }
+ };
+
+ public static com.google.protobuf.Parser<KeyValue> parser() {
+ return PARSER;
+ }
+
+ @java.lang.Override
+ public com.google.protobuf.Parser<KeyValue> getParserForType() {
+ return PARSER;
+ }
+
+ public
org.apache.hadoop.hbase.shaded.protobuf.generated.CellProtos.KeyValue
getDefaultInstanceForType() {
+ return DEFAULT_INSTANCE;
}
- // @@protoc_insertion_point(class_scope:hbase.pb.KeyValue)
}
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_hbase_pb_Cell_descriptor;
- private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ private static final
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internal_static_hbase_pb_Cell_fieldAccessorTable;
- private static com.google.protobuf.Descriptors.Descriptor
+ private static final com.google.protobuf.Descriptors.Descriptor
internal_static_hbase_pb_KeyValue_descriptor;
- private static
- com.google.protobuf.GeneratedMessage.FieldAccessorTable
+ private static final
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable
internal_static_hbase_pb_KeyValue_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 = {
@@ -2215,29 +2258,29 @@ public final class CellProtos {
"\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_hbase_pb_Cell_descriptor =
- getDescriptor().getMessageTypes().get(0);
- internal_static_hbase_pb_Cell_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_hbase_pb_Cell_descriptor,
- new java.lang.String[] { "Row", "Family", "Qualifier",
"Timestamp", "CellType", "Value", "Tags", });
- internal_static_hbase_pb_KeyValue_descriptor =
- getDescriptor().getMessageTypes().get(1);
- internal_static_hbase_pb_KeyValue_fieldAccessorTable = new
- com.google.protobuf.GeneratedMessage.FieldAccessorTable(
- internal_static_hbase_pb_KeyValue_descriptor,
- new java.lang.String[] { "Row", "Family", "Qualifier",
"Timestamp", "KeyType", "Value", "Tags", });
- 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_hbase_pb_Cell_descriptor =
+ getDescriptor().getMessageTypes().get(0);
+ internal_static_hbase_pb_Cell_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+ internal_static_hbase_pb_Cell_descriptor,
+ new java.lang.String[] { "Row", "Family", "Qualifier", "Timestamp",
"CellType", "Value", "Tags", });
+ internal_static_hbase_pb_KeyValue_descriptor =
+ getDescriptor().getMessageTypes().get(1);
+ internal_static_hbase_pb_KeyValue_fieldAccessorTable = new
+ com.google.protobuf.GeneratedMessageV3.FieldAccessorTable(
+ internal_static_hbase_pb_KeyValue_descriptor,
+ new java.lang.String[] { "Row", "Family", "Qualifier", "Timestamp",
"KeyType", "Value", "Tags", });
}
// @@protoc_insertion_point(outer_class_scope)
