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 8C1EE18072 for ; Mon, 29 Feb 2016 09:28:27 +0000 (UTC) Received: (qmail 87786 invoked by uid 500); 29 Feb 2016 09:28:27 -0000 Delivered-To: apmail-hbase-commits-archive@hbase.apache.org Received: (qmail 87746 invoked by uid 500); 29 Feb 2016 09:28:27 -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 87736 invoked by uid 99); 29 Feb 2016 09:28:27 -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; Mon, 29 Feb 2016 09:28:27 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 2C472E00C7; Mon, 29 Feb 2016 09:28:27 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: zhangduo@apache.org To: commits@hbase.apache.org Message-Id: <9f663877a9474193aa054e244c3baa81@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hbase git commit: HBASE-15358 canEnforceTimeLimitFromScope should use timeScope instead of sizeScope Date: Mon, 29 Feb 2016 09:28:27 +0000 (UTC) Repository: hbase Updated Branches: refs/heads/master 03ffb30ef -> 88f775996 HBASE-15358 canEnforceTimeLimitFromScope should use timeScope instead of sizeScope Signed-off-by: zhangduo Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/88f77599 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/88f77599 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/88f77599 Branch: refs/heads/master Commit: 88f775996b3b52d784ad13ab07515134619316ba Parents: 03ffb30 Author: Phil Yang Authored: Mon Feb 29 16:26:51 2016 +0800 Committer: zhangduo Committed: Mon Feb 29 17:21:42 2016 +0800 ---------------------------------------------------------------------- .../java/org/apache/hadoop/hbase/regionserver/ScannerContext.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/88f77599/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScannerContext.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScannerContext.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScannerContext.java index 2062230..6674443 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScannerContext.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ScannerContext.java @@ -626,7 +626,7 @@ public class ScannerContext { * @return true when the limit can be enforced from the scope of the checker */ boolean canEnforceTimeLimitFromScope(LimitScope checkerScope) { - return this.sizeScope.canEnforceLimitFromScope(checkerScope); + return this.timeScope.canEnforceLimitFromScope(checkerScope); } @Override