Repository: hbase Updated Branches: refs/heads/master 03ffb30ef -> 88f775996
HBASE-15358 canEnforceTimeLimitFromScope should use timeScope instead of sizeScope Signed-off-by: zhangduo <zhang...@apache.org> 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 <ud1...@gmail.com> Authored: Mon Feb 29 16:26:51 2016 +0800 Committer: zhangduo <zhang...@apache.org> 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