Repository: hbase Updated Branches: refs/heads/0.98 de01f6f4d -> dc145552c
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/dc145552 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/dc145552 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/dc145552 Branch: refs/heads/0.98 Commit: dc145552c10273bec9679052ed1008872c9bb031 Parents: de01f6f Author: tedyu <[email protected]> Authored: Mon Jan 26 11:36:53 2015 -0800 Committer: tedyu <[email protected]> Committed: Mon Jan 26 11:36: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/dc145552/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 9cc6d7b..c429ba3 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 @@ -754,6 +754,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()); }
