You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2012/12/19 19:49:34 UTC

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

Author: tedyu
Date: Wed Dec 19 18:49:34 2012
New Revision: 1424020

URL: http://svn.apache.org/viewvc?rev=1424020&view=rev
Log:
HBASE-6499 StoreScanner's QueryMatcher not reset on store update (Max Lapan)


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

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java?rev=1424020&r1=1424019&r2=1424020&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java Wed Dec 19 18:49:34 2012
@@ -277,13 +277,8 @@ public class StoreScanner extends NonLaz
 
   @Override
   public synchronized boolean seek(KeyValue key) throws IOException {
-    if (this.heap == null) {
-
-      List<KeyValueScanner> scanners = getScannersNoCompaction();
-
-      heap = new KeyValueHeap(scanners, store.comparator);
-    }
-
+    // reset matcher state, in case that underlying store changed
+    checkReseek();
     return this.heap.seek(key);
   }