http://git-wip-us.apache.org/repos/asf/hbase/blob/ee33bf0c/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClientProtos.java ---------------------------------------------------------------------- diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClientProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClientProtos.java index e6e715d..1964140 100644 --- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClientProtos.java +++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ClientProtos.java @@ -29159,6 +29159,1095 @@ public final class ClientProtos { // @@protoc_insertion_point(class_scope:hbase.pb.RegionLoadStats) } + public interface MultiRegionLoadStatsOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // repeated .hbase.pb.RegionSpecifier region = 1; + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier> + getRegionList(); + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion(int index); + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + int getRegionCount(); + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> + getRegionOrBuilderList(); + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder( + int index); + + // repeated .hbase.pb.RegionLoadStats stat = 2; + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats> + getStatList(); + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats getStat(int index); + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + int getStatCount(); + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStatsOrBuilder> + getStatOrBuilderList(); + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStatsOrBuilder getStatOrBuilder( + int index); + } + /** + * Protobuf type {@code hbase.pb.MultiRegionLoadStats} + */ + public static final class MultiRegionLoadStats extends + com.google.protobuf.GeneratedMessage + implements MultiRegionLoadStatsOrBuilder { + // Use MultiRegionLoadStats.newBuilder() to construct. + private MultiRegionLoadStats(com.google.protobuf.GeneratedMessage.Builder<?> builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private MultiRegionLoadStats(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final MultiRegionLoadStats defaultInstance; + public static MultiRegionLoadStats getDefaultInstance() { + return defaultInstance; + } + + public MultiRegionLoadStats getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private MultiRegionLoadStats( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + initFields(); + int mutable_bitField0_ = 0; + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + default: { + if (!parseUnknownField(input, unknownFields, + extensionRegistry, tag)) { + done = true; + } + break; + } + case 10: { + if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + region_ = new java.util.ArrayList<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier>(); + mutable_bitField0_ |= 0x00000001; + } + region_.add(input.readMessage(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.PARSER, extensionRegistry)); + break; + } + case 18: { + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + stat_ = new java.util.ArrayList<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats>(); + mutable_bitField0_ |= 0x00000002; + } + stat_.add(input.readMessage(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.PARSER, extensionRegistry)); + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e.getMessage()).setUnfinishedMessage(this); + } finally { + if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { + region_ = java.util.Collections.unmodifiableList(region_); + } + if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + stat_ = java.util.Collections.unmodifiableList(stat_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MultiRegionLoadStats_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MultiRegionLoadStats_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats.Builder.class); + } + + public static com.google.protobuf.Parser<MultiRegionLoadStats> PARSER = + new com.google.protobuf.AbstractParser<MultiRegionLoadStats>() { + public MultiRegionLoadStats parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new MultiRegionLoadStats(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser<MultiRegionLoadStats> getParserForType() { + return PARSER; + } + + // repeated .hbase.pb.RegionSpecifier region = 1; + public static final int REGION_FIELD_NUMBER = 1; + private java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier> region_; + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + public java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier> getRegionList() { + return region_; + } + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> + getRegionOrBuilderList() { + return region_; + } + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + public int getRegionCount() { + return region_.size(); + } + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion(int index) { + return region_.get(index); + } + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder( + int index) { + return region_.get(index); + } + + // repeated .hbase.pb.RegionLoadStats stat = 2; + public static final int STAT_FIELD_NUMBER = 2; + private java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats> stat_; + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + public java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats> getStatList() { + return stat_; + } + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStatsOrBuilder> + getStatOrBuilderList() { + return stat_; + } + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + public int getStatCount() { + return stat_.size(); + } + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats getStat(int index) { + return stat_.get(index); + } + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStatsOrBuilder getStatOrBuilder( + int index) { + return stat_.get(index); + } + + private void initFields() { + region_ = java.util.Collections.emptyList(); + stat_ = java.util.Collections.emptyList(); + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + for (int i = 0; i < getRegionCount(); i++) { + if (!getRegion(i).isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + for (int i = 0; i < region_.size(); i++) { + output.writeMessage(1, region_.get(i)); + } + for (int i = 0; i < stat_.size(); i++) { + output.writeMessage(2, stat_.get(i)); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + for (int i = 0; i < region_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, region_.get(i)); + } + for (int i = 0; i < stat_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(2, stat_.get(i)); + } + size += getUnknownFields().getSerializedSize(); + memoizedSerializedSize = 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; + } + if (!(obj instanceof org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats)) { + return super.equals(obj); + } + org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats other = (org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats) obj; + + boolean result = true; + result = result && getRegionList() + .equals(other.getRegionList()); + result = result && getStatList() + .equals(other.getStatList()); + result = result && + getUnknownFields().equals(other.getUnknownFields()); + return result; + } + + private int memoizedHashCode = 0; + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptorForType().hashCode(); + if (getRegionCount() > 0) { + hash = (37 * hash) + REGION_FIELD_NUMBER; + hash = (53 * hash) + getRegionList().hashCode(); + } + if (getStatCount() > 0) { + hash = (37 * hash) + STAT_FIELD_NUMBER; + hash = (53 * hash) + getStatList().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input, extensionRegistry); + } + public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return PARSER.parseFrom(input, extensionRegistry); + } + + public static Builder newBuilder() { return Builder.create(); } + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats prototype) { + return newBuilder().mergeFrom(prototype); + } + public Builder toBuilder() { return newBuilder(this); } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code hbase.pb.MultiRegionLoadStats} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder<Builder> + implements org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStatsOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MultiRegionLoadStats_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MultiRegionLoadStats_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats.class, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats.Builder.class); + } + + // Construct using org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getRegionFieldBuilder(); + getStatFieldBuilder(); + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + if (regionBuilder_ == null) { + region_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + } else { + regionBuilder_.clear(); + } + if (statBuilder_ == null) { + stat_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + } else { + statBuilder_.clear(); + } + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.internal_static_hbase_pb_MultiRegionLoadStats_descriptor; + } + + public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats getDefaultInstanceForType() { + return org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats.getDefaultInstance(); + } + + public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats build() { + org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats buildPartial() { + org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats result = new org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats(this); + int from_bitField0_ = bitField0_; + if (regionBuilder_ == null) { + if (((bitField0_ & 0x00000001) == 0x00000001)) { + region_ = java.util.Collections.unmodifiableList(region_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.region_ = region_; + } else { + result.region_ = regionBuilder_.build(); + } + if (statBuilder_ == null) { + if (((bitField0_ & 0x00000002) == 0x00000002)) { + stat_ = java.util.Collections.unmodifiableList(stat_); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.stat_ = stat_; + } else { + result.stat_ = statBuilder_.build(); + } + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats) { + return mergeFrom((org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats other) { + if (other == org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats.getDefaultInstance()) return this; + if (regionBuilder_ == null) { + if (!other.region_.isEmpty()) { + if (region_.isEmpty()) { + region_ = other.region_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureRegionIsMutable(); + region_.addAll(other.region_); + } + onChanged(); + } + } else { + if (!other.region_.isEmpty()) { + if (regionBuilder_.isEmpty()) { + regionBuilder_.dispose(); + regionBuilder_ = null; + region_ = other.region_; + bitField0_ = (bitField0_ & ~0x00000001); + regionBuilder_ = + com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + getRegionFieldBuilder() : null; + } else { + regionBuilder_.addAllMessages(other.region_); + } + } + } + if (statBuilder_ == null) { + if (!other.stat_.isEmpty()) { + if (stat_.isEmpty()) { + stat_ = other.stat_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureStatIsMutable(); + stat_.addAll(other.stat_); + } + onChanged(); + } + } else { + if (!other.stat_.isEmpty()) { + if (statBuilder_.isEmpty()) { + statBuilder_.dispose(); + statBuilder_ = null; + stat_ = other.stat_; + bitField0_ = (bitField0_ & ~0x00000002); + statBuilder_ = + com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + getStatFieldBuilder() : null; + } else { + statBuilder_.addAllMessages(other.stat_); + } + } + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + for (int i = 0; i < getRegionCount(); i++) { + if (!getRegion(i).isInitialized()) { + + return false; + } + } + return true; + } + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // repeated .hbase.pb.RegionSpecifier region = 1; + private java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier> region_ = + java.util.Collections.emptyList(); + private void ensureRegionIsMutable() { + if (!((bitField0_ & 0x00000001) == 0x00000001)) { + region_ = new java.util.ArrayList<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier>(region_); + bitField0_ |= 0x00000001; + } + } + + private com.google.protobuf.RepeatedFieldBuilder< + org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> regionBuilder_; + + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + public java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier> getRegionList() { + if (regionBuilder_ == null) { + return java.util.Collections.unmodifiableList(region_); + } else { + return regionBuilder_.getMessageList(); + } + } + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + public int getRegionCount() { + if (regionBuilder_ == null) { + return region_.size(); + } else { + return regionBuilder_.getCount(); + } + } + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier getRegion(int index) { + if (regionBuilder_ == null) { + return region_.get(index); + } else { + return regionBuilder_.getMessage(index); + } + } + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + public Builder setRegion( + int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) { + if (regionBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureRegionIsMutable(); + region_.set(index, value); + onChanged(); + } else { + regionBuilder_.setMessage(index, value); + } + return this; + } + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + public Builder setRegion( + int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) { + if (regionBuilder_ == null) { + ensureRegionIsMutable(); + region_.set(index, builderForValue.build()); + onChanged(); + } else { + regionBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + public Builder addRegion(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) { + if (regionBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureRegionIsMutable(); + region_.add(value); + onChanged(); + } else { + regionBuilder_.addMessage(value); + } + return this; + } + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + public Builder addRegion( + int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier value) { + if (regionBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureRegionIsMutable(); + region_.add(index, value); + onChanged(); + } else { + regionBuilder_.addMessage(index, value); + } + return this; + } + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + public Builder addRegion( + org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) { + if (regionBuilder_ == null) { + ensureRegionIsMutable(); + region_.add(builderForValue.build()); + onChanged(); + } else { + regionBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + public Builder addRegion( + int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder builderForValue) { + if (regionBuilder_ == null) { + ensureRegionIsMutable(); + region_.add(index, builderForValue.build()); + onChanged(); + } else { + regionBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + public Builder addAllRegion( + java.lang.Iterable<? extends org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier> values) { + if (regionBuilder_ == null) { + ensureRegionIsMutable(); + super.addAll(values, region_); + onChanged(); + } else { + regionBuilder_.addAllMessages(values); + } + return this; + } + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + public Builder clearRegion() { + if (regionBuilder_ == null) { + region_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000001); + onChanged(); + } else { + regionBuilder_.clear(); + } + return this; + } + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + public Builder removeRegion(int index) { + if (regionBuilder_ == null) { + ensureRegionIsMutable(); + region_.remove(index); + onChanged(); + } else { + regionBuilder_.remove(index); + } + return this; + } + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder getRegionBuilder( + int index) { + return getRegionFieldBuilder().getBuilder(index); + } + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder getRegionOrBuilder( + int index) { + if (regionBuilder_ == null) { + return region_.get(index); } else { + return regionBuilder_.getMessageOrBuilder(index); + } + } + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> + getRegionOrBuilderList() { + if (regionBuilder_ != null) { + return regionBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(region_); + } + } + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder addRegionBuilder() { + return getRegionFieldBuilder().addBuilder( + org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance()); + } + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder addRegionBuilder( + int index) { + return getRegionFieldBuilder().addBuilder( + index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.getDefaultInstance()); + } + /** + * <code>repeated .hbase.pb.RegionSpecifier region = 1;</code> + */ + public java.util.List<org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder> + getRegionBuilderList() { + return getRegionFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilder< + org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder> + getRegionFieldBuilder() { + if (regionBuilder_ == null) { + regionBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifier.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.RegionSpecifierOrBuilder>( + region_, + ((bitField0_ & 0x00000001) == 0x00000001), + getParentForChildren(), + isClean()); + region_ = null; + } + return regionBuilder_; + } + + // repeated .hbase.pb.RegionLoadStats stat = 2; + private java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats> stat_ = + java.util.Collections.emptyList(); + private void ensureStatIsMutable() { + if (!((bitField0_ & 0x00000002) == 0x00000002)) { + stat_ = new java.util.ArrayList<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats>(stat_); + bitField0_ |= 0x00000002; + } + } + + private com.google.protobuf.RepeatedFieldBuilder< + org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStatsOrBuilder> statBuilder_; + + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + public java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats> getStatList() { + if (statBuilder_ == null) { + return java.util.Collections.unmodifiableList(stat_); + } else { + return statBuilder_.getMessageList(); + } + } + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + public int getStatCount() { + if (statBuilder_ == null) { + return stat_.size(); + } else { + return statBuilder_.getCount(); + } + } + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats getStat(int index) { + if (statBuilder_ == null) { + return stat_.get(index); + } else { + return statBuilder_.getMessage(index); + } + } + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + public Builder setStat( + int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats value) { + if (statBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureStatIsMutable(); + stat_.set(index, value); + onChanged(); + } else { + statBuilder_.setMessage(index, value); + } + return this; + } + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + public Builder setStat( + int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.Builder builderForValue) { + if (statBuilder_ == null) { + ensureStatIsMutable(); + stat_.set(index, builderForValue.build()); + onChanged(); + } else { + statBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + public Builder addStat(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats value) { + if (statBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureStatIsMutable(); + stat_.add(value); + onChanged(); + } else { + statBuilder_.addMessage(value); + } + return this; + } + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + public Builder addStat( + int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats value) { + if (statBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureStatIsMutable(); + stat_.add(index, value); + onChanged(); + } else { + statBuilder_.addMessage(index, value); + } + return this; + } + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + public Builder addStat( + org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.Builder builderForValue) { + if (statBuilder_ == null) { + ensureStatIsMutable(); + stat_.add(builderForValue.build()); + onChanged(); + } else { + statBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + public Builder addStat( + int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.Builder builderForValue) { + if (statBuilder_ == null) { + ensureStatIsMutable(); + stat_.add(index, builderForValue.build()); + onChanged(); + } else { + statBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + public Builder addAllStat( + java.lang.Iterable<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats> values) { + if (statBuilder_ == null) { + ensureStatIsMutable(); + super.addAll(values, stat_); + onChanged(); + } else { + statBuilder_.addAllMessages(values); + } + return this; + } + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + public Builder clearStat() { + if (statBuilder_ == null) { + stat_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + } else { + statBuilder_.clear(); + } + return this; + } + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + public Builder removeStat(int index) { + if (statBuilder_ == null) { + ensureStatIsMutable(); + stat_.remove(index); + onChanged(); + } else { + statBuilder_.remove(index); + } + return this; + } + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.Builder getStatBuilder( + int index) { + return getStatFieldBuilder().getBuilder(index); + } + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStatsOrBuilder getStatOrBuilder( + int index) { + if (statBuilder_ == null) { + return stat_.get(index); } else { + return statBuilder_.getMessageOrBuilder(index); + } + } + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStatsOrBuilder> + getStatOrBuilderList() { + if (statBuilder_ != null) { + return statBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(stat_); + } + } + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.Builder addStatBuilder() { + return getStatFieldBuilder().addBuilder( + org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.getDefaultInstance()); + } + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.Builder addStatBuilder( + int index) { + return getStatFieldBuilder().addBuilder( + index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.getDefaultInstance()); + } + /** + * <code>repeated .hbase.pb.RegionLoadStats stat = 2;</code> + */ + public java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.Builder> + getStatBuilderList() { + return getStatFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilder< + org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStatsOrBuilder> + getStatFieldBuilder() { + if (statBuilder_ == null) { + statBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStatsOrBuilder>( + stat_, + ((bitField0_ & 0x00000002) == 0x00000002), + getParentForChildren(), + isClean()); + stat_ = null; + } + return statBuilder_; + } + + // @@protoc_insertion_point(builder_scope:hbase.pb.MultiRegionLoadStats) + } + + static { + defaultInstance = new MultiRegionLoadStats(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:hbase.pb.MultiRegionLoadStats) + } + public interface ResultOrExceptionOrBuilder extends com.google.protobuf.MessageOrBuilder { @@ -29236,31 +30325,31 @@ public final class ClientProtos { */ org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResultOrBuilder getServiceResultOrBuilder(); - // optional .hbase.pb.RegionLoadStats loadStats = 5; + // optional .hbase.pb.RegionLoadStats loadStats = 5 [deprecated = true]; /** - * <code>optional .hbase.pb.RegionLoadStats loadStats = 5;</code> + * <code>optional .hbase.pb.RegionLoadStats loadStats = 5 [deprecated = true];</code> * * <pre> * current load on the region * </pre> */ - boolean hasLoadStats(); + @java.lang.Deprecated boolean hasLoadStats(); /** - * <code>optional .hbase.pb.RegionLoadStats loadStats = 5;</code> + * <code>optional .hbase.pb.RegionLoadStats loadStats = 5 [deprecated = true];</code> * * <pre> * current load on the region * </pre> */ - org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats getLoadStats(); + @java.lang.Deprecated org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats getLoadStats(); /** - * <code>optional .hbase.pb.RegionLoadStats loadStats = 5;</code> + * <code>optional .hbase.pb.RegionLoadStats loadStats = 5 [deprecated = true];</code> * * <pre> * current load on the region * </pre> */ - org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStatsOrBuilder getLoadStatsOrBuilder(); + @java.lang.Deprecated org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStatsOrBuilder getLoadStatsOrBuilder(); } /** * Protobuf type {@code hbase.pb.ResultOrException} @@ -29521,37 +30610,37 @@ public final class ClientProtos { return serviceResult_; } - // optional .hbase.pb.RegionLoadStats loadStats = 5; + // optional .hbase.pb.RegionLoadStats loadStats = 5 [deprecated = true]; public static final int LOADSTATS_FIELD_NUMBER = 5; private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats loadStats_; /** - * <code>optional .hbase.pb.RegionLoadStats loadStats = 5;</code> + * <code>optional .hbase.pb.RegionLoadStats loadStats = 5 [deprecated = true];</code> * * <pre> * current load on the region * </pre> */ - public boolean hasLoadStats() { + @java.lang.Deprecated public boolean hasLoadStats() { return ((bitField0_ & 0x00000010) == 0x00000010); } /** - * <code>optional .hbase.pb.RegionLoadStats loadStats = 5;</code> + * <code>optional .hbase.pb.RegionLoadStats loadStats = 5 [deprecated = true];</code> * * <pre> * current load on the region * </pre> */ - public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats getLoadStats() { + @java.lang.Deprecated public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats getLoadStats() { return loadStats_; } /** - * <code>optional .hbase.pb.RegionLoadStats loadStats = 5;</code> + * <code>optional .hbase.pb.RegionLoadStats loadStats = 5 [deprecated = true];</code> * * <pre> * current load on the region * </pre> */ - public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStatsOrBuilder getLoadStatsOrBuilder() { + @java.lang.Deprecated public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStatsOrBuilder getLoadStatsOrBuilder() { return loadStats_; } @@ -30431,28 +31520,28 @@ public final class ClientProtos { return serviceResultBuilder_; } - // optional .hbase.pb.RegionLoadStats loadStats = 5; + // optional .hbase.pb.RegionLoadStats loadStats = 5 [deprecated = true]; private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats loadStats_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.getDefaultInstance(); private com.google.protobuf.SingleFieldBuilder< org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStatsOrBuilder> loadStatsBuilder_; /** - * <code>optional .hbase.pb.RegionLoadStats loadStats = 5;</code> + * <code>optional .hbase.pb.RegionLoadStats loadStats = 5 [deprecated = true];</code> * * <pre> * current load on the region * </pre> */ - public boolean hasLoadStats() { + @java.lang.Deprecated public boolean hasLoadStats() { return ((bitField0_ & 0x00000010) == 0x00000010); } /** - * <code>optional .hbase.pb.RegionLoadStats loadStats = 5;</code> + * <code>optional .hbase.pb.RegionLoadStats loadStats = 5 [deprecated = true];</code> * * <pre> * current load on the region * </pre> */ - public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats getLoadStats() { + @java.lang.Deprecated public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats getLoadStats() { if (loadStatsBuilder_ == null) { return loadStats_; } else { @@ -30460,13 +31549,13 @@ public final class ClientProtos { } } /** - * <code>optional .hbase.pb.RegionLoadStats loadStats = 5;</code> + * <code>optional .hbase.pb.RegionLoadStats loadStats = 5 [deprecated = true];</code> * * <pre> * current load on the region * </pre> */ - public Builder setLoadStats(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats value) { + @java.lang.Deprecated public Builder setLoadStats(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats value) { if (loadStatsBuilder_ == null) { if (value == null) { throw new NullPointerException(); @@ -30480,13 +31569,13 @@ public final class ClientProtos { return this; } /** - * <code>optional .hbase.pb.RegionLoadStats loadStats = 5;</code> + * <code>optional .hbase.pb.RegionLoadStats loadStats = 5 [deprecated = true];</code> * * <pre> * current load on the region * </pre> */ - public Builder setLoadStats( + @java.lang.Deprecated public Builder setLoadStats( org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.Builder builderForValue) { if (loadStatsBuilder_ == null) { loadStats_ = builderForValue.build(); @@ -30498,13 +31587,13 @@ public final class ClientProtos { return this; } /** - * <code>optional .hbase.pb.RegionLoadStats loadStats = 5;</code> + * <code>optional .hbase.pb.RegionLoadStats loadStats = 5 [deprecated = true];</code> * * <pre> * current load on the region * </pre> */ - public Builder mergeLoadStats(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats value) { + @java.lang.Deprecated public Builder mergeLoadStats(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats value) { if (loadStatsBuilder_ == null) { if (((bitField0_ & 0x00000010) == 0x00000010) && loadStats_ != org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.getDefaultInstance()) { @@ -30521,13 +31610,13 @@ public final class ClientProtos { return this; } /** - * <code>optional .hbase.pb.RegionLoadStats loadStats = 5;</code> + * <code>optional .hbase.pb.RegionLoadStats loadStats = 5 [deprecated = true];</code> * * <pre> * current load on the region * </pre> */ - public Builder clearLoadStats() { + @java.lang.Deprecated public Builder clearLoadStats() { if (loadStatsBuilder_ == null) { loadStats_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.getDefaultInstance(); onChanged(); @@ -30538,25 +31627,25 @@ public final class ClientProtos { return this; } /** - * <code>optional .hbase.pb.RegionLoadStats loadStats = 5;</code> + * <code>optional .hbase.pb.RegionLoadStats loadStats = 5 [deprecated = true];</code> * * <pre> * current load on the region * </pre> */ - public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.Builder getLoadStatsBuilder() { + @java.lang.Deprecated public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStats.Builder getLoadStatsBuilder() { bitField0_ |= 0x00000010; onChanged(); return getLoadStatsFieldBuilder().getBuilder(); } /** - * <code>optional .hbase.pb.RegionLoadStats loadStats = 5;</code> + * <code>optional .hbase.pb.RegionLoadStats loadStats = 5 [deprecated = true];</code> * * <pre> * current load on the region * </pre> */ - public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStatsOrBuilder getLoadStatsOrBuilder() { + @java.lang.Deprecated public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionLoadStatsOrBuilder getLoadStatsOrBuilder() { if (loadStatsBuilder_ != null) { return loadStatsBuilder_.getMessageOrBuilder(); } else { @@ -30564,7 +31653,7 @@ public final class ClientProtos { } } /** - * <code>optional .hbase.pb.RegionLoadStats loadStats = 5;</code> + * <code>optional .hbase.pb.RegionLoadStats loadStats = 5 [deprecated = true];</code> * * <pre> * current load on the region @@ -32692,6 +33781,20 @@ public final class ClientProtos { * </pre> */ boolean getProcessed(); + + // optional .hbase.pb.MultiRegionLoadStats regionStatistics = 3; + /** + * <code>optional .hbase.pb.MultiRegionLoadStats regionStatistics = 3;</code> + */ + boolean hasRegionStatistics(); + /** + * <code>optional .hbase.pb.MultiRegionLoadStats regionStatistics = 3;</code> + */ + org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats getRegionStatistics(); + /** + * <code>optional .hbase.pb.MultiRegionLoadStats regionStatistics = 3;</code> + */ + org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStatsOrBuilder getRegionStatisticsOrBuilder(); } /** * Protobuf type {@code hbase.pb.MultiResponse} @@ -32757,6 +33860,19 @@ public final class ClientProtos { processed_ = input.readBool(); break; } + case 26: { + org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats.Builder subBuilder = null; + if (((bitField0_ & 0x00000002) == 0x00000002)) { + subBuilder = regionStatistics_.toBuilder(); + } + regionStatistics_ = input.readMessage(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(regionStatistics_); + regionStatistics_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000002; + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -32860,9 +33976,32 @@ public final class ClientProtos { return processed_; } + // optional .hbase.pb.MultiRegionLoadStats regionStatistics = 3; + public static final int REGIONSTATISTICS_FIELD_NUMBER = 3; + private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats regionStatistics_; + /** + * <code>optional .hbase.pb.MultiRegionLoadStats regionStatistics = 3;</code> + */ + public boolean hasRegionStatistics() { + return ((bitField0_ & 0x00000002) == 0x00000002); + } + /** + * <code>optional .hbase.pb.MultiRegionLoadStats regionStatistics = 3;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats getRegionStatistics() { + return regionStatistics_; + } + /** + * <code>optional .hbase.pb.MultiRegionLoadStats regionStatistics = 3;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStatsOrBuilder getRegionStatisticsOrBuilder() { + return regionStatistics_; + } + private void initFields() { regionActionResult_ = java.util.Collections.emptyList(); processed_ = false; + regionStatistics_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats.getDefaultInstance(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -32875,6 +34014,12 @@ public final class ClientProtos { return false; } } + if (hasRegionStatistics()) { + if (!getRegionStatistics().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } memoizedIsInitialized = 1; return true; } @@ -32888,6 +34033,9 @@ public final class ClientProtos { if (((bitField0_ & 0x00000001) == 0x00000001)) { output.writeBool(2, processed_); } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + output.writeMessage(3, regionStatistics_); + } getUnknownFields().writeTo(output); } @@ -32905,6 +34053,10 @@ public final class ClientProtos { size += com.google.protobuf.CodedOutputStream .computeBoolSize(2, processed_); } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(3, regionStatistics_); + } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -32935,6 +34087,11 @@ public final class ClientProtos { result = result && (getProcessed() == other.getProcessed()); } + result = result && (hasRegionStatistics() == other.hasRegionStatistics()); + if (hasRegionStatistics()) { + result = result && getRegionStatistics() + .equals(other.getRegionStatistics()); + } result = result && getUnknownFields().equals(other.getUnknownFields()); return result; @@ -32956,6 +34113,10 @@ public final class ClientProtos { hash = (37 * hash) + PROCESSED_FIELD_NUMBER; hash = (53 * hash) + hashBoolean(getProcessed()); } + if (hasRegionStatistics()) { + hash = (37 * hash) + REGIONSTATISTICS_FIELD_NUMBER; + hash = (53 * hash) + getRegionStatistics().hashCode(); + } hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -33058,6 +34219,7 @@ public final class ClientProtos { private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { getRegionActionResultFieldBuilder(); + getRegionStatisticsFieldBuilder(); } } private static Builder create() { @@ -33074,6 +34236,12 @@ public final class ClientProtos { } processed_ = false; bitField0_ = (bitField0_ & ~0x00000002); + if (regionStatisticsBuilder_ == null) { + regionStatistics_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats.getDefaultInstance(); + } else { + regionStatisticsBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000004); return this; } @@ -33115,6 +34283,14 @@ public final class ClientProtos { to_bitField0_ |= 0x00000001; } result.processed_ = processed_; + if (((from_bitField0_ & 0x00000004) == 0x00000004)) { + to_bitField0_ |= 0x00000002; + } + if (regionStatisticsBuilder_ == null) { + result.regionStatistics_ = regionStatistics_; + } else { + result.regionStatistics_ = regionStatisticsBuilder_.build(); + } result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -33160,6 +34336,9 @@ public final class ClientProtos { if (other.hasProcessed()) { setProcessed(other.getProcessed()); } + if (other.hasRegionStatistics()) { + mergeRegionStatistics(other.getRegionStatistics()); + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -33171,6 +34350,12 @@ public final class ClientProtos { return false; } } + if (hasRegionStatistics()) { + if (!getRegionStatistics().isInitialized()) { + + return false; + } + } return true; } @@ -33482,6 +34667,123 @@ public final class ClientProtos { return this; } + // optional .hbase.pb.MultiRegionLoadStats regionStatistics = 3; + private org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats regionStatistics_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStatsOrBuilder> regionStatisticsBuilder_; + /** + * <code>optional .hbase.pb.MultiRegionLoadStats regionStatistics = 3;</code> + */ + public boolean hasRegionStatistics() { + return ((bitField0_ & 0x00000004) == 0x00000004); + } + /** + * <code>optional .hbase.pb.MultiRegionLoadStats regionStatistics = 3;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats getRegionStatistics() { + if (regionStatisticsBuilder_ == null) { + return regionStatistics_; + } else { + return regionStatisticsBuilder_.getMessage(); + } + } + /** + * <code>optional .hbase.pb.MultiRegionLoadStats regionStatistics = 3;</code> + */ + public Builder setRegionStatistics(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats value) { + if (regionStatisticsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + regionStatistics_ = value; + onChanged(); + } else { + regionStatisticsBuilder_.setMessage(value); + } + bitField0_ |= 0x00000004; + return this; + } + /** + * <code>optional .hbase.pb.MultiRegionLoadStats regionStatistics = 3;</code> + */ + public Builder setRegionStatistics( + org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats.Builder builderForValue) { + if (regionStatisticsBuilder_ == null) { + regionStatistics_ = builderForValue.build(); + onChanged(); + } else { + regionStatisticsBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000004; + return this; + } + /** + * <code>optional .hbase.pb.MultiRegionLoadStats regionStatistics = 3;</code> + */ + public Builder mergeRegionStatistics(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats value) { + if (regionStatisticsBuilder_ == null) { + if (((bitField0_ & 0x00000004) == 0x00000004) && + regionStatistics_ != org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats.getDefaultInstance()) { + regionStatistics_ = + org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats.newBuilder(regionStatistics_).mergeFrom(value).buildPartial(); + } else { + regionStatistics_ = value; + } + onChanged(); + } else { + regionStatisticsBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000004; + return this; + } + /** + * <code>optional .hbase.pb.MultiRegionLoadStats regionStatistics = 3;</code> + */ + public Builder clearRegionStatistics() { + if (regionStatisticsBuilder_ == null) { + regionStatistics_ = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats.getDefaultInstance(); + onChanged(); + } else { + regionStatisticsBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000004); + return this; + } + /** + * <code>optional .hbase.pb.MultiRegionLoadStats regionStatistics = 3;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats.Builder getRegionStatisticsBuilder() { + bitField0_ |= 0x00000004; + onChanged(); + return getRegionStatisticsFieldBuilder().getBuilder(); + } + /** + * <code>optional .hbase.pb.MultiRegionLoadStats regionStatistics = 3;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStatsOrBuilder getRegionStatisticsOrBuilder() { + if (regionStatisticsBuilder_ != null) { + return regionStatisticsBuilder_.getMessageOrBuilder(); + } else { + return regionStatistics_; + } + } + /** + * <code>optional .hbase.pb.MultiRegionLoadStats regionStatistics = 3;</code> + */ + private com.google.protobuf.SingleFieldBuilder< + org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStatsOrBuilder> + getRegionStatisticsFieldBuilder() { + if (regionStatisticsBuilder_ == null) { + regionStatisticsBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStatsOrBuilder>( + regionStatistics_, + getParentForChildren(), + isClean()); + regionStatistics_ = null; + } + return regionStatisticsBuilder_; + } + // @@protoc_insertion_point(builder_scope:hbase.pb.MultiResponse) } @@ -34282,6 +35584,11 @@ public final class ClientProtos { com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_hbase_pb_RegionLoadStats_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor + internal_static_hbase_pb_MultiRegionLoadStats_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_hbase_pb_MultiRegionLoadStats_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor internal_static_hbase_pb_ResultOrException_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable @@ -34419,36 +35726,40 @@ public final class ClientProtos { "\0132\020.hbase.pb.Action\"c\n\017RegionLoadStats\022\027" + "\n\014memstoreLoad\030\001 \001(\005:\0010\022\030\n\rheapOccupancy" + "\030\002 \001(\005:\0010\022\035\n\022compactionPressure\030\003 \001(\005:\0010" + - "\"\332\001\n\021ResultOrException\022\r\n\005index\030\001 \001(\r\022 \n", - "\006result\030\002 \001(\0132\020.hbase.pb.Result\022*\n\texcep" + - "tion\030\003 \001(\0132\027.hbase.pb.NameBytesPair\022:\n\016s" + - "ervice_result\030\004 \001(\0132\".hbase.pb.Coprocess" + - "orServiceResult\022,\n\tloadStats\030\005 \001(\0132\031.hba" + - "se.pb.RegionLoadStats\"x\n\022RegionActionRes" + - "ult\0226\n\021resultOrException\030\001 \003(\0132\033.hbase.p" + - "b.ResultOrException\022*\n\texception\030\002 \001(\0132\027" + - ".hbase.pb.NameBytesPair\"x\n\014MultiRequest\022" + - ",\n\014regionAction\030\001 \003(\0132\026.hbase.pb.RegionA" + - "ction\022\022\n\nnonceGroup\030\002 \001(\004\022&\n\tcondition\030\003", - " \001(\0132\023.hbase.pb.Condition\"\\\n\rMultiRespon" + - "se\0228\n\022regionActionResult\030\001 \003(\0132\034.hbase.p" + - "b.RegionActionResult\022\021\n\tprocessed\030\002 \001(\010*" + - "\'\n\013Consistency\022\n\n\006STRONG\020\000\022\014\n\010TIMELINE\020\001" + - "2\203\004\n\rClientService\0222\n\003Get\022\024.hbase.pb.Get" + - "Request\032\025.hbase.pb.GetResponse\022;\n\006Mutate" + - "\022\027.hbase.pb.MutateRequest\032\030.hbase.pb.Mut" + - "ateResponse\0225\n\004Scan\022\025.hbase.pb.ScanReque" + - "st\032\026.hbase.pb.ScanResponse\022P\n\rBulkLoadHF" + - "ile\022\036.hbase.pb.BulkLoadHFileRequest\032\037.hb", - "ase.pb.BulkLoadHFileResponse\022X\n\013ExecServ" + - "ice\022#.hbase.pb.CoprocessorServiceRequest" + - "\032$.hbase.pb.CoprocessorServiceResponse\022d" + - "\n\027ExecRegionServerService\022#.hbase.pb.Cop" + - "rocessorServiceRequest\032$.hbase.pb.Coproc" + - "essorServiceResponse\0228\n\005Multi\022\026.hbase.pb" + - ".MultiRequest\032\027.hbase.pb.MultiResponseBB" + - "\n*org.apache.hadoop.hbase.protobuf.gener" + - "atedB\014ClientProtosH\001\210\001\001\240\001\001" + "\"j\n\024MultiRegionLoadStats\022)\n\006region\030\001 \003(\013", + "2\031.hbase.pb.RegionSpecifier\022\'\n\004stat\030\002 \003(" + + "\0132\031.hbase.pb.RegionLoadStats\"\336\001\n\021ResultO" + + "rException\022\r\n\005index\030\001 \001(\r\022 \n\006result\030\002 \001(" + + "\0132\020.hbase.pb.Result\022*\n\texception\030\003 \001(\0132\027" + + ".hbase.pb.NameBytesPair\022:\n\016service_resul" + + "t\030\004 \001(\0132\".hbase.pb.CoprocessorServiceRes" + + "ult\0220\n\tloadStats\030\005 \001(\0132\031.hbase.pb.Region" + + "LoadStatsB\002\030\001\"x\n\022RegionActionResult\0226\n\021r" + + "esultOrException\030\001 \003(\0132\033.hbase.pb.Result" + + "OrException\022*\n\texception\030\002 \001(\0132\027.hbase.p", + "b.NameBytesPair\"x\n\014MultiRequest\022,\n\014regio" + + "nAction\030\001 \003(\0132\026.hbase.pb.RegionAction\022\022\n" + + "\nnonceGroup\030\002 \001(\004\022&\n\tcondition\030\003 \001(\0132\023.h" + + "base.pb.Condition\"\226\001\n\rMultiResponse\0228\n\022r" + + "egionActionResult\030\001 \003(\0132\034.hbase.pb.Regio" + + "nActionResult\022\021\n\tprocessed\030\002 \001(\010\0228\n\020regi" + + "onStatistics\030\003 \001(\0132\036.hbase.pb.MultiRegio" + + "nLoadStats*\'\n\013Consistency\022\n\n\006STRONG\020\000\022\014\n" + + "\010TIMELINE\020\0012\203\004\n\rClientService\0222\n\003Get\022\024.h" + + "base.pb.GetRequest\032\025.hbase.pb.GetRespons", + "e\022;\n\006Mutate\022\027.hbase.pb.MutateRequest\032\030.h" + + "base.pb.MutateResponse\0225\n\004Scan\022\025.hbase.p" + + "b.ScanRequest\032\026.hbase.pb.ScanResponse\022P\n" + + "\rBulkLoadHFile\022\036.hbase.pb.BulkLoadHFileR" + + "equest\032\037.hbase.pb.BulkLoadHFileResponse\022" + + "X\n\013ExecService\022#.hbase.pb.CoprocessorSer" + + "viceRequest\032$.hbase.pb.CoprocessorServic" + + "eResponse\022d\n\027ExecRegionServerService\022#.h" + + "base.pb.CoprocessorServiceRequest\032$.hbas" + + "e.pb.CoprocessorServiceResponse\0228\n\005Multi", + "\022\026.hbase.pb.MultiRequest\032\027.hbase.pb.Mult" + + "iResponseBB\n*org.apache.hadoop.hbase.pro" + + "tobuf.generatedB\014ClientProtosH\001\210\001\001\240\001\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -34611,30 +35922,36 @@ public final class ClientProtos { com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_hbase_pb_RegionLoadStats_descriptor, new java.lang.String[] { "MemstoreLoad", "HeapOccupancy", "CompactionPressure", }); - internal_static_hbase_pb_ResultOrException_descriptor = + internal_static_hbase_pb_MultiRegionLoadStats_descriptor = getDescriptor().getMessageTypes().get(23); + internal_static_hbase_pb_MultiRegionLoadStats_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_hbase_pb_MultiRegionLoadStats_descriptor, + new java.lang.String[] { "Region", "Stat", }); + internal_static_hbase_pb_ResultOrException_descriptor = + getDescriptor().getMessageTypes().get(24); internal_static_hbase_pb_ResultOrException_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_hbase_pb_ResultOrException_descriptor, new java.lang.String[] { "Index", "Result", "Exception", "ServiceResult", "LoadStats", }); internal_static_hbase_pb_RegionActionResult_descriptor = - getDescriptor().getMessageTypes().get(24); + getDescriptor().getMessageTypes().get(25); internal_static_hbase_pb_RegionActionResult_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_hbase_pb_RegionActionResult_descriptor, new java.lang.String[] { "ResultOrException", "Exception", }); internal_static_hbase_pb_MultiRequest_descriptor = - getDescriptor().getMessageTypes().get(25); + getDescriptor().getMessageTypes().get(26); internal_static_hbase_pb_MultiRequest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_hbase_pb_MultiRequest_descriptor, new java.lang.String[] { "RegionAction", "NonceGroup", "Condition", }); internal_static_hbase_pb_MultiResponse_descriptor = - getDescriptor().getMessageTypes().get(26); + getDescriptor().getMessageTypes().get(27); internal_static_hbase_pb_MultiResponse_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_hbase_pb_MultiResponse_descriptor, - new java.lang.String[] { "RegionActionResult", "Processed", }); + new java.lang.String[] { "RegionActionResult", "Processed", "RegionStatistics", }); return null; } };
http://git-wip-us.apache.org/repos/asf/hbase/blob/ee33bf0c/hbase-protocol/src/main/protobuf/Client.proto ---------------------------------------------------------------------- diff --git a/hbase-protocol/src/main/protobuf/Client.proto b/hbase-protocol/src/main/protobuf/Client.proto index 1e48ef0..9cb1555 100644 --- a/hbase-protocol/src/main/protobuf/Client.proto +++ b/hbase-protocol/src/main/protobuf/Client.proto @@ -407,6 +407,11 @@ message RegionLoadStats { optional int32 compactionPressure = 3 [default = 0]; } +message MultiRegionLoadStats{ + repeated RegionSpecifier region = 1; + repeated RegionLoadStats stat = 2; +} + /** * Either a Result or an Exception NameBytesPair (keyed by * exception name whose value is the exception stringified) @@ -421,7 +426,7 @@ message ResultOrException { // result if this was a coprocessor service call optional CoprocessorServiceResult service_result = 4; // current load on the region - optional RegionLoadStats loadStats = 5; + optional RegionLoadStats loadStats = 5 [deprecated=true]; } /** @@ -450,6 +455,7 @@ message MultiResponse { repeated RegionActionResult regionActionResult = 1; // used for mutate to indicate processed only optional bool processed = 2; + optional MultiRegionLoadStats regionStatistics = 3; } http://git-wip-us.apache.org/repos/asf/hbase/blob/ee33bf0c/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java index 374dabe..d3a31a3 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -6934,9 +6934,9 @@ public class HRegion implements HeapSize, PropagatingConfigurationObserver, Regi } /** - * @return the current load statistics for the the region + * @return statistics about the current load of the region */ - public ClientProtos.RegionLoadStats getRegionStats() { + public ClientProtos.RegionLoadStats getLoadStatistics() { if (!regionStatsEnabled) { return null; } http://git-wip-us.apache.org/repos/asf/hbase/blob/ee33bf0c/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java index c35e8ab..b91156f 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java @@ -139,6 +139,7 @@ import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServic import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceResponse; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetRequest; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.GetResponse; +import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRegionLoadStats; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRequest; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiResponse; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateRequest; @@ -324,9 +325,9 @@ public class RSRpcServices implements HBaseRPCErrorHandler, } } - private static ResultOrException getResultOrException( - final ClientProtos.Result r, final int index, final ClientProtos.RegionLoadStats stats) { - return getResultOrException(ResponseConverter.buildActionResult(r, stats), index); + private static ResultOrException getResultOrException(final ClientProtos.Result r, + final int index){ + return getResultOrException(ResponseConverter.buildActionResult(r), index); } private static ResultOrException getResultOrException(final Exception e, final int index) { @@ -427,13 +428,16 @@ public class RSRpcServices implements HBaseRPCErrorHandler, * @param cellScanner if non-null, the mutation data -- the Cell content. * @throws IOException */ - private ClientProtos.RegionLoadStats mutateRows(final Region region, + private void mutateRows(final Region region, final List<ClientProtos.Action> actions, - final CellScanner cellScanner) throws IOException { + final CellScanner cellScanner, RegionActionResult.Builder builder) throws IOException { if (!region.getRegionInfo().isMetaTable()) { regionServer.cacheFlusher.reclaimMemStoreMemory(); } RowMutations rm = null; + int i = 0; + ClientProtos.ResultOrException.Builder resultOrExceptionOrBuilder = + ClientProtos.ResultOrException.newBuilder(); for (ClientProtos.Action action: actions) { if (action.hasGet()) { throw new DoNotRetryIOException("Atomic put and/or delete only, not a Get=" + @@ -453,9 +457,14 @@ public class RSRpcServices implements HBaseRPCErrorHandler, default: throw new DoNotRetryIOException("Atomic put and/or delete only, not " + type.name()); } + // To unify the response format with doNonAtomicRegionMutation and read through client's + // AsyncProcess we have to add an empty result instance per operation + resultOrExceptionOrBuilder.clear(); + resultOrExceptionOrBuilder.setIndex(i++); + builder.addResultOrException( + resultOrExceptionOrBuilder.build()); } region.mutateRow(rm); - return ((HRegion)region).getRegionStats(); } /** @@ -472,11 +481,15 @@ public class RSRpcServices implements HBaseRPCErrorHandler, */ private boolean checkAndRowMutate(final Region region, final List<ClientProtos.Action> actions, final CellScanner cellScanner, byte[] row, byte[] family, byte[] qualifier, - CompareOp compareOp, ByteArrayComparable comparator) throws IOException { + CompareOp compareOp, ByteArrayComparable comparator, + RegionActionResult.Builder builder) throws IOException { if (!region.getRegionInfo().isMetaTable()) { regionServer.cacheFlusher.reclaimMemStoreMemory(); } RowMutations rm = null; + int i = 0; + ClientProtos.ResultOrException.Builder resultOrExceptionOrBuilder = + ClientProtos.ResultOrException.newBuilder(); for (ClientProtos.Action action: actions) { if (action.hasGet()) { throw new DoNotRetryIOException("Atomic put and/or delete only, not a Get=" + @@ -496,8 +509,15 @@ public class RSRpcServices implements HBaseRPCErrorHandler, default: throw new DoNotRetryIOException("Atomic put and/or delete only, not " + type.name()); } + // To unify the response format with doNonAtomicRegionMutation and read through client's + // AsyncProcess we have to add an empty result instance per operation + resultOrExceptionOrBuilder.clear(); + resultOrExceptionOrBuilder.setIndex(i++); + builder.addResultOrException( + resultOrExceptionOrBuilder.build()); } - return region.checkAndRowMutate(row, family, qualifier, compareOp, comparator, rm, Boolean.TRUE); + return region.checkAndRowMutate(row, family, qualifier, compareOp, + comparator, rm, Boolean.TRUE); } /** @@ -787,8 +807,7 @@ public class RSRpcServices implements HBaseRPCErrorHandler, case SUCCESS: builder.addResultOrException(getResultOrException( - ClientProtos.Result.getDefaultInstance(), index, - ((HRegion) region).getRegionStats())); + ClientProtos.Result.getDefaultInstance(), index)); break; } } @@ -2113,13 +2132,16 @@ public class RSRpcServices implements HBaseRPCErrorHandler, Boolean processed = null; this.rpcMultiRequestCount.increment(); + Map<RegionSpecifier, ClientProtos.RegionLoadStats> regionStats = new HashMap<>(request + .getRegionActionCount()); for (RegionAction regionAction : request.getRegionActionList()) { this.requestCount.add(regionAction.getActionCount()); OperationQuota quota; Region region; regionActionResultBuilder.clear(); + RegionSpecifier regionSpecifier = regionAction.getRegion(); try { - region = getRegion(regionAction.getRegion()); + region = getRegion(regionSpecifier); quota = getQuotaManager().checkQuota(region, regionAction.getActionList()); } catch (IOException e) { rpcServer.getMetrics().exception(e); @@ -2147,15 +2169,11 @@ public class RSRpcServices implements HBaseRPCErrorHandler, ByteArrayComparable comparator = ProtobufUtil.toComparator(condition.getComparator()); processed = checkAndRowMutate(region, regionAction.getActionList(), - cellScanner, row, family, qualifier, compareOp, comparator); + cellScanner, row, family, qualifier, compareOp, + comparator, regionActionResultBuilder); } else { - ClientProtos.RegionLoadStats stats = mutateRows(region, regionAction.getActionList(), - cellScanner); - // add the stats to the request - if(stats != null) { - responseBuilder.addRegionActionResult(RegionActionResult.newBuilder() - .addResultOrException(ResultOrException.newBuilder().setLoadStats(stats))); - } + mutateRows(region, regionAction.getActionList(), cellScanner, + regionActionResultBuilder); processed = Boolean.TRUE; } } catch (IOException e) { @@ -2170,14 +2188,26 @@ public class RSRpcServices implements HBaseRPCErrorHandler, } responseBuilder.addRegionActionResult(regionActionResultBuilder.build()); quota.close(); + ClientProtos.RegionLoadStats regionLoadStats = ((HRegion)region).getLoadStatistics(); + if(regionLoadStats != null) { + regionStats.put(regionSpecifier, regionLoadStats); + } } // Load the controller with the Cells to return. if (cellsToReturn != null && !cellsToReturn.isEmpty() && controller != null) { controller.setCellScanner(CellUtil.createCellScanner(cellsToReturn)); } + if (processed != null) { responseBuilder.setProcessed(processed); } + + MultiRegionLoadStats.Builder builder = MultiRegionLoadStats.newBuilder(); + for(Entry<RegionSpecifier, ClientProtos.RegionLoadStats> stat: regionStats.entrySet()){ + builder.addRegion(stat.getKey()); + builder.addStat(stat.getValue()); + } + responseBuilder.setRegionStatistics(builder); return responseBuilder.build(); } http://git-wip-us.apache.org/repos/asf/hbase/blob/ee33bf0c/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCheckAndMutate.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCheckAndMutate.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCheckAndMutate.java index e22f072..591474f 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCheckAndMutate.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestCheckAndMutate.java @@ -53,7 +53,7 @@ public class TestCheckAndMutate { } @Test - public void testCheckAndMutate() throws Exception { + public void testCheckAndMutate() throws Throwable { final TableName tableName = TableName.valueOf("TestPutWithDelete"); final byte[] rowKey = Bytes.toBytes("12345"); final byte[] family = Bytes.toBytes("cf"); @@ -108,7 +108,12 @@ public class TestCheckAndMutate { table.checkAndMutate(rowKey, family, Bytes.toBytes("A"), CompareFilter.CompareOp.EQUAL, Bytes.toBytes("a"), rm); fail("Expected NoSuchColumnFamilyException"); - } catch(NoSuchColumnFamilyException e) { + } catch (RetriesExhaustedWithDetailsException e) { + try { + throw e.getCause(0); + } catch (NoSuchColumnFamilyException e1) { + // expected + } } } finally { table.close();
