Repository: hbase Updated Branches: refs/heads/branch-1.0 1011c46f9 -> d2d4e05dd
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/d2d4e05d Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/d2d4e05d Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/d2d4e05d Branch: refs/heads/branch-1.0 Commit: d2d4e05dd0ce3d2e16560bf561190ed2939345ba Parents: 1011c46 Author: tedyu <[email protected]> Authored: Mon Jan 26 11:00:15 2015 -0800 Committer: tedyu <[email protected]> Committed: Mon Jan 26 11:00:15 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/d2d4e05d/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 b9593d9..5e4dd3c 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 @@ -796,6 +796,9 @@ public class HTable implements HTableInterface, RegionLocator { */ @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()); }
