Repository: hbase Updated Branches: refs/heads/master 8241531f4 -> 26b8b48b4
HBASE-12915 Disallow small scan with batching Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/26b8b48b Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/26b8b48b Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/26b8b48b Branch: refs/heads/master Commit: 26b8b48b4262695d900207adc13b32af6ed77875 Parents: 8241531 Author: tedyu <[email protected]> Authored: Mon Jan 26 10:58:53 2015 -0800 Committer: tedyu <[email protected]> Committed: Mon Jan 26 10:58:53 2015 -0800 ---------------------------------------------------------------------- .../src/main/java/org/apache/hadoop/hbase/client/HTable.java | 3 +++ 1 file changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/26b8b48b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java ---------------------------------------------------------------------- diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java index 21b35ab..d15ab27 100644 --- a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java +++ b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/HTable.java @@ -771,6 +771,9 @@ public class HTable implements HTableInterface { */ @Override public ResultScanner getScanner(final Scan scan) throws IOException { + if (scan.getBatch() > 0 && scan.isSmall()) { + throw new IllegalArgumentException("Small scan should not be used with batching"); + } if (scan.getCaching() <= 0) { scan.setCaching(getScannerCaching()); }
