Repository: hbase Updated Branches: refs/heads/master 641513757 -> ac415f85f
HBASE-16929 Move default method of shipped to Shipper interface Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/ac415f85 Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/ac415f85 Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/ac415f85 Branch: refs/heads/master Commit: ac415f85f3dd0ecf01a655f3b72351a4b5c675bd Parents: 6415137 Author: tedyu <[email protected]> Authored: Fri Oct 21 17:23:07 2016 -0700 Committer: tedyu <[email protected]> Committed: Fri Oct 21 17:23:07 2016 -0700 ---------------------------------------------------------------------- .../org/apache/hadoop/hbase/regionserver/RegionScanner.java | 9 --------- .../java/org/apache/hadoop/hbase/regionserver/Shipper.java | 2 +- 2 files changed, 1 insertion(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/ac415f85/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 8d8c051..fb1fe5d 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,13 +115,4 @@ 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/ac415f85/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 fb66f51..8fa393b 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. */ - void shipped() throws IOException; + default void shipped() throws IOException { } }
