You are viewing a plain text version of this content. The canonical link for it is here.

Posted to mapreduce-commits@hadoop.apache.org by to...@apache.org on 2012/05/20 09:41:37 UTC

svn commit: r1340629 - in /hadoop/common/branches/branch-2/hadoop-mapreduce-project: CHANGES.txt hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/MultiFileWordCount.java

Author: todd
Date: Sun May 20 07:41:37 2012
New Revision: 1340629

URL: http://svn.apache.org/viewvc?rev=1340629&view=rev
Log:
MAPREDUCE-4002. MultiFileWordCount job fails if the input path is not from default file system. Contributed by Bhallamudi Venkata Siva Kamesh.

Modified:
    hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
    hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/MultiFileWordCount.java

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1340629&r1=1340628&r2=1340629&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Sun May 20 07:41:37 2012
@@ -18,6 +18,9 @@ Release 2.0.1-alpha - UNRELEASED
     MAPREDUCE-4250. hadoop-config.sh missing variable exports, causes Yarn 
     jobs to fail with ClassNotFoundException MRAppMaster. (phunt via tucu)
 
+    MAPREDUCE-4002. MultiFileWordCount job fails if the input path is not
+    from default file system. (Bhallamudi Venkata Siva Kamesh via todd)
+
 Release 2.0.0-alpha - UNRELEASED
 
   INCOMPATIBLE CHANGES

Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/MultiFileWordCount.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/MultiFileWordCount.java?rev=1340629&r1=1340628&r2=1340629&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/MultiFileWordCount.java (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-examples/src/main/java/org/apache/hadoop/examples/MultiFileWordCount.java Sun May 20 07:41:37 2012
@@ -130,8 +130,8 @@ public class MultiFileWordCount extends 
     public CombineFileLineRecordReader(CombineFileSplit split,
         TaskAttemptContext context, Integer index) throws IOException {
       
-      fs = FileSystem.get(context.getConfiguration());
       this.path = split.getPath(index);
+      fs = this.path.getFileSystem(context.getConfiguration());
       this.startOffset = split.getOffset(index);
       this.end = startOffset + split.getLength(index);
       boolean skipFirstLine = false;