You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by te...@apache.org on 2016/10/24 08:39:10 UTC
hbase git commit: HBASE-16929 Move default method of shipped to
Shipper interface - revert pending finding cause for Phoenix compilation
error
Repository: hbase
Updated Branches:
refs/heads/master 187ff190e -> 97cb1d71b
HBASE-16929 Move default method of shipped to Shipper interface - revert pending finding cause for Phoenix compilation error
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/97cb1d71
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/97cb1d71
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/97cb1d71
Branch: refs/heads/master
Commit: 97cb1d71bc4f426ceca1de86b86bafcd9799be20
Parents: 187ff19
Author: tedyu <yu...@gmail.com>
Authored: Mon Oct 24 01:39:02 2016 -0700
Committer: tedyu <yu...@gmail.com>
Committed: Mon Oct 24 01:39:02 2016 -0700
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/regionserver/RegionScanner.java | 9 +++++++++
.../java/org/apache/hadoop/hbase/regionserver/Shipper.java | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/97cb1d71/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionScanner.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionScanner.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionScanner.java
index fb1fe5d..8d8c051 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionScanner.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionScanner.java
@@ -115,4 +115,13 @@ public interface RegionScanner extends InternalScanner, Shipper {
*/
boolean nextRaw(List<Cell> result, ScannerContext scannerContext)
throws IOException;
+
+ /**
+ * Empty implementation to provide compatibility for user migrating from 1.X
+ * @see <a href="https://issues.apache.org/jira/browse/HBASE-16626">HBASE-16626</a>
+ */
+ @Override
+ default void shipped() throws IOException {
+ // do nothing
+ }
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/hbase/blob/97cb1d71/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Shipper.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Shipper.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Shipper.java
index 8fa393b..fb66f51 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Shipper.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/Shipper.java
@@ -33,5 +33,5 @@ public interface Shipper {
* Called after a batch of rows scanned and set to be returned to client. Any in between cleanup
* can be done here.
*/
- default void shipped() throws IOException { }
+ void shipped() throws IOException;
}