Repository: hbase Updated Branches: refs/heads/HBASE-7912 15b257a88 -> 49db355e3
HBASE-14030 Move backup tablename to TableName.java Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/49db355e Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/49db355e Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/49db355e Branch: refs/heads/HBASE-7912 Commit: 49db355e345f1f7d580900d3d22cf1b4df920a18 Parents: 15b257a Author: tedyu <[email protected]> Authored: Sun Mar 27 09:42:56 2016 -0700 Committer: tedyu <[email protected]> Committed: Sun Mar 27 09:42:56 2016 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hbase/TableName.java | 4 ++++ .../hadoop/hbase/backup/impl/BackupSystemTable.java | 12 +----------- .../hadoop/hbase/backup/TestBackupSystemTable.java | 8 ++++---- 3 files changed, 9 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/49db355e/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java ---------------------------------------------------------------------- diff --git a/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java b/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java index 63066b3..54d5f71 100644 --- a/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java +++ b/hbase-common/src/main/java/org/apache/hadoop/hbase/TableName.java @@ -86,6 +86,10 @@ public final class TableName implements Comparable<TableName> { public static final TableName NAMESPACE_TABLE_NAME = valueOf(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR, "namespace"); + /** The backup table's name. */ + public static final TableName BACKUP_TABLE_NAME = + valueOf(NamespaceDescriptor.SYSTEM_NAMESPACE_NAME_STR, "backup"); + public static final String OLD_META_STR = ".META."; public static final String OLD_ROOT_STR = "-ROOT-"; http://git-wip-us.apache.org/repos/asf/hbase/blob/49db355e/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java index 18a0f06..f4d6761 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java @@ -60,9 +60,7 @@ import org.apache.hadoop.hbase.protobuf.generated.BackupProtos; public final class BackupSystemTable implements Closeable { private static final Log LOG = LogFactory.getLog(BackupSystemTable.class); - private final static String TABLE_NAMESPACE = "hbase"; - private final static String TABLE_NAME = "backup"; - private final static TableName tableName = TableName.valueOf(TABLE_NAMESPACE, TABLE_NAME); + private final static TableName tableName = TableName.BACKUP_TABLE_NAME; final static byte[] familyName = "f".getBytes(); // Connection to HBase cluster, shared @@ -88,14 +86,6 @@ public final class BackupSystemTable implements Closeable { public void close() { } - /** - * Gets table name - * @return table name - */ - public static TableName getTableName() { - return tableName; - } - private void createSystemTableIfNotExists() throws IOException { try(Admin admin = connection.getAdmin()) { if (admin.tableExists(tableName) == false) { http://git-wip-us.apache.org/repos/asf/hbase/blob/49db355e/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupSystemTable.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupSystemTable.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupSystemTable.java index 2dc31df..17d5013 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupSystemTable.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/TestBackupSystemTable.java @@ -113,10 +113,10 @@ public class TestBackupSystemTable { private void cleanBackupTable() throws IOException { Admin admin = UTIL.getHBaseAdmin(); - admin.disableTable(BackupSystemTable.getTableName()); - admin.truncateTable(BackupSystemTable.getTableName(), true); - if (admin.isTableDisabled(BackupSystemTable.getTableName())) { - admin.enableTable(BackupSystemTable.getTableName()); + admin.disableTable(TableName.BACKUP_TABLE_NAME); + admin.truncateTable(TableName.BACKUP_TABLE_NAME, true); + if (admin.isTableDisabled(TableName.BACKUP_TABLE_NAME)) { + admin.enableTable(TableName.BACKUP_TABLE_NAME); } }
