You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2011/06/12 18:07:11 UTC
svn commit: r1134940 - in /hbase/trunk: CHANGES.txt
src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Author: apurtell
Date: Sun Jun 12 16:07:11 2011
New Revision: 1134940
URL: http://svn.apache.org/viewvc?rev=1134940&view=rev
Log:
HBASE-3978 Rowlock lease renew doesn't work when custom coprocessor indicates to bypass default action
Modified:
hbase/trunk/CHANGES.txt
hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
Modified: hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hbase/trunk/CHANGES.txt?rev=1134940&r1=1134939&r2=1134940&view=diff
==============================================================================
--- hbase/trunk/CHANGES.txt (original)
+++ hbase/trunk/CHANGES.txt Sun Jun 12 16:07:11 2011
@@ -120,6 +120,8 @@ Release 0.91.0 - Unreleased
HBASE-3979 Trivial fixes in code, document (Ming Ma)
HBASE-3794 Ability to Discard Bad HTable Puts
HBASE-3923 HBASE-1502 Broke Shell's status 'simple' and 'detailed'
+ HBASE-3978 Rowlock lease renew doesn't work when custom coprocessor
+ indicates to bypass default action (Ming Ma)
IMPROVEMENTS
HBASE-3290 Max Compaction Size (Nicolas Spiegelberg via Stack)
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1134940&r1=1134939&r2=1134940&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Sun Jun 12 16:07:11 2011
@@ -1616,13 +1616,14 @@ public class HRegionServer implements HR
requestCount.incrementAndGet();
try {
HRegion region = getRegion(regionName);
+ Integer lock = getLockFromId(get.getLockId());
if (region.getCoprocessorHost() != null) {
Boolean result = region.getCoprocessorHost().preExists(get);
if (result != null) {
return result.booleanValue();
}
}
- Result r = region.get(get, getLockFromId(get.getLockId()));
+ Result r = region.get(get, lock);
boolean result = r != null && !r.isEmpty();
if (region.getCoprocessorHost() != null) {
result = region.getCoprocessorHost().postExists(get, result);
@@ -1723,6 +1724,7 @@ public class HRegionServer implements HR
+ "regionName is null");
}
HRegion region = getRegion(regionName);
+ Integer lock = getLockFromId(put.getLockId());
WritableByteArrayComparable comparator = new BinaryComparator(value);
if (region.getCoprocessorHost() != null) {
Boolean result = region.getCoprocessorHost()
@@ -1734,7 +1736,7 @@ public class HRegionServer implements HR
}
boolean result = checkAndMutate(regionName, row, family, qualifier,
CompareOp.EQUAL, new BinaryComparator(value), put,
- getLockFromId(put.getLockId()));
+ lock);
if (region.getCoprocessorHost() != null) {
result = region.getCoprocessorHost().postCheckAndPut(row, family,
qualifier, CompareOp.EQUAL, comparator, put, result);
@@ -1764,6 +1766,7 @@ public class HRegionServer implements HR
+ "regionName is null");
}
HRegion region = getRegion(regionName);
+ Integer lock = getLockFromId(put.getLockId());
if (region.getCoprocessorHost() != null) {
Boolean result = region.getCoprocessorHost()
.preCheckAndPut(row, family, qualifier, compareOp, comparator, put);
@@ -1772,7 +1775,7 @@ public class HRegionServer implements HR
}
}
boolean result = checkAndMutate(regionName, row, family, qualifier,
- compareOp, comparator, put, getLockFromId(put.getLockId()));
+ compareOp, comparator, put, lock);
if (region.getCoprocessorHost() != null) {
result = region.getCoprocessorHost().postCheckAndPut(row, family,
qualifier, compareOp, comparator, put, result);
@@ -1802,6 +1805,7 @@ public class HRegionServer implements HR
+ "regionName is null");
}
HRegion region = getRegion(regionName);
+ Integer lock = getLockFromId(delete.getLockId());
WritableByteArrayComparable comparator = new BinaryComparator(value);
if (region.getCoprocessorHost() != null) {
Boolean result = region.getCoprocessorHost().preCheckAndDelete(row,
@@ -1811,7 +1815,7 @@ public class HRegionServer implements HR
}
}
boolean result = checkAndMutate(regionName, row, family, qualifier,
- CompareOp.EQUAL, comparator, delete, getLockFromId(delete.getLockId()));
+ CompareOp.EQUAL, comparator, delete, lock);
if (region.getCoprocessorHost() != null) {
result = region.getCoprocessorHost().postCheckAndDelete(row, family,
qualifier, CompareOp.EQUAL, comparator, delete, result);
@@ -1842,6 +1846,7 @@ public class HRegionServer implements HR
+ "regionName is null");
}
HRegion region = getRegion(regionName);
+ Integer lock = getLockFromId(delete.getLockId());
if (region.getCoprocessorHost() != null) {
Boolean result = region.getCoprocessorHost().preCheckAndDelete(row,
family, qualifier, compareOp, comparator, delete);
@@ -1850,7 +1855,7 @@ public class HRegionServer implements HR
}
}
boolean result = checkAndMutate(regionName, row, family, qualifier,
- compareOp, comparator, delete, getLockFromId(delete.getLockId()));
+ compareOp, comparator, delete, lock);
if (region.getCoprocessorHost() != null) {
result = region.getCoprocessorHost().postCheckAndDelete(row, family,
qualifier, compareOp, comparator, delete, result);
@@ -2618,6 +2623,7 @@ public class HRegionServer implements HR
requestCount.incrementAndGet();
try {
HRegion region = getRegion(regionName);
+ Integer lock = getLockFromId(increment.getLockId());
Increment incVal = increment;
Result resVal;
if (region.getCoprocessorHost() != null) {
@@ -2626,7 +2632,7 @@ public class HRegionServer implements HR
return resVal;
}
}
- resVal = region.increment(incVal, getLockFromId(increment.getLockId()),
+ resVal = region.increment(incVal, lock,
increment.getWriteToWAL());
if (region.getCoprocessorHost() != null) {
region.getCoprocessorHost().postIncrement(incVal, resVal);