diff --git hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/BackupProtos.java hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/BackupProtos.java index c5220cc..6ec7c6d 100644 --- hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/BackupProtos.java +++ hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/BackupProtos.java @@ -10,26 +10,6 @@ public final class BackupProtos { } /** * Protobuf enum {@code hbase.pb.BackupType} - * - *
-   *enum FullTableBackupState {
-   *PRE_SNAPSHOT_TABLE = 1;
-   *SNAPSHOT_TABLES = 2;
-   *SNAPSHOT_COPY = 3;
-   *BACKUP_COMPLETE = 4;
-   *}
-   *
-   *enum IncrementalTableBackupState {
-   *PREPARE_INCREMENTAL = 1;
-   *INCREMENTAL_COPY = 2;
-   *INCR_BACKUP_COMPLETE = 3;
-   *}
-   *
-   *message SnapshotTableStateData {
-   *required TableName table = 1;
-   *required string snapshotName = 2;
-   *}
-   * 
*/ public enum BackupType implements com.google.protobuf.ProtocolMessageEnum { @@ -113,42 +93,42 @@ public final class BackupProtos { public interface BackupImageOrBuilder extends com.google.protobuf.MessageOrBuilder { - // required string backup_id = 1; + // optional string backup_id = 1; /** - * required string backup_id = 1; + * optional string backup_id = 1; */ boolean hasBackupId(); /** - * required string backup_id = 1; + * optional string backup_id = 1; */ java.lang.String getBackupId(); /** - * required string backup_id = 1; + * optional string backup_id = 1; */ com.google.protobuf.ByteString getBackupIdBytes(); - // required .hbase.pb.BackupType backup_type = 2; + // optional .hbase.pb.BackupType backup_type = 2; /** - * required .hbase.pb.BackupType backup_type = 2; + * optional .hbase.pb.BackupType backup_type = 2; */ boolean hasBackupType(); /** - * required .hbase.pb.BackupType backup_type = 2; + * optional .hbase.pb.BackupType backup_type = 2; */ org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType getBackupType(); - // required string root_dir = 3; + // optional string root_dir = 3; /** - * required string root_dir = 3; + * optional string root_dir = 3; */ boolean hasRootDir(); /** - * required string root_dir = 3; + * optional string root_dir = 3; */ java.lang.String getRootDir(); /** - * required string root_dir = 3; + * optional string root_dir = 3; */ com.google.protobuf.ByteString getRootDirBytes(); @@ -178,23 +158,23 @@ public final class BackupProtos { org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableListOrBuilder( int index); - // required uint64 start_ts = 5; + // optional uint64 start_ts = 5; /** - * required uint64 start_ts = 5; + * optional uint64 start_ts = 5; */ boolean hasStartTs(); /** - * required uint64 start_ts = 5; + * optional uint64 start_ts = 5; */ long getStartTs(); - // required uint64 complete_ts = 6; + // optional uint64 complete_ts = 6; /** - * required uint64 complete_ts = 6; + * optional uint64 complete_ts = 6; */ boolean hasCompleteTs(); /** - * required uint64 complete_ts = 6; + * optional uint64 complete_ts = 6; */ long getCompleteTs(); @@ -367,17 +347,17 @@ public final class BackupProtos { } private int bitField0_; - // required string backup_id = 1; + // optional string backup_id = 1; public static final int BACKUP_ID_FIELD_NUMBER = 1; private java.lang.Object backupId_; /** - * required string backup_id = 1; + * optional string backup_id = 1; */ public boolean hasBackupId() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required string backup_id = 1; + * optional string backup_id = 1; */ public java.lang.String getBackupId() { java.lang.Object ref = backupId_; @@ -394,7 +374,7 @@ public final class BackupProtos { } } /** - * required string backup_id = 1; + * optional string backup_id = 1; */ public com.google.protobuf.ByteString getBackupIdBytes() { @@ -410,33 +390,33 @@ public final class BackupProtos { } } - // required .hbase.pb.BackupType backup_type = 2; + // optional .hbase.pb.BackupType backup_type = 2; public static final int BACKUP_TYPE_FIELD_NUMBER = 2; private org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType backupType_; /** - * required .hbase.pb.BackupType backup_type = 2; + * optional .hbase.pb.BackupType backup_type = 2; */ public boolean hasBackupType() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * required .hbase.pb.BackupType backup_type = 2; + * optional .hbase.pb.BackupType backup_type = 2; */ public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType getBackupType() { return backupType_; } - // required string root_dir = 3; + // optional string root_dir = 3; public static final int ROOT_DIR_FIELD_NUMBER = 3; private java.lang.Object rootDir_; /** - * required string root_dir = 3; + * optional string root_dir = 3; */ public boolean hasRootDir() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * required string root_dir = 3; + * optional string root_dir = 3; */ public java.lang.String getRootDir() { java.lang.Object ref = rootDir_; @@ -453,7 +433,7 @@ public final class BackupProtos { } } /** - * required string root_dir = 3; + * optional string root_dir = 3; */ public com.google.protobuf.ByteString getRootDirBytes() { @@ -505,33 +485,33 @@ public final class BackupProtos { return tableList_.get(index); } - // required uint64 start_ts = 5; + // optional uint64 start_ts = 5; public static final int START_TS_FIELD_NUMBER = 5; private long startTs_; /** - * required uint64 start_ts = 5; + * optional uint64 start_ts = 5; */ public boolean hasStartTs() { return ((bitField0_ & 0x00000008) == 0x00000008); } /** - * required uint64 start_ts = 5; + * optional uint64 start_ts = 5; */ public long getStartTs() { return startTs_; } - // required uint64 complete_ts = 6; + // optional uint64 complete_ts = 6; public static final int COMPLETE_TS_FIELD_NUMBER = 6; private long completeTs_; /** - * required uint64 complete_ts = 6; + * optional uint64 complete_ts = 6; */ public boolean hasCompleteTs() { return ((bitField0_ & 0x00000010) == 0x00000010); } /** - * required uint64 complete_ts = 6; + * optional uint64 complete_ts = 6; */ public long getCompleteTs() { return completeTs_; @@ -587,26 +567,6 @@ public final class BackupProtos { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - if (!hasBackupId()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasBackupType()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasRootDir()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasStartTs()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasCompleteTs()) { - memoizedIsInitialized = 0; - return false; - } for (int i = 0; i < getTableListCount(); i++) { if (!getTableList(i).isInitialized()) { memoizedIsInitialized = 0; @@ -1068,26 +1028,6 @@ public final class BackupProtos { } public final boolean isInitialized() { - if (!hasBackupId()) { - - return false; - } - if (!hasBackupType()) { - - return false; - } - if (!hasRootDir()) { - - return false; - } - if (!hasStartTs()) { - - return false; - } - if (!hasCompleteTs()) { - - return false; - } for (int i = 0; i < getTableListCount(); i++) { if (!getTableList(i).isInitialized()) { @@ -1122,16 +1062,16 @@ public final class BackupProtos { } private int bitField0_; - // required string backup_id = 1; + // optional string backup_id = 1; private java.lang.Object backupId_ = ""; /** - * required string backup_id = 1; + * optional string backup_id = 1; */ public boolean hasBackupId() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required string backup_id = 1; + * optional string backup_id = 1; */ public java.lang.String getBackupId() { java.lang.Object ref = backupId_; @@ -1145,7 +1085,7 @@ public final class BackupProtos { } } /** - * required string backup_id = 1; + * optional string backup_id = 1; */ public com.google.protobuf.ByteString getBackupIdBytes() { @@ -1161,7 +1101,7 @@ public final class BackupProtos { } } /** - * required string backup_id = 1; + * optional string backup_id = 1; */ public Builder setBackupId( java.lang.String value) { @@ -1174,7 +1114,7 @@ public final class BackupProtos { return this; } /** - * required string backup_id = 1; + * optional string backup_id = 1; */ public Builder clearBackupId() { bitField0_ = (bitField0_ & ~0x00000001); @@ -1183,7 +1123,7 @@ public final class BackupProtos { return this; } /** - * required string backup_id = 1; + * optional string backup_id = 1; */ public Builder setBackupIdBytes( com.google.protobuf.ByteString value) { @@ -1196,22 +1136,22 @@ public final class BackupProtos { return this; } - // required .hbase.pb.BackupType backup_type = 2; + // optional .hbase.pb.BackupType backup_type = 2; private org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType backupType_ = org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType.FULL; /** - * required .hbase.pb.BackupType backup_type = 2; + * optional .hbase.pb.BackupType backup_type = 2; */ public boolean hasBackupType() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * required .hbase.pb.BackupType backup_type = 2; + * optional .hbase.pb.BackupType backup_type = 2; */ public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType getBackupType() { return backupType_; } /** - * required .hbase.pb.BackupType backup_type = 2; + * optional .hbase.pb.BackupType backup_type = 2; */ public Builder setBackupType(org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType value) { if (value == null) { @@ -1223,7 +1163,7 @@ public final class BackupProtos { return this; } /** - * required .hbase.pb.BackupType backup_type = 2; + * optional .hbase.pb.BackupType backup_type = 2; */ public Builder clearBackupType() { bitField0_ = (bitField0_ & ~0x00000002); @@ -1232,16 +1172,16 @@ public final class BackupProtos { return this; } - // required string root_dir = 3; + // optional string root_dir = 3; private java.lang.Object rootDir_ = ""; /** - * required string root_dir = 3; + * optional string root_dir = 3; */ public boolean hasRootDir() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * required string root_dir = 3; + * optional string root_dir = 3; */ public java.lang.String getRootDir() { java.lang.Object ref = rootDir_; @@ -1255,7 +1195,7 @@ public final class BackupProtos { } } /** - * required string root_dir = 3; + * optional string root_dir = 3; */ public com.google.protobuf.ByteString getRootDirBytes() { @@ -1271,7 +1211,7 @@ public final class BackupProtos { } } /** - * required string root_dir = 3; + * optional string root_dir = 3; */ public Builder setRootDir( java.lang.String value) { @@ -1284,7 +1224,7 @@ public final class BackupProtos { return this; } /** - * required string root_dir = 3; + * optional string root_dir = 3; */ public Builder clearRootDir() { bitField0_ = (bitField0_ & ~0x00000004); @@ -1293,7 +1233,7 @@ public final class BackupProtos { return this; } /** - * required string root_dir = 3; + * optional string root_dir = 3; */ public Builder setRootDirBytes( com.google.protobuf.ByteString value) { @@ -1546,22 +1486,22 @@ public final class BackupProtos { return tableListBuilder_; } - // required uint64 start_ts = 5; + // optional uint64 start_ts = 5; private long startTs_ ; /** - * required uint64 start_ts = 5; + * optional uint64 start_ts = 5; */ public boolean hasStartTs() { return ((bitField0_ & 0x00000010) == 0x00000010); } /** - * required uint64 start_ts = 5; + * optional uint64 start_ts = 5; */ public long getStartTs() { return startTs_; } /** - * required uint64 start_ts = 5; + * optional uint64 start_ts = 5; */ public Builder setStartTs(long value) { bitField0_ |= 0x00000010; @@ -1570,7 +1510,7 @@ public final class BackupProtos { return this; } /** - * required uint64 start_ts = 5; + * optional uint64 start_ts = 5; */ public Builder clearStartTs() { bitField0_ = (bitField0_ & ~0x00000010); @@ -1579,22 +1519,22 @@ public final class BackupProtos { return this; } - // required uint64 complete_ts = 6; + // optional uint64 complete_ts = 6; private long completeTs_ ; /** - * required uint64 complete_ts = 6; + * optional uint64 complete_ts = 6; */ public boolean hasCompleteTs() { return ((bitField0_ & 0x00000020) == 0x00000020); } /** - * required uint64 complete_ts = 6; + * optional uint64 complete_ts = 6; */ public long getCompleteTs() { return completeTs_; } /** - * required uint64 complete_ts = 6; + * optional uint64 complete_ts = 6; */ public Builder setCompleteTs(long value) { bitField0_ |= 0x00000020; @@ -1603,7 +1543,7 @@ public final class BackupProtos { return this; } /** - * required uint64 complete_ts = 6; + * optional uint64 complete_ts = 6; */ public Builder clearCompleteTs() { bitField0_ = (bitField0_ & ~0x00000020); @@ -1866,28 +1806,27 @@ public final class BackupProtos { public interface ServerTimestampOrBuilder extends com.google.protobuf.MessageOrBuilder { - // required string server = 1; + // optional .hbase.pb.ServerName server = 1; /** - * required string server = 1; + * optional .hbase.pb.ServerName server = 1; */ boolean hasServer(); /** - * required string server = 1; + * optional .hbase.pb.ServerName server = 1; */ - java.lang.String getServer(); + org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getServer(); /** - * required string server = 1; + * optional .hbase.pb.ServerName server = 1; */ - com.google.protobuf.ByteString - getServerBytes(); + org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getServerOrBuilder(); - // required uint64 timestamp = 2; + // optional uint64 timestamp = 2; /** - * required uint64 timestamp = 2; + * optional uint64 timestamp = 2; */ boolean hasTimestamp(); /** - * required uint64 timestamp = 2; + * optional uint64 timestamp = 2; */ long getTimestamp(); } @@ -1943,8 +1882,16 @@ public final class BackupProtos { break; } case 10: { + org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder subBuilder = null; + if (((bitField0_ & 0x00000001) == 0x00000001)) { + subBuilder = server_.toBuilder(); + } + server_ = input.readMessage(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.PARSER, extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(server_); + server_ = subBuilder.buildPartial(); + } bitField0_ |= 0x00000001; - server_ = input.readBytes(); break; } case 16: { @@ -1992,67 +1939,46 @@ public final class BackupProtos { } private int bitField0_; - // required string server = 1; + // optional .hbase.pb.ServerName server = 1; public static final int SERVER_FIELD_NUMBER = 1; - private java.lang.Object server_; + private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName server_; /** - * required string server = 1; + * optional .hbase.pb.ServerName server = 1; */ public boolean hasServer() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required string server = 1; + * optional .hbase.pb.ServerName server = 1; */ - public java.lang.String getServer() { - java.lang.Object ref = server_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - server_ = s; - } - return s; - } + public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getServer() { + return server_; } /** - * required string server = 1; + * optional .hbase.pb.ServerName server = 1; */ - public com.google.protobuf.ByteString - getServerBytes() { - java.lang.Object ref = server_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - server_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } + public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getServerOrBuilder() { + return server_; } - // required uint64 timestamp = 2; + // optional uint64 timestamp = 2; public static final int TIMESTAMP_FIELD_NUMBER = 2; private long timestamp_; /** - * required uint64 timestamp = 2; + * optional uint64 timestamp = 2; */ public boolean hasTimestamp() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * required uint64 timestamp = 2; + * optional uint64 timestamp = 2; */ public long getTimestamp() { return timestamp_; } private void initFields() { - server_ = ""; + server_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance(); timestamp_ = 0L; } private byte memoizedIsInitialized = -1; @@ -2060,13 +1986,11 @@ public final class BackupProtos { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - if (!hasServer()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasTimestamp()) { - memoizedIsInitialized = 0; - return false; + if (hasServer()) { + if (!getServer().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } } memoizedIsInitialized = 1; return true; @@ -2076,7 +2000,7 @@ public final class BackupProtos { throws java.io.IOException { getSerializedSize(); if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getServerBytes()); + output.writeMessage(1, server_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { output.writeUInt64(2, timestamp_); @@ -2092,7 +2016,7 @@ public final class BackupProtos { size = 0; if (((bitField0_ & 0x00000001) == 0x00000001)) { size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, getServerBytes()); + .computeMessageSize(1, server_); } if (((bitField0_ & 0x00000002) == 0x00000002)) { size += com.google.protobuf.CodedOutputStream @@ -2253,6 +2177,7 @@ public final class BackupProtos { } private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { + getServerFieldBuilder(); } } private static Builder create() { @@ -2261,7 +2186,11 @@ public final class BackupProtos { public Builder clear() { super.clear(); - server_ = ""; + if (serverBuilder_ == null) { + server_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance(); + } else { + serverBuilder_.clear(); + } bitField0_ = (bitField0_ & ~0x00000001); timestamp_ = 0L; bitField0_ = (bitField0_ & ~0x00000002); @@ -2296,7 +2225,11 @@ public final class BackupProtos { if (((from_bitField0_ & 0x00000001) == 0x00000001)) { to_bitField0_ |= 0x00000001; } - result.server_ = server_; + if (serverBuilder_ == null) { + result.server_ = server_; + } else { + result.server_ = serverBuilder_.build(); + } if (((from_bitField0_ & 0x00000002) == 0x00000002)) { to_bitField0_ |= 0x00000002; } @@ -2318,9 +2251,7 @@ public final class BackupProtos { public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.BackupProtos.ServerTimestamp other) { if (other == org.apache.hadoop.hbase.protobuf.generated.BackupProtos.ServerTimestamp.getDefaultInstance()) return this; if (other.hasServer()) { - bitField0_ |= 0x00000001; - server_ = other.server_; - onChanged(); + mergeServer(other.getServer()); } if (other.hasTimestamp()) { setTimestamp(other.getTimestamp()); @@ -2330,13 +2261,11 @@ public final class BackupProtos { } public final boolean isInitialized() { - if (!hasServer()) { - - return false; - } - if (!hasTimestamp()) { - - return false; + if (hasServer()) { + if (!getServer().isInitialized()) { + + return false; + } } return true; } @@ -2360,96 +2289,139 @@ public final class BackupProtos { } private int bitField0_; - // required string server = 1; - private java.lang.Object server_ = ""; + // optional .hbase.pb.ServerName server = 1; + private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName server_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance(); + private com.google.protobuf.SingleFieldBuilder< + org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> serverBuilder_; /** - * required string server = 1; + * optional .hbase.pb.ServerName server = 1; */ public boolean hasServer() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required string server = 1; + * optional .hbase.pb.ServerName server = 1; */ - public java.lang.String getServer() { - java.lang.Object ref = server_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - server_ = s; - return s; + public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName getServer() { + if (serverBuilder_ == null) { + return server_; } else { - return (java.lang.String) ref; + return serverBuilder_.getMessage(); } } /** - * required string server = 1; + * optional .hbase.pb.ServerName server = 1; */ - public com.google.protobuf.ByteString - getServerBytes() { - java.lang.Object ref = server_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - server_ = b; - return b; + public Builder setServer(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) { + if (serverBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + server_ = value; + onChanged(); } else { - return (com.google.protobuf.ByteString) ref; + serverBuilder_.setMessage(value); } + bitField0_ |= 0x00000001; + return this; } /** - * required string server = 1; + * optional .hbase.pb.ServerName server = 1; */ public Builder setServer( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - server_ = value; - onChanged(); + org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder builderForValue) { + if (serverBuilder_ == null) { + server_ = builderForValue.build(); + onChanged(); + } else { + serverBuilder_.setMessage(builderForValue.build()); + } + bitField0_ |= 0x00000001; + return this; + } + /** + * optional .hbase.pb.ServerName server = 1; + */ + public Builder mergeServer(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName value) { + if (serverBuilder_ == null) { + if (((bitField0_ & 0x00000001) == 0x00000001) && + server_ != org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance()) { + server_ = + org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.newBuilder(server_).mergeFrom(value).buildPartial(); + } else { + server_ = value; + } + onChanged(); + } else { + serverBuilder_.mergeFrom(value); + } + bitField0_ |= 0x00000001; return this; } /** - * required string server = 1; + * optional .hbase.pb.ServerName server = 1; */ public Builder clearServer() { + if (serverBuilder_ == null) { + server_ = org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.getDefaultInstance(); + onChanged(); + } else { + serverBuilder_.clear(); + } bitField0_ = (bitField0_ & ~0x00000001); - server_ = getDefaultInstance().getServer(); - onChanged(); return this; } /** - * required string server = 1; + * optional .hbase.pb.ServerName server = 1; */ - public Builder setServerBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - server_ = value; + public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder getServerBuilder() { + bitField0_ |= 0x00000001; onChanged(); - return this; + return getServerFieldBuilder().getBuilder(); + } + /** + * optional .hbase.pb.ServerName server = 1; + */ + public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder getServerOrBuilder() { + if (serverBuilder_ != null) { + return serverBuilder_.getMessageOrBuilder(); + } else { + return server_; + } + } + /** + * optional .hbase.pb.ServerName server = 1; + */ + private com.google.protobuf.SingleFieldBuilder< + org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder> + getServerFieldBuilder() { + if (serverBuilder_ == null) { + serverBuilder_ = new com.google.protobuf.SingleFieldBuilder< + org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerName.Builder, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.ServerNameOrBuilder>( + server_, + getParentForChildren(), + isClean()); + server_ = null; + } + return serverBuilder_; } - // required uint64 timestamp = 2; + // optional uint64 timestamp = 2; private long timestamp_ ; /** - * required uint64 timestamp = 2; + * optional uint64 timestamp = 2; */ public boolean hasTimestamp() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * required uint64 timestamp = 2; + * optional uint64 timestamp = 2; */ public long getTimestamp() { return timestamp_; } /** - * required uint64 timestamp = 2; + * optional uint64 timestamp = 2; */ public Builder setTimestamp(long value) { bitField0_ |= 0x00000002; @@ -2458,7 +2430,7 @@ public final class BackupProtos { return this; } /** - * required uint64 timestamp = 2; + * optional uint64 timestamp = 2; */ public Builder clearTimestamp() { bitField0_ = (bitField0_ & ~0x00000002); @@ -2481,17 +2453,17 @@ public final class BackupProtos { public interface TableServerTimestampOrBuilder extends com.google.protobuf.MessageOrBuilder { - // required .hbase.pb.TableName table = 1; + // optional .hbase.pb.TableName table = 1; /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ boolean hasTable(); /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTable(); /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableOrBuilder(); @@ -2635,23 +2607,23 @@ public final class BackupProtos { } private int bitField0_; - // required .hbase.pb.TableName table = 1; + // optional .hbase.pb.TableName table = 1; public static final int TABLE_FIELD_NUMBER = 1; private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName table_; /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ public boolean hasTable() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTable() { return table_; } /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableOrBuilder() { return table_; @@ -2702,13 +2674,11 @@ public final class BackupProtos { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - if (!hasTable()) { - memoizedIsInitialized = 0; - return false; - } - if (!getTable().isInitialized()) { - memoizedIsInitialized = 0; - return false; + if (hasTable()) { + if (!getTable().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } } for (int i = 0; i < getServerTimestampCount(); i++) { if (!getServerTimestamp(i).isInitialized()) { @@ -3015,13 +2985,11 @@ public final class BackupProtos { } public final boolean isInitialized() { - if (!hasTable()) { - - return false; - } - if (!getTable().isInitialized()) { - - return false; + if (hasTable()) { + if (!getTable().isInitialized()) { + + return false; + } } for (int i = 0; i < getServerTimestampCount(); i++) { if (!getServerTimestamp(i).isInitialized()) { @@ -3051,18 +3019,18 @@ public final class BackupProtos { } private int bitField0_; - // required .hbase.pb.TableName table = 1; + // optional .hbase.pb.TableName table = 1; private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName table_ = 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> tableBuilder_; /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ public boolean hasTable() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTable() { if (tableBuilder_ == null) { @@ -3072,7 +3040,7 @@ public final class BackupProtos { } } /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ public Builder setTable(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) { if (tableBuilder_ == null) { @@ -3088,7 +3056,7 @@ public final class BackupProtos { return this; } /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ public Builder setTable( org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) { @@ -3102,7 +3070,7 @@ public final class BackupProtos { return this; } /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ public Builder mergeTable(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) { if (tableBuilder_ == null) { @@ -3121,7 +3089,7 @@ public final class BackupProtos { return this; } /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ public Builder clearTable() { if (tableBuilder_ == null) { @@ -3134,7 +3102,7 @@ public final class BackupProtos { return this; } /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableBuilder() { bitField0_ |= 0x00000001; @@ -3142,7 +3110,7 @@ public final class BackupProtos { return getTableFieldBuilder().getBuilder(); } /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableOrBuilder() { if (tableBuilder_ != null) { @@ -3152,7 +3120,7 @@ public final class BackupProtos { } } /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ 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> @@ -3422,137 +3390,92 @@ public final class BackupProtos { public interface BackupManifestOrBuilder extends com.google.protobuf.MessageOrBuilder { - // required string version = 1; - /** - * required string version = 1; - */ - boolean hasVersion(); - /** - * required string version = 1; - */ - java.lang.String getVersion(); - /** - * required string version = 1; - */ - com.google.protobuf.ByteString - getVersionBytes(); - - // required string backup_id = 2; - /** - * required string backup_id = 2; - */ - boolean hasBackupId(); - /** - * required string backup_id = 2; - */ - java.lang.String getBackupId(); - /** - * required string backup_id = 2; - */ - com.google.protobuf.ByteString - getBackupIdBytes(); - - // required .hbase.pb.BackupType type = 3; - /** - * required .hbase.pb.BackupType type = 3; - */ - boolean hasType(); - /** - * required .hbase.pb.BackupType type = 3; - */ - org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType getType(); - - // repeated .hbase.pb.TableName table_list = 4; - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - java.util.List - getTableListList(); - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableList(int index); - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - int getTableListCount(); - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - java.util.List - getTableListOrBuilderList(); - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableListOrBuilder( - int index); - - // required uint64 start_ts = 5; - /** - * required uint64 start_ts = 5; - */ - boolean hasStartTs(); - /** - * required uint64 start_ts = 5; - */ - long getStartTs(); - - // required uint64 complete_ts = 6; - /** - * required uint64 complete_ts = 6; - */ - boolean hasCompleteTs(); - /** - * required uint64 complete_ts = 6; - */ - long getCompleteTs(); - - // repeated .hbase.pb.TableServerTimestamp tst_map = 7; + // repeated .hbase.pb.TableServerTimestamp tst_map = 1; /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+     *optional string backup_id = 1;
+     *optional BackupType type = 2;
+     *repeated TableName table_list = 3;
+     *optional uint64 start_ts = 4;
+     *optional uint64 complete_ts = 5;
+     * 
*/ java.util.List getTstMapList(); /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+     *optional string backup_id = 1;
+     *optional BackupType type = 2;
+     *repeated TableName table_list = 3;
+     *optional uint64 start_ts = 4;
+     *optional uint64 complete_ts = 5;
+     * 
*/ org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestamp getTstMap(int index); /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+     *optional string backup_id = 1;
+     *optional BackupType type = 2;
+     *repeated TableName table_list = 3;
+     *optional uint64 start_ts = 4;
+     *optional uint64 complete_ts = 5;
+     * 
*/ int getTstMapCount(); /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+     *optional string backup_id = 1;
+     *optional BackupType type = 2;
+     *repeated TableName table_list = 3;
+     *optional uint64 start_ts = 4;
+     *optional uint64 complete_ts = 5;
+     * 
*/ java.util.List getTstMapOrBuilderList(); /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+     *optional string backup_id = 1;
+     *optional BackupType type = 2;
+     *repeated TableName table_list = 3;
+     *optional uint64 start_ts = 4;
+     *optional uint64 complete_ts = 5;
+     * 
*/ org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestampOrBuilder getTstMapOrBuilder( int index); - // repeated .hbase.pb.BackupImage dependent_backup_image = 8; + // repeated .hbase.pb.BackupImage dependent_backup_image = 2; /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ java.util.List getDependentBackupImageList(); /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImage getDependentBackupImage(int index); /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ int getDependentBackupImageCount(); /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ java.util.List getDependentBackupImageOrBuilderList(); /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImageOrBuilder getDependentBackupImageOrBuilder( int index); @@ -3609,56 +3532,17 @@ public final class BackupProtos { break; } case 10: { - bitField0_ |= 0x00000001; - version_ = input.readBytes(); - break; - } - case 18: { - bitField0_ |= 0x00000002; - backupId_ = input.readBytes(); - break; - } - case 24: { - int rawValue = input.readEnum(); - org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType value = org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType.valueOf(rawValue); - if (value == null) { - unknownFields.mergeVarintField(3, rawValue); - } else { - bitField0_ |= 0x00000004; - type_ = value; - } - break; - } - case 34: { - if (!((mutable_bitField0_ & 0x00000008) == 0x00000008)) { - tableList_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000008; - } - tableList_.add(input.readMessage(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.PARSER, extensionRegistry)); - break; - } - case 40: { - bitField0_ |= 0x00000008; - startTs_ = input.readUInt64(); - break; - } - case 48: { - bitField0_ |= 0x00000010; - completeTs_ = input.readUInt64(); - break; - } - case 58: { - if (!((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (!((mutable_bitField0_ & 0x00000001) == 0x00000001)) { tstMap_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000040; + mutable_bitField0_ |= 0x00000001; } tstMap_.add(input.readMessage(org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestamp.PARSER, extensionRegistry)); break; } - case 66: { - if (!((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + case 18: { + if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) { dependentBackupImage_ = new java.util.ArrayList(); - mutable_bitField0_ |= 0x00000080; + mutable_bitField0_ |= 0x00000002; } dependentBackupImage_.add(input.readMessage(org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImage.PARSER, extensionRegistry)); break; @@ -3671,13 +3555,10 @@ public final class BackupProtos { throw new com.google.protobuf.InvalidProtocolBufferException( e.getMessage()).setUnfinishedMessage(this); } finally { - if (((mutable_bitField0_ & 0x00000008) == 0x00000008)) { - tableList_ = java.util.Collections.unmodifiableList(tableList_); - } - if (((mutable_bitField0_ & 0x00000040) == 0x00000040)) { + if (((mutable_bitField0_ & 0x00000001) == 0x00000001)) { tstMap_ = java.util.Collections.unmodifiableList(tstMap_); } - if (((mutable_bitField0_ & 0x00000080) == 0x00000080)) { + if (((mutable_bitField0_ & 0x00000002) == 0x00000002)) { dependentBackupImage_ = java.util.Collections.unmodifiableList(dependentBackupImage_); } this.unknownFields = unknownFields.build(); @@ -3711,243 +3592,112 @@ public final class BackupProtos { return PARSER; } - private int bitField0_; - // required string version = 1; - public static final int VERSION_FIELD_NUMBER = 1; - private java.lang.Object version_; + // repeated .hbase.pb.TableServerTimestamp tst_map = 1; + public static final int TST_MAP_FIELD_NUMBER = 1; + private java.util.List tstMap_; /** - * required string version = 1; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+     *optional string backup_id = 1;
+     *optional BackupType type = 2;
+     *repeated TableName table_list = 3;
+     *optional uint64 start_ts = 4;
+     *optional uint64 complete_ts = 5;
+     * 
*/ - public boolean hasVersion() { - return ((bitField0_ & 0x00000001) == 0x00000001); + public java.util.List getTstMapList() { + return tstMap_; } /** - * required string version = 1; - */ - public java.lang.String getVersion() { - java.lang.Object ref = version_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - version_ = s; - } - return s; - } - } - /** - * required string version = 1; - */ - public com.google.protobuf.ByteString - getVersionBytes() { - java.lang.Object ref = version_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - version_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - // required string backup_id = 2; - public static final int BACKUP_ID_FIELD_NUMBER = 2; - private java.lang.Object backupId_; - /** - * required string backup_id = 2; - */ - public boolean hasBackupId() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * required string backup_id = 2; - */ - public java.lang.String getBackupId() { - java.lang.Object ref = backupId_; - if (ref instanceof java.lang.String) { - return (java.lang.String) ref; - } else { - com.google.protobuf.ByteString bs = - (com.google.protobuf.ByteString) ref; - java.lang.String s = bs.toStringUtf8(); - if (bs.isValidUtf8()) { - backupId_ = s; - } - return s; - } - } - /** - * required string backup_id = 2; - */ - public com.google.protobuf.ByteString - getBackupIdBytes() { - java.lang.Object ref = backupId_; - if (ref instanceof java.lang.String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - backupId_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - - // required .hbase.pb.BackupType type = 3; - public static final int TYPE_FIELD_NUMBER = 3; - private org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType type_; - /** - * required .hbase.pb.BackupType type = 3; - */ - public boolean hasType() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * required .hbase.pb.BackupType type = 3; - */ - public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType getType() { - return type_; - } - - // repeated .hbase.pb.TableName table_list = 4; - public static final int TABLE_LIST_FIELD_NUMBER = 4; - private java.util.List tableList_; - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - public java.util.List getTableListList() { - return tableList_; - } - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - public java.util.List - getTableListOrBuilderList() { - return tableList_; - } - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - public int getTableListCount() { - return tableList_.size(); - } - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableList(int index) { - return tableList_.get(index); - } - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableListOrBuilder( - int index) { - return tableList_.get(index); - } - - // required uint64 start_ts = 5; - public static final int START_TS_FIELD_NUMBER = 5; - private long startTs_; - /** - * required uint64 start_ts = 5; - */ - public boolean hasStartTs() { - return ((bitField0_ & 0x00000008) == 0x00000008); - } - /** - * required uint64 start_ts = 5; - */ - public long getStartTs() { - return startTs_; - } - - // required uint64 complete_ts = 6; - public static final int COMPLETE_TS_FIELD_NUMBER = 6; - private long completeTs_; - /** - * required uint64 complete_ts = 6; - */ - public boolean hasCompleteTs() { - return ((bitField0_ & 0x00000010) == 0x00000010); - } - /** - * required uint64 complete_ts = 6; - */ - public long getCompleteTs() { - return completeTs_; - } - - // repeated .hbase.pb.TableServerTimestamp tst_map = 7; - public static final int TST_MAP_FIELD_NUMBER = 7; - private java.util.List tstMap_; - /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; - */ - public java.util.List getTstMapList() { - return tstMap_; - } - /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+     *optional string backup_id = 1;
+     *optional BackupType type = 2;
+     *repeated TableName table_list = 3;
+     *optional uint64 start_ts = 4;
+     *optional uint64 complete_ts = 5;
+     * 
*/ public java.util.List getTstMapOrBuilderList() { return tstMap_; } /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+     *optional string backup_id = 1;
+     *optional BackupType type = 2;
+     *repeated TableName table_list = 3;
+     *optional uint64 start_ts = 4;
+     *optional uint64 complete_ts = 5;
+     * 
*/ public int getTstMapCount() { return tstMap_.size(); } /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+     *optional string backup_id = 1;
+     *optional BackupType type = 2;
+     *repeated TableName table_list = 3;
+     *optional uint64 start_ts = 4;
+     *optional uint64 complete_ts = 5;
+     * 
*/ public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestamp getTstMap(int index) { return tstMap_.get(index); } /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+     *optional string backup_id = 1;
+     *optional BackupType type = 2;
+     *repeated TableName table_list = 3;
+     *optional uint64 start_ts = 4;
+     *optional uint64 complete_ts = 5;
+     * 
*/ public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestampOrBuilder getTstMapOrBuilder( int index) { return tstMap_.get(index); } - // repeated .hbase.pb.BackupImage dependent_backup_image = 8; - public static final int DEPENDENT_BACKUP_IMAGE_FIELD_NUMBER = 8; + // repeated .hbase.pb.BackupImage dependent_backup_image = 2; + public static final int DEPENDENT_BACKUP_IMAGE_FIELD_NUMBER = 2; private java.util.List dependentBackupImage_; /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ public java.util.List getDependentBackupImageList() { return dependentBackupImage_; } /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ public java.util.List getDependentBackupImageOrBuilderList() { return dependentBackupImage_; } /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ public int getDependentBackupImageCount() { return dependentBackupImage_.size(); } /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImage getDependentBackupImage(int index) { return dependentBackupImage_.get(index); } /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImageOrBuilder getDependentBackupImageOrBuilder( int index) { @@ -3955,12 +3705,6 @@ public final class BackupProtos { } private void initFields() { - version_ = ""; - backupId_ = ""; - type_ = org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType.FULL; - tableList_ = java.util.Collections.emptyList(); - startTs_ = 0L; - completeTs_ = 0L; tstMap_ = java.util.Collections.emptyList(); dependentBackupImage_ = java.util.Collections.emptyList(); } @@ -3969,32 +3713,6 @@ public final class BackupProtos { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - if (!hasVersion()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasBackupId()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasType()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasStartTs()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasCompleteTs()) { - memoizedIsInitialized = 0; - return false; - } - for (int i = 0; i < getTableListCount(); i++) { - if (!getTableList(i).isInitialized()) { - memoizedIsInitialized = 0; - return false; - } - } for (int i = 0; i < getTstMapCount(); i++) { if (!getTstMap(i).isInitialized()) { memoizedIsInitialized = 0; @@ -4014,29 +3732,11 @@ public final class BackupProtos { public void writeTo(com.google.protobuf.CodedOutputStream output) throws java.io.IOException { getSerializedSize(); - if (((bitField0_ & 0x00000001) == 0x00000001)) { - output.writeBytes(1, getVersionBytes()); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - output.writeBytes(2, getBackupIdBytes()); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - output.writeEnum(3, type_.getNumber()); - } - for (int i = 0; i < tableList_.size(); i++) { - output.writeMessage(4, tableList_.get(i)); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - output.writeUInt64(5, startTs_); - } - if (((bitField0_ & 0x00000010) == 0x00000010)) { - output.writeUInt64(6, completeTs_); - } for (int i = 0; i < tstMap_.size(); i++) { - output.writeMessage(7, tstMap_.get(i)); + output.writeMessage(1, tstMap_.get(i)); } for (int i = 0; i < dependentBackupImage_.size(); i++) { - output.writeMessage(8, dependentBackupImage_.get(i)); + output.writeMessage(2, dependentBackupImage_.get(i)); } getUnknownFields().writeTo(output); } @@ -4047,37 +3747,13 @@ public final class BackupProtos { if (size != -1) return size; size = 0; - if (((bitField0_ & 0x00000001) == 0x00000001)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(1, getVersionBytes()); - } - if (((bitField0_ & 0x00000002) == 0x00000002)) { - size += com.google.protobuf.CodedOutputStream - .computeBytesSize(2, getBackupIdBytes()); - } - if (((bitField0_ & 0x00000004) == 0x00000004)) { - size += com.google.protobuf.CodedOutputStream - .computeEnumSize(3, type_.getNumber()); - } - for (int i = 0; i < tableList_.size(); i++) { - size += com.google.protobuf.CodedOutputStream - .computeMessageSize(4, tableList_.get(i)); - } - if (((bitField0_ & 0x00000008) == 0x00000008)) { - size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(5, startTs_); - } - if (((bitField0_ & 0x00000010) == 0x00000010)) { - size += com.google.protobuf.CodedOutputStream - .computeUInt64Size(6, completeTs_); - } for (int i = 0; i < tstMap_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(7, tstMap_.get(i)); + .computeMessageSize(1, tstMap_.get(i)); } for (int i = 0; i < dependentBackupImage_.size(); i++) { size += com.google.protobuf.CodedOutputStream - .computeMessageSize(8, dependentBackupImage_.get(i)); + .computeMessageSize(2, dependentBackupImage_.get(i)); } size += getUnknownFields().getSerializedSize(); memoizedSerializedSize = size; @@ -4102,33 +3778,6 @@ public final class BackupProtos { org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest other = (org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest) obj; boolean result = true; - result = result && (hasVersion() == other.hasVersion()); - if (hasVersion()) { - result = result && getVersion() - .equals(other.getVersion()); - } - result = result && (hasBackupId() == other.hasBackupId()); - if (hasBackupId()) { - result = result && getBackupId() - .equals(other.getBackupId()); - } - result = result && (hasType() == other.hasType()); - if (hasType()) { - result = result && - (getType() == other.getType()); - } - result = result && getTableListList() - .equals(other.getTableListList()); - result = result && (hasStartTs() == other.hasStartTs()); - if (hasStartTs()) { - result = result && (getStartTs() - == other.getStartTs()); - } - result = result && (hasCompleteTs() == other.hasCompleteTs()); - if (hasCompleteTs()) { - result = result && (getCompleteTs() - == other.getCompleteTs()); - } result = result && getTstMapList() .equals(other.getTstMapList()); result = result && getDependentBackupImageList() @@ -4146,30 +3795,6 @@ public final class BackupProtos { } int hash = 41; hash = (19 * hash) + getDescriptorForType().hashCode(); - if (hasVersion()) { - hash = (37 * hash) + VERSION_FIELD_NUMBER; - hash = (53 * hash) + getVersion().hashCode(); - } - if (hasBackupId()) { - hash = (37 * hash) + BACKUP_ID_FIELD_NUMBER; - hash = (53 * hash) + getBackupId().hashCode(); - } - if (hasType()) { - hash = (37 * hash) + TYPE_FIELD_NUMBER; - hash = (53 * hash) + hashEnum(getType()); - } - if (getTableListCount() > 0) { - hash = (37 * hash) + TABLE_LIST_FIELD_NUMBER; - hash = (53 * hash) + getTableListList().hashCode(); - } - if (hasStartTs()) { - hash = (37 * hash) + START_TS_FIELD_NUMBER; - hash = (53 * hash) + hashLong(getStartTs()); - } - if (hasCompleteTs()) { - hash = (37 * hash) + COMPLETE_TS_FIELD_NUMBER; - hash = (53 * hash) + hashLong(getCompleteTs()); - } if (getTstMapCount() > 0) { hash = (37 * hash) + TST_MAP_FIELD_NUMBER; hash = (53 * hash) + getTstMapList().hashCode(); @@ -4279,7 +3904,6 @@ public final class BackupProtos { } private void maybeForceBuilderInitialization() { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { - getTableListFieldBuilder(); getTstMapFieldBuilder(); getDependentBackupImageFieldBuilder(); } @@ -4290,784 +3914,176 @@ public final class BackupProtos { public Builder clear() { super.clear(); - version_ = ""; - bitField0_ = (bitField0_ & ~0x00000001); - backupId_ = ""; - bitField0_ = (bitField0_ & ~0x00000002); - type_ = org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType.FULL; - bitField0_ = (bitField0_ & ~0x00000004); - if (tableListBuilder_ == null) { - tableList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000008); - } else { - tableListBuilder_.clear(); - } - startTs_ = 0L; - bitField0_ = (bitField0_ & ~0x00000010); - completeTs_ = 0L; - bitField0_ = (bitField0_ & ~0x00000020); if (tstMapBuilder_ == null) { tstMap_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000040); + bitField0_ = (bitField0_ & ~0x00000001); } else { - tstMapBuilder_.clear(); - } - if (dependentBackupImageBuilder_ == null) { - dependentBackupImage_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000080); - } else { - dependentBackupImageBuilder_.clear(); - } - return this; - } - - public Builder clone() { - return create().mergeFrom(buildPartial()); - } - - public com.google.protobuf.Descriptors.Descriptor - getDescriptorForType() { - return org.apache.hadoop.hbase.protobuf.generated.BackupProtos.internal_static_hbase_pb_BackupManifest_descriptor; - } - - public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest getDefaultInstanceForType() { - return org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest.getDefaultInstance(); - } - - public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest build() { - org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest result = buildPartial(); - if (!result.isInitialized()) { - throw newUninitializedMessageException(result); - } - return result; - } - - public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest buildPartial() { - org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest result = new org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest(this); - int from_bitField0_ = bitField0_; - int to_bitField0_ = 0; - if (((from_bitField0_ & 0x00000001) == 0x00000001)) { - to_bitField0_ |= 0x00000001; - } - result.version_ = version_; - if (((from_bitField0_ & 0x00000002) == 0x00000002)) { - to_bitField0_ |= 0x00000002; - } - result.backupId_ = backupId_; - if (((from_bitField0_ & 0x00000004) == 0x00000004)) { - to_bitField0_ |= 0x00000004; - } - result.type_ = type_; - if (tableListBuilder_ == null) { - if (((bitField0_ & 0x00000008) == 0x00000008)) { - tableList_ = java.util.Collections.unmodifiableList(tableList_); - bitField0_ = (bitField0_ & ~0x00000008); - } - result.tableList_ = tableList_; - } else { - result.tableList_ = tableListBuilder_.build(); - } - if (((from_bitField0_ & 0x00000010) == 0x00000010)) { - to_bitField0_ |= 0x00000008; - } - result.startTs_ = startTs_; - if (((from_bitField0_ & 0x00000020) == 0x00000020)) { - to_bitField0_ |= 0x00000010; - } - result.completeTs_ = completeTs_; - if (tstMapBuilder_ == null) { - if (((bitField0_ & 0x00000040) == 0x00000040)) { - tstMap_ = java.util.Collections.unmodifiableList(tstMap_); - bitField0_ = (bitField0_ & ~0x00000040); - } - result.tstMap_ = tstMap_; - } else { - result.tstMap_ = tstMapBuilder_.build(); - } - if (dependentBackupImageBuilder_ == null) { - if (((bitField0_ & 0x00000080) == 0x00000080)) { - dependentBackupImage_ = java.util.Collections.unmodifiableList(dependentBackupImage_); - bitField0_ = (bitField0_ & ~0x00000080); - } - result.dependentBackupImage_ = dependentBackupImage_; - } else { - result.dependentBackupImage_ = dependentBackupImageBuilder_.build(); - } - result.bitField0_ = to_bitField0_; - onBuilt(); - return result; - } - - public Builder mergeFrom(com.google.protobuf.Message other) { - if (other instanceof org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest) { - return mergeFrom((org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest)other); - } else { - super.mergeFrom(other); - return this; - } - } - - public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest other) { - if (other == org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest.getDefaultInstance()) return this; - if (other.hasVersion()) { - bitField0_ |= 0x00000001; - version_ = other.version_; - onChanged(); - } - if (other.hasBackupId()) { - bitField0_ |= 0x00000002; - backupId_ = other.backupId_; - onChanged(); - } - if (other.hasType()) { - setType(other.getType()); - } - if (tableListBuilder_ == null) { - if (!other.tableList_.isEmpty()) { - if (tableList_.isEmpty()) { - tableList_ = other.tableList_; - bitField0_ = (bitField0_ & ~0x00000008); - } else { - ensureTableListIsMutable(); - tableList_.addAll(other.tableList_); - } - onChanged(); - } - } else { - if (!other.tableList_.isEmpty()) { - if (tableListBuilder_.isEmpty()) { - tableListBuilder_.dispose(); - tableListBuilder_ = null; - tableList_ = other.tableList_; - bitField0_ = (bitField0_ & ~0x00000008); - tableListBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getTableListFieldBuilder() : null; - } else { - tableListBuilder_.addAllMessages(other.tableList_); - } - } - } - if (other.hasStartTs()) { - setStartTs(other.getStartTs()); - } - if (other.hasCompleteTs()) { - setCompleteTs(other.getCompleteTs()); - } - if (tstMapBuilder_ == null) { - if (!other.tstMap_.isEmpty()) { - if (tstMap_.isEmpty()) { - tstMap_ = other.tstMap_; - bitField0_ = (bitField0_ & ~0x00000040); - } else { - ensureTstMapIsMutable(); - tstMap_.addAll(other.tstMap_); - } - onChanged(); - } - } else { - if (!other.tstMap_.isEmpty()) { - if (tstMapBuilder_.isEmpty()) { - tstMapBuilder_.dispose(); - tstMapBuilder_ = null; - tstMap_ = other.tstMap_; - bitField0_ = (bitField0_ & ~0x00000040); - tstMapBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getTstMapFieldBuilder() : null; - } else { - tstMapBuilder_.addAllMessages(other.tstMap_); - } - } - } - if (dependentBackupImageBuilder_ == null) { - if (!other.dependentBackupImage_.isEmpty()) { - if (dependentBackupImage_.isEmpty()) { - dependentBackupImage_ = other.dependentBackupImage_; - bitField0_ = (bitField0_ & ~0x00000080); - } else { - ensureDependentBackupImageIsMutable(); - dependentBackupImage_.addAll(other.dependentBackupImage_); - } - onChanged(); - } - } else { - if (!other.dependentBackupImage_.isEmpty()) { - if (dependentBackupImageBuilder_.isEmpty()) { - dependentBackupImageBuilder_.dispose(); - dependentBackupImageBuilder_ = null; - dependentBackupImage_ = other.dependentBackupImage_; - bitField0_ = (bitField0_ & ~0x00000080); - dependentBackupImageBuilder_ = - com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? - getDependentBackupImageFieldBuilder() : null; - } else { - dependentBackupImageBuilder_.addAllMessages(other.dependentBackupImage_); - } - } - } - this.mergeUnknownFields(other.getUnknownFields()); - return this; - } - - public final boolean isInitialized() { - if (!hasVersion()) { - - return false; - } - if (!hasBackupId()) { - - return false; - } - if (!hasType()) { - - return false; - } - if (!hasStartTs()) { - - return false; - } - if (!hasCompleteTs()) { - - return false; - } - for (int i = 0; i < getTableListCount(); i++) { - if (!getTableList(i).isInitialized()) { - - return false; - } - } - for (int i = 0; i < getTstMapCount(); i++) { - if (!getTstMap(i).isInitialized()) { - - return false; - } - } - for (int i = 0; i < getDependentBackupImageCount(); i++) { - if (!getDependentBackupImage(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.BackupProtos.BackupManifest parsedMessage = null; - try { - parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); - } catch (com.google.protobuf.InvalidProtocolBufferException e) { - parsedMessage = (org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest) e.getUnfinishedMessage(); - throw e; - } finally { - if (parsedMessage != null) { - mergeFrom(parsedMessage); - } - } - return this; - } - private int bitField0_; - - // required string version = 1; - private java.lang.Object version_ = ""; - /** - * required string version = 1; - */ - public boolean hasVersion() { - return ((bitField0_ & 0x00000001) == 0x00000001); - } - /** - * required string version = 1; - */ - public java.lang.String getVersion() { - java.lang.Object ref = version_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - version_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * required string version = 1; - */ - public com.google.protobuf.ByteString - getVersionBytes() { - java.lang.Object ref = version_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - version_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * required string version = 1; - */ - public Builder setVersion( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - version_ = value; - onChanged(); - return this; - } - /** - * required string version = 1; - */ - public Builder clearVersion() { - bitField0_ = (bitField0_ & ~0x00000001); - version_ = getDefaultInstance().getVersion(); - onChanged(); - return this; - } - /** - * required string version = 1; - */ - public Builder setVersionBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000001; - version_ = value; - onChanged(); - return this; - } - - // required string backup_id = 2; - private java.lang.Object backupId_ = ""; - /** - * required string backup_id = 2; - */ - public boolean hasBackupId() { - return ((bitField0_ & 0x00000002) == 0x00000002); - } - /** - * required string backup_id = 2; - */ - public java.lang.String getBackupId() { - java.lang.Object ref = backupId_; - if (!(ref instanceof java.lang.String)) { - java.lang.String s = ((com.google.protobuf.ByteString) ref) - .toStringUtf8(); - backupId_ = s; - return s; - } else { - return (java.lang.String) ref; - } - } - /** - * required string backup_id = 2; - */ - public com.google.protobuf.ByteString - getBackupIdBytes() { - java.lang.Object ref = backupId_; - if (ref instanceof String) { - com.google.protobuf.ByteString b = - com.google.protobuf.ByteString.copyFromUtf8( - (java.lang.String) ref); - backupId_ = b; - return b; - } else { - return (com.google.protobuf.ByteString) ref; - } - } - /** - * required string backup_id = 2; - */ - public Builder setBackupId( - java.lang.String value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - backupId_ = value; - onChanged(); - return this; - } - /** - * required string backup_id = 2; - */ - public Builder clearBackupId() { - bitField0_ = (bitField0_ & ~0x00000002); - backupId_ = getDefaultInstance().getBackupId(); - onChanged(); - return this; - } - /** - * required string backup_id = 2; - */ - public Builder setBackupIdBytes( - com.google.protobuf.ByteString value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000002; - backupId_ = value; - onChanged(); - return this; - } - - // required .hbase.pb.BackupType type = 3; - private org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType type_ = org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType.FULL; - /** - * required .hbase.pb.BackupType type = 3; - */ - public boolean hasType() { - return ((bitField0_ & 0x00000004) == 0x00000004); - } - /** - * required .hbase.pb.BackupType type = 3; - */ - public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType getType() { - return type_; - } - /** - * required .hbase.pb.BackupType type = 3; - */ - public Builder setType(org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType value) { - if (value == null) { - throw new NullPointerException(); - } - bitField0_ |= 0x00000004; - type_ = value; - onChanged(); - return this; - } - /** - * required .hbase.pb.BackupType type = 3; - */ - public Builder clearType() { - bitField0_ = (bitField0_ & ~0x00000004); - type_ = org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType.FULL; - onChanged(); - return this; - } - - // repeated .hbase.pb.TableName table_list = 4; - private java.util.List tableList_ = - java.util.Collections.emptyList(); - private void ensureTableListIsMutable() { - if (!((bitField0_ & 0x00000008) == 0x00000008)) { - tableList_ = new java.util.ArrayList(tableList_); - bitField0_ |= 0x00000008; - } - } - - private com.google.protobuf.RepeatedFieldBuilder< - 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> tableListBuilder_; - - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - public java.util.List getTableListList() { - if (tableListBuilder_ == null) { - return java.util.Collections.unmodifiableList(tableList_); - } else { - return tableListBuilder_.getMessageList(); - } - } - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - public int getTableListCount() { - if (tableListBuilder_ == null) { - return tableList_.size(); - } else { - return tableListBuilder_.getCount(); - } - } - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTableList(int index) { - if (tableListBuilder_ == null) { - return tableList_.get(index); - } else { - return tableListBuilder_.getMessage(index); - } - } - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - public Builder setTableList( - int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) { - if (tableListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTableListIsMutable(); - tableList_.set(index, value); - onChanged(); - } else { - tableListBuilder_.setMessage(index, value); - } - return this; - } - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - public Builder setTableList( - int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) { - if (tableListBuilder_ == null) { - ensureTableListIsMutable(); - tableList_.set(index, builderForValue.build()); - onChanged(); - } else { - tableListBuilder_.setMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - public Builder addTableList(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) { - if (tableListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTableListIsMutable(); - tableList_.add(value); - onChanged(); - } else { - tableListBuilder_.addMessage(value); - } - return this; - } - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - public Builder addTableList( - int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) { - if (tableListBuilder_ == null) { - if (value == null) { - throw new NullPointerException(); - } - ensureTableListIsMutable(); - tableList_.add(index, value); - onChanged(); - } else { - tableListBuilder_.addMessage(index, value); - } - return this; - } - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - public Builder addTableList( - org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) { - if (tableListBuilder_ == null) { - ensureTableListIsMutable(); - tableList_.add(builderForValue.build()); - onChanged(); - } else { - tableListBuilder_.addMessage(builderForValue.build()); - } - return this; - } - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - public Builder addTableList( - int index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) { - if (tableListBuilder_ == null) { - ensureTableListIsMutable(); - tableList_.add(index, builderForValue.build()); - onChanged(); - } else { - tableListBuilder_.addMessage(index, builderForValue.build()); - } - return this; - } - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - public Builder addAllTableList( - java.lang.Iterable values) { - if (tableListBuilder_ == null) { - ensureTableListIsMutable(); - super.addAll(values, tableList_); - onChanged(); - } else { - tableListBuilder_.addAllMessages(values); - } - return this; - } - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - public Builder clearTableList() { - if (tableListBuilder_ == null) { - tableList_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000008); - onChanged(); - } else { - tableListBuilder_.clear(); - } - return this; - } - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - public Builder removeTableList(int index) { - if (tableListBuilder_ == null) { - ensureTableListIsMutable(); - tableList_.remove(index); - onChanged(); - } else { - tableListBuilder_.remove(index); - } - return this; - } - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableListBuilder( - int index) { - return getTableListFieldBuilder().getBuilder(index); - } - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableListOrBuilder( - int index) { - if (tableListBuilder_ == null) { - return tableList_.get(index); } else { - return tableListBuilder_.getMessageOrBuilder(index); - } - } - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - public java.util.List - getTableListOrBuilderList() { - if (tableListBuilder_ != null) { - return tableListBuilder_.getMessageOrBuilderList(); + tstMapBuilder_.clear(); + } + if (dependentBackupImageBuilder_ == null) { + dependentBackupImage_ = java.util.Collections.emptyList(); + bitField0_ = (bitField0_ & ~0x00000002); } else { - return java.util.Collections.unmodifiableList(tableList_); + dependentBackupImageBuilder_.clear(); } + return this; } - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder addTableListBuilder() { - return getTableListFieldBuilder().addBuilder( - org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance()); + + public Builder clone() { + return create().mergeFrom(buildPartial()); } - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder addTableListBuilder( - int index) { - return getTableListFieldBuilder().addBuilder( - index, org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.getDefaultInstance()); + + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return org.apache.hadoop.hbase.protobuf.generated.BackupProtos.internal_static_hbase_pb_BackupManifest_descriptor; } - /** - * repeated .hbase.pb.TableName table_list = 4; - */ - public java.util.List - getTableListBuilderList() { - return getTableListFieldBuilder().getBuilderList(); + + public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest getDefaultInstanceForType() { + return org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest.getDefaultInstance(); } - private com.google.protobuf.RepeatedFieldBuilder< - 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> - getTableListFieldBuilder() { - if (tableListBuilder_ == null) { - tableListBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< - 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>( - tableList_, - ((bitField0_ & 0x00000008) == 0x00000008), - getParentForChildren(), - isClean()); - tableList_ = null; + + public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest build() { + org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); } - return tableListBuilder_; + return result; } - // required uint64 start_ts = 5; - private long startTs_ ; - /** - * required uint64 start_ts = 5; - */ - public boolean hasStartTs() { - return ((bitField0_ & 0x00000010) == 0x00000010); - } - /** - * required uint64 start_ts = 5; - */ - public long getStartTs() { - return startTs_; + public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest buildPartial() { + org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest result = new org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest(this); + int from_bitField0_ = bitField0_; + if (tstMapBuilder_ == null) { + if (((bitField0_ & 0x00000001) == 0x00000001)) { + tstMap_ = java.util.Collections.unmodifiableList(tstMap_); + bitField0_ = (bitField0_ & ~0x00000001); + } + result.tstMap_ = tstMap_; + } else { + result.tstMap_ = tstMapBuilder_.build(); + } + if (dependentBackupImageBuilder_ == null) { + if (((bitField0_ & 0x00000002) == 0x00000002)) { + dependentBackupImage_ = java.util.Collections.unmodifiableList(dependentBackupImage_); + bitField0_ = (bitField0_ & ~0x00000002); + } + result.dependentBackupImage_ = dependentBackupImage_; + } else { + result.dependentBackupImage_ = dependentBackupImageBuilder_.build(); + } + onBuilt(); + return result; } - /** - * required uint64 start_ts = 5; - */ - public Builder setStartTs(long value) { - bitField0_ |= 0x00000010; - startTs_ = value; - onChanged(); - return this; + + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest) { + return mergeFrom((org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest)other); + } else { + super.mergeFrom(other); + return this; + } } - /** - * required uint64 start_ts = 5; - */ - public Builder clearStartTs() { - bitField0_ = (bitField0_ & ~0x00000010); - startTs_ = 0L; - onChanged(); + + public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest other) { + if (other == org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest.getDefaultInstance()) return this; + if (tstMapBuilder_ == null) { + if (!other.tstMap_.isEmpty()) { + if (tstMap_.isEmpty()) { + tstMap_ = other.tstMap_; + bitField0_ = (bitField0_ & ~0x00000001); + } else { + ensureTstMapIsMutable(); + tstMap_.addAll(other.tstMap_); + } + onChanged(); + } + } else { + if (!other.tstMap_.isEmpty()) { + if (tstMapBuilder_.isEmpty()) { + tstMapBuilder_.dispose(); + tstMapBuilder_ = null; + tstMap_ = other.tstMap_; + bitField0_ = (bitField0_ & ~0x00000001); + tstMapBuilder_ = + com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + getTstMapFieldBuilder() : null; + } else { + tstMapBuilder_.addAllMessages(other.tstMap_); + } + } + } + if (dependentBackupImageBuilder_ == null) { + if (!other.dependentBackupImage_.isEmpty()) { + if (dependentBackupImage_.isEmpty()) { + dependentBackupImage_ = other.dependentBackupImage_; + bitField0_ = (bitField0_ & ~0x00000002); + } else { + ensureDependentBackupImageIsMutable(); + dependentBackupImage_.addAll(other.dependentBackupImage_); + } + onChanged(); + } + } else { + if (!other.dependentBackupImage_.isEmpty()) { + if (dependentBackupImageBuilder_.isEmpty()) { + dependentBackupImageBuilder_.dispose(); + dependentBackupImageBuilder_ = null; + dependentBackupImage_ = other.dependentBackupImage_; + bitField0_ = (bitField0_ & ~0x00000002); + dependentBackupImageBuilder_ = + com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? + getDependentBackupImageFieldBuilder() : null; + } else { + dependentBackupImageBuilder_.addAllMessages(other.dependentBackupImage_); + } + } + } + this.mergeUnknownFields(other.getUnknownFields()); return this; } - // required uint64 complete_ts = 6; - private long completeTs_ ; - /** - * required uint64 complete_ts = 6; - */ - public boolean hasCompleteTs() { - return ((bitField0_ & 0x00000020) == 0x00000020); - } - /** - * required uint64 complete_ts = 6; - */ - public long getCompleteTs() { - return completeTs_; - } - /** - * required uint64 complete_ts = 6; - */ - public Builder setCompleteTs(long value) { - bitField0_ |= 0x00000020; - completeTs_ = value; - onChanged(); - return this; + public final boolean isInitialized() { + for (int i = 0; i < getTstMapCount(); i++) { + if (!getTstMap(i).isInitialized()) { + + return false; + } + } + for (int i = 0; i < getDependentBackupImageCount(); i++) { + if (!getDependentBackupImage(i).isInitialized()) { + + return false; + } + } + return true; } - /** - * required uint64 complete_ts = 6; - */ - public Builder clearCompleteTs() { - bitField0_ = (bitField0_ & ~0x00000020); - completeTs_ = 0L; - onChanged(); + + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupManifest) e.getUnfinishedMessage(); + throw e; + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } return this; } + private int bitField0_; - // repeated .hbase.pb.TableServerTimestamp tst_map = 7; + // repeated .hbase.pb.TableServerTimestamp tst_map = 1; private java.util.List tstMap_ = java.util.Collections.emptyList(); private void ensureTstMapIsMutable() { - if (!((bitField0_ & 0x00000040) == 0x00000040)) { + if (!((bitField0_ & 0x00000001) == 0x00000001)) { tstMap_ = new java.util.ArrayList(tstMap_); - bitField0_ |= 0x00000040; + bitField0_ |= 0x00000001; } } @@ -5075,7 +4091,15 @@ public final class BackupProtos { org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestamp, org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestamp.Builder, org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestampOrBuilder> tstMapBuilder_; /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+       *optional string backup_id = 1;
+       *optional BackupType type = 2;
+       *repeated TableName table_list = 3;
+       *optional uint64 start_ts = 4;
+       *optional uint64 complete_ts = 5;
+       * 
*/ public java.util.List getTstMapList() { if (tstMapBuilder_ == null) { @@ -5085,7 +4109,15 @@ public final class BackupProtos { } } /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+       *optional string backup_id = 1;
+       *optional BackupType type = 2;
+       *repeated TableName table_list = 3;
+       *optional uint64 start_ts = 4;
+       *optional uint64 complete_ts = 5;
+       * 
*/ public int getTstMapCount() { if (tstMapBuilder_ == null) { @@ -5095,7 +4127,15 @@ public final class BackupProtos { } } /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+       *optional string backup_id = 1;
+       *optional BackupType type = 2;
+       *repeated TableName table_list = 3;
+       *optional uint64 start_ts = 4;
+       *optional uint64 complete_ts = 5;
+       * 
*/ public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestamp getTstMap(int index) { if (tstMapBuilder_ == null) { @@ -5105,7 +4145,15 @@ public final class BackupProtos { } } /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+       *optional string backup_id = 1;
+       *optional BackupType type = 2;
+       *repeated TableName table_list = 3;
+       *optional uint64 start_ts = 4;
+       *optional uint64 complete_ts = 5;
+       * 
*/ public Builder setTstMap( int index, org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestamp value) { @@ -5122,7 +4170,15 @@ public final class BackupProtos { return this; } /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+       *optional string backup_id = 1;
+       *optional BackupType type = 2;
+       *repeated TableName table_list = 3;
+       *optional uint64 start_ts = 4;
+       *optional uint64 complete_ts = 5;
+       * 
*/ public Builder setTstMap( int index, org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestamp.Builder builderForValue) { @@ -5136,7 +4192,15 @@ public final class BackupProtos { return this; } /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+       *optional string backup_id = 1;
+       *optional BackupType type = 2;
+       *repeated TableName table_list = 3;
+       *optional uint64 start_ts = 4;
+       *optional uint64 complete_ts = 5;
+       * 
*/ public Builder addTstMap(org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestamp value) { if (tstMapBuilder_ == null) { @@ -5152,7 +4216,15 @@ public final class BackupProtos { return this; } /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+       *optional string backup_id = 1;
+       *optional BackupType type = 2;
+       *repeated TableName table_list = 3;
+       *optional uint64 start_ts = 4;
+       *optional uint64 complete_ts = 5;
+       * 
*/ public Builder addTstMap( int index, org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestamp value) { @@ -5169,7 +4241,15 @@ public final class BackupProtos { return this; } /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+       *optional string backup_id = 1;
+       *optional BackupType type = 2;
+       *repeated TableName table_list = 3;
+       *optional uint64 start_ts = 4;
+       *optional uint64 complete_ts = 5;
+       * 
*/ public Builder addTstMap( org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestamp.Builder builderForValue) { @@ -5183,7 +4263,15 @@ public final class BackupProtos { return this; } /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+       *optional string backup_id = 1;
+       *optional BackupType type = 2;
+       *repeated TableName table_list = 3;
+       *optional uint64 start_ts = 4;
+       *optional uint64 complete_ts = 5;
+       * 
*/ public Builder addTstMap( int index, org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestamp.Builder builderForValue) { @@ -5197,7 +4285,15 @@ public final class BackupProtos { return this; } /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+       *optional string backup_id = 1;
+       *optional BackupType type = 2;
+       *repeated TableName table_list = 3;
+       *optional uint64 start_ts = 4;
+       *optional uint64 complete_ts = 5;
+       * 
*/ public Builder addAllTstMap( java.lang.Iterable values) { @@ -5211,12 +4307,20 @@ public final class BackupProtos { return this; } /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+       *optional string backup_id = 1;
+       *optional BackupType type = 2;
+       *repeated TableName table_list = 3;
+       *optional uint64 start_ts = 4;
+       *optional uint64 complete_ts = 5;
+       * 
*/ public Builder clearTstMap() { if (tstMapBuilder_ == null) { tstMap_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000040); + bitField0_ = (bitField0_ & ~0x00000001); onChanged(); } else { tstMapBuilder_.clear(); @@ -5224,7 +4328,15 @@ public final class BackupProtos { return this; } /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+       *optional string backup_id = 1;
+       *optional BackupType type = 2;
+       *repeated TableName table_list = 3;
+       *optional uint64 start_ts = 4;
+       *optional uint64 complete_ts = 5;
+       * 
*/ public Builder removeTstMap(int index) { if (tstMapBuilder_ == null) { @@ -5237,14 +4349,30 @@ public final class BackupProtos { return this; } /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+       *optional string backup_id = 1;
+       *optional BackupType type = 2;
+       *repeated TableName table_list = 3;
+       *optional uint64 start_ts = 4;
+       *optional uint64 complete_ts = 5;
+       * 
*/ public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestamp.Builder getTstMapBuilder( int index) { return getTstMapFieldBuilder().getBuilder(index); } /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+       *optional string backup_id = 1;
+       *optional BackupType type = 2;
+       *repeated TableName table_list = 3;
+       *optional uint64 start_ts = 4;
+       *optional uint64 complete_ts = 5;
+       * 
*/ public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestampOrBuilder getTstMapOrBuilder( int index) { @@ -5254,7 +4382,15 @@ public final class BackupProtos { } } /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+       *optional string backup_id = 1;
+       *optional BackupType type = 2;
+       *repeated TableName table_list = 3;
+       *optional uint64 start_ts = 4;
+       *optional uint64 complete_ts = 5;
+       * 
*/ public java.util.List getTstMapOrBuilderList() { @@ -5265,14 +4401,30 @@ public final class BackupProtos { } } /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+       *optional string backup_id = 1;
+       *optional BackupType type = 2;
+       *repeated TableName table_list = 3;
+       *optional uint64 start_ts = 4;
+       *optional uint64 complete_ts = 5;
+       * 
*/ public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestamp.Builder addTstMapBuilder() { return getTstMapFieldBuilder().addBuilder( org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestamp.getDefaultInstance()); } /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+       *optional string backup_id = 1;
+       *optional BackupType type = 2;
+       *repeated TableName table_list = 3;
+       *optional uint64 start_ts = 4;
+       *optional uint64 complete_ts = 5;
+       * 
*/ public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestamp.Builder addTstMapBuilder( int index) { @@ -5280,7 +4432,15 @@ public final class BackupProtos { index, org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestamp.getDefaultInstance()); } /** - * repeated .hbase.pb.TableServerTimestamp tst_map = 7; + * repeated .hbase.pb.TableServerTimestamp tst_map = 1; + * + *
+       *optional string backup_id = 1;
+       *optional BackupType type = 2;
+       *repeated TableName table_list = 3;
+       *optional uint64 start_ts = 4;
+       *optional uint64 complete_ts = 5;
+       * 
*/ public java.util.List getTstMapBuilderList() { @@ -5293,7 +4453,7 @@ public final class BackupProtos { tstMapBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestamp, org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestamp.Builder, org.apache.hadoop.hbase.protobuf.generated.BackupProtos.TableServerTimestampOrBuilder>( tstMap_, - ((bitField0_ & 0x00000040) == 0x00000040), + ((bitField0_ & 0x00000001) == 0x00000001), getParentForChildren(), isClean()); tstMap_ = null; @@ -5301,13 +4461,13 @@ public final class BackupProtos { return tstMapBuilder_; } - // repeated .hbase.pb.BackupImage dependent_backup_image = 8; + // repeated .hbase.pb.BackupImage dependent_backup_image = 2; private java.util.List dependentBackupImage_ = java.util.Collections.emptyList(); private void ensureDependentBackupImageIsMutable() { - if (!((bitField0_ & 0x00000080) == 0x00000080)) { + if (!((bitField0_ & 0x00000002) == 0x00000002)) { dependentBackupImage_ = new java.util.ArrayList(dependentBackupImage_); - bitField0_ |= 0x00000080; + bitField0_ |= 0x00000002; } } @@ -5315,7 +4475,7 @@ public final class BackupProtos { org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImage, org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImage.Builder, org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImageOrBuilder> dependentBackupImageBuilder_; /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ public java.util.List getDependentBackupImageList() { if (dependentBackupImageBuilder_ == null) { @@ -5325,7 +4485,7 @@ public final class BackupProtos { } } /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ public int getDependentBackupImageCount() { if (dependentBackupImageBuilder_ == null) { @@ -5335,7 +4495,7 @@ public final class BackupProtos { } } /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImage getDependentBackupImage(int index) { if (dependentBackupImageBuilder_ == null) { @@ -5345,7 +4505,7 @@ public final class BackupProtos { } } /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ public Builder setDependentBackupImage( int index, org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImage value) { @@ -5362,7 +4522,7 @@ public final class BackupProtos { return this; } /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ public Builder setDependentBackupImage( int index, org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImage.Builder builderForValue) { @@ -5376,7 +4536,7 @@ public final class BackupProtos { return this; } /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ public Builder addDependentBackupImage(org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImage value) { if (dependentBackupImageBuilder_ == null) { @@ -5392,7 +4552,7 @@ public final class BackupProtos { return this; } /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ public Builder addDependentBackupImage( int index, org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImage value) { @@ -5409,7 +4569,7 @@ public final class BackupProtos { return this; } /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ public Builder addDependentBackupImage( org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImage.Builder builderForValue) { @@ -5423,7 +4583,7 @@ public final class BackupProtos { return this; } /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ public Builder addDependentBackupImage( int index, org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImage.Builder builderForValue) { @@ -5437,7 +4597,7 @@ public final class BackupProtos { return this; } /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ public Builder addAllDependentBackupImage( java.lang.Iterable values) { @@ -5451,12 +4611,12 @@ public final class BackupProtos { return this; } /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ public Builder clearDependentBackupImage() { if (dependentBackupImageBuilder_ == null) { dependentBackupImage_ = java.util.Collections.emptyList(); - bitField0_ = (bitField0_ & ~0x00000080); + bitField0_ = (bitField0_ & ~0x00000002); onChanged(); } else { dependentBackupImageBuilder_.clear(); @@ -5464,7 +4624,7 @@ public final class BackupProtos { return this; } /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ public Builder removeDependentBackupImage(int index) { if (dependentBackupImageBuilder_ == null) { @@ -5477,14 +4637,14 @@ public final class BackupProtos { return this; } /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImage.Builder getDependentBackupImageBuilder( int index) { return getDependentBackupImageFieldBuilder().getBuilder(index); } /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImageOrBuilder getDependentBackupImageOrBuilder( int index) { @@ -5494,7 +4654,7 @@ public final class BackupProtos { } } /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ public java.util.List getDependentBackupImageOrBuilderList() { @@ -5505,14 +4665,14 @@ public final class BackupProtos { } } /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImage.Builder addDependentBackupImageBuilder() { return getDependentBackupImageFieldBuilder().addBuilder( org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImage.getDefaultInstance()); } /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImage.Builder addDependentBackupImageBuilder( int index) { @@ -5520,7 +4680,7 @@ public final class BackupProtos { index, org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImage.getDefaultInstance()); } /** - * repeated .hbase.pb.BackupImage dependent_backup_image = 8; + * repeated .hbase.pb.BackupImage dependent_backup_image = 2; */ public java.util.List getDependentBackupImageBuilderList() { @@ -5533,7 +4693,7 @@ public final class BackupProtos { dependentBackupImageBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImage, org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImage.Builder, org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupImageOrBuilder>( dependentBackupImage_, - ((bitField0_ & 0x00000080) == 0x00000080), + ((bitField0_ & 0x00000002) == 0x00000002), getParentForChildren(), isClean()); dependentBackupImage_ = null; @@ -5555,31 +4715,31 @@ public final class BackupProtos { public interface TableBackupStatusOrBuilder extends com.google.protobuf.MessageOrBuilder { - // required .hbase.pb.TableName table = 1; + // optional .hbase.pb.TableName table = 1; /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ boolean hasTable(); /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTable(); /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableOrBuilder(); - // required string target_dir = 2; + // optional string target_dir = 2; /** - * required string target_dir = 2; + * optional string target_dir = 2; */ boolean hasTargetDir(); /** - * required string target_dir = 2; + * optional string target_dir = 2; */ java.lang.String getTargetDir(); /** - * required string target_dir = 2; + * optional string target_dir = 2; */ com.google.protobuf.ByteString getTargetDirBytes(); @@ -5713,39 +4873,39 @@ public final class BackupProtos { } private int bitField0_; - // required .hbase.pb.TableName table = 1; + // optional .hbase.pb.TableName table = 1; public static final int TABLE_FIELD_NUMBER = 1; private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName table_; /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ public boolean hasTable() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTable() { return table_; } /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableOrBuilder() { return table_; } - // required string target_dir = 2; + // optional string target_dir = 2; public static final int TARGET_DIR_FIELD_NUMBER = 2; private java.lang.Object targetDir_; /** - * required string target_dir = 2; + * optional string target_dir = 2; */ public boolean hasTargetDir() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * required string target_dir = 2; + * optional string target_dir = 2; */ public java.lang.String getTargetDir() { java.lang.Object ref = targetDir_; @@ -5762,7 +4922,7 @@ public final class BackupProtos { } } /** - * required string target_dir = 2; + * optional string target_dir = 2; */ public com.google.protobuf.ByteString getTargetDirBytes() { @@ -5831,17 +4991,11 @@ public final class BackupProtos { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - if (!hasTable()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasTargetDir()) { - memoizedIsInitialized = 0; - return false; - } - if (!getTable().isInitialized()) { - memoizedIsInitialized = 0; - return false; + if (hasTable()) { + if (!getTable().isInitialized()) { + memoizedIsInitialized = 0; + return false; + } } memoizedIsInitialized = 1; return true; @@ -6141,17 +5295,11 @@ public final class BackupProtos { } public final boolean isInitialized() { - if (!hasTable()) { - - return false; - } - if (!hasTargetDir()) { - - return false; - } - if (!getTable().isInitialized()) { - - return false; + if (hasTable()) { + if (!getTable().isInitialized()) { + + return false; + } } return true; } @@ -6175,18 +5323,18 @@ public final class BackupProtos { } private int bitField0_; - // required .hbase.pb.TableName table = 1; + // optional .hbase.pb.TableName table = 1; private org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName table_ = 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> tableBuilder_; /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ public boolean hasTable() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName getTable() { if (tableBuilder_ == null) { @@ -6196,7 +5344,7 @@ public final class BackupProtos { } } /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ public Builder setTable(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) { if (tableBuilder_ == null) { @@ -6212,7 +5360,7 @@ public final class BackupProtos { return this; } /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ public Builder setTable( org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder builderForValue) { @@ -6226,7 +5374,7 @@ public final class BackupProtos { return this; } /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ public Builder mergeTable(org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName value) { if (tableBuilder_ == null) { @@ -6245,7 +5393,7 @@ public final class BackupProtos { return this; } /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ public Builder clearTable() { if (tableBuilder_ == null) { @@ -6258,7 +5406,7 @@ public final class BackupProtos { return this; } /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableName.Builder getTableBuilder() { bitField0_ |= 0x00000001; @@ -6266,7 +5414,7 @@ public final class BackupProtos { return getTableFieldBuilder().getBuilder(); } /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ public org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.TableNameOrBuilder getTableOrBuilder() { if (tableBuilder_ != null) { @@ -6276,7 +5424,7 @@ public final class BackupProtos { } } /** - * required .hbase.pb.TableName table = 1; + * optional .hbase.pb.TableName table = 1; */ 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> @@ -6292,16 +5440,16 @@ public final class BackupProtos { return tableBuilder_; } - // required string target_dir = 2; + // optional string target_dir = 2; private java.lang.Object targetDir_ = ""; /** - * required string target_dir = 2; + * optional string target_dir = 2; */ public boolean hasTargetDir() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * required string target_dir = 2; + * optional string target_dir = 2; */ public java.lang.String getTargetDir() { java.lang.Object ref = targetDir_; @@ -6315,7 +5463,7 @@ public final class BackupProtos { } } /** - * required string target_dir = 2; + * optional string target_dir = 2; */ public com.google.protobuf.ByteString getTargetDirBytes() { @@ -6331,7 +5479,7 @@ public final class BackupProtos { } } /** - * required string target_dir = 2; + * optional string target_dir = 2; */ public Builder setTargetDir( java.lang.String value) { @@ -6344,7 +5492,7 @@ public final class BackupProtos { return this; } /** - * required string target_dir = 2; + * optional string target_dir = 2; */ public Builder clearTargetDir() { bitField0_ = (bitField0_ & ~0x00000002); @@ -6353,7 +5501,7 @@ public final class BackupProtos { return this; } /** - * required string target_dir = 2; + * optional string target_dir = 2; */ public Builder setTargetDirBytes( com.google.protobuf.ByteString value) { @@ -6454,42 +5602,42 @@ public final class BackupProtos { public interface BackupInfoOrBuilder extends com.google.protobuf.MessageOrBuilder { - // required string backup_id = 1; + // optional string backup_id = 1; /** - * required string backup_id = 1; + * optional string backup_id = 1; */ boolean hasBackupId(); /** - * required string backup_id = 1; + * optional string backup_id = 1; */ java.lang.String getBackupId(); /** - * required string backup_id = 1; + * optional string backup_id = 1; */ com.google.protobuf.ByteString getBackupIdBytes(); - // required .hbase.pb.BackupType type = 2; + // optional .hbase.pb.BackupType type = 2; /** - * required .hbase.pb.BackupType type = 2; + * optional .hbase.pb.BackupType type = 2; */ boolean hasType(); /** - * required .hbase.pb.BackupType type = 2; + * optional .hbase.pb.BackupType type = 2; */ org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType getType(); - // required string target_root_dir = 3; + // optional string target_root_dir = 3; /** - * required string target_root_dir = 3; + * optional string target_root_dir = 3; */ boolean hasTargetRootDir(); /** - * required string target_root_dir = 3; + * optional string target_root_dir = 3; */ java.lang.String getTargetRootDir(); /** - * required string target_root_dir = 3; + * optional string target_root_dir = 3; */ com.google.protobuf.ByteString getTargetRootDirBytes(); @@ -6599,23 +5747,23 @@ public final class BackupProtos { com.google.protobuf.ByteString getJobIdBytes(); - // required uint32 workers_number = 12; + // optional uint32 workers_number = 12; /** - * required uint32 workers_number = 12; + * optional uint32 workers_number = 12; */ boolean hasWorkersNumber(); /** - * required uint32 workers_number = 12; + * optional uint32 workers_number = 12; */ int getWorkersNumber(); - // required uint64 bandwidth = 13; + // optional uint64 bandwidth = 13; /** - * required uint64 bandwidth = 13; + * optional uint64 bandwidth = 13; */ boolean hasBandwidth(); /** - * required uint64 bandwidth = 13; + * optional uint64 bandwidth = 13; */ long getBandwidth(); } @@ -7026,17 +6174,17 @@ public final class BackupProtos { } private int bitField0_; - // required string backup_id = 1; + // optional string backup_id = 1; public static final int BACKUP_ID_FIELD_NUMBER = 1; private java.lang.Object backupId_; /** - * required string backup_id = 1; + * optional string backup_id = 1; */ public boolean hasBackupId() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required string backup_id = 1; + * optional string backup_id = 1; */ public java.lang.String getBackupId() { java.lang.Object ref = backupId_; @@ -7053,7 +6201,7 @@ public final class BackupProtos { } } /** - * required string backup_id = 1; + * optional string backup_id = 1; */ public com.google.protobuf.ByteString getBackupIdBytes() { @@ -7069,33 +6217,33 @@ public final class BackupProtos { } } - // required .hbase.pb.BackupType type = 2; + // optional .hbase.pb.BackupType type = 2; public static final int TYPE_FIELD_NUMBER = 2; private org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType type_; /** - * required .hbase.pb.BackupType type = 2; + * optional .hbase.pb.BackupType type = 2; */ public boolean hasType() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * required .hbase.pb.BackupType type = 2; + * optional .hbase.pb.BackupType type = 2; */ public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType getType() { return type_; } - // required string target_root_dir = 3; + // optional string target_root_dir = 3; public static final int TARGET_ROOT_DIR_FIELD_NUMBER = 3; private java.lang.Object targetRootDir_; /** - * required string target_root_dir = 3; + * optional string target_root_dir = 3; */ public boolean hasTargetRootDir() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * required string target_root_dir = 3; + * optional string target_root_dir = 3; */ public java.lang.String getTargetRootDir() { java.lang.Object ref = targetRootDir_; @@ -7112,7 +6260,7 @@ public final class BackupProtos { } } /** - * required string target_root_dir = 3; + * optional string target_root_dir = 3; */ public com.google.protobuf.ByteString getTargetRootDirBytes() { @@ -7330,33 +6478,33 @@ public final class BackupProtos { } } - // required uint32 workers_number = 12; + // optional uint32 workers_number = 12; public static final int WORKERS_NUMBER_FIELD_NUMBER = 12; private int workersNumber_; /** - * required uint32 workers_number = 12; + * optional uint32 workers_number = 12; */ public boolean hasWorkersNumber() { return ((bitField0_ & 0x00000400) == 0x00000400); } /** - * required uint32 workers_number = 12; + * optional uint32 workers_number = 12; */ public int getWorkersNumber() { return workersNumber_; } - // required uint64 bandwidth = 13; + // optional uint64 bandwidth = 13; public static final int BANDWIDTH_FIELD_NUMBER = 13; private long bandwidth_; /** - * required uint64 bandwidth = 13; + * optional uint64 bandwidth = 13; */ public boolean hasBandwidth() { return ((bitField0_ & 0x00000800) == 0x00000800); } /** - * required uint64 bandwidth = 13; + * optional uint64 bandwidth = 13; */ public long getBandwidth() { return bandwidth_; @@ -7382,26 +6530,6 @@ public final class BackupProtos { byte isInitialized = memoizedIsInitialized; if (isInitialized != -1) return isInitialized == 1; - if (!hasBackupId()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasType()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasTargetRootDir()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasWorkersNumber()) { - memoizedIsInitialized = 0; - return false; - } - if (!hasBandwidth()) { - memoizedIsInitialized = 0; - return false; - } for (int i = 0; i < getTableBackupStatusCount(); i++) { if (!getTableBackupStatus(i).isInitialized()) { memoizedIsInitialized = 0; @@ -7981,26 +7109,6 @@ public final class BackupProtos { } public final boolean isInitialized() { - if (!hasBackupId()) { - - return false; - } - if (!hasType()) { - - return false; - } - if (!hasTargetRootDir()) { - - return false; - } - if (!hasWorkersNumber()) { - - return false; - } - if (!hasBandwidth()) { - - return false; - } for (int i = 0; i < getTableBackupStatusCount(); i++) { if (!getTableBackupStatus(i).isInitialized()) { @@ -8029,16 +7137,16 @@ public final class BackupProtos { } private int bitField0_; - // required string backup_id = 1; + // optional string backup_id = 1; private java.lang.Object backupId_ = ""; /** - * required string backup_id = 1; + * optional string backup_id = 1; */ public boolean hasBackupId() { return ((bitField0_ & 0x00000001) == 0x00000001); } /** - * required string backup_id = 1; + * optional string backup_id = 1; */ public java.lang.String getBackupId() { java.lang.Object ref = backupId_; @@ -8052,7 +7160,7 @@ public final class BackupProtos { } } /** - * required string backup_id = 1; + * optional string backup_id = 1; */ public com.google.protobuf.ByteString getBackupIdBytes() { @@ -8068,7 +7176,7 @@ public final class BackupProtos { } } /** - * required string backup_id = 1; + * optional string backup_id = 1; */ public Builder setBackupId( java.lang.String value) { @@ -8081,7 +7189,7 @@ public final class BackupProtos { return this; } /** - * required string backup_id = 1; + * optional string backup_id = 1; */ public Builder clearBackupId() { bitField0_ = (bitField0_ & ~0x00000001); @@ -8090,7 +7198,7 @@ public final class BackupProtos { return this; } /** - * required string backup_id = 1; + * optional string backup_id = 1; */ public Builder setBackupIdBytes( com.google.protobuf.ByteString value) { @@ -8103,22 +7211,22 @@ public final class BackupProtos { return this; } - // required .hbase.pb.BackupType type = 2; + // optional .hbase.pb.BackupType type = 2; private org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType type_ = org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType.FULL; /** - * required .hbase.pb.BackupType type = 2; + * optional .hbase.pb.BackupType type = 2; */ public boolean hasType() { return ((bitField0_ & 0x00000002) == 0x00000002); } /** - * required .hbase.pb.BackupType type = 2; + * optional .hbase.pb.BackupType type = 2; */ public org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType getType() { return type_; } /** - * required .hbase.pb.BackupType type = 2; + * optional .hbase.pb.BackupType type = 2; */ public Builder setType(org.apache.hadoop.hbase.protobuf.generated.BackupProtos.BackupType value) { if (value == null) { @@ -8130,7 +7238,7 @@ public final class BackupProtos { return this; } /** - * required .hbase.pb.BackupType type = 2; + * optional .hbase.pb.BackupType type = 2; */ public Builder clearType() { bitField0_ = (bitField0_ & ~0x00000002); @@ -8139,16 +7247,16 @@ public final class BackupProtos { return this; } - // required string target_root_dir = 3; + // optional string target_root_dir = 3; private java.lang.Object targetRootDir_ = ""; /** - * required string target_root_dir = 3; + * optional string target_root_dir = 3; */ public boolean hasTargetRootDir() { return ((bitField0_ & 0x00000004) == 0x00000004); } /** - * required string target_root_dir = 3; + * optional string target_root_dir = 3; */ public java.lang.String getTargetRootDir() { java.lang.Object ref = targetRootDir_; @@ -8162,7 +7270,7 @@ public final class BackupProtos { } } /** - * required string target_root_dir = 3; + * optional string target_root_dir = 3; */ public com.google.protobuf.ByteString getTargetRootDirBytes() { @@ -8178,7 +7286,7 @@ public final class BackupProtos { } } /** - * required string target_root_dir = 3; + * optional string target_root_dir = 3; */ public Builder setTargetRootDir( java.lang.String value) { @@ -8191,7 +7299,7 @@ public final class BackupProtos { return this; } /** - * required string target_root_dir = 3; + * optional string target_root_dir = 3; */ public Builder clearTargetRootDir() { bitField0_ = (bitField0_ & ~0x00000004); @@ -8200,7 +7308,7 @@ public final class BackupProtos { return this; } /** - * required string target_root_dir = 3; + * optional string target_root_dir = 3; */ public Builder setTargetRootDirBytes( com.google.protobuf.ByteString value) { @@ -8772,22 +7880,22 @@ public final class BackupProtos { return this; } - // required uint32 workers_number = 12; + // optional uint32 workers_number = 12; private int workersNumber_ ; /** - * required uint32 workers_number = 12; + * optional uint32 workers_number = 12; */ public boolean hasWorkersNumber() { return ((bitField0_ & 0x00000800) == 0x00000800); } /** - * required uint32 workers_number = 12; + * optional uint32 workers_number = 12; */ public int getWorkersNumber() { return workersNumber_; } /** - * required uint32 workers_number = 12; + * optional uint32 workers_number = 12; */ public Builder setWorkersNumber(int value) { bitField0_ |= 0x00000800; @@ -8796,7 +7904,7 @@ public final class BackupProtos { return this; } /** - * required uint32 workers_number = 12; + * optional uint32 workers_number = 12; */ public Builder clearWorkersNumber() { bitField0_ = (bitField0_ & ~0x00000800); @@ -8805,22 +7913,22 @@ public final class BackupProtos { return this; } - // required uint64 bandwidth = 13; + // optional uint64 bandwidth = 13; private long bandwidth_ ; /** - * required uint64 bandwidth = 13; + * optional uint64 bandwidth = 13; */ public boolean hasBandwidth() { return ((bitField0_ & 0x00001000) == 0x00001000); } /** - * required uint64 bandwidth = 13; + * optional uint64 bandwidth = 13; */ public long getBandwidth() { return bandwidth_; } /** - * required uint64 bandwidth = 13; + * optional uint64 bandwidth = 13; */ public Builder setBandwidth(long value) { bitField0_ |= 0x00001000; @@ -8829,7 +7937,7 @@ public final class BackupProtos { return this; } /** - * required uint64 bandwidth = 13; + * optional uint64 bandwidth = 13; */ public Builder clearBandwidth() { bitField0_ = (bitField0_ & ~0x00001000); @@ -8889,43 +7997,40 @@ public final class BackupProtos { static { java.lang.String[] descriptorData = { "\n\014Backup.proto\022\010hbase.pb\032\013HBase.proto\"\327\001" + - "\n\013BackupImage\022\021\n\tbackup_id\030\001 \002(\t\022)\n\013back" + - "up_type\030\002 \002(\0162\024.hbase.pb.BackupType\022\020\n\010r" + - "oot_dir\030\003 \002(\t\022\'\n\ntable_list\030\004 \003(\0132\023.hbas" + - "e.pb.TableName\022\020\n\010start_ts\030\005 \002(\004\022\023\n\013comp" + - "lete_ts\030\006 \002(\004\022(\n\tancestors\030\007 \003(\0132\025.hbase" + - ".pb.BackupImage\"4\n\017ServerTimestamp\022\016\n\006se" + - "rver\030\001 \002(\t\022\021\n\ttimestamp\030\002 \002(\004\"o\n\024TableSe" + - "rverTimestamp\022\"\n\005table\030\001 \002(\0132\023.hbase.pb." + - "TableName\0223\n\020server_timestamp\030\002 \003(\0132\031.hb", - "ase.pb.ServerTimestamp\"\220\002\n\016BackupManifes" + - "t\022\017\n\007version\030\001 \002(\t\022\021\n\tbackup_id\030\002 \002(\t\022\"\n" + - "\004type\030\003 \002(\0162\024.hbase.pb.BackupType\022\'\n\ntab" + - "le_list\030\004 \003(\0132\023.hbase.pb.TableName\022\020\n\010st" + - "art_ts\030\005 \002(\004\022\023\n\013complete_ts\030\006 \002(\004\022/\n\007tst" + - "_map\030\007 \003(\0132\036.hbase.pb.TableServerTimesta" + - "mp\0225\n\026dependent_backup_image\030\010 \003(\0132\025.hba" + - "se.pb.BackupImage\"]\n\021TableBackupStatus\022\"" + - "\n\005table\030\001 \002(\0132\023.hbase.pb.TableName\022\022\n\nta" + - "rget_dir\030\002 \002(\t\022\020\n\010snapshot\030\003 \001(\t\"\320\004\n\nBac", - "kupInfo\022\021\n\tbackup_id\030\001 \002(\t\022\"\n\004type\030\002 \002(\016" + - "2\024.hbase.pb.BackupType\022\027\n\017target_root_di" + - "r\030\003 \002(\t\022/\n\005state\030\004 \001(\0162 .hbase.pb.Backup" + - "Info.BackupState\022/\n\005phase\030\005 \001(\0162 .hbase." + - "pb.BackupInfo.BackupPhase\022\026\n\016failed_mess" + - "age\030\006 \001(\t\0228\n\023table_backup_status\030\007 \003(\0132\033" + - ".hbase.pb.TableBackupStatus\022\020\n\010start_ts\030" + - "\010 \001(\004\022\016\n\006end_ts\030\t \001(\004\022\020\n\010progress\030\n \001(\r\022" + - "\016\n\006job_id\030\013 \001(\t\022\026\n\016workers_number\030\014 \002(\r\022" + - "\021\n\tbandwidth\030\r \002(\004\"P\n\013BackupState\022\013\n\007WAI", - "TING\020\000\022\013\n\007RUNNING\020\001\022\014\n\010COMPLETE\020\002\022\n\n\006FAI" + - "LED\020\003\022\r\n\tCANCELLED\020\004\"}\n\013BackupPhase\022\013\n\007R" + - "EQUEST\020\000\022\014\n\010SNAPSHOT\020\001\022\027\n\023PREPARE_INCREM" + - "ENTAL\020\002\022\020\n\014SNAPSHOTCOPY\020\003\022\024\n\020INCREMENTAL" + - "_COPY\020\004\022\022\n\016STORE_MANIFEST\020\005*\'\n\nBackupTyp" + - "e\022\010\n\004FULL\020\000\022\017\n\013INCREMENTAL\020\001BB\n*org.apac" + - "he.hadoop.hbase.protobuf.generatedB\014Back" + - "upProtosH\001\210\001\001\240\001\001" + "\n\013BackupImage\022\021\n\tbackup_id\030\001 \001(\t\022)\n\013back" + + "up_type\030\002 \001(\0162\024.hbase.pb.BackupType\022\020\n\010r" + + "oot_dir\030\003 \001(\t\022\'\n\ntable_list\030\004 \003(\0132\023.hbas" + + "e.pb.TableName\022\020\n\010start_ts\030\005 \001(\004\022\023\n\013comp" + + "lete_ts\030\006 \001(\004\022(\n\tancestors\030\007 \003(\0132\025.hbase" + + ".pb.BackupImage\"J\n\017ServerTimestamp\022$\n\006se" + + "rver\030\001 \001(\0132\024.hbase.pb.ServerName\022\021\n\ttime" + + "stamp\030\002 \001(\004\"o\n\024TableServerTimestamp\022\"\n\005t" + + "able\030\001 \001(\0132\023.hbase.pb.TableName\0223\n\020serve", + "r_timestamp\030\002 \003(\0132\031.hbase.pb.ServerTimes" + + "tamp\"x\n\016BackupManifest\022/\n\007tst_map\030\001 \003(\0132" + + "\036.hbase.pb.TableServerTimestamp\0225\n\026depen" + + "dent_backup_image\030\002 \003(\0132\025.hbase.pb.Backu" + + "pImage\"]\n\021TableBackupStatus\022\"\n\005table\030\001 \001" + + "(\0132\023.hbase.pb.TableName\022\022\n\ntarget_dir\030\002 " + + "\001(\t\022\020\n\010snapshot\030\003 \001(\t\"\320\004\n\nBackupInfo\022\021\n\t" + + "backup_id\030\001 \001(\t\022\"\n\004type\030\002 \001(\0162\024.hbase.pb" + + ".BackupType\022\027\n\017target_root_dir\030\003 \001(\t\022/\n\005" + + "state\030\004 \001(\0162 .hbase.pb.BackupInfo.Backup", + "State\022/\n\005phase\030\005 \001(\0162 .hbase.pb.BackupIn" + + "fo.BackupPhase\022\026\n\016failed_message\030\006 \001(\t\0228" + + "\n\023table_backup_status\030\007 \003(\0132\033.hbase.pb.T" + + "ableBackupStatus\022\020\n\010start_ts\030\010 \001(\004\022\016\n\006en" + + "d_ts\030\t \001(\004\022\020\n\010progress\030\n \001(\r\022\016\n\006job_id\030\013" + + " \001(\t\022\026\n\016workers_number\030\014 \001(\r\022\021\n\tbandwidt" + + "h\030\r \001(\004\"P\n\013BackupState\022\013\n\007WAITING\020\000\022\013\n\007R" + + "UNNING\020\001\022\014\n\010COMPLETE\020\002\022\n\n\006FAILED\020\003\022\r\n\tCA" + + "NCELLED\020\004\"}\n\013BackupPhase\022\013\n\007REQUEST\020\000\022\014\n" + + "\010SNAPSHOT\020\001\022\027\n\023PREPARE_INCREMENTAL\020\002\022\020\n\014", + "SNAPSHOTCOPY\020\003\022\024\n\020INCREMENTAL_COPY\020\004\022\022\n\016" + + "STORE_MANIFEST\020\005*\'\n\nBackupType\022\010\n\004FULL\020\000" + + "\022\017\n\013INCREMENTAL\020\001BB\n*org.apache.hadoop.h" + + "base.protobuf.generatedB\014BackupProtosH\001\210" + + "\001\001\240\001\001" }; com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { @@ -8955,7 +8060,7 @@ public final class BackupProtos { internal_static_hbase_pb_BackupManifest_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable( internal_static_hbase_pb_BackupManifest_descriptor, - new java.lang.String[] { "Version", "BackupId", "Type", "TableList", "StartTs", "CompleteTs", "TstMap", "DependentBackupImage", }); + new java.lang.String[] { "TstMap", "DependentBackupImage", }); internal_static_hbase_pb_TableBackupStatus_descriptor = getDescriptor().getMessageTypes().get(4); internal_static_hbase_pb_TableBackupStatus_fieldAccessorTable = new diff --git hbase-protocol/src/main/protobuf/Backup.proto hbase-protocol/src/main/protobuf/Backup.proto index 2b3feeb..ff115d2 100644 --- hbase-protocol/src/main/protobuf/Backup.proto +++ hbase-protocol/src/main/protobuf/Backup.proto @@ -9,7 +9,7 @@ * * http://www.apache.org/licenses/LICENSE-2.0 * - * Unless required by applicable law or agreed to in writing, software + * Unless optional 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 @@ -27,70 +27,46 @@ option optimize_for = SPEED; import "HBase.proto"; -/*enum FullTableBackupState { - PRE_SNAPSHOT_TABLE = 1; - SNAPSHOT_TABLES = 2; - SNAPSHOT_COPY = 3; - BACKUP_COMPLETE = 4; -} - -enum IncrementalTableBackupState { - PREPARE_INCREMENTAL = 1; - INCREMENTAL_COPY = 2; - INCR_BACKUP_COMPLETE = 3; -} - -message SnapshotTableStateData { - required TableName table = 1; - required string snapshotName = 2; -} -*/ enum BackupType { FULL = 0; INCREMENTAL = 1; } message BackupImage { - required string backup_id = 1; - required BackupType backup_type = 2; - required string root_dir = 3; + optional string backup_id = 1; + optional BackupType backup_type = 2; + optional string root_dir = 3; repeated TableName table_list = 4; - required uint64 start_ts = 5; - required uint64 complete_ts = 6; + optional uint64 start_ts = 5; + optional uint64 complete_ts = 6; repeated BackupImage ancestors = 7; } message ServerTimestamp { - required string server = 1; - required uint64 timestamp = 2; + optional ServerName server = 1; + optional uint64 timestamp = 2; } message TableServerTimestamp { - required TableName table = 1; + optional TableName table = 1; repeated ServerTimestamp server_timestamp = 2; } message BackupManifest { - required string version = 1; - required string backup_id = 2; - required BackupType type = 3; - repeated TableName table_list = 4; - required uint64 start_ts = 5; - required uint64 complete_ts = 6; - repeated TableServerTimestamp tst_map = 7; - repeated BackupImage dependent_backup_image = 8; + repeated TableServerTimestamp tst_map = 1; + repeated BackupImage dependent_backup_image = 2; } message TableBackupStatus { - required TableName table = 1; - required string target_dir = 2; + optional TableName table = 1; + optional string target_dir = 2; optional string snapshot = 3; } message BackupInfo { - required string backup_id = 1; - required BackupType type = 2; - required string target_root_dir = 3; + optional string backup_id = 1; + optional BackupType type = 2; + optional string target_root_dir = 3; optional BackupState state = 4; optional BackupPhase phase = 5; optional string failed_message = 6; @@ -99,8 +75,8 @@ message BackupInfo { optional uint64 end_ts = 9; optional uint32 progress = 10; optional string job_id = 11; - required uint32 workers_number = 12; - required uint64 bandwidth = 13; + optional uint32 workers_number = 12; + optional uint64 bandwidth = 13; enum BackupState { WAITING = 0; @@ -119,9 +95,3 @@ message BackupInfo { STORE_MANIFEST = 5; } } -/* -message BackupProcContext { - required BackupInfo ctx = 1; - repeated ServerTimestamp server_timestamp = 2; -} -*/ diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupManifest.java hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupManifest.java index 878d23b..3d8e132 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupManifest.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupManifest.java @@ -36,6 +36,7 @@ import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.backup.BackupInfo; import org.apache.hadoop.hbase.backup.BackupType; @@ -255,9 +256,6 @@ public class BackupManifest { } } - // manifest version - private String version = MANIFEST_VERSION; - // hadoop hbase configuration protected Configuration config = null; @@ -378,9 +376,6 @@ public class BackupManifest { } catch(Exception e){ throw new BackupException(e); } - this.version = proto.getVersion(); - this.backupId = proto.getBackupId(); - this.type = BackupType.valueOf(proto.getType().name()); // Here the parameter backupDir is where the manifest file is. // There should always be a manifest file under: // backupRootDir/namespace/table/backupId/.backup.manifest @@ -392,13 +387,14 @@ public class BackupManifest { } else { this.rootDir = p.getParent().getParent().toString(); } - - loadTableList(proto); - this.startTs = proto.getStartTs(); - this.completeTs = proto.getCompleteTs(); loadIncrementalTimestampMap(proto); loadDependency(proto); - //TODO: merge will be implemented by future jira + BackupImage image = getDependency().values().iterator().next(); + this.backupId = image.getBackupId(); + this.startTs = image.getStartTs(); + this.completeTs = image.getCompleteTs(); + this.type = image.getType(); + this.tableList = (ArrayList)image.getTableNames(); LOG.debug("Loaded manifest instance from manifest file: " + BackupClientUtil.getPath(subFile.getPath())); return; @@ -425,16 +421,12 @@ public class BackupManifest { } List listSt = tst.getServerTimestampList(); for(BackupProtos.ServerTimestamp stm: listSt) { - map.put(stm.getServer(), stm.getTimestamp()); + map.put(ProtobufUtil.toServerName(stm.getServer()).toString(), stm.getTimestamp()); } } } private void loadDependency(BackupProtos.BackupManifest proto) { - if(LOG.isDebugEnabled()) { - LOG.debug("load dependency for: "+proto.getBackupId()); - } - dependency = new HashMap(); List list = proto.getDependentBackupImageList(); for (BackupProtos.BackupImage im : list) { @@ -448,14 +440,6 @@ public class BackupManifest { } } - private void loadTableList(BackupProtos.BackupManifest proto) { - this.tableList = new ArrayList(); - List list = proto.getTableListList(); - for (HBaseProtos.TableName name: list) { - this.tableList.add(ProtobufUtil.toTableName(name)); - } - } - public BackupType getType() { return type; } @@ -522,12 +506,6 @@ public class BackupManifest { */ public byte[] toByteArray() { BackupProtos.BackupManifest.Builder builder = BackupProtos.BackupManifest.newBuilder(); - builder.setVersion(this.version); - builder.setBackupId(this.backupId); - builder.setType(BackupProtos.BackupType.valueOf(this.type.name())); - setTableList(builder); - builder.setStartTs(this.startTs); - builder.setCompleteTs(this.completeTs); setIncrementalTimestampMap(builder); setDependencyMap(builder); return builder.build().toByteArray(); @@ -547,7 +525,11 @@ public class BackupManifest { for (Map.Entry entry2 : value.entrySet()) { String s = entry2.getKey(); BackupProtos.ServerTimestamp.Builder stBuilder = BackupProtos.ServerTimestamp.newBuilder(); - stBuilder.setServer(s); + HBaseProtos.ServerName.Builder snBuilder = HBaseProtos.ServerName.newBuilder(); + ServerName sn = ServerName.parseServerName(s); + snBuilder.setHostName(sn.getHostname()); + snBuilder.setPort(sn.getPort()); + stBuilder.setServer(snBuilder.build()); stBuilder.setTimestamp(entry2.getValue()); tstBuilder.addServerTimestamp(stBuilder.build()); } @@ -561,12 +543,6 @@ public class BackupManifest { } } - private void setTableList(BackupProtos.BackupManifest.Builder builder) { - for(TableName name: tableList){ - builder.addTableList(ProtobufUtil.toProtoTableName(name)); - } - } - /** * Parse protobuf from byte array * @param pbBytes A pb serialized BackupManifest instance @@ -584,13 +560,6 @@ public class BackupManifest { return proto; } - /** - * Get manifest file version - * @return version - */ - public String getVersion() { - return version; - } /** * Get this backup image. @@ -606,7 +575,6 @@ public class BackupManifest { */ public void addDependentImage(BackupImage image) { this.getDependency().get(this.backupId).addAncestor(image); - this.setDependencyMap(this.getDependency(), image); } @@ -650,7 +618,9 @@ public class BackupManifest { */ public ArrayList getRestoreDependentList(boolean reverse) { TreeMap restoreImages = new TreeMap(); - for (BackupImage image : this.getDependency().values()) { + BackupImage root = getDependency().get(backupId); + restoreImages.put(root.startTs, root); + for (BackupImage image : root.getAncestors()) { restoreImages.put(Long.valueOf(image.startTs), image); } return new ArrayList(reverse ? (restoreImages.descendingMap().values()) @@ -696,23 +666,6 @@ public class BackupManifest { return tableImageList; } - - /** - * Recursively set the dependency map of the backup images. - * @param map The dependency map - * @param image The backup image - */ - private void setDependencyMap(Map map, BackupImage image) { - if (image == null) { - return; - } else { - map.put(image.getBackupId(), image); - for (BackupImage img : image.getAncestors()) { - setDependencyMap(map, img); - } - } - } - /** * Check whether backup image1 could cover backup image2 or not. * @param image1 backup image 1 diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java index 72c28d5..c19bc97 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java @@ -38,6 +38,7 @@ import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HTableDescriptor; +import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.backup.BackupInfo; import org.apache.hadoop.hbase.backup.BackupRestoreConstants; @@ -55,6 +56,7 @@ import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; import org.apache.hadoop.hbase.protobuf.generated.BackupProtos; +import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos; /** * This class provides 'hbase:backup' table API @@ -498,7 +500,11 @@ public final class BackupSystemTable implements Closeable { for (Entry entry : map.entrySet()) { BackupProtos.ServerTimestamp.Builder builder = BackupProtos.ServerTimestamp.newBuilder(); - builder.setServer(entry.getKey()); + HBaseProtos.ServerName.Builder snBuilder = HBaseProtos.ServerName.newBuilder(); + ServerName sn = ServerName.parseServerName(entry.getKey()); + snBuilder.setHostName(sn.getHostname()); + snBuilder.setPort(sn.getPort()); + builder.setServer(snBuilder.build()); builder.setTimestamp(entry.getValue()); tstBuilder.addServerTimestamp(builder.build()); } @@ -511,7 +517,8 @@ public final class BackupSystemTable implements Closeable { HashMap map = new HashMap(); List list = proto.getServerTimestampList(); for (BackupProtos.ServerTimestamp st : list) { - map.put(st.getServer(), st.getTimestamp()); + ServerName sn = ProtobufUtil.toServerName(st.getServer()); + map.put(sn.getHostname()+":"+sn.getPort(), st.getTimestamp()); } return map; } diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupSystemTable.java hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupSystemTable.java index 75832d3..3488786 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupSystemTable.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupSystemTable.java @@ -269,9 +269,9 @@ public class TestBackupSystemTable { HashMap rsTimestampMap = new HashMap(); - rsTimestampMap.put("rs1", 100L); - rsTimestampMap.put("rs2", 101L); - rsTimestampMap.put("rs3", 103L); + rsTimestampMap.put("rs1:100", 100L); + rsTimestampMap.put("rs2:100", 101L); + rsTimestampMap.put("rs3:100", 103L); table.writeRegionServerLogTimestamp(tables, rsTimestampMap, "root"); @@ -282,9 +282,9 @@ public class TestBackupSystemTable { for (TableName t : tables) { HashMap rstm = result.get(t); assertNotNull(rstm); - assertEquals(rstm.get("rs1"), new Long(100L)); - assertEquals(rstm.get("rs2"), new Long(101L)); - assertEquals(rstm.get("rs3"), new Long(103L)); + assertEquals(rstm.get("rs1:100"), new Long(100L)); + assertEquals(rstm.get("rs2:100"), new Long(101L)); + assertEquals(rstm.get("rs3:100"), new Long(103L)); } Set tables1 = new TreeSet<>(); @@ -295,9 +295,9 @@ public class TestBackupSystemTable { HashMap rsTimestampMap1 = new HashMap(); - rsTimestampMap1.put("rs1", 200L); - rsTimestampMap1.put("rs2", 201L); - rsTimestampMap1.put("rs3", 203L); + rsTimestampMap1.put("rs1:100", 200L); + rsTimestampMap1.put("rs2:100", 201L); + rsTimestampMap1.put("rs3:100", 203L); table.writeRegionServerLogTimestamp(tables1, rsTimestampMap1, "root"); @@ -309,22 +309,22 @@ public class TestBackupSystemTable { HashMap rstm = result.get(t); assertNotNull(rstm); if (t.equals(TableName.valueOf("t3")) == false) { - assertEquals(rstm.get("rs1"), new Long(100L)); - assertEquals(rstm.get("rs2"), new Long(101L)); - assertEquals(rstm.get("rs3"), new Long(103L)); + assertEquals(rstm.get("rs1:100"), new Long(100L)); + assertEquals(rstm.get("rs2:100"), new Long(101L)); + assertEquals(rstm.get("rs3:100"), new Long(103L)); } else { - assertEquals(rstm.get("rs1"), new Long(200L)); - assertEquals(rstm.get("rs2"), new Long(201L)); - assertEquals(rstm.get("rs3"), new Long(203L)); + assertEquals(rstm.get("rs1:100"), new Long(200L)); + assertEquals(rstm.get("rs2:100"), new Long(201L)); + assertEquals(rstm.get("rs3:100"), new Long(203L)); } } for (TableName t : tables1) { HashMap rstm = result.get(t); assertNotNull(rstm); - assertEquals(rstm.get("rs1"), new Long(200L)); - assertEquals(rstm.get("rs2"), new Long(201L)); - assertEquals(rstm.get("rs3"), new Long(203L)); + assertEquals(rstm.get("rs1:100"), new Long(200L)); + assertEquals(rstm.get("rs2:100"), new Long(201L)); + assertEquals(rstm.get("rs3:100"), new Long(203L)); } cleanBackupTable();