Repository: hbase Updated Branches: refs/heads/branch-1 0a50a7a47 -> 87a5ad4aa
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/87a5ad4a Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/87a5ad4a Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/87a5ad4a Branch: refs/heads/branch-1 Commit: 87a5ad4aa4f023487af05c5aaad814fbb72c79f5 Parents: 0a50a7a Author: tedyu <[email protected]> Authored: Mon Jan 26 10:59:28 2015 -0800 Committer: tedyu <[email protected]> Committed: Mon Jan 26 10:59:28 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/87a5ad4a/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 6ff1f02..d6f066d 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 @@ -774,6 +774,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()); }
