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

HBASE-2901 HBASE-2461 broke build 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@982461 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Michael Stack 2010-08-05 03:58:32 +00:00
parent 2db593c8c6
commit 37af9aab2e
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -468,6 +468,7 @@ Release 0.21.0 - Unreleased
reference files reference files
HBASE-2871 Make "start|stop" commands symmetric for Master & Cluster HBASE-2871 Make "start|stop" commands symmetric for Master & Cluster
(Nicolas Spiegelberg via Stack) (Nicolas Spiegelberg via Stack)
HBASE-2901 HBASE-2461 broke build
IMPROVEMENTS IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable HBASE-1760 Cleanup TODOs in HTable

15
src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
View File

@ -140,17 +140,10 @@ class SplitTransaction {
// Check splitrow. // Check splitrow.
byte [] startKey = hri.getStartKey(); byte [] startKey = hri.getStartKey();
byte [] endKey = hri.getEndKey(); byte [] endKey = hri.getEndKey();
KVComparator comparator = this.parent.comparator; if (Bytes.equals(startKey, splitrow) ||
if (comparator.compareRows(startKey, 0, startKey.length, !this.parent.getRegionInfo().containsRow(splitrow)) {
this.splitrow, 0, this.splitrow.length) >= 0) { LOG.info("Split row is not inside region key range or is equal to " +
LOG.info("Split row is <= start key row, not splitting: " + "startkey: " + Bytes.toString(this.splitrow));
Bytes.toString(this.splitrow));
return prepared;
}
if (comparator.compareRows(this.splitrow, 0, this.splitrow.length,
endKey, 0, endKey.length) >= 0) {
LOG.info("Split row is >= end key row, not splitting: " +
Bytes.toString(this.splitrow));
return prepared; return prepared;
} }
long rid = getDaughterRegionIdTimestamp(hri); long rid = getDaughterRegionIdTimestamp(hri);