You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2019/03/04 20:45:40 UTC

[hbase] 02/02: HBASE-21989 Revert HBASE-21915 from branch-2.0

This is an automated email from the ASF dual-hosted git repository.

stack pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/hbase.git

commit e1d5962b4ea245a6e5a896b8ea8552872a8b6416
Author: stack <st...@apache.org>
AuthorDate: Mon Mar 4 12:45:11 2019 -0800

    HBASE-21989 Revert HBASE-21915 from branch-2.0
    
    Revert "HBASE-21915 Make FileLinkInputStream implement CanUnbuffer"
    
    This reverts commit 724188246362a737404cc55da0996c543f295e46.
---
 .../src/main/java/org/apache/hadoop/hbase/io/FileLink.java    | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/FileLink.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/FileLink.java
index 36e086a..42f3483 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/io/FileLink.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/io/FileLink.java
@@ -31,7 +31,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.apache.hadoop.fs.CanSetDropBehind;
 import org.apache.hadoop.fs.CanSetReadahead;
-import org.apache.hadoop.fs.CanUnbuffer;
 import org.apache.hadoop.fs.FSDataInputStream;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.FileStatus;
@@ -103,7 +102,7 @@ public class FileLink {
    * and the alternative locations, when the file is moved.
    */
   private static class FileLinkInputStream extends InputStream
-      implements Seekable, PositionedReadable, CanSetDropBehind, CanSetReadahead, CanUnbuffer {
+      implements Seekable, PositionedReadable, CanSetDropBehind, CanSetReadahead {
     private FSDataInputStream in = null;
     private Path currentPath = null;
     private long pos = 0;
@@ -282,14 +281,6 @@ public class FileLink {
       return false;
     }
 
-    @Override
-    public void unbuffer() {
-      if (in == null) {
-        return;
-      }
-      in.unbuffer();
-    }
-
     /**
      * Try to open the file from one of the available locations.
      *