http://git-wip-us.apache.org/repos/asf/hbase/blob/7f39baf0/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ZooKeeperProtos.java ---------------------------------------------------------------------- diff --git a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ZooKeeperProtos.java b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ZooKeeperProtos.java index 0240a67..f64d0c1 100644 --- a/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ZooKeeperProtos.java +++ b/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/ZooKeeperProtos.java @@ -3947,6 +3947,719 @@ public final class ZooKeeperProtos { // @@protoc_insertion_point(class_scope:hbase.pb.DeprecatedTableState) } + public interface TableCFOrBuilder + extends com.google.protobuf.MessageOrBuilder { + + // optional .hbase.pb.TableName table_name = 1; + /** + * <code>optional .hbase.pb.TableName table_name = 1;</code> + */ + boolean hasTableName(); + /** + * <code>optional .hbase.pb.TableName table_name = 1;</code> + */ + org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName(); + /** + * <code>optional .hbase.pb.TableName table_name = 1;</code> + */ + org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder(); + + // repeated bytes families = 2; + /** + * <code>repeated bytes families = 2;</code> + */ + java.util.List<com.google.protobuf.ByteString> getFamiliesList(); + /** + * <code>repeated bytes families = 2;</code> + */ + int getFamiliesCount(); + /** + * <code>repeated bytes families = 2;</code> + */ + com.google.protobuf.ByteString getFamilies(int index); + } + /** + * Protobuf type {@code hbase.pb.TableCF} + */ + public static final class TableCF extends + com.google.protobuf.GeneratedMessage + implements TableCFOrBuilder { + // Use TableCF.newBuilder() to construct. + private TableCF(com.google.protobuf.GeneratedMessage.Builder<?> builder) { + super(builder); + this.unknownFields = builder.getUnknownFields(); + } + private TableCF(boolean noInit) { this.unknownFields = com.google.protobuf.UnknownFieldSet.getDefaultInstance(); } + + private static final TableCF defaultInstance; + public static TableCF getDefaultInstance() { + return defaultInstance; + } + + public TableCF getDefaultInstanceForType() { + return defaultInstance; + } + + private final com.google.protobuf.UnknownFieldSet unknownFields; + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private TableCF( + 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: { + org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder subBuilder = null; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + subBuilder = tableName_.toBuilder(); + } + tableName_ = input.readMessage(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(tableName_); + tableName_ = subBuilder.buildPartial(); + } + bitField0_ |= 0x00000001; + break; + } + case 18: { + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { + families_ = new java.util.ArrayList<com.google.protobuf.ByteString>(); + mutable_bitField0_ |= 0x00000002; + } + families_.add(input.readBytes()); + 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_ & 0x00000002) == 0x00000002)) { + families_ = java.util.Collections.unmodifiableList(families_); + } + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_TableCF_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_TableCF_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF.class, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF.Builder.class); + } + + public static com.google.protobuf.Parser<TableCF> PARSER = + new com.google.protobuf.AbstractParser<TableCF>() { + public TableCF parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new TableCF(input, extensionRegistry); + } + }; + + @java.lang.Override + public com.google.protobuf.Parser<TableCF> getParserForType() { + return PARSER; + } + + private int bitField0_; + // optional .hbase.pb.TableName table_name = 1; + public static final int TABLE_NAME_FIELD_NUMBER = 1; + private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName tableName_; + /** + * <code>optional .hbase.pb.TableName table_name = 1;</code> + */ + public boolean hasTableName() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * <code>optional .hbase.pb.TableName table_name = 1;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() { + return tableName_; + } + /** + * <code>optional .hbase.pb.TableName table_name = 1;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() { + return tableName_; + } + + // repeated bytes families = 2; + public static final int FAMILIES_FIELD_NUMBER = 2; + private java.util.List<com.google.protobuf.ByteString> families_; + /** + * <code>repeated bytes families = 2;</code> + */ + public java.util.List<com.google.protobuf.ByteString> + getFamiliesList() { + return families_; + } + /** + * <code>repeated bytes families = 2;</code> + */ + public int getFamiliesCount() { + return families_.size(); + } + /** + * <code>repeated bytes families = 2;</code> + */ + public com.google.protobuf.ByteString getFamilies(int index) { + return families_.get(index); + } + + private void initFields() { + tableName_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance(); + families_ = java.util.Collections.emptyList(); + } + private byte memoizedIsInitialized = -1; + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized != -1) return isInitialized == 1; + + if (hasTableName()) { + if (!getTableName().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } + memoizedIsInitialized = 1; + return true; + } + + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + getSerializedSize(); + if (((bitField0_ & 0x00000001) == 0x00000001)) { + output.writeMessage(1, tableName_); + } + for (int i = 0; i < families_.size(); i++) { + output.writeBytes(2, families_.get(i)); + } + getUnknownFields().writeTo(output); + } + + private int memoizedSerializedSize = -1; + public int getSerializedSize() { + int size = memoizedSerializedSize; + if (size != -1) return size; + + size = 0; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(1, tableName_); + } + { + int dataSize = 0; + for (int i = 0; i < families_.size(); i++) { + dataSize += com.google.protobuf.CodedOutputStream + .computeBytesSizeNoTag(families_.get(i)); + } + size += dataSize; + size += 1 * getFamiliesList().size(); + } + 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.ZooKeeperProtos.TableCF)) { + return super.equals(obj); + } + org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF other = (org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF) obj; + + boolean result = true; + result = result && (hasTableName() == other.hasTableName()); + if (hasTableName()) { + result = result && getTableName() + .equals(other.getTableName()); + } + result = result && getFamiliesList() + .equals(other.getFamiliesList()); + 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 (hasTableName()) { + hash = (37 * hash) + TABLE_NAME_FIELD_NUMBER; + hash = (53 * hash) + getTableName().hashCode(); + } + if (getFamiliesCount() > 0) { + hash = (37 * hash) + FAMILIES_FIELD_NUMBER; + hash = (53 * hash) + getFamiliesList().hashCode(); + } + hash = (29 * hash) + getUnknownFields().hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF 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.ZooKeeperProtos.TableCF parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF 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.ZooKeeperProtos.TableCF parseFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF 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.ZooKeeperProtos.TableCF parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return PARSER.parseDelimitedFrom(input); + } + public static org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF 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.ZooKeeperProtos.TableCF parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return PARSER.parseFrom(input); + } + public static org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF 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.ZooKeeperProtos.TableCF 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.TableCF} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessage.Builder<Builder> + implements org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCFOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_TableCF_descriptor; + } + + protected com.google.protobuf.GeneratedMessage.FieldAccessorTable + internalGetFieldAccessorTable() { + return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_TableCF_fieldAccessorTable + .ensureFieldAccessorsInitialized( + org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF.class, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF.Builder.class); + } + + // Construct using org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessage.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getTableNameFieldBuilder(); + } + } + private static Builder create() { + return new Builder(); + } + + public Builder clear() { + super.clear(); + if (tableNameBuilder_ == null) { + tableName_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance(); + } else { + tableNameBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + families_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + return this; + } + + public Builder clone() { + return create().mergeFrom(buildPartial()); + } + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.internal_static_hbase_pb_TableCF_descriptor; + } + + public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF getDefaultInstanceForType() { + return org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF.getDefaultInstance(); + } + + public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF build() { + org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF buildPartial() { + org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF result = new org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF(this); + int from_bitField0_ = bitField0_; + int to_bitField0_ = 0; + if (((from_bitField0_ & 0x00000001) == 0x00000001)) { + to_bitField0_ |= 0x00000001; + } + if (tableNameBuilder_ == null) { + result.tableName_ = tableName_; + } else { + result.tableName_ = tableNameBuilder_.build(); + } + if (((bitField0_ & 0x00000002) == 0x00000002)) { + families_ = java.util.Collections.unmodifiableList(families_); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.families_ = families_; + result.bitField0_ = to_bitField0_; + onBuilt(); + return result; + } + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF) { + return mergeFrom((org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF other) { + if (other == org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF.getDefaultInstance()) return this; + if (other.hasTableName()) { + mergeTableName(other.getTableName()); + } + if (!other.families_.isEmpty()) { + if (families_.isEmpty()) { + families_ = other.families_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureFamiliesIsMutable(); + families_.addAll(other.families_); + } + onChanged(); + } + this.mergeUnknownFields(other.getUnknownFields()); + return this; + } + + public final boolean isInitialized() { + if (hasTableName()) { + if (!getTableName().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.ZooKeeperProtos.TableCF parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + private int bitField0_; + + // optional .hbase.pb.TableName table_name = 1; + private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName tableName_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder> tableNameBuilder_; + /** + * <code>optional .hbase.pb.TableName table_name = 1;</code> + */ + public boolean hasTableName() { + return ((bitField0_ & 0x00000001) == 0x00000001); + } + /** + * <code>optional .hbase.pb.TableName table_name = 1;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableName() { + if (tableNameBuilder_ == null) { + return tableName_; + } else { + return tableNameBuilder_.getMessage(); + } + } + /** + * <code>optional .hbase.pb.TableName table_name = 1;</code> + */ + public Builder setTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) { + if (tableNameBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + tableName_ = value; + onChanged(); + } else { + tableNameBuilder_.setMessage(value); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * <code>optional .hbase.pb.TableName table_name = 1;</code> + */ + public Builder setTableName( + org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) { + if (tableNameBuilder_ == null) { + tableName_ = builderForValue.build(); + onChanged(); + } else { + tableNameBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * <code>optional .hbase.pb.TableName table_name = 1;</code> + */ + public Builder mergeTableName(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) { + if (tableNameBuilder_ == null) { + if (((bitField0_ & 0x00000001) == 0x00000001) && + tableName_ != org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance()) { + tableName_ = + org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.newBuilder(tableName_).mergeFrom(value).buildPartial(); + } else { + tableName_ = value; + } + onChanged(); + } else { + tableNameBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * <code>optional .hbase.pb.TableName table_name = 1;</code> + */ + public Builder clearTableName() { + if (tableNameBuilder_ == null) { + tableName_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance(); + onChanged(); + } else { + tableNameBuilder_.clear(); + } + bitField0_ = (bitField0_ & ~0x00000001); + return this; + } + /** + * <code>optional .hbase.pb.TableName table_name = 1;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableNameBuilder() { + bitField0_ |= 0x00000001; + onChanged(); + return getTableNameFieldBuilder().getBuilder(); + } + /** + * <code>optional .hbase.pb.TableName table_name = 1;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableNameOrBuilder() { + if (tableNameBuilder_ != null) { + return tableNameBuilder_.getMessageOrBuilder(); + } else { + return tableName_; + } + } + /** + * <code>optional .hbase.pb.TableName table_name = 1;</code> + */ + private com.google.protobuf.SingleFieldBuilder< + org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder> + getTableNameFieldBuilder() { + if (tableNameBuilder_ == null) { + tableNameBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder>( + tableName_, + getParentForChildren(), + isClean()); + tableName_ = null; + } + return tableNameBuilder_; + } + + // repeated bytes families = 2; + private java.util.List<com.google.protobuf.ByteString> families_ = java.util.Collections.emptyList(); + private void ensureFamiliesIsMutable() { + if (!((bitField0_ & 0x00000002) == 0x00000002)) { + families_ = new java.util.ArrayList<com.google.protobuf.ByteString>(families_); + bitField0_ |= 0x00000002; + } + } + /** + * <code>repeated bytes families = 2;</code> + */ + public java.util.List<com.google.protobuf.ByteString> + getFamiliesList() { + return java.util.Collections.unmodifiableList(families_); + } + /** + * <code>repeated bytes families = 2;</code> + */ + public int getFamiliesCount() { + return families_.size(); + } + /** + * <code>repeated bytes families = 2;</code> + */ + public com.google.protobuf.ByteString getFamilies(int index) { + return families_.get(index); + } + /** + * <code>repeated bytes families = 2;</code> + */ + public Builder setFamilies( + int index, com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + ensureFamiliesIsMutable(); + families_.set(index, value); + onChanged(); + return this; + } + /** + * <code>repeated bytes families = 2;</code> + */ + public Builder addFamilies(com.google.protobuf.ByteString value) { + if (value == null) { + throw new NullPointerException(); + } + ensureFamiliesIsMutable(); + families_.add(value); + onChanged(); + return this; + } + /** + * <code>repeated bytes families = 2;</code> + */ + public Builder addAllFamilies( + java.lang.Iterable<? extends com.google.protobuf.ByteString> values) { + ensureFamiliesIsMutable(); + super.addAll(values, families_); + onChanged(); + return this; + } + /** + * <code>repeated bytes families = 2;</code> + */ + public Builder clearFamilies() { + families_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); + onChanged(); + return this; + } + + // @@protoc_insertion_point(builder_scope:hbase.pb.TableCF) + } + + static { + defaultInstance = new TableCF(true); + defaultInstance.initFields(); + } + + // @@protoc_insertion_point(class_scope:hbase.pb.TableCF) + } + public interface ReplicationPeerOrBuilder extends com.google.protobuf.MessageOrBuilder { @@ -4044,6 +4757,31 @@ public final class ZooKeeperProtos { */ org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPairOrBuilder getConfigurationOrBuilder( int index); + + // repeated .hbase.pb.TableCF table_cfs = 5; + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + java.util.List<org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF> + getTableCfsList(); + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF getTableCfs(int index); + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + int getTableCfsCount(); + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCFOrBuilder> + getTableCfsOrBuilderList(); + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCFOrBuilder getTableCfsOrBuilder( + int index); } /** * Protobuf type {@code hbase.pb.ReplicationPeer} @@ -4127,6 +4865,14 @@ public final class ZooKeeperProtos { configuration_.add(input.readMessage(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.NameStringPair.PARSER, extensionRegistry)); break; } + case 42: { + if (!((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + tableCfs_ = new java.util.ArrayList<org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF>(); + mutable_bitField0_ |= 0x00000010; + } + tableCfs_.add(input.readMessage(org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF.PARSER, extensionRegistry)); + break; + } } } } catch (com.google.protobuf.InvalidProtocolBufferException e) { @@ -4141,6 +4887,9 @@ public final class ZooKeeperProtos { if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { configuration_ = java.util.Collections.unmodifiableList(configuration_); } + if (((mutable_bitField0_ & 0x00000010) == 0x00000010)) { + tableCfs_ = java.util.Collections.unmodifiableList(tableCfs_); + } this.unknownFields = unknownFields.build(); makeExtensionsImmutable(); } @@ -4346,11 +5095,48 @@ public final class ZooKeeperProtos { return configuration_.get(index); } + // repeated .hbase.pb.TableCF table_cfs = 5; + public static final int TABLE_CFS_FIELD_NUMBER = 5; + private java.util.List<org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF> tableCfs_; + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + public java.util.List<org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF> getTableCfsList() { + return tableCfs_; + } + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCFOrBuilder> + getTableCfsOrBuilderList() { + return tableCfs_; + } + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + public int getTableCfsCount() { + return tableCfs_.size(); + } + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF getTableCfs(int index) { + return tableCfs_.get(index); + } + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCFOrBuilder getTableCfsOrBuilder( + int index) { + return tableCfs_.get(index); + } + private void initFields() { clusterkey_ = ""; replicationEndpointImpl_ = ""; data_ = java.util.Collections.emptyList(); configuration_ = java.util.Collections.emptyList(); + tableCfs_ = java.util.Collections.emptyList(); } private byte memoizedIsInitialized = -1; public final boolean isInitialized() { @@ -4373,6 +5159,12 @@ public final class ZooKeeperProtos { return false; } } + for (int i = 0; i < getTableCfsCount(); i++) { + if (!getTableCfs(i).isInitialized()) { + memoizedIsInitialized = 0; + return false; + } + } memoizedIsInitialized = 1; return true; } @@ -4392,6 +5184,9 @@ public final class ZooKeeperProtos { for (int i = 0; i < configuration_.size(); i++) { output.writeMessage(4, configuration_.get(i)); } + for (int i = 0; i < tableCfs_.size(); i++) { + output.writeMessage(5, tableCfs_.get(i)); + } getUnknownFields().writeTo(output); } @@ -4417,6 +5212,10 @@ public final class ZooKeeperProtos { size += com.google.protobuf.CodedOutputStream .computeMessageSize(4, configuration_.get(i)); } + for (int i = 0; i < tableCfs_.size(); i++) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(5, tableCfs_.get(i)); + } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; return size; @@ -4454,6 +5253,8 @@ public final class ZooKeeperProtos { .equals(other.getDataList()); result = result && getConfigurationList() .equals(other.getConfigurationList()); + result = result && getTableCfsList() + .equals(other.getTableCfsList()); result = result && getUnknownFields().equals(other.getUnknownFields()); return result; @@ -4483,6 +5284,10 @@ public final class ZooKeeperProtos { hash = (37 * hash) + CONFIGURATION_FIELD_NUMBER; hash = (53 * hash) + getConfigurationList().hashCode(); } + if (getTableCfsCount() > 0) { + hash = (37 * hash) + TABLE_CFS_FIELD_NUMBER; + hash = (53 * hash) + getTableCfsList().hashCode(); + } hash = (29 * hash) + getUnknownFields().hashCode(); memoizedHashCode = hash; return hash; @@ -4591,6 +5396,7 @@ public final class ZooKeeperProtos { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { getDataFieldBuilder(); getConfigurationFieldBuilder(); + getTableCfsFieldBuilder(); } } private static Builder create() { @@ -4615,6 +5421,12 @@ public final class ZooKeeperProtos { } else { configurationBuilder_.clear(); } + if (tableCfsBuilder_ == null) { + tableCfs_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000010); + } else { + tableCfsBuilder_.clear(); + } return this; } @@ -4669,6 +5481,15 @@ public final class ZooKeeperProtos { } else { result.configuration_ = configurationBuilder_.build(); } + if (tableCfsBuilder_ == null) { + if (((bitField0_ & 0x00000010) == 0x00000010)) { + tableCfs_ = java.util.Collections.unmodifiableList(tableCfs_); + bitField0_ = (bitField0_ & ~0x00000010); + } + result.tableCfs_ = tableCfs_; + } else { + result.tableCfs_ = tableCfsBuilder_.build(); + } result.bitField0_ = to_bitField0_; onBuilt(); return result; @@ -4747,6 +5568,32 @@ public final class ZooKeeperProtos { } } } + if (tableCfsBuilder_ == null) { + if (!other.tableCfs_.isEmpty()) { + if (tableCfs_.isEmpty()) { + tableCfs_ = other.tableCfs_; + bitField0_ = (bitField0_ & ~0x00000010); + } else { + ensureTableCfsIsMutable(); + tableCfs_.addAll(other.tableCfs_); + } + onChanged(); + } + } else { + if (!other.tableCfs_.isEmpty()) { + if (tableCfsBuilder_.isEmpty()) { + tableCfsBuilder_.dispose(); + tableCfsBuilder_ = null; + tableCfs_ = other.tableCfs_; + bitField0_ = (bitField0_ & ~0x00000010); + tableCfsBuilder_ = + com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + getTableCfsFieldBuilder() : null; + } else { + tableCfsBuilder_.addAllMessages(other.tableCfs_); + } + } + } this.mergeUnknownFields(other.getUnknownFields()); return this; } @@ -4768,6 +5615,12 @@ public final class ZooKeeperProtos { return false; } } + for (int i = 0; i < getTableCfsCount(); i++) { + if (!getTableCfs(i).isInitialized()) { + + return false; + } + } return true; } @@ -5448,6 +6301,246 @@ public final class ZooKeeperProtos { return configurationBuilder_; } + // repeated .hbase.pb.TableCF table_cfs = 5; + private java.util.List<org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF> tableCfs_ = + java.util.Collections.emptyList(); + private void ensureTableCfsIsMutable() { + if (!((bitField0_ & 0x00000010) == 0x00000010)) { + tableCfs_ = new java.util.ArrayList<org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF>(tableCfs_); + bitField0_ |= 0x00000010; + } + } + + private com.google.protobuf.RepeatedFieldBuilder< + org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF.Builder, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCFOrBuilder> tableCfsBuilder_; + + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + public java.util.List<org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF> getTableCfsList() { + if (tableCfsBuilder_ == null) { + return java.util.Collections.unmodifiableList(tableCfs_); + } else { + return tableCfsBuilder_.getMessageList(); + } + } + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + public int getTableCfsCount() { + if (tableCfsBuilder_ == null) { + return tableCfs_.size(); + } else { + return tableCfsBuilder_.getCount(); + } + } + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF getTableCfs(int index) { + if (tableCfsBuilder_ == null) { + return tableCfs_.get(index); + } else { + return tableCfsBuilder_.getMessage(index); + } + } + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + public Builder setTableCfs( + int index, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF value) { + if (tableCfsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureTableCfsIsMutable(); + tableCfs_.set(index, value); + onChanged(); + } else { + tableCfsBuilder_.setMessage(index, value); + } + return this; + } + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + public Builder setTableCfs( + int index, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF.Builder builderForValue) { + if (tableCfsBuilder_ == null) { + ensureTableCfsIsMutable(); + tableCfs_.set(index, builderForValue.build()); + onChanged(); + } else { + tableCfsBuilder_.setMessage(index, builderForValue.build()); + } + return this; + } + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + public Builder addTableCfs(org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF value) { + if (tableCfsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureTableCfsIsMutable(); + tableCfs_.add(value); + onChanged(); + } else { + tableCfsBuilder_.addMessage(value); + } + return this; + } + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + public Builder addTableCfs( + int index, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF value) { + if (tableCfsBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + ensureTableCfsIsMutable(); + tableCfs_.add(index, value); + onChanged(); + } else { + tableCfsBuilder_.addMessage(index, value); + } + return this; + } + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + public Builder addTableCfs( + org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF.Builder builderForValue) { + if (tableCfsBuilder_ == null) { + ensureTableCfsIsMutable(); + tableCfs_.add(builderForValue.build()); + onChanged(); + } else { + tableCfsBuilder_.addMessage(builderForValue.build()); + } + return this; + } + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + public Builder addTableCfs( + int index, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF.Builder builderForValue) { + if (tableCfsBuilder_ == null) { + ensureTableCfsIsMutable(); + tableCfs_.add(index, builderForValue.build()); + onChanged(); + } else { + tableCfsBuilder_.addMessage(index, builderForValue.build()); + } + return this; + } + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + public Builder addAllTableCfs( + java.lang.Iterable<? extends org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF> values) { + if (tableCfsBuilder_ == null) { + ensureTableCfsIsMutable(); + super.addAll(values, tableCfs_); + onChanged(); + } else { + tableCfsBuilder_.addAllMessages(values); + } + return this; + } + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + public Builder clearTableCfs() { + if (tableCfsBuilder_ == null) { + tableCfs_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000010); + onChanged(); + } else { + tableCfsBuilder_.clear(); + } + return this; + } + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + public Builder removeTableCfs(int index) { + if (tableCfsBuilder_ == null) { + ensureTableCfsIsMutable(); + tableCfs_.remove(index); + onChanged(); + } else { + tableCfsBuilder_.remove(index); + } + return this; + } + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF.Builder getTableCfsBuilder( + int index) { + return getTableCfsFieldBuilder().getBuilder(index); + } + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCFOrBuilder getTableCfsOrBuilder( + int index) { + if (tableCfsBuilder_ == null) { + return tableCfs_.get(index); } else { + return tableCfsBuilder_.getMessageOrBuilder(index); + } + } + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCFOrBuilder> + getTableCfsOrBuilderList() { + if (tableCfsBuilder_ != null) { + return tableCfsBuilder_.getMessageOrBuilderList(); + } else { + return java.util.Collections.unmodifiableList(tableCfs_); + } + } + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF.Builder addTableCfsBuilder() { + return getTableCfsFieldBuilder().addBuilder( + org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF.getDefaultInstance()); + } + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + public org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF.Builder addTableCfsBuilder( + int index) { + return getTableCfsFieldBuilder().addBuilder( + index, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF.getDefaultInstance()); + } + /** + * <code>repeated .hbase.pb.TableCF table_cfs = 5;</code> + */ + public java.util.List<org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF.Builder> + getTableCfsBuilderList() { + return getTableCfsFieldBuilder().getBuilderList(); + } + private com.google.protobuf.RepeatedFieldBuilder< + org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF.Builder, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCFOrBuilder> + getTableCfsFieldBuilder() { + if (tableCfsBuilder_ == null) { + tableCfsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< + org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCF.Builder, org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos.TableCFOrBuilder>( + tableCfs_, + ((bitField0_ & 0x00000010) == 0x00000010), + getParentForChildren(), + isClean()); + tableCfs_ = null; + } + return tableCfsBuilder_; + } + // @@protoc_insertion_point(builder_scope:hbase.pb.ReplicationPeer) } @@ -8666,6 +9759,11 @@ public final class ZooKeeperProtos { com.google.protobuf.GeneratedMessage.FieldAccessorTable internal_static_hbase_pb_DeprecatedTableState_fieldAccessorTable; private static com.google.protobuf.Descriptors.Descriptor + internal_static_hbase_pb_TableCF_descriptor; + private static + com.google.protobuf.GeneratedMessage.FieldAccessorTable + internal_static_hbase_pb_TableCF_fieldAccessorTable; + private static com.google.protobuf.Descriptors.Descriptor internal_static_hbase_pb_ReplicationPeer_descriptor; private static com.google.protobuf.GeneratedMessage.FieldAccessorTable @@ -8722,23 +9820,26 @@ public final class ZooKeeperProtos { "Y\020\002\"\225\001\n\024DeprecatedTableState\022<\n\005state\030\001 " + "\002(\0162$.hbase.pb.DeprecatedTableState.Stat" + "e:\007ENABLED\"?\n\005State\022\013\n\007ENABLED\020\000\022\014\n\010DISA" + - "BLED\020\001\022\r\n\tDISABLING\020\002\022\014\n\010ENABLING\020\003\"\237\001\n\017" + - "ReplicationPeer\022\022\n\nclusterkey\030\001 \002(\t\022\037\n\027r", - "eplicationEndpointImpl\030\002 \001(\t\022&\n\004data\030\003 \003" + - "(\0132\030.hbase.pb.BytesBytesPair\022/\n\rconfigur" + - "ation\030\004 \003(\0132\030.hbase.pb.NameStringPair\"g\n" + - "\020ReplicationState\022/\n\005state\030\001 \002(\0162 .hbase" + - ".pb.ReplicationState.State\"\"\n\005State\022\013\n\007E" + - "NABLED\020\000\022\014\n\010DISABLED\020\001\"+\n\027ReplicationHLo" + - "gPosition\022\020\n\010position\030\001 \002(\003\"%\n\017Replicati" + - "onLock\022\022\n\nlock_owner\030\001 \002(\t\"\252\001\n\tTableLock" + - "\022\'\n\ntable_name\030\001 \001(\0132\023.hbase.pb.TableNam" + - "e\022(\n\nlock_owner\030\002 \001(\0132\024.hbase.pb.ServerN", - "ame\022\021\n\tthread_id\030\003 \001(\003\022\021\n\tis_shared\030\004 \001(" + - "\010\022\017\n\007purpose\030\005 \001(\t\022\023\n\013create_time\030\006 \001(\003\"" + - "\036\n\013SwitchState\022\017\n\007enabled\030\001 \001(\010BE\n*org.a" + - "pache.hadoop.hbase.protobuf.generatedB\017Z" + - "ooKeeperProtosH\001\210\001\001\240\001\001" + "BLED\020\001\022\r\n\tDISABLING\020\002\022\014\n\010ENABLING\020\003\"D\n\007T" + + "ableCF\022\'\n\ntable_name\030\001 \001(\0132\023.hbase.pb.Ta", + "bleName\022\020\n\010families\030\002 \003(\014\"\305\001\n\017Replicatio" + + "nPeer\022\022\n\nclusterkey\030\001 \002(\t\022\037\n\027replication" + + "EndpointImpl\030\002 \001(\t\022&\n\004data\030\003 \003(\0132\030.hbase" + + ".pb.BytesBytesPair\022/\n\rconfiguration\030\004 \003(" + + "\0132\030.hbase.pb.NameStringPair\022$\n\ttable_cfs" + + "\030\005 \003(\0132\021.hbase.pb.TableCF\"g\n\020Replication" + + "State\022/\n\005state\030\001 \002(\0162 .hbase.pb.Replicat" + + "ionState.State\"\"\n\005State\022\013\n\007ENABLED\020\000\022\014\n\010" + + "DISABLED\020\001\"+\n\027ReplicationHLogPosition\022\020\n" + + "\010position\030\001 \002(\003\"%\n\017ReplicationLock\022\022\n\nlo", + "ck_owner\030\001 \002(\t\"\252\001\n\tTableLock\022\'\n\ntable_na" + + "me\030\001 \001(\0132\023.hbase.pb.TableName\022(\n\nlock_ow" + + "ner\030\002 \001(\0132\024.hbase.pb.ServerName\022\021\n\tthrea" + + "d_id\030\003 \001(\003\022\021\n\tis_shared\030\004 \001(\010\022\017\n\007purpose" + + "\030\005 \001(\t\022\023\n\013create_time\030\006 \001(\003\"\036\n\013SwitchSta" + + "te\022\017\n\007enabled\030\001 \001(\010BE\n*org.apache.hadoop" + + ".hbase.protobuf.generatedB\017ZooKeeperProt" + + "osH\001\210\001\001\240\001\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -8775,38 +9876,44 @@ public final class ZooKeeperProtos { com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_hbase_pb_DeprecatedTableState_descriptor, new java.lang.String[] { "State", }); - internal_static_hbase_pb_ReplicationPeer_descriptor = + internal_static_hbase_pb_TableCF_descriptor = getDescriptor().getMessageTypes().get(5); + internal_static_hbase_pb_TableCF_fieldAccessorTable = new + com.google.protobuf.GeneratedMessage.FieldAccessorTable( + internal_static_hbase_pb_TableCF_descriptor, + new java.lang.String[] { "TableName", "Families", }); + internal_static_hbase_pb_ReplicationPeer_descriptor = + getDescriptor().getMessageTypes().get(6); internal_static_hbase_pb_ReplicationPeer_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_hbase_pb_ReplicationPeer_descriptor, - new java.lang.String[] { "Clusterkey", "ReplicationEndpointImpl", "Data", "Configuration", }); + new java.lang.String[] { "Clusterkey", "ReplicationEndpointImpl", "Data", "Configuration", "TableCfs", }); internal_static_hbase_pb_ReplicationState_descriptor = - getDescriptor().getMessageTypes().get(6); + getDescriptor().getMessageTypes().get(7); internal_static_hbase_pb_ReplicationState_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_hbase_pb_ReplicationState_descriptor, new java.lang.String[] { "State", }); internal_static_hbase_pb_ReplicationHLogPosition_descriptor = - getDescriptor().getMessageTypes().get(7); + getDescriptor().getMessageTypes().get(8); internal_static_hbase_pb_ReplicationHLogPosition_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_hbase_pb_ReplicationHLogPosition_descriptor, new java.lang.String[] { "Position", }); internal_static_hbase_pb_ReplicationLock_descriptor = - getDescriptor().getMessageTypes().get(8); + getDescriptor().getMessageTypes().get(9); internal_static_hbase_pb_ReplicationLock_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_hbase_pb_ReplicationLock_descriptor, new java.lang.String[] { "LockOwner", }); internal_static_hbase_pb_TableLock_descriptor = - getDescriptor().getMessageTypes().get(9); + getDescriptor().getMessageTypes().get(10); internal_static_hbase_pb_TableLock_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_hbase_pb_TableLock_descriptor, new java.lang.String[] { "TableName", "LockOwner", "ThreadId", "IsShared", "Purpose", "CreateTime", }); internal_static_hbase_pb_SwitchState_descriptor = - getDescriptor().getMessageTypes().get(10); + getDescriptor().getMessageTypes().get(11); internal_static_hbase_pb_SwitchState_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_hbase_pb_SwitchState_descriptor,
http://git-wip-us.apache.org/repos/asf/hbase/blob/7f39baf0/hbase-protocol/src/main/protobuf/ZooKeeper.proto ---------------------------------------------------------------------- diff --git a/hbase-protocol/src/main/protobuf/ZooKeeper.proto b/hbase-protocol/src/main/protobuf/ZooKeeper.proto index 4963c09..186d183 100644 --- a/hbase-protocol/src/main/protobuf/ZooKeeper.proto +++ b/hbase-protocol/src/main/protobuf/ZooKeeper.proto @@ -105,6 +105,11 @@ message DeprecatedTableState { required State state = 1 [default = ENABLED]; } +message TableCF { + optional TableName table_name = 1; + repeated bytes families = 2; +} + /** * Used by replication. Holds a replication peer key. */ @@ -115,6 +120,7 @@ message ReplicationPeer { optional string replicationEndpointImpl = 2; repeated BytesBytesPair data = 3; repeated NameStringPair configuration = 4; + repeated TableCF table_cfs = 5; } /** http://git-wip-us.apache.org/repos/asf/hbase/blob/7f39baf0/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java index 221dcd5..9829a85 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/master/HMaster.java @@ -141,6 +141,7 @@ import org.apache.hadoop.hbase.regionserver.RegionCoprocessorHost; import org.apache.hadoop.hbase.regionserver.RegionSplitPolicy; import org.apache.hadoop.hbase.regionserver.compactions.ExploringCompactionPolicy; import org.apache.hadoop.hbase.regionserver.compactions.FIFOCompactionPolicy; +import org.apache.hadoop.hbase.replication.master.TableCFsUpdater; import org.apache.hadoop.hbase.replication.regionserver.Replication; import org.apache.hadoop.hbase.security.User; import org.apache.hadoop.hbase.security.UserProvider; @@ -671,6 +672,7 @@ public class HMaster extends HRegionServer implements MasterServices { // publish cluster ID status.setStatus("Publishing Cluster ID in ZooKeeper"); ZKClusterId.setClusterId(this.zooKeeper, fileSystemManager.getClusterId()); + this.serverManager = createServerManager(this, this); // Invalidate all write locks held previously @@ -680,6 +682,13 @@ public class HMaster extends HRegionServer implements MasterServices { status.setStatus("Initializing ZK system trackers"); initializeZKBasedSystemTrackers(); + // This is for backwards compatibility + // See HBASE-11393 + status.setStatus("Update TableCFs node in ZNode"); + TableCFsUpdater tableCFsUpdater = new TableCFsUpdater(zooKeeper, + conf, this.clusterConnection); + tableCFsUpdater.update(); + // initialize master side coprocessors before we start handling requests status.setStatus("Initializing master coprocessors"); this.cpHost = new MasterCoprocessorHost(this, this.conf); @@ -849,7 +858,6 @@ public class HMaster extends HRegionServer implements MasterServices { zombieDetector.interrupt(); } - /** * Create a {@link ServerManager} instance. */ http://git-wip-us.apache.org/repos/asf/hbase/blob/7f39baf0/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/master/TableCFsUpdater.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/master/TableCFsUpdater.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/master/TableCFsUpdater.java new file mode 100644 index 0000000..4e28756 --- /dev/null +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/replication/master/TableCFsUpdater.java @@ -0,0 +1,122 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.hadoop.hbase.replication.master; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.Abortable; +import org.apache.hadoop.hbase.classification.InterfaceAudience; +import org.apache.hadoop.hbase.classification.InterfaceStability; +import org.apache.hadoop.hbase.client.replication.ReplicationSerDeHelper; +import org.apache.hadoop.hbase.exceptions.DeserializationException; +import org.apache.hadoop.hbase.protobuf.generated.ZooKeeperProtos; +import org.apache.hadoop.hbase.replication.ReplicationPeerConfig; +import org.apache.hadoop.hbase.replication.ReplicationStateZKBase; +import org.apache.hadoop.hbase.zookeeper.ZKUtil; +import org.apache.hadoop.hbase.zookeeper.ZooKeeperWatcher; +import org.apache.zookeeper.KeeperException; + +import java.io.IOException; +import java.util.List; + +/** + * This class is used to upgrade TableCFs from HBase 1.x to HBase 2.x. + * It will be removed in HBase 3.x. See HBASE-11393 + */ +@InterfaceAudience.Private +@InterfaceStability.Unstable +public class TableCFsUpdater extends ReplicationStateZKBase { + + private static final Log LOG = LogFactory.getLog(TableCFsUpdater.class); + + public TableCFsUpdater(ZooKeeperWatcher zookeeper, + Configuration conf, Abortable abortable) { + super(zookeeper, conf, abortable); + } + + public void update() { + List<String> znodes = null; + try { + znodes = ZKUtil.listChildrenNoWatch(this.zookeeper, this.peersZNode); + } catch (KeeperException e) { + LOG.warn("", e); + } + if (znodes != null) { + for (String peerId : znodes) { + if (!update(peerId)) { + LOG.error("upgrade tableCFs failed for peerId=" + peerId); + } + } + } + } + + public boolean update(String peerId) { + String tableCFsNode = getTableCFsNode(peerId); + try { + if (ZKUtil.checkExists(zookeeper, tableCFsNode) != -1) { + String peerNode = getPeerNode(peerId); + ReplicationPeerConfig rpc = getReplicationPeerConig(peerNode); + // We only need to copy data from tableCFs node to rpc Node the first time hmaster start. + if (rpc.getTableCFsMap() == null || rpc.getTableCFsMap().size() == 0) { + // we copy TableCFs node into PeerNode + LOG.info("copy tableCFs into peerNode:" + peerId); + ZooKeeperProtos.TableCF[] tableCFs = + ReplicationSerDeHelper.parseTableCFs( + ZKUtil.getData(this.zookeeper, tableCFsNode)); + if (tableCFs != null && tableCFs.length > 0) { + rpc.setTableCFsMap(ReplicationSerDeHelper.convert2Map(tableCFs)); + ZKUtil.setData(this.zookeeper, peerNode, + ReplicationSerDeHelper.toByteArray(rpc)); + } + } else { + LOG.info("No tableCFs in peerNode:" + peerId); + } + } + } catch (KeeperException e) { + LOG.warn("NOTICE!! Update peerId failed, peerId=" + peerId, e); + return false; + } catch (InterruptedException e) { + LOG.warn("NOTICE!! Update peerId failed, peerId=" + peerId, e); + return false; + } catch (IOException e) { + LOG.warn("NOTICE!! Update peerId failed, peerId=" + peerId, e); + return false; + } + return true; + } + + private ReplicationPeerConfig getReplicationPeerConig(String peerNode) + throws KeeperException, InterruptedException { + byte[] data = null; + data = ZKUtil.getData(this.zookeeper, peerNode); + if (data == null) { + LOG.error("Could not get configuration for " + + "peer because it doesn't exist. peer=" + peerNode); + return null; + } + try { + return ReplicationSerDeHelper.parsePeerFrom(data); + } catch (DeserializationException e) { + LOG.warn("Failed to parse cluster key from peer=" + peerNode); + return null; + } + } + +} http://git-wip-us.apache.org/repos/asf/hbase/blob/7f39baf0/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java index b773b46..a79aa0a 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestReplicaWithCluster.java @@ -39,6 +39,7 @@ import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequ import org.apache.hadoop.hbase.protobuf.RequestConverter; import org.apache.hadoop.hbase.regionserver.StorefileRefresherChore; import org.apache.hadoop.hbase.regionserver.TestHRegionServerBulkLoad; +import org.apache.hadoop.hbase.replication.ReplicationPeerConfig; import org.apache.hadoop.hbase.testclassification.ClientTests; import org.apache.hadoop.hbase.testclassification.MediumTests; import org.apache.hadoop.hbase.util.Bytes; @@ -249,7 +250,10 @@ public class TestReplicaWithCluster { HTU2.getHBaseAdmin().createTable(hdt, HBaseTestingUtility.KEYS_FOR_HBA_CREATE_TABLE); ReplicationAdmin admin = new ReplicationAdmin(HTU.getConfiguration()); - admin.addPeer("2", HTU2.getClusterKey()); + + ReplicationPeerConfig rpc = new ReplicationPeerConfig(); + rpc.setClusterKey(HTU2.getClusterKey()); + admin.addPeer("2", rpc, null); admin.close(); Put p = new Put(row); http://git-wip-us.apache.org/repos/asf/hbase/blob/7f39baf0/hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java index 7e1b3aa..c3241c9 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/replication/TestReplicationAdmin.java @@ -17,9 +17,11 @@ */ package org.apache.hadoop.hbase.client.replication; + +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.TreeMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -40,11 +42,10 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.experimental.categories.Category; -import com.google.common.collect.Lists; - import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -93,11 +94,15 @@ public class TestReplicationAdmin { */ @Test public void testAddRemovePeer() throws Exception { + ReplicationPeerConfig rpc1 = new ReplicationPeerConfig(); + rpc1.setClusterKey(KEY_ONE); + ReplicationPeerConfig rpc2 = new ReplicationPeerConfig(); + rpc2.setClusterKey(KEY_SECOND); // Add a valid peer - admin.addPeer(ID_ONE, KEY_ONE); + admin.addPeer(ID_ONE, rpc1, null); // try adding the same (fails) try { - admin.addPeer(ID_ONE, KEY_ONE); + admin.addPeer(ID_ONE, rpc1, null); } catch (IllegalArgumentException iae) { // OK! } @@ -112,7 +117,7 @@ public class TestReplicationAdmin { assertEquals(1, admin.getPeersCount()); // Add a second since multi-slave is supported try { - admin.addPeer(ID_SECOND, KEY_SECOND); + admin.addPeer(ID_SECOND, rpc2, null); } catch (IllegalStateException iae) { fail(); } @@ -148,6 +153,10 @@ public class TestReplicationAdmin { @Test public void testAddPeerWithUnDeletedQueues() throws Exception { + ReplicationPeerConfig rpc1 = new ReplicationPeerConfig(); + rpc1.setClusterKey(KEY_ONE); + ReplicationPeerConfig rpc2 = new ReplicationPeerConfig(); + rpc2.setClusterKey(KEY_SECOND); Configuration conf = TEST_UTIL.getConfiguration(); ZooKeeperWatcher zkw = new ZooKeeperWatcher(conf, "Test HBaseAdmin", null); ReplicationQueues repQueues = @@ -157,7 +166,7 @@ public class TestReplicationAdmin { // add queue for ID_ONE repQueues.addLog(ID_ONE, "file1"); try { - admin.addPeer(ID_ONE, KEY_ONE); + admin.addPeer(ID_ONE, rpc1, null); fail(); } catch (ReplicationException e) { // OK! @@ -168,7 +177,7 @@ public class TestReplicationAdmin { // add recovered queue for ID_ONE repQueues.addLog(ID_ONE + "-server2", "file1"); try { - admin.addPeer(ID_ONE, KEY_ONE); + admin.addPeer(ID_ONE, rpc2, null); fail(); } catch (ReplicationException e) { // OK! @@ -183,7 +192,9 @@ public class TestReplicationAdmin { */ @Test public void testEnableDisable() throws Exception { - admin.addPeer(ID_ONE, KEY_ONE); + ReplicationPeerConfig rpc1 = new ReplicationPeerConfig(); + rpc1.setClusterKey(KEY_ONE); + admin.addPeer(ID_ONE, rpc1, null); assertEquals(1, admin.getPeersCount()); assertTrue(admin.getPeerState(ID_ONE)); admin.disablePeer(ID_ONE); @@ -198,100 +209,142 @@ public class TestReplicationAdmin { } @Test - public void testGetTableCfsStr() { - // opposite of TestPerTableCFReplication#testParseTableCFsFromConfig() - - Map<TableName, List<String>> tabCFsMap = null; - - // 1. null or empty string, result should be null - assertEquals(null, ReplicationAdmin.getTableCfsStr(tabCFsMap)); - - - // 2. single table: "tab1" / "tab2:cf1" / "tab3:cf1,cf3" - tabCFsMap = new TreeMap<TableName, List<String>>(); - tabCFsMap.put(TableName.valueOf("tab1"), null); // its table name is "tab1" - assertEquals("tab1", ReplicationAdmin.getTableCfsStr(tabCFsMap)); - - tabCFsMap = new TreeMap<TableName, List<String>>(); - tabCFsMap.put(TableName.valueOf("tab1"), Lists.newArrayList("cf1")); - assertEquals("tab1:cf1", ReplicationAdmin.getTableCfsStr(tabCFsMap)); - - tabCFsMap = new TreeMap<TableName, List<String>>(); - tabCFsMap.put(TableName.valueOf("tab1"), Lists.newArrayList("cf1", "cf3")); - assertEquals("tab1:cf1,cf3", ReplicationAdmin.getTableCfsStr(tabCFsMap)); - - // 3. multiple tables: "tab1 ; tab2:cf1 ; tab3:cf1,cf3" - tabCFsMap = new TreeMap<TableName, List<String>>(); - tabCFsMap.put(TableName.valueOf("tab1"), null); - tabCFsMap.put(TableName.valueOf("tab2"), Lists.newArrayList("cf1")); - tabCFsMap.put(TableName.valueOf("tab3"), Lists.newArrayList("cf1", "cf3")); - assertEquals("tab1;tab2:cf1;tab3:cf1,cf3", ReplicationAdmin.getTableCfsStr(tabCFsMap)); - } - - @Test public void testAppendPeerTableCFs() throws Exception { + ReplicationPeerConfig rpc1 = new ReplicationPeerConfig(); + rpc1.setClusterKey(KEY_ONE); + TableName tab1 = TableName.valueOf("t1"); + TableName tab2 = TableName.valueOf("t2"); + TableName tab3 = TableName.valueOf("t3"); + TableName tab4 = TableName.valueOf("t4"); + // Add a valid peer - admin.addPeer(ID_ONE, KEY_ONE); + admin.addPeer(ID_ONE, rpc1, null); - admin.appendPeerTableCFs(ID_ONE, "t1"); - assertEquals("t1", admin.getPeerTableCFs(ID_ONE)); + Map<TableName, List<String>> tableCFs = new HashMap<>(); - // append table t2 to replication - admin.appendPeerTableCFs(ID_ONE, "t2"); - String peerTablesOne = admin.getPeerTableCFs(ID_ONE); + tableCFs.put(tab1, null); + admin.appendPeerTableCFs(ID_ONE, tableCFs); + Map<TableName, List<String>> result = + ReplicationSerDeHelper.parseTableCFsFromConfig(admin.getPeerTableCFs(ID_ONE)); + assertEquals(1, result.size()); + assertEquals(true, result.containsKey(tab1)); + assertNull(result.get(tab1)); - // Different jdk's return different sort order for the tables. ( Not sure on why exactly ) - // - // So instead of asserting that the string is exactly we - // assert that the string contains all tables and the needed separator. - assertTrue("Should contain t1", peerTablesOne.contains("t1")); - assertTrue("Should contain t2", peerTablesOne.contains("t2")); - assertTrue("Should contain ; as the seperator", peerTablesOne.contains(";")); + // append table t2 to replication + tableCFs.clear(); + tableCFs.put(tab2, null); + admin.appendPeerTableCFs(ID_ONE, tableCFs); + result = ReplicationSerDeHelper.parseTableCFsFromConfig(admin.getPeerTableCFs(ID_ONE)); + assertEquals(2, result.size()); + assertTrue("Should contain t1", result.containsKey(tab1)); + assertTrue("Should contain t2", result.containsKey(tab2)); + assertNull(result.get(tab1)); + assertNull(result.get(tab2)); // append table column family: f1 of t3 to replication - admin.appendPeerTableCFs(ID_ONE, "t3:f1"); - String peerTablesTwo = admin.getPeerTableCFs(ID_ONE); - assertTrue("Should contain t1", peerTablesTwo.contains("t1")); - assertTrue("Should contain t2", peerTablesTwo.contains("t2")); - assertTrue("Should contain t3:f1", peerTablesTwo.contains("t3:f1")); - assertTrue("Should contain ; as the seperator", peerTablesTwo.contains(";")); + tableCFs.clear(); + tableCFs.put(tab3, new ArrayList<String>()); + tableCFs.get(tab3).add("f1"); + admin.appendPeerTableCFs(ID_ONE, tableCFs); + result = ReplicationSerDeHelper.parseTableCFsFromConfig(admin.getPeerTableCFs(ID_ONE)); + assertEquals(3, result.size()); + assertTrue("Should contain t1", result.containsKey(tab1)); + assertTrue("Should contain t2", result.containsKey(tab2)); + assertTrue("Should contain t3", result.containsKey(tab3)); + assertNull(result.get(tab1)); + assertNull(result.get(tab2)); + assertEquals(1, result.get(tab3).size()); + assertEquals("f1", result.get(tab3).get(0)); + + tableCFs.clear(); + tableCFs.put(tab4, new ArrayList<String>()); + tableCFs.get(tab4).add("f1"); + tableCFs.get(tab4).add("f2"); + admin.appendPeerTableCFs(ID_ONE, tableCFs); + result = ReplicationSerDeHelper.parseTableCFsFromConfig(admin.getPeerTableCFs(ID_ONE)); + assertEquals(4, result.size()); + assertTrue("Should contain t1", result.containsKey(tab1)); + assertTrue("Should contain t2", result.containsKey(tab2)); + assertTrue("Should contain t3", result.containsKey(tab3)); + assertTrue("Should contain t4", result.containsKey(tab4)); + assertNull(result.get(tab1)); + assertNull(result.get(tab2)); + assertEquals(1, result.get(tab3).size()); + assertEquals("f1", result.get(tab3).get(0)); + assertEquals(2, result.get(tab4).size()); + assertEquals("f1", result.get(tab4).get(0)); + assertEquals("f2", result.get(tab4).get(1)); + admin.removePeer(ID_ONE); } @Test public void testRemovePeerTableCFs() throws Exception { + ReplicationPeerConfig rpc1 = new ReplicationPeerConfig(); + rpc1.setClusterKey(KEY_ONE); + TableName tab1 = TableName.valueOf("t1"); + TableName tab2 = TableName.valueOf("t2"); + TableName tab3 = TableName.valueOf("t3"); // Add a valid peer - admin.addPeer(ID_ONE, KEY_ONE); + admin.addPeer(ID_ONE, rpc1, null); + Map<TableName, List<String>> tableCFs = new HashMap<>(); try { - admin.removePeerTableCFs(ID_ONE, "t3"); + tableCFs.put(tab3, null); + admin.removePeerTableCFs(ID_ONE, tableCFs); assertTrue(false); } catch (ReplicationException e) { } - assertEquals("", admin.getPeerTableCFs(ID_ONE)); + assertNull(admin.getPeerTableCFs(ID_ONE)); - admin.setPeerTableCFs(ID_ONE, "t1;t2:cf1"); + tableCFs.clear(); + tableCFs.put(tab1, null); + tableCFs.put(tab2, new ArrayList<String>()); + tableCFs.get(tab2).add("cf1"); + admin.setPeerTableCFs(ID_ONE, tableCFs); try { - admin.removePeerTableCFs(ID_ONE, "t3"); + tableCFs.clear(); + tableCFs.put(tab3, null); + admin.removePeerTableCFs(ID_ONE, tableCFs); assertTrue(false); } catch (ReplicationException e) { } - assertEquals("t1;t2:cf1", admin.getPeerTableCFs(ID_ONE)); + Map<TableName, List<String>> result = + ReplicationSerDeHelper.parseTableCFsFromConfig(admin.getPeerTableCFs(ID_ONE)); + assertEquals(2, result.size()); + assertTrue("Should contain t1", result.containsKey(tab1)); + assertTrue("Should contain t2", result.containsKey(tab2)); + assertNull(result.get(tab1)); + assertEquals(1, result.get(tab2).size()); + assertEquals("cf1", result.get(tab2).get(0)); try { - admin.removePeerTableCFs(ID_ONE, "t1:f1"); + tableCFs.clear(); + tableCFs.put(tab1, new ArrayList<String>()); + tableCFs.get(tab1).add("f1"); + admin.removePeerTableCFs(ID_ONE, tableCFs); assertTrue(false); } catch (ReplicationException e) { } - admin.removePeerTableCFs(ID_ONE, "t1"); - assertEquals("t2:cf1", admin.getPeerTableCFs(ID_ONE)); + tableCFs.clear(); + tableCFs.put(tab1, null); + admin.removePeerTableCFs(ID_ONE, tableCFs); + result = ReplicationSerDeHelper.parseTableCFsFromConfig(admin.getPeerTableCFs(ID_ONE)); + assertEquals(1, result.size()); + assertEquals(1, result.get(tab2).size()); + assertEquals("cf1", result.get(tab2).get(0)); try { - admin.removePeerTableCFs(ID_ONE, "t2"); + tableCFs.clear(); + tableCFs.put(tab2, null); + admin.removePeerTableCFs(ID_ONE, tableCFs); assertTrue(false); } catch (ReplicationException e) { } - admin.removePeerTableCFs(ID_ONE, "t2:cf1"); - assertEquals("", admin.getPeerTableCFs(ID_ONE)); + tableCFs.clear(); + tableCFs.put(tab2, new ArrayList<String>()); + tableCFs.get(tab2).add("cf1"); + admin.removePeerTableCFs(ID_ONE, tableCFs); + assertNull(admin.getPeerTableCFs(ID_ONE)); admin.removePeer(ID_ONE); } } http://git-wip-us.apache.org/repos/asf/hbase/blob/7f39baf0/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.java index b13f337..7a1be47 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/master/cleaner/TestReplicationHFileCleaner.java @@ -100,7 +100,7 @@ public class TestReplicationHFileCleaner { @Before public void setup() throws ReplicationException, IOException { root = TEST_UTIL.getDataTestDirOnTestFS(); - rp.addPeer(peerId, new ReplicationPeerConfig().setClusterKey(TEST_UTIL.getClusterKey()), null); + rp.addPeer(peerId, new ReplicationPeerConfig().setClusterKey(TEST_UTIL.getClusterKey())); } @After http://git-wip-us.apache.org/repos/asf/hbase/blob/7f39baf0/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java index e919c24..775e4a5 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMasterReplication.java @@ -52,6 +52,7 @@ import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.client.replication.ReplicationAdmin; +import org.apache.hadoop.hbase.client.replication.ReplicationSerDeHelper; import org.apache.hadoop.hbase.coprocessor.BaseRegionObserver; import org.apache.hadoop.hbase.coprocessor.CoprocessorHost; import org.apache.hadoop.hbase.coprocessor.ObserverContext; @@ -501,8 +502,9 @@ public class TestMasterReplication { try { replicationAdmin = new ReplicationAdmin( configurations[masterClusterNumber]); - replicationAdmin.addPeer(id, - utilities[slaveClusterNumber].getClusterKey()); + ReplicationPeerConfig rpc = new ReplicationPeerConfig(); + rpc.setClusterKey(utilities[slaveClusterNumber].getClusterKey()); + replicationAdmin.addPeer(id, rpc, null); } finally { close(replicationAdmin); } @@ -513,7 +515,10 @@ public class TestMasterReplication { ReplicationAdmin replicationAdmin = null; try { replicationAdmin = new ReplicationAdmin(configurations[masterClusterNumber]); - replicationAdmin.addPeer(id, utilities[slaveClusterNumber].getClusterKey(), tableCfs); + ReplicationPeerConfig replicationPeerConfig = new ReplicationPeerConfig(); + replicationPeerConfig.setClusterKey(utilities[slaveClusterNumber].getClusterKey()); + replicationAdmin.addPeer(id, replicationPeerConfig, + ReplicationSerDeHelper.parseTableCFsFromConfig(tableCfs)); } finally { close(replicationAdmin); } http://git-wip-us.apache.org/repos/asf/hbase/blob/7f39baf0/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.java index 82a0680..b778864 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestMultiSlaveReplication.java @@ -138,8 +138,10 @@ public class TestMultiSlaveReplication { htable2.setWriteBufferSize(1024); Table htable3 = utility3.getConnection().getTable(tableName); htable3.setWriteBufferSize(1024); - - admin1.addPeer("1", utility2.getClusterKey()); + + ReplicationPeerConfig rpc = new ReplicationPeerConfig(); + rpc.setClusterKey(utility2.getClusterKey()); + admin1.addPeer("1", rpc, null); // put "row" and wait 'til it got around, then delete putAndWait(row, famName, htable1, htable2); @@ -155,7 +157,9 @@ public class TestMultiSlaveReplication { // after the log was rolled put a new row putAndWait(row3, famName, htable1, htable2); - admin1.addPeer("2", utility3.getClusterKey()); + rpc = new ReplicationPeerConfig(); + rpc.setClusterKey(utility3.getClusterKey()); + admin1.addPeer("2", rpc, null); // put a row, check it was replicated to all clusters putAndWait(row1, famName, htable1, htable2, htable3);
