HBASE-14895 Seek only to the newly flushed file on scanner reset on flush - Addendum (Ram)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/1822bb5d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/1822bb5d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/1822bb5d Branch: refs/heads/hbase-12439 Commit: 1822bb5d9578e3e650115a220132ab85e7db732a Parents: 10d86c7 Author: ramkrishna <ramkrishna.s.vasude...@gmail.com> Authored: Tue Dec 15 10:34:25 2015 +0530 Committer: ramkrishna <ramkrishna.s.vasude...@gmail.com> Committed: Tue Dec 15 10:34:25 2015 +0530 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/regionserver/StoreScanner.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/1822bb5d/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java index 987a3f5..5fdfa79 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/StoreScanner.java @@ -414,7 +414,6 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner @Override public Cell peek() { - checkFlushed(); if (this.heap == null) { return this.lastTop; } @@ -810,7 +809,7 @@ public class StoreScanner extends NonReversedNonLazyKeyValueScanner // If there is a flush and the current scan is notified on the flush ensure that the // scan's heap gets reset and we do a seek on the newly flushed file. if(!this.closing) { - this.lastTop = this.heap.peek(); + this.lastTop = this.peek(); } else { return false; }
