You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2014/07/11 22:07:12 UTC
[1/3] git commit: HBASE-11487 ScanResponse carries non-zero cellblock
for CloseScanRequest (Shengzhe Yao)
Repository: hbase
Updated Branches:
refs/heads/0.98 76f17569a -> ca219267c
refs/heads/branch-1 94e29bd0a -> 0c97649b6
refs/heads/master dd9f1cbf3 -> f2a40fc05
HBASE-11487 ScanResponse carries non-zero cellblock for CloseScanRequest (Shengzhe Yao)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ca219267
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ca219267
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ca219267
Branch: refs/heads/0.98
Commit: ca219267c3a91e6bbbfd55848f88592d70972ae7
Parents: 76f1756
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Jul 11 10:37:48 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Jul 11 11:30:11 2014 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/regionserver/HRegionServer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/ca219267/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
index c054211..aaea9f4 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
@@ -3054,7 +3054,7 @@ public class HRegionServer implements ClientProtos.ClientService.BlockingInterfa
if (request.hasCloseScanner()) {
closeScanner = request.getCloseScanner();
}
- int rows = 1;
+ int rows = closeScanner ? 0 : 1;
if (request.hasNumberOfRows()) {
rows = request.getNumberOfRows();
}
[2/3] git commit: HBASE-11487 ScanResponse carries non-zero cellblock
for CloseScanRequest (Shengzhe Yao)
Posted by ap...@apache.org.
HBASE-11487 ScanResponse carries non-zero cellblock for CloseScanRequest (Shengzhe Yao)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f2a40fc0
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f2a40fc0
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f2a40fc0
Branch: refs/heads/master
Commit: f2a40fc058d013099be6090d5360cd8a70fa8cdb
Parents: dd9f1cb
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Jul 11 13:06:42 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Jul 11 13:06:42 2014 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/f2a40fc0/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
index 26233b5..e1b8e3f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
@@ -1866,7 +1866,7 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
if (request.hasCloseScanner()) {
closeScanner = request.getCloseScanner();
}
- int rows = 1;
+ int rows = closeScanner ? 0 : 1;
if (request.hasNumberOfRows()) {
rows = request.getNumberOfRows();
}
[3/3] git commit: HBASE-11487 ScanResponse carries non-zero cellblock
for CloseScanRequest (Shengzhe Yao)
Posted by ap...@apache.org.
HBASE-11487 ScanResponse carries non-zero cellblock for CloseScanRequest (Shengzhe Yao)
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/0c97649b
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/0c97649b
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/0c97649b
Branch: refs/heads/branch-1
Commit: 0c97649b6f3cedddc667b11316ff4c69c397b5a0
Parents: 94e29bd
Author: Andrew Purtell <ap...@apache.org>
Authored: Fri Jul 11 13:06:48 2014 -0700
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Jul 11 13:06:48 2014 -0700
----------------------------------------------------------------------
.../java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/0c97649b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
index 26233b5..e1b8e3f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RSRpcServices.java
@@ -1866,7 +1866,7 @@ public class RSRpcServices implements HBaseRPCErrorHandler,
if (request.hasCloseScanner()) {
closeScanner = request.getCloseScanner();
}
- int rows = 1;
+ int rows = closeScanner ? 0 : 1;
if (request.hasNumberOfRows()) {
rows = request.getNumberOfRows();
}