big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-7336. Unused member DFSInputStream.buffersize. Contributed by Milan Desai.

Browse Source
This commit is contained in:
Milan Desai 2014-11-05 21:00:28 -08:00 committed by Konstantin V Shvachko
parent 228afed14c
commit 80d7d183cd
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
View File

@ -347,6 +347,8 @@ Release 2.7.0 - UNRELEASED
HDFS-7329. Improve logging when MiniDFSCluster fails to start. HDFS-7329. Improve logging when MiniDFSCluster fails to start.
(Byron Wong via shv) (Byron Wong via shv)
HDFS-7336. Unused member DFSInputStream.buffersize. (Milan Desai via shv)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSClient.java
View File

@ -1503,7 +1503,7 @@ public DFSInputStream open(String src, int buffersize, boolean verifyChecksum)
throws IOException, UnresolvedLinkException { throws IOException, UnresolvedLinkException {
checkOpen(); checkOpen();
// Get block info from namenode // Get block info from namenode
return new DFSInputStream(this, src, buffersize, verifyChecksum); return new DFSInputStream(this, src, verifyChecksum);
} }
/** /**

7
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/DFSInputStream.java
View File

@ -41,7 +41,6 @@
import java.util.concurrent.ExecutorCompletionService; import java.util.concurrent.ExecutorCompletionService;
import java.util.concurrent.Future; import java.util.concurrent.Future;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.commons.io.IOUtils; import org.apache.commons.io.IOUtils;
import org.apache.hadoop.classification.InterfaceAudience; import org.apache.hadoop.classification.InterfaceAudience;
@ -215,19 +214,17 @@ void addZeroCopyBytes(long amt) {
* parallel accesses to DFSInputStream (through ptreads) properly */ * parallel accesses to DFSInputStream (through ptreads) properly */
private final ConcurrentHashMap<DatanodeInfo, DatanodeInfo> deadNodes = private final ConcurrentHashMap<DatanodeInfo, DatanodeInfo> deadNodes =
new ConcurrentHashMap<DatanodeInfo, DatanodeInfo>(); new ConcurrentHashMap<DatanodeInfo, DatanodeInfo>();
private int buffersize = 1;
private final byte[] oneByteBuf = new byte[1]; // used for 'int read()' private final byte[] oneByteBuf = new byte[1]; // used for 'int read()'
void addToDeadNodes(DatanodeInfo dnInfo) { void addToDeadNodes(DatanodeInfo dnInfo) {
deadNodes.put(dnInfo, dnInfo); deadNodes.put(dnInfo, dnInfo);
} }
DFSInputStream(DFSClient dfsClient, String src, int buffersize, boolean verifyChecksum DFSInputStream(DFSClient dfsClient, String src, boolean verifyChecksum
) throws IOException, UnresolvedLinkException { ) throws IOException, UnresolvedLinkException {
this.dfsClient = dfsClient; this.dfsClient = dfsClient;
this.verifyChecksum = verifyChecksum; this.verifyChecksum = verifyChecksum;
this.buffersize = buffersize;
this.src = src; this.src = src;
this.cachingStrategy = this.cachingStrategy =
dfsClient.getDefaultReadCachingStrategy(); dfsClient.getDefaultReadCachingStrategy();