You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cu...@apache.org on 2007/01/10 22:49:25 UTC
svn commit: r495001 - in /lucene/hadoop/trunk: CHANGES.txt
src/java/org/apache/hadoop/mapred/InputFormatBase.java
src/test/org/apache/hadoop/mapred/TestMapRed.java
Author: cutting
Date: Wed Jan 10 13:49:24 2007
New Revision: 495001
URL: http://svn.apache.org/viewvc?view=rev&rev=495001
Log:
HADOOP-879. Fix InputFormatBase to again handle output generated by MapFileOutputFormat.
Modified:
lucene/hadoop/trunk/CHANGES.txt
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/InputFormatBase.java
lucene/hadoop/trunk/src/test/org/apache/hadoop/mapred/TestMapRed.java
Modified: lucene/hadoop/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/CHANGES.txt?view=diff&rev=495001&r1=495000&r2=495001
==============================================================================
--- lucene/hadoop/trunk/CHANGES.txt (original)
+++ lucene/hadoop/trunk/CHANGES.txt Wed Jan 10 13:49:24 2007
@@ -39,6 +39,9 @@
12. HADOOP-880. Fix S3 FileSystem to remove directories.
(Tom White via cutting)
+13. HADOOP-879. Fix InputFormatBase to handle output generated by
+ MapFileOutputFormat. (cutting)
+
Release 0.10.0 - 2007-01-05
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/InputFormatBase.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/InputFormatBase.java?view=diff&rev=495001&r1=495000&r2=495001
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/InputFormatBase.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/InputFormatBase.java Wed Jan 10 13:49:24 2007
@@ -108,9 +108,9 @@
// while generating splits
for (Path subPath : fs.listPaths(p, hiddenFileFilter)) {
FileSystem subFS = subPath.getFileSystem(job);
- if (!subFS.isFile(subPath)) {
+ if (!subFS.exists(subPath)) {
result.add(new IOException(
- "Input path is not a file : " + subPath));
+ "Input path does not exist: " + subPath));
} else {
totalFiles++;
}
Modified: lucene/hadoop/trunk/src/test/org/apache/hadoop/mapred/TestMapRed.java
URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/test/org/apache/hadoop/mapred/TestMapRed.java?view=diff&rev=495001&r1=495000&r2=495001
==============================================================================
--- lucene/hadoop/trunk/src/test/org/apache/hadoop/mapred/TestMapRed.java (original)
+++ lucene/hadoop/trunk/src/test/org/apache/hadoop/mapred/TestMapRed.java Wed Jan 10 13:49:24 2007
@@ -455,7 +455,7 @@
checkJob.setOutputPath(intermediateOuts);
checkJob.setOutputKeyClass(IntWritable.class);
checkJob.setOutputValueClass(IntWritable.class);
- checkJob.setOutputFormat(SequenceFileOutputFormat.class);
+ checkJob.setOutputFormat(MapFileOutputFormat.class);
checkJob.setReducerClass(RandomCheckReducer.class);
checkJob.setNumReduceTasks(intermediateReduces);