HBASE-6499 StoreScanner's QueryMatcher not reset on store update (Max Lapan)

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1424020 13f79535-47bb-0310-9956-ffa450edef68

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

@@ -277,13 +277,8 @@ public class StoreScanner extends NonLazyKeyValueScanner
 
   @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);
   }