diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java index af9b587..04979b5 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/MetaTableAccessor.java @@ -328,7 +328,7 @@ public class MetaTableAccessor { public static boolean tableExists(HConnection hConnection, final TableName tableName) throws IOException { - if (tableName.equals(HTableDescriptor.META_TABLEDESC.getTableName())) { + if (tableName.equals(TableName.META_TABLE_NAME)) { // Catalog tables always exist. return true; } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java index f05575c..24fa064 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/util/FSTableDescriptors.java @@ -156,7 +156,7 @@ public class FSTableDescriptors implements TableDescriptors { public TableDescriptor getDescriptor(final TableName tablename) throws IOException { invocations++; - if (HTableDescriptor.META_TABLEDESC.getTableName().equals(tablename)) { + if (TableName.META_TABLE_NAME.equals(tablename)) { cachehits++; return new TableDescriptor(HTableDescriptor.META_TABLEDESC, TableState.State.ENABLED); } @@ -202,7 +202,7 @@ public class FSTableDescriptors implements TableDescriptors { */ @Override public HTableDescriptor get(TableName tableName) throws IOException { - if (HTableDescriptor.META_TABLEDESC.getTableName().equals(tableName)) { + if (TableName.META_TABLE_NAME.equals(tableName)) { cachehits++; return HTableDescriptor.META_TABLEDESC; } diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java index 6fe6ede..e424318 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestAdmin.java @@ -1157,7 +1157,7 @@ public class TestAdmin { } assertTrue("Unexcepted exception message " + msg, msg != null && msg.startsWith(TableExistsException.class.getName()) && - msg.contains(HTableDescriptor.META_TABLEDESC.getTableName().getNameAsString())); + msg.contains(TableName.META_TABLE_NAME.getNameAsString())); // Now try and do concurrent creation with a bunch of threads. final HTableDescriptor threadDesc = diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollingNoCluster.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollingNoCluster.java index 413aa8d..8ec6d84 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollingNoCluster.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/wal/TestLogRollingNoCluster.java @@ -126,7 +126,7 @@ public class TestLogRollingNoCluster { byte[] bytes = Bytes.toBytes(i); edit.add(new KeyValue(bytes, bytes, bytes, now, EMPTY_1K_ARRAY)); this.wal.append(HRegionInfo.FIRST_META_REGIONINFO, - HTableDescriptor.META_TABLEDESC.getTableName(), + TableName.META_TABLE_NAME, edit, now, HTableDescriptor.META_TABLEDESC, sequenceId); } String msg = getName() + " finished"; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationWALEntryFilters.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationWALEntryFilters.java index b116341..898516d 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationWALEntryFilters.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/replication/TestReplicationWALEntryFilters.java @@ -65,7 +65,7 @@ public class TestReplicationWALEntryFilters { assertNull(filter.filter(metaEntry)); // ns table - HLogKey key2 = new HLogKey(new byte[] {}, HTableDescriptor.NAMESPACE_TABLEDESC.getTableName()); + HLogKey key2 = new HLogKey(new byte[] {}, TableName.NAMESPACE_TABLE_NAME); HLog.Entry nsEntry = new Entry(key2, null); assertNull(filter.filter(nsEntry)); diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java index 3dc2868..cae58b3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/TestHBaseFsck.java @@ -166,7 +166,7 @@ public class TestHBaseFsck { // Now let's mess it up and change the assignment in hbase:meta to // point to a different region server - Table meta = new HTable(conf, HTableDescriptor.META_TABLEDESC.getTableName(), + Table meta = new HTable(conf, TableName.META_TABLE_NAME, executorService); Scan scan = new Scan(); scan.setStartRow(Bytes.toBytes(table+",,")); @@ -1475,7 +1475,7 @@ public class TestHBaseFsck { Bytes.toBytes("C"), true, true, false); // Create a new meta entry to fake it as a split parent. - meta = new HTable(conf, HTableDescriptor.META_TABLEDESC.getTableName(), + meta = new HTable(conf, TableName.META_TABLE_NAME, executorService); HRegionInfo hri = location.getRegionInfo(); @@ -1550,7 +1550,7 @@ public class TestHBaseFsck { TEST_UTIL.getHBaseAdmin().flush(table); HRegionLocation location = tbl.getRegionLocation("B"); - meta = new HTable(conf, HTableDescriptor.META_TABLEDESC.getTableName()); + meta = new HTable(conf, TableName.META_TABLE_NAME); HRegionInfo hri = location.getRegionInfo(); // do a regular split @@ -1600,7 +1600,7 @@ public class TestHBaseFsck { TEST_UTIL.getHBaseAdmin().flush(table); HRegionLocation location = tbl.getRegionLocation("B"); - meta = new HTable(conf, HTableDescriptor.META_TABLEDESC.getTableName()); + meta = new HTable(conf, TableName.META_TABLE_NAME); HRegionInfo hri = location.getRegionInfo(); // do a regular split @@ -2143,7 +2143,7 @@ public class TestHBaseFsck { // Mess it up by removing the RegionInfo for one region. final List deletes = new LinkedList(); - Table meta = new HTable(conf, HTableDescriptor.META_TABLEDESC.getTableName()); + Table meta = new HTable(conf, TableName.META_TABLE_NAME); MetaScanner.metaScan(conf, new MetaScanner.MetaScannerVisitor() { @Override diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java index ce01281..165cac3 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java +++ b/hbase-server/src/test/java/org/apache/hadoop/hbase/util/hbck/OfflineMetaRebuildTestCore.java @@ -279,7 +279,7 @@ public class OfflineMetaRebuildTestCore { */ protected int scanMeta() throws IOException { int count = 0; - HTable meta = new HTable(conf, HTableDescriptor.META_TABLEDESC.getTableName()); + HTable meta = new HTable(conf, TableName.META_TABLE_NAME); ResultScanner scanner = meta.getScanner(new Scan()); LOG.info("Table: " + Bytes.toString(meta.getTableName())); for (Result res : scanner) {