You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@hbase.apache.org by la...@apache.org on 2012/10/31 23:02:10 UTC

svn commit: r1404377 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

Author: larsh
Date: Wed Oct 31 22:02:09 2012
New Revision: 1404377

URL: http://svn.apache.org/viewvc?rev=1404377&view=rev
Log:
HBASE-7051 CheckAndPut should properly read MVCC

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1404377&r1=1404376&r2=1404377&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Wed Oct 31 22:02:09 2012
@@ -2395,6 +2395,8 @@ public class HRegion implements HeapSize
 
       // Lock row
       Integer lid = getLock(lockId, get.getRow(), true);
+      // wait for all previous transactions to complete (with lock held)
+      mvcc.completeMemstoreInsert(mvcc.beginMemstoreInsert());
       List<KeyValue> result = null;
       try {
         result = get(get, false);