HBASE-2579 Add atomic checkAndDelete support; fix broke build -- i forgot to change one of the prepareDelete calls
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@950813 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
94c6f4c1b8
commit
e9b68fdce6
|
@ -1495,10 +1495,13 @@ public class HRegion implements HConstants, HeapSize { // , Writable{
|
|||
//If matches put the new put or delete the new delete
|
||||
if (matches) {
|
||||
// All edits for the given row (across all column families) must happen atomically.
|
||||
if (isPut)
|
||||
if (isPut) {
|
||||
put(((Put)w).getFamilyMap(), writeToWAL);
|
||||
else
|
||||
delete(prepareDelete((Delete)w).getFamilyMap(), writeToWAL);
|
||||
} else {
|
||||
Delete d = (Delete)w;
|
||||
prepareDelete(d);
|
||||
delete(d.getFamilyMap(), writeToWAL);
|
||||
}
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
Loading…
Reference in New Issue