Return-Path: X-Original-To: apmail-hbase-commits-archive@www.apache.org Delivered-To: apmail-hbase-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7FB92189A5 for ; Tue, 15 Dec 2015 05:05:21 +0000 (UTC) Received: (qmail 27098 invoked by uid 500); 15 Dec 2015 05:05:21 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 27046 invoked by uid 500); 15 Dec 2015 05:05:21 -0000 Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hbase.apache.org Delivered-To: mailing list commits@hbase.apache.org Received: (qmail 27037 invoked by uid 99); 15 Dec 2015 05:05:21 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 15 Dec 2015 05:05:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7EE20E0667; Tue, 15 Dec 2015 05:05:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ramkrishna@apache.org To: commits@hbase.apache.org Message-Id: <2232e2379fab4a09bb977e6b4d0bc7c2@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-14895 Seek only to the newly flushed file on scanner reset on flush - Addendum (Ram) Date: Tue, 15 Dec 2015 05:05:20 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/master 10d86c7da -> 1822bb5d9 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/master Commit: 1822bb5d9578e3e650115a220132ab85e7db732a Parents: 10d86c7 Author: ramkrishna Authored: Tue Dec 15 10:34:25 2015 +0530 Committer: ramkrishna 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; }