Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
Michael Stack 2009-03-19 03:18:58 +00:00
parent 35e12fb811
commit 04904e3ba8
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/java/org/apache/hadoop/hbase/regionserver/HRegion.java
View File

@ -64,7 +64,6 @@ import org.apache.hadoop.hbase.ipc.HRegionInterface;
import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Bytes;
import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.util.FSUtils;
import org.apache.hadoop.hbase.util.Writables; import org.apache.hadoop.hbase.util.Writables;
import org.apache.hadoop.io.RawComparator;
import org.apache.hadoop.io.WritableUtils; import org.apache.hadoop.io.WritableUtils;
import org.apache.hadoop.util.Progressable; import org.apache.hadoop.util.Progressable;
import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.StringUtils;
@ -1222,9 +1221,6 @@ public class HRegion implements HConstants {
// See HRegionServer#RegionListener for how the expire on HRegionServer // See HRegionServer#RegionListener for how the expire on HRegionServer
// invokes a HRegion#abort. // invokes a HRegion#abort.
byte [] row = b.getRow(); 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 // If we did not pass an existing row lock, obtain a new one
Integer lid = getLock(lockid,row); Integer lid = getLock(lockid,row);
long commitTime = (b.getTimestamp() == LATEST_TIMESTAMP) ? long commitTime = (b.getTimestamp() == LATEST_TIMESTAMP) ?
@ -1956,10 +1952,7 @@ public class HRegion implements HConstants {
this.filter = filter; this.filter = filter;
this.scanners = new InternalScanner[stores.length]; this.scanners = new InternalScanner[stores.length];
try { try {
this.comparator = regionInfo.isRootRegion()? this.comparator = HStoreKey.getRawComparator(regionInfo);
new HStoreKey.RootStoreKeyComparator(): regionInfo.isMetaRegion()?
new HStoreKey.MetaStoreKeyComparator():
new HStoreKey.StoreKeyComparator();
for (int i = 0; i < stores.length; i++) { for (int i = 0; i < stores.length; i++) {
// Only pass relevant columns to each store // Only pass relevant columns to each store