Author: eli
Date: Mon Jun 4 21:48:06 2012
New Revision: 1346172
URL: http://svn.apache.org/viewvc?rev=1346172&view=rev
Log:
HADOOP-8430. Backport new FileSystem methods introduced by HADOOP-8014.
Contributed by Eli Collins
Modified:
hadoop/common/branches/branch-1.1/ (props changed)
hadoop/common/branches/branch-1.1/CHANGES.txt (contents, props changed)
hadoop/common/branches/branch-1.1/src/core/org/apache/hadoop/fs/FileSystem.java
hadoop/common/branches/branch-1.1/src/mapred/ (props changed)
Propchange: hadoop/common/branches/branch-1.1/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1:r1346167
Modified: hadoop/common/branches/branch-1.1/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/CHANGES.txt?rev=1346172&r1=1346171&r2=1346172&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.1/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.1/CHANGES.txt Mon Jun 4 21:48:06 2012
@@ -101,6 +101,8 @@ Release 1.1.0 - unreleased
HADOOP-6995. Allow wildcards to be used in ProxyUsers configurations
(todd via tucu)
+ HADOOP-8430. Backport new FileSystem methods introduced by HADOOP-8014.
(eli)
+
BUG FIXES
MAPREDUCE-4087. [Gridmix] GenerateDistCacheData job of Gridmix can
Propchange: hadoop/common/branches/branch-1.1/CHANGES.txt
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1/CHANGES.txt:r1346167
Modified:
hadoop/common/branches/branch-1.1/src/core/org/apache/hadoop/fs/FileSystem.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.1/src/core/org/apache/hadoop/fs/FileSystem.java?rev=1346172&r1=1346171&r2=1346172&view=diff
==============================================================================
---
hadoop/common/branches/branch-1.1/src/core/org/apache/hadoop/fs/FileSystem.java
(original)
+++
hadoop/common/branches/branch-1.1/src/core/org/apache/hadoop/fs/FileSystem.java
Mon Jun 4 21:48:06 2012
@@ -1275,19 +1275,44 @@ public abstract class FileSystem extends
return getFileStatus(f).getBlockSize();
}
- /** Return the number of bytes that large input files should be optimally
- * be split into to minimize i/o time. */
+ /**
+ * Return the number of bytes that large input files should be optimally
+ * be split into to minimize i/o time.
+ * @deprecated use {@link #getDefaultBlockSize(Path)} instead
+ */
+ @Deprecated
public long getDefaultBlockSize() {
// default to 32MB: large enough to minimize the impact of seeks
return getConf().getLong("fs.local.block.size", 32 * 1024 * 1024);
}
+
+ /**
+ * Return the number of bytes that large input files should be optimally
+ * be split into to minimize i/o time.
+ * @param f path of file
+ * @return the default block size for the path's filesystem
+ */
+ public long getDefaultBlockSize(Path f) {
+ return getDefaultBlockSize();
+ }
/**
* Get the default replication.
+ * @deprecated use {@link #getDefaultReplication(Path)} instead
*/
+ @Deprecated
public short getDefaultReplication() { return 1; }
/**
+ * Get the default replication.
+ * @param path of the file
+ * @return default replication for the path's filesystem
+ */
+ public short getDefaultReplication(Path path) {
+ return getDefaultReplication();
+ }
+
+ /**
* Return a file status object that represents the path.
* @param f The path we want information from
* @return a FileStatus object
Propchange: hadoop/common/branches/branch-1.1/src/mapred/
------------------------------------------------------------------------------
Merged /hadoop/common/branches/branch-1/src/mapred:r1346167
