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

HBASE-1267 binary keys broken in trunk (again) 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@755804 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2009-03-19 00:54:10 +00:00
parent c3a68eaf4c
commit 35e12fb811
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -48,6 +48,7 @@ Release 0.20.0 - Unreleased
server recovery, we could inadvertantly try to reassign regions server recovery, we could inadvertantly try to reassign regions
assigned to a restarted server with a different start code; assigned to a restarted server with a different start code;
Improve lease handling Improve lease handling
HBASE-1267 binary keys broken in trunk (again) (Ryan Rawson via Stack)
IMPROVEMENTS IMPROVEMENTS
HBASE-1089 Add count of regions on filesystem to master UI; add percentage HBASE-1089 Add count of regions on filesystem to master UI; add percentage

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

@ -64,6 +64,7 @@ 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;
@ -1221,6 +1222,9 @@ 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) ?
@ -1942,6 +1946,7 @@ public class HRegion implements HConstants {
private TreeMap<byte [], Cell>[] resultSets; private TreeMap<byte [], Cell>[] resultSets;
private HStoreKey[] keys; private HStoreKey[] keys;
private RowFilterInterface filter; private RowFilterInterface filter;
private HStoreKey.StoreKeyComparator comparator;
/** Create an HScanner with a handle on many HStores. */ /** Create an HScanner with a handle on many HStores. */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@ -1951,6 +1956,11 @@ 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()?
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
List<byte[]> columns = new ArrayList<byte[]>(); List<byte[]> columns = new ArrayList<byte[]>();
@ -2009,8 +2019,8 @@ public class HRegion implements HConstants {
for (int i = 0; i < this.keys.length; i++) { for (int i = 0; i < this.keys.length; i++) {
if (scanners[i] != null && if (scanners[i] != null &&
(chosenRow == null || (chosenRow == null ||
(Bytes.compareTo(this.keys[i].getRow(), chosenRow) < 0) || (this.comparator.compareRows(this.keys[i].getRow(), chosenRow) < 0) ||
((Bytes.compareTo(this.keys[i].getRow(), chosenRow) == 0) && ((this.comparator.compareRows(this.keys[i].getRow(), chosenRow) == 0) &&
(keys[i].getTimestamp() > chosenTimestamp)))) { (keys[i].getTimestamp() > chosenTimestamp)))) {
chosenRow = keys[i].getRow(); chosenRow = keys[i].getRow();
chosenTimestamp = keys[i].getTimestamp(); chosenTimestamp = keys[i].getTimestamp();
@ -2027,7 +2037,7 @@ public class HRegion implements HConstants {
for (int i = 0; i < scanners.length; i++) { for (int i = 0; i < scanners.length; i++) {
if (scanners[i] != null && if (scanners[i] != null &&
Bytes.compareTo(this.keys[i].getRow(), chosenRow) == 0) { this.comparator.compareRows(this.keys[i].getRow(), chosenRow) == 0) {
// NOTE: We used to do results.putAll(resultSets[i]); // NOTE: We used to do results.putAll(resultSets[i]);
// but this had the effect of overwriting newer // but this had the effect of overwriting newer
// values with older ones. So now we only insert // values with older ones. So now we only insert
@ -2049,7 +2059,7 @@ public class HRegion implements HConstants {
// If the current scanner is non-null AND has a lower-or-equal // If the current scanner is non-null AND has a lower-or-equal
// row label, then its timestamp is bad. We need to advance it. // row label, then its timestamp is bad. We need to advance it.
while ((scanners[i] != null) && while ((scanners[i] != null) &&
(Bytes.compareTo(this.keys[i].getRow(), chosenRow) <= 0)) { (this.comparator.compareRows(this.keys[i].getRow(), chosenRow) <= 0)) {
resultSets[i].clear(); resultSets[i].clear();
if (!scanners[i].next(keys[i], resultSets[i])) { if (!scanners[i].next(keys[i], resultSets[i])) {
closeScanner(i); closeScanner(i);