From 04904e3ba89d33f3a12217f14389e15d83a76f56 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Thu, 19 Mar 2009 03:18:58 +0000 Subject: [PATCH] HBASE-1267 binary keys broken in trunk (again) -- part2 git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@755820 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/hadoop/hbase/regionserver/HRegion.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java index adad8037110..edb65fd46a4 100644 --- a/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java +++ b/src/java/org/apache/hadoop/hbase/regionserver/HRegion.java @@ -64,7 +64,6 @@ import org.apache.hadoop.hbase.ipc.HRegionInterface; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.Writables; -import org.apache.hadoop.io.RawComparator; import org.apache.hadoop.io.WritableUtils; import org.apache.hadoop.util.Progressable; import org.apache.hadoop.util.StringUtils; @@ -1222,9 +1221,6 @@ public class HRegion implements HConstants { // See HRegionServer#RegionListener for how the expire on HRegionServer // invokes a HRegion#abort. byte [] row = b.getRow(); - if (this.regionInfo.isMetaRegion()) { - LOG.debug("batchUpdate on row for .META.: " + Bytes.toString(row)); - } // If we did not pass an existing row lock, obtain a new one Integer lid = getLock(lockid,row); long commitTime = (b.getTimestamp() == LATEST_TIMESTAMP) ? @@ -1956,10 +1952,7 @@ public class HRegion implements HConstants { this.filter = filter; this.scanners = new InternalScanner[stores.length]; try { - this.comparator = regionInfo.isRootRegion()? - new HStoreKey.RootStoreKeyComparator(): regionInfo.isMetaRegion()? - new HStoreKey.MetaStoreKeyComparator(): - new HStoreKey.StoreKeyComparator(); + this.comparator = HStoreKey.getRawComparator(regionInfo); for (int i = 0; i < stores.length; i++) { // Only pass relevant columns to each store