HBASE-15274 ClientSideRegionScanner's reaction to Scan#setBatch is not consistent between HBase versions (Youngjoon Kim)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/95b55fea Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/95b55fea Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/95b55fea Branch: refs/heads/0.98 Commit: 95b55fea8735c712f8ece4cb019dbbb1bedfc4bc Parents: c20d34c Author: Enis Soztutar <[email protected]> Authored: Wed Feb 17 18:27:55 2016 -0800 Committer: Enis Soztutar <[email protected]> Committed: Wed Feb 17 18:27:55 2016 -0800 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/client/ClientSideRegionScanner.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/95b55fea/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientSideRegionScanner.java ---------------------------------------------------------------------- diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientSideRegionScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientSideRegionScanner.java index 584d434..5c2b372 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientSideRegionScanner.java +++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/client/ClientSideRegionScanner.java @@ -73,9 +73,8 @@ public class ClientSideRegionScanner extends AbstractClientScanner { @Override public Result next() throws IOException { values.clear(); - - scanner.nextRaw(values, -1); // pass -1 as limit so that we see the whole row. - if (values == null || values.isEmpty()) { + scanner.nextRaw(values); + if (values.isEmpty()) { //we are done return null; }
