You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by en...@apache.org on 2016/02/18 03:30:04 UTC

[1/2] hbase git commit: HBASE-15274 ClientSideRegionScanner's reaction to Scan#setBatch is not consistent between HBase versions (Youngjoon Kim)

Repository: hbase
Updated Branches:
  refs/heads/0.98 c20d34c15 -> 95b55fea8
  refs/heads/branch-1.0 f280c4595 -> 2ce516b0f


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/2ce516b0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/2ce516b0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/2ce516b0

Branch: refs/heads/branch-1.0
Commit: 2ce516b0fff93a4ee84bb53f9623c495d8dc3d13
Parents: f280c45
Author: Enis Soztutar <en...@apache.org>
Authored: Wed Feb 17 17:41:13 2016 -0800
Committer: Enis Soztutar <en...@apache.org>
Committed: Wed Feb 17 17:41:13 2016 -0800

----------------------------------------------------------------------
 .../org/apache/hadoop/hbase/client/ClientSideRegionScanner.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hbase/blob/2ce516b0/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 9cb9494..f9dacdd 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
@@ -71,8 +71,7 @@ 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.
+    scanner.nextRaw(values);
     if (values.isEmpty()) {
       //we are done
       return null;

[2/2] hbase git commit: HBASE-15274 ClientSideRegionScanner's reaction to Scan#setBatch is not consistent between HBase versions (Youngjoon Kim)

Posted by en...@apache.org.
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 <en...@apache.org>
Authored: Wed Feb 17 18:27:55 2016 -0800
Committer: Enis Soztutar <en...@apache.org>
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;
     }