From 912ef2bc531c1bd09b21cadc87b8ea2620311cf3 Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Sat, 10 Oct 2020 01:14:17 -0700 Subject: [PATCH] Hadoop: remove unused variable bufferSize --- .../src/main/java/seaweed/hdfs/SeaweedFileSystem.java | 2 +- .../main/java/seaweed/hdfs/SeaweedFileSystemStore.java | 8 +++----- .../src/main/java/seaweed/hdfs/SeaweedInputStream.java | 5 +---- .../src/main/java/seaweed/hdfs/SeaweedFileSystem.java | 2 +- .../main/java/seaweed/hdfs/SeaweedFileSystemStore.java | 8 +++----- .../src/main/java/seaweed/hdfs/SeaweedInputStream.java | 5 +---- 6 files changed, 10 insertions(+), 20 deletions(-) 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 6551548fa..44c2ef053 100644 --- a/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedFileSystem.java +++ b/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedFileSystem.java @@ -74,7 +74,7 @@ public class SeaweedFileSystem extends FileSystem { try { int seaweedBufferSize = this.getConf().getInt(FS_SEAWEED_BUFFER_SIZE, FS_SEAWEED_DEFAULT_BUFFER_SIZE); - FSInputStream inputStream = seaweedFileSystemStore.openFileForRead(path, statistics, seaweedBufferSize); + FSInputStream inputStream = seaweedFileSystemStore.openFileForRead(path, statistics); return new FSDataInputStream(new BufferedFSInputStream(inputStream, 4 * seaweedBufferSize)); } catch (Exception ex) { LOG.warn("open path: {} bufferSize:{}", path, bufferSize, ex); 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 3dc38fe1e..eec5bd2d3 100644 --- a/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java +++ b/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java @@ -205,10 +205,9 @@ public class SeaweedFileSystemStore { } - public FSInputStream openFileForRead(final Path path, FileSystem.Statistics statistics, - int bufferSize) throws IOException { + public FSInputStream openFileForRead(final Path path, FileSystem.Statistics statistics) throws IOException { - LOG.debug("openFileForRead path:{} bufferSize:{}", path, bufferSize); + LOG.debug("openFileForRead path:{}", path); FilerProto.Entry entry = lookupEntry(path); @@ -219,8 +218,7 @@ public class SeaweedFileSystemStore { return new SeaweedInputStream(filerGrpcClient, statistics, path.toUri().getPath(), - entry, - bufferSize); + entry); } public void setOwner(Path path, String owner, String group) { diff --git a/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedInputStream.java b/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedInputStream.java index 36c0766a4..8bda2e092 100644 --- a/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedInputStream.java +++ b/other/java/hdfs2/src/main/java/seaweed/hdfs/SeaweedInputStream.java @@ -25,7 +25,6 @@ public class SeaweedInputStream extends FSInputStream { private final FilerProto.Entry entry; private final List visibleIntervalList; private final long contentLength; - private final int bufferSize; // default buffer size private long position = 0; // cursor of the file @@ -35,14 +34,12 @@ public class SeaweedInputStream extends FSInputStream { final FilerGrpcClient filerGrpcClient, final Statistics statistics, final String path, - final FilerProto.Entry entry, - final int bufferSize) throws IOException { + final FilerProto.Entry entry) throws IOException { this.filerGrpcClient = filerGrpcClient; this.statistics = statistics; this.path = path; this.entry = entry; this.contentLength = SeaweedRead.fileSize(entry); - this.bufferSize = bufferSize; this.visibleIntervalList = SeaweedRead.nonOverlappingVisibleIntervals(filerGrpcClient, entry.getChunksList()); diff --git a/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedFileSystem.java b/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedFileSystem.java index 6551548fa..44c2ef053 100644 --- a/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedFileSystem.java +++ b/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedFileSystem.java @@ -74,7 +74,7 @@ public class SeaweedFileSystem extends FileSystem { try { int seaweedBufferSize = this.getConf().getInt(FS_SEAWEED_BUFFER_SIZE, FS_SEAWEED_DEFAULT_BUFFER_SIZE); - FSInputStream inputStream = seaweedFileSystemStore.openFileForRead(path, statistics, seaweedBufferSize); + FSInputStream inputStream = seaweedFileSystemStore.openFileForRead(path, statistics); return new FSDataInputStream(new BufferedFSInputStream(inputStream, 4 * seaweedBufferSize)); } catch (Exception ex) { LOG.warn("open path: {} bufferSize:{}", path, bufferSize, ex); diff --git a/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java b/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java index 3dc38fe1e..eec5bd2d3 100644 --- a/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java +++ b/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedFileSystemStore.java @@ -205,10 +205,9 @@ public class SeaweedFileSystemStore { } - public FSInputStream openFileForRead(final Path path, FileSystem.Statistics statistics, - int bufferSize) throws IOException { + public FSInputStream openFileForRead(final Path path, FileSystem.Statistics statistics) throws IOException { - LOG.debug("openFileForRead path:{} bufferSize:{}", path, bufferSize); + LOG.debug("openFileForRead path:{}", path); FilerProto.Entry entry = lookupEntry(path); @@ -219,8 +218,7 @@ public class SeaweedFileSystemStore { return new SeaweedInputStream(filerGrpcClient, statistics, path.toUri().getPath(), - entry, - bufferSize); + entry); } public void setOwner(Path path, String owner, String group) { diff --git a/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedInputStream.java b/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedInputStream.java index 36c0766a4..8bda2e092 100644 --- a/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedInputStream.java +++ b/other/java/hdfs3/src/main/java/seaweed/hdfs/SeaweedInputStream.java @@ -25,7 +25,6 @@ public class SeaweedInputStream extends FSInputStream { private final FilerProto.Entry entry; private final List visibleIntervalList; private final long contentLength; - private final int bufferSize; // default buffer size private long position = 0; // cursor of the file @@ -35,14 +34,12 @@ public class SeaweedInputStream extends FSInputStream { final FilerGrpcClient filerGrpcClient, final Statistics statistics, final String path, - final FilerProto.Entry entry, - final int bufferSize) throws IOException { + final FilerProto.Entry entry) throws IOException { this.filerGrpcClient = filerGrpcClient; this.statistics = statistics; this.path = path; this.entry = entry; this.contentLength = SeaweedRead.fileSize(entry); - this.bufferSize = bufferSize; this.visibleIntervalList = SeaweedRead.nonOverlappingVisibleIntervals(filerGrpcClient, entry.getChunksList());