You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2010/08/05 05:58:32 UTC
svn commit: r982461 - in /hbase/trunk: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
Author: stack
Date: Thu Aug 5 03:58:32 2010
New Revision: 982461
URL: http://svn.apache.org/viewvc?rev=982461&view=rev
Log:
HBASE-2901 HBASE-2461 broke build
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=982461&r1=982460&r2=982461&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Thu Aug 5 03:58:32 2010
@@ -468,6 +468,7 @@ Release 0.21.0 - Unreleased
reference files
HBASE-2871 Make "start|stop" commands symmetric for Master & Cluster
(Nicolas Spiegelberg via Stack)
+ HBASE-2901 HBASE-2461 broke build
IMPROVEMENTS
HBASE-1760 Cleanup TODOs in HTable
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java?rev=982461&r1=982460&r2=982461&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/SplitTransaction.java Thu Aug 5 03:58:32 2010
@@ -140,17 +140,10 @@ class SplitTransaction {
// Check splitrow.
byte [] startKey = hri.getStartKey();
byte [] endKey = hri.getEndKey();
- KVComparator comparator = this.parent.comparator;
- if (comparator.compareRows(startKey, 0, startKey.length,
- this.splitrow, 0, this.splitrow.length) >= 0) {
- LOG.info("Split row is <= start key row, not splitting: " +
- 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));
+ if (Bytes.equals(startKey, splitrow) ||
+ !this.parent.getRegionInfo().containsRow(splitrow)) {
+ LOG.info("Split row is not inside region key range or is equal to " +
+ "startkey: " + Bytes.toString(this.splitrow));
return prepared;
}
long rid = getDaughterRegionIdTimestamp(hri);