.../main/java/org/apache/hadoop/hbase/client/MetaCache.java | 8 ++++++++ .../src/main/java/org/apache/hadoop/hbase/TableName.java | 12 ------------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaCache.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaCache.java index b1c7ac0..1e17078 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaCache.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/MetaCache.java @@ -31,11 +31,13 @@ import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; import org.apache.hadoop.hbase.HRegionLocation; +import org.apache.hadoop.hbase.KeyValue; import org.apache.hadoop.hbase.RegionLocations; import org.apache.hadoop.hbase.ServerName; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.classification.InterfaceAudience; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.hadoop.hbase.KeyValue.KVComparator; /** * A cache implementation for region locations from meta. @@ -94,6 +96,12 @@ public class MetaCache { return null; } + private KVComparator getRowComparator(TableName tableName) { + if (TableName.META_TABLE_NAME.equals(this)) { + return KeyValue.META_COMPARATOR; + } + return KeyValue.COMPARATOR; + } /** * Put a newly discovered HRegionLocation into the cache. * @param tableName The table name. 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 17fd3b7..517839b 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 @@ -508,16 +508,4 @@ public final class TableName implements Comparable { } return this.nameAsString.compareTo(tableName.getNameAsString()); } - - /** - * Get the appropriate row comparator for this table. - * - * @return The comparator. - */ - public KVComparator getRowComparator() { - if(TableName.META_TABLE_NAME.equals(this)) { - return KeyValue.META_COMPARATOR; - } - return KeyValue.COMPARATOR; - } }