diff options
Diffstat (limited to 'other/java/hdfs2/src')
3 files changed, 5 insertions, 53 deletions
diff --git a/other/java/hdfs2/src/main/java/seaweed/hdfs/BufferedSeaweedInputStream.java b/other/java/hdfs2/src/main/java/seaweed/hdfs/BufferedSeaweedInputStream.java deleted file mode 100644 index 0bee6e43f..000000000 --- a/other/java/hdfs2/src/main/java/seaweed/hdfs/BufferedSeaweedInputStream.java +++ /dev/null @@ -1,49 +0,0 @@ -package seaweed.hdfs; - -import org.apache.hadoop.fs.PositionedReadable; -import org.apache.hadoop.fs.Seekable; - -import java.io.BufferedInputStream; -import java.io.FilterInputStream; -import java.io.IOException; -import java.io.InputStream; - -class BufferedSeaweedInputStream extends FilterInputStream implements Seekable, PositionedReadable { - - SeaweedInputStream t; - - protected BufferedSeaweedInputStream(InputStream in, int bufferSize) { - super(new BufferedInputStream(in, bufferSize)); - t = (SeaweedInputStream)in; - } - - @Override - public int read(long position, byte[] buffer, int offset, int length) throws IOException { - return this.t.read(position,buffer,offset,length); - } - - @Override - public void readFully(long position, byte[] buffer, int offset, int length) throws IOException { - this.t.readFully(position,buffer,offset,length); - } - - @Override - public void readFully(long position, byte[] buffer) throws IOException { - this.t.readFully(position,buffer); - } - - @Override - public void seek(long pos) throws IOException { - this.t.seek(pos); - } - - @Override - public long getPos() throws IOException { - return this.t.getPos(); - } - - @Override - public boolean seekToNewSource(long targetPos) throws IOException { - return this.t.seekToNewSource(targetPos); - } -} diff --git a/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedFileSystem.java b/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedFileSystem.java index 585fa39a3..fd8877806 100644 --- a/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedFileSystem.java +++ b/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedFileSystem.java @@ -75,8 +75,8 @@ public class SeaweedFileSystem extends FileSystem { path = qualify(path); try { - InputStream inputStream = seaweedFileSystemStore.openFileForRead(path, statistics, bufferSize); - return new FSDataInputStream(new BufferedSeaweedInputStream(inputStream, 16 * 1024 * 1024)); + FSInputStream inputStream = seaweedFileSystemStore.openFileForRead(path, statistics, bufferSize); + return new FSDataInputStream(new BufferedFSInputStream(inputStream, 16 * 1024 * 1024)); } catch (Exception ex) { LOG.warn("open path: {} bufferSize:{}", path, bufferSize, ex); return null; diff --git a/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java b/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java index d9c6d6f0d..0db6a1f49 100644 --- a/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java +++ b/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java @@ -1,5 +1,6 @@ package seaweed.hdfs; +import org.apache.hadoop.fs.FSInputStream; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -207,8 +208,8 @@ public class SeaweedFileSystemStore { } - public InputStream openFileForRead(final Path path, FileSystem.Statistics statistics, - int bufferSize) throws IOException { + public FSInputStream openFileForRead(final Path path, FileSystem.Statistics statistics, + int bufferSize) throws IOException { LOG.debug("openFileForRead path:{} bufferSize:{}", path, bufferSize); |
