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 ac...@apache.org on 2008/04/16 19:35:45 UTC
svn commit: r648765 [1/2] - in /hadoop/core/branches/branch-0.17: ./
src/contrib/data_join/src/java/org/apache/hadoop/contrib/utils/join/
src/contrib/index/src/java/org/apache/hadoop/contrib/index/main/
src/contrib/index/src/java/org/apache/hadoop/cont...
Author: acmurthy
Date: Wed Apr 16 10:35:39 2008
New Revision: 648765
URL: http://svn.apache.org/viewvc?rev=648765&view=rev
Log:
Merge -r 648753:648754 from trunk to branch-0.17 to fix HADOOP-3162
Added:
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestInputPath.java
- copied unchanged from r648761, hadoop/core/trunk/src/test/org/apache/hadoop/mapred/TestInputPath.java
Modified:
hadoop/core/branches/branch-0.17/CHANGES.txt
hadoop/core/branches/branch-0.17/src/contrib/data_join/src/java/org/apache/hadoop/contrib/utils/join/DataJoinJob.java
hadoop/core/branches/branch-0.17/src/contrib/index/src/java/org/apache/hadoop/contrib/index/main/UpdateIndex.java
hadoop/core/branches/branch-0.17/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IndexUpdater.java
hadoop/core/branches/branch-0.17/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java
hadoop/core/branches/branch-0.17/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
hadoop/core/branches/branch-0.17/src/docs/src/documentation/content/xdocs/site.xml
hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/Grep.java
hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/MultiFileWordCount.java
hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/PiEstimator.java
hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/SleepJob.java
hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/Sort.java
hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/WordCount.java
hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/dancing/DistributedPentomino.java
hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/FileInputFormat.java
hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/JobConf.java
hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/jobcontrol/Job.java
hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/join/Parser.java
hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorJob.java
hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/pipes/Submitter.java
hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/tools/Logalyzer.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/conf/TestJobConf.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/dfs/NNBench.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/fs/DFSCIOTest.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/fs/DistributedFSCheck.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/fs/TestDFSIO.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/fs/TestFileSystem.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/io/FileBench.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/BigMapOutput.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/GenericMRLoadGenerator.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/MRBench.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/MRCaching.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/NotificationTestCase.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/PiEstimator.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/SortValidator.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestClusterMapReduceTestCase.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestComparators.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestEmptyJobWithDFS.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestFieldSelection.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestFileInputFormatPathFilter.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestJavaSerialization.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestJobStatusPersistency.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMapOutputType.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMapRed.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMiniMRClasspath.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMiniMRMapRedDebugScript.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMiniMRTaskTempDir.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMiniMRWithDFS.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMultiFileInputFormat.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestRackAwareTaskPlacement.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSequenceFileAsBinaryInputFormat.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSequenceFileAsTextInputFormat.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSequenceFileInputFilter.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSequenceFileInputFormat.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSpecialCharactersInOutputPath.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestTextInputFormat.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/ThreadedMapBenchmark.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/jobcontrol/JobControlTestUtils.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/lib/TestMultithreadedMapRunner.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/lib/aggregate/TestAggregates.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/pipes/TestPipes.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/pipes/WordCountInputFormat.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/record/TestRecordMR.java
hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/record/TestRecordWritable.java
hadoop/core/branches/branch-0.17/src/test/testshell/ExternalMapReduce.java
Modified: hadoop/core/branches/branch-0.17/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/CHANGES.txt?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/CHANGES.txt (original)
+++ hadoop/core/branches/branch-0.17/CHANGES.txt Wed Apr 16 10:35:39 2008
@@ -579,6 +579,9 @@
HADOOP-3256. Encodes the job name used in the filename for history files.
(Arun Murthy via ddas)
+ HADOOP-3162. Ensure that comma-separated input paths are treated correctly
+ as multiple input paths. (Amareshwari Sri Ramadasu via acmurthy)
+
Release 0.16.3 - 2008-04-16
BUG FIXES
Modified: hadoop/core/branches/branch-0.17/src/contrib/data_join/src/java/org/apache/hadoop/contrib/utils/join/DataJoinJob.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/contrib/data_join/src/java/org/apache/hadoop/contrib/utils/join/DataJoinJob.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/contrib/data_join/src/java/org/apache/hadoop/contrib/utils/join/DataJoinJob.java (original)
+++ hadoop/core/branches/branch-0.17/src/contrib/data_join/src/java/org/apache/hadoop/contrib/utils/join/DataJoinJob.java Wed Apr 16 10:35:39 2008
@@ -28,6 +28,7 @@
import org.apache.hadoop.mapred.FileOutputFormat;
import org.apache.hadoop.mapred.JobClient;
import org.apache.hadoop.mapred.JobConf;
+import org.apache.hadoop.mapred.FileInputFormat;
import org.apache.hadoop.mapred.RunningJob;
import org.apache.hadoop.mapred.SequenceFileInputFormat;
import org.apache.hadoop.mapred.SequenceFileOutputFormat;
@@ -92,11 +93,7 @@
FileSystem fs = FileSystem.get(defaults);
fs.delete(new Path(outputDir));
- String[] inputDirsSpecs = inputDir.split(",");
- for (int i = 0; i < inputDirsSpecs.length; i++) {
- String spec = inputDirsSpecs[i];
- job.addInputPath(new Path(spec));
- }
+ FileInputFormat.setInputPaths(job, inputDir);
job.setInputFormat(inputFormat);
Modified: hadoop/core/branches/branch-0.17/src/contrib/index/src/java/org/apache/hadoop/contrib/index/main/UpdateIndex.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/contrib/index/src/java/org/apache/hadoop/contrib/index/main/UpdateIndex.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/contrib/index/src/java/org/apache/hadoop/contrib/index/main/UpdateIndex.java (original)
+++ hadoop/core/branches/branch-0.17/src/contrib/index/src/java/org/apache/hadoop/contrib/index/main/UpdateIndex.java Wed Apr 16 10:35:39 2008
@@ -33,6 +33,7 @@
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.FileOutputFormat;
import org.apache.hadoop.mapred.JobConf;
+import org.apache.hadoop.mapred.FileInputFormat;
import org.apache.hadoop.util.ReflectionUtils;
/**
@@ -205,7 +206,7 @@
if (inputPathsString != null) {
jobConf.set("mapred.input.dir", inputPathsString);
}
- inputPaths = jobConf.getInputPaths();
+ inputPaths = FileInputFormat.getInputPaths(jobConf);
if (inputPaths.length == 0) {
inputPaths = null;
}
Modified: hadoop/core/branches/branch-0.17/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IndexUpdater.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IndexUpdater.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IndexUpdater.java (original)
+++ hadoop/core/branches/branch-0.17/src/contrib/index/src/java/org/apache/hadoop/contrib/index/mapred/IndexUpdater.java Wed Apr 16 10:35:39 2008
@@ -27,6 +27,7 @@
import org.apache.hadoop.contrib.index.lucene.LuceneUtil;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.mapred.FileInputFormat;
import org.apache.hadoop.mapred.FileOutputFormat;
import org.apache.hadoop.mapred.JobClient;
import org.apache.hadoop.mapred.JobConf;
@@ -75,11 +76,7 @@
+ System.currentTimeMillis());
// provided by application
- jobConf.setInputPath(inputPaths[0]);
- for (int i = 1; i < inputPaths.length; i++) {
- jobConf.addInputPath(inputPaths[i]);
- }
-
+ FileInputFormat.setInputPaths(jobConf, inputPaths);
FileOutputFormat.setOutputPath(jobConf, outputPath);
jobConf.setNumMapTasks(numMapTasks);
@@ -89,7 +86,7 @@
jobConf.setInputFormat(iconf.getIndexInputFormatClass());
- Path[] inputs = jobConf.getInputPaths();
+ Path[] inputs = FileInputFormat.getInputPaths(jobConf);
StringBuilder buffer = new StringBuilder(inputs[0].toString());
for (int i = 1; i < inputs.length; i++) {
buffer.append(",");
Modified: hadoop/core/branches/branch-0.17/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java (original)
+++ hadoop/core/branches/branch-0.17/src/contrib/streaming/src/java/org/apache/hadoop/streaming/StreamJob.java Wed Apr 16 10:35:39 2008
@@ -52,6 +52,7 @@
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.FileAlreadyExistsException;
+import org.apache.hadoop.mapred.FileInputFormat;
import org.apache.hadoop.mapred.FileOutputFormat;
import org.apache.hadoop.mapred.InvalidJobConfException;
import org.apache.hadoop.mapred.JobConf;
@@ -687,7 +688,8 @@
// (to resolve local vs. dfs drive letter differences)
// (mapred.working.dir will be lazily initialized ONCE and depends on FS)
for (int i = 0; i < inputSpecs_.size(); i++) {
- jobConf_.addInputPath(new Path(((String) inputSpecs_.get(i))));
+ FileInputFormat.addInputPaths(jobConf_,
+ (String) inputSpecs_.get(i));
}
jobConf_.set("stream.numinputspecs", "" + inputSpecs_.size());
Modified: hadoop/core/branches/branch-0.17/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml (original)
+++ hadoop/core/branches/branch-0.17/src/docs/src/documentation/content/xdocs/mapred_tutorial.xml Wed Apr 16 10:35:39 2008
@@ -503,7 +503,7 @@
<td>52.</td>
<td>
- <code>conf.setInputPath(new Path(args[0]));</code>
+ <code>FileInputFormat.setInputPaths(conf, new Path(args[0]));</code>
</td>
</tr>
<tr>
@@ -1000,7 +1000,10 @@
<code>Reducer</code>, <code>InputFormat</code> and
<code>OutputFormat</code> implementations. <code>JobConf</code> also
indicates the set of input files
- (<a href="ext:api/org/apache/hadoop/mapred/jobconf/setinputpath">setInputPath(Path)</a>/<a href="ext:api/org/apache/hadoop/mapred/jobconf/addinputpath">addInputPath(Path)</a>)
+ (<a href="ext:api/org/apache/hadoop/mapred/fileinputformat/setinputpaths">setInputPaths(JobConf, Path...)</a>
+ /<a href="ext:api/org/apache/hadoop/mapred/fileinputformat/addinputpath">addInputPath(JobConf, Path)</a>)
+ and (<a href="ext:api/org/apache/hadoop/mapred/fileinputformat/setinputpathstring">setInputPaths(JobConf, String)</a>
+ /<a href="ext:api/org/apache/hadoop/mapred/fileinputformat/addinputpathstring">addInputPaths(JobConf, String)</a>)
and where the output files should be written
(<a href="ext:api/org/apache/hadoop/mapred/fileoutputformat/setoutputpath">setOutputPath(Path)</a>).</p>
@@ -2388,7 +2391,7 @@
<td>111.</td>
<td>
- <code>conf.setInputPath(new Path(other_args.get(0)));</code>
+ <code>FileInputFormat.setInputPaths(conf, new Path(other_args.get(0)));</code>
</td>
</tr>
<tr>
Modified: hadoop/core/branches/branch-0.17/src/docs/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/docs/src/documentation/content/xdocs/site.xml?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/docs/src/documentation/content/xdocs/site.xml (original)
+++ hadoop/core/branches/branch-0.17/src/docs/src/documentation/content/xdocs/site.xml Wed Apr 16 10:35:39 2008
@@ -125,7 +125,12 @@
<mapred href="mapred/">
<clusterstatus href="ClusterStatus.html" />
<counters href="Counters.html" />
- <fileinputformat href="FileInputFormat.html" />
+ <fileinputformat href="FileInputFormat.html">
+ <setinputpaths href="#setInputPaths(org.apache.hadoop.mapred.JobConf,%20org.apache.hadoop.fs.Path[])" />
+ <addinputpath href="#addInputPath(org.apache.hadoop.mapred.JobConf,%20org.apache.hadoop.fs.Path)" />
+ <setinputpathstring href="#setInputPaths(org.apache.hadoop.mapred.JobConf,%20java.lang.String)" />
+ <addinputpathstring href="#addInputPath(org.apache.hadoop.mapred.JobConf,%20java.lang.String)" />
+ </fileinputformat>
<fileoutputformat href="FileInputFormat.html">
<getoutputpath href="#getOutputPath(org.apache.hadoop.mapred.JobConf)" />
<getworkoutputpath href="#getWorkOutputPath(org.apache.hadoop.mapred.JobConf)" />
@@ -144,8 +149,6 @@
<setnumreducetasks href="#setNumReduceTasks(int)" />
<setoutputkeycomparatorclass href="#setOutputKeyComparatorClass(java.lang.Class)" />
<setoutputvaluegroupingcomparator href="#setOutputValueGroupingComparator(java.lang.Class)" />
- <setinputpath href="#setInputPath(org.apache.hadoop.fs.Path)" />
- <addinputpath href="#addInputPath(org.apache.hadoop.fs.Path)" />
<setcombinerclass href="#setCombinerClass(java.lang.Class)" />
<setmapdebugscript href="#setMapDebugScript(java.lang.String)" />
<setreducedebugscript href="#setReduceDebugScript(java.lang.String)" />
Modified: hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/Grep.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/Grep.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/Grep.java (original)
+++ hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/Grep.java Wed Apr 16 10:35:39 2008
@@ -51,7 +51,7 @@
grepJob.setJobName("grep-search");
- grepJob.setInputPath(new Path(args[0]));
+ FileInputFormat.setInputPaths(grepJob, args[0]);
grepJob.setMapperClass(RegexMapper.class);
grepJob.set("mapred.mapper.regex", args[2]);
@@ -71,7 +71,7 @@
JobConf sortJob = new JobConf(Grep.class);
sortJob.setJobName("grep-sort");
- sortJob.setInputPath(tempDir);
+ FileInputFormat.setInputPaths(sortJob, tempDir);
sortJob.setInputFormat(SequenceFileInputFormat.class);
sortJob.setMapperClass(InverseMapper.class);
Modified: hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/MultiFileWordCount.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/MultiFileWordCount.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/MultiFileWordCount.java (original)
+++ hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/MultiFileWordCount.java Wed Apr 16 10:35:39 2008
@@ -33,6 +33,7 @@
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.WritableComparable;
+import org.apache.hadoop.mapred.FileInputFormat;
import org.apache.hadoop.mapred.FileOutputFormat;
import org.apache.hadoop.mapred.InputSplit;
import org.apache.hadoop.mapred.JobClient;
@@ -250,7 +251,7 @@
job.setCombinerClass(WordCount.Reduce.class);
job.setReducerClass(WordCount.Reduce.class);
- job.addInputPath(new Path(args[0]));
+ FileInputFormat.addInputPaths(job, args[0]);
FileOutputFormat.setOutputPath(job, new Path(args[1]));
JobClient.runJob(job);
Modified: hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/PiEstimator.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/PiEstimator.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/PiEstimator.java (original)
+++ hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/PiEstimator.java Wed Apr 16 10:35:39 2008
@@ -31,6 +31,7 @@
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.io.SequenceFile.CompressionType;
+import org.apache.hadoop.mapred.FileInputFormat;
import org.apache.hadoop.mapred.FileOutputFormat;
import org.apache.hadoop.mapred.JobClient;
import org.apache.hadoop.mapred.JobConf;
@@ -189,7 +190,7 @@
throw new IOException("Mkdirs failed to create " + inDir.toString());
}
- jobConf.setInputPath(inDir);
+ FileInputFormat.setInputPaths(jobConf, inDir);
FileOutputFormat.setOutputPath(jobConf, outDir);
jobConf.setNumMapTasks(numMaps);
Modified: hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/SleepJob.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/SleepJob.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/SleepJob.java (original)
+++ hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/SleepJob.java Wed Apr 16 10:35:39 2008
@@ -27,6 +27,7 @@
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.SequenceFile;
+import org.apache.hadoop.mapred.FileInputFormat;
import org.apache.hadoop.mapred.JobClient;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.Mapper;
@@ -146,7 +147,7 @@
job.setInputFormat(SequenceFileInputFormat.class);
job.setSpeculativeExecution(false);
job.setJobName("Sleep job");
- job.addInputPath(tempPath);
+ FileInputFormat.addInputPath(job, tempPath);
job.setLong("sleep.job.map.sleep.time", mapSleepTime);
job.setLong("sleep.job.reduce.sleep.time", reduceSleepTime);
job.setLong("sleep.job.map.sleep.count", mapSleepCount);
Modified: hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/Sort.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/Sort.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/Sort.java (original)
+++ hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/Sort.java Wed Apr 16 10:35:39 2008
@@ -133,13 +133,13 @@
otherArgs.size() + " instead of 2.");
return printUsage();
}
- jobConf.setInputPath(new Path(otherArgs.get(0)));
+ FileInputFormat.setInputPaths(jobConf, otherArgs.get(0));
FileOutputFormat.setOutputPath(jobConf, new Path(otherArgs.get(1)));
System.out.println("Running on " +
cluster.getTaskTrackers() +
" nodes to sort from " +
- jobConf.getInputPaths()[0] + " into " +
+ FileInputFormat.getInputPaths(jobConf)[0] + " into " +
FileOutputFormat.getOutputPath(jobConf) +
" with " + num_reduces + " reduces.");
Date startTime = new Date();
Modified: hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/WordCount.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/WordCount.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/WordCount.java (original)
+++ hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/WordCount.java Wed Apr 16 10:35:39 2008
@@ -30,6 +30,7 @@
import org.apache.hadoop.io.IntWritable;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.Text;
+import org.apache.hadoop.mapred.FileInputFormat;
import org.apache.hadoop.mapred.FileOutputFormat;
import org.apache.hadoop.mapred.JobClient;
import org.apache.hadoop.mapred.JobConf;
@@ -142,7 +143,7 @@
other_args.size() + " instead of 2.");
return printUsage();
}
- conf.setInputPath(new Path(other_args.get(0)));
+ FileInputFormat.setInputPaths(conf, other_args.get(0));
FileOutputFormat.setOutputPath(conf, new Path(other_args.get(1)));
JobClient.runJob(conf);
Modified: hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/dancing/DistributedPentomino.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/dancing/DistributedPentomino.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/dancing/DistributedPentomino.java (original)
+++ hadoop/core/branches/branch-0.17/src/examples/org/apache/hadoop/examples/dancing/DistributedPentomino.java Wed Apr 16 10:35:39 2008
@@ -177,7 +177,7 @@
Path input = new Path(output + "_input");
FileSystem fileSys = FileSystem.get(conf);
try {
- conf.setInputPath(input);
+ FileInputFormat.setInputPaths(conf, input);
FileOutputFormat.setOutputPath(conf, output);
conf.setJarByClass(PentMap.class);
Modified: hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/FileInputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/FileInputFormat.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/FileInputFormat.java (original)
+++ hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/FileInputFormat.java Wed Apr 16 10:35:39 2008
@@ -32,6 +32,7 @@
import org.apache.hadoop.fs.FileStatus;
import org.apache.hadoop.fs.BlockLocation;
import org.apache.hadoop.util.ReflectionUtils;
+import org.apache.hadoop.util.StringUtils;
/**
* A base class for file-based {@link InputFormat}.
@@ -136,7 +137,7 @@
*/
protected Path[] listPaths(JobConf job)
throws IOException {
- Path[] dirs = job.getInputPaths();
+ Path[] dirs = getInputPaths(job);
if (dirs.length == 0) {
throw new IOException("No input paths specified in job");
}
@@ -167,7 +168,7 @@
}
public void validateInput(JobConf job) throws IOException {
- Path[] inputDirs = job.getInputPaths();
+ Path[] inputDirs = getInputPaths(job);
if (inputDirs.length == 0) {
throw new IOException("No input paths specified in input");
}
@@ -285,4 +286,121 @@
}
return 0;
}
+
+ /**
+ * Sets the given comma separated paths as the list of inputs
+ * for the map-reduce job.
+ *
+ * @param conf Configuration of the job
+ * @param commaSeparatedPaths Comma separated paths to be set as
+ * the list of inputs for the map-reduce job.
+ */
+ public static void setInputPaths(JobConf conf, String commaSeparatedPaths) {
+ setInputPaths(conf, StringUtils.stringToPath(
+ getPathStrings(commaSeparatedPaths)));
+ }
+
+ /**
+ * Add the given comma separated paths to the list of inputs for
+ * the map-reduce job.
+ *
+ * @param conf The configuration of the job
+ * @param commaSeparatedPaths Comma separated paths to be added to
+ * the list of inputs for the map-reduce job.
+ */
+ public static void addInputPaths(JobConf conf, String commaSeparatedPaths) {
+ for (String str : getPathStrings(commaSeparatedPaths)) {
+ addInputPath(conf, new Path(str));
+ }
+ }
+
+ /**
+ * Set the array of {@link Path}s as the list of inputs
+ * for the map-reduce job.
+ *
+ * @param conf Configuration of the job.
+ * @param inputPaths the {@link Path}s of the input directories/files
+ * for the map-reduce job.
+ */
+ public static void setInputPaths(JobConf conf, Path... inputPaths) {
+ Path path = new Path(conf.getWorkingDirectory(), inputPaths[0]);
+ StringBuffer str = new StringBuffer(StringUtils.escapeString(path.toString()));
+ for(int i = 1; i < inputPaths.length;i++) {
+ str.append(StringUtils.COMMA_STR);
+ path = new Path(conf.getWorkingDirectory(), inputPaths[i]);
+ str.append(StringUtils.escapeString(path.toString()));
+ }
+ conf.set("mapred.input.dir", str.toString());
+ }
+
+ /**
+ * Add a {@link Path} to the list of inputs for the map-reduce job.
+ *
+ * @param conf The configuration of the job
+ * @param path {@link Path} to be added to the list of inputs for
+ * the map-reduce job.
+ */
+ public static void addInputPath(JobConf conf, Path path ) {
+ path = new Path(conf.getWorkingDirectory(), path);
+ String dirStr = StringUtils.escapeString(path.toString());
+ String dirs = conf.get("mapred.input.dir");
+ conf.set("mapred.input.dir", dirs == null ? dirStr :
+ dirs + StringUtils.COMMA_STR + dirStr);
+ }
+
+ // This method escapes commas in the glob pattern of the given paths.
+ private static String[] getPathStrings(String commaSeparatedPaths) {
+ int length = commaSeparatedPaths.length();
+ int curlyOpen = 0;
+ int pathStart = 0;
+ boolean globPattern = false;
+ List<String> pathStrings = new ArrayList<String>();
+
+ for (int i=0; i<length; i++) {
+ char ch = commaSeparatedPaths.charAt(i);
+ switch(ch) {
+ case '{' : {
+ curlyOpen++;
+ if (!globPattern) {
+ globPattern = true;
+ }
+ break;
+ }
+ case '}' : {
+ curlyOpen--;
+ if (curlyOpen == 0 && globPattern) {
+ globPattern = false;
+ }
+ break;
+ }
+ case ',' : {
+ if (!globPattern) {
+ pathStrings.add(commaSeparatedPaths.substring(pathStart, i));
+ pathStart = i + 1 ;
+ }
+ break;
+ }
+ }
+ }
+ pathStrings.add(commaSeparatedPaths.substring(pathStart, length));
+
+ return pathStrings.toArray(new String[0]);
+ }
+
+ /**
+ * Get the list of input {@link Path}s for the map-reduce job.
+ *
+ * @param conf The configuration of the job
+ * @return the list of input {@link Path}s for the map-reduce job.
+ */
+ public static Path[] getInputPaths(JobConf conf) {
+ String dirs = conf.get("mapred.input.dir", "");
+ String [] list = StringUtils.split(dirs);
+ Path[] result = new Path[list.length];
+ for (int i = 0; i < list.length; i++) {
+ result[i] = new Path(StringUtils.unEscapeString(list[i]));
+ }
+ return result;
+ }
+
}
Modified: hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/JobConf.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/JobConf.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/JobConf.java (original)
+++ hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/JobConf.java Wed Apr 16 10:35:39 2008
@@ -21,10 +21,10 @@
import java.io.IOException;
-import java.util.StringTokenizer;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Enumeration;
+import java.util.StringTokenizer;
import java.net.URL;
import java.net.URLDecoder;
@@ -45,7 +45,6 @@
import org.apache.hadoop.mapred.lib.IdentityReducer;
import org.apache.hadoop.mapred.lib.HashPartitioner;
import org.apache.hadoop.util.ReflectionUtils;
-import org.apache.hadoop.util.StringUtils;
import org.apache.hadoop.util.Tool;
/**
@@ -70,10 +69,7 @@
*
* <p><code>JobConf</code> typically specifies the {@link Mapper}, combiner
* (if any), {@link Partitioner}, {@link Reducer}, {@link InputFormat} and
- * {@link OutputFormat} implementations to be used etc. It also indicates the
- * set of input files ({@link #setInputPath(Path)}/{@link #addInputPath(Path)}),
- * and where the output files should be written via
- * {@link FileOutputFormat#setOutputPath(JobConf, Path)}.
+ * {@link OutputFormat} implementations to be used etc.
*
* <p>Optionally <code>JobConf</code> is used to specify other advanced facets
* of the job such as <code>Comparator</code>s to be used, files to be put in
@@ -91,7 +87,7 @@
* // Specify various job-specific parameters
* job.setJobName("myjob");
*
- * job.setInputPath(new Path("in"));
+ * FileInputFormat.setInputPaths(job, new Path("in"));
* FileOutputFormat.setOutputPath(job, new Path("out"));
*
* job.setMapperClass(MyJob.MyMapper.class);
@@ -228,10 +224,13 @@
* Set the {@link Path} of the input directory for the map-reduce job.
*
* @param dir the {@link Path} of the input directory for the map-reduce job.
+ * @deprecated Use {@link FileInputFormat#setInputPaths(JobConf, Path...)} or
+ * {@link FileInputFormat#setInputPaths(JobConf, String)}
*/
+ @Deprecated
public void setInputPath(Path dir) {
dir = new Path(getWorkingDirectory(), dir);
- set("mapred.input.dir", StringUtils.escapeString(dir.toString()));
+ set("mapred.input.dir", dir.toString());
}
/**
@@ -239,26 +238,29 @@
*
* @param dir {@link Path} to be added to the list of inputs for
* the map-reduce job.
+ * @deprecated Use {@link FileInputFormat#addInputPath(JobConf, Path)} or
+ * {@link FileInputFormat#addInputPaths(JobConf, String)}
*/
+ @Deprecated
public void addInputPath(Path dir) {
dir = new Path(getWorkingDirectory(), dir);
- String dirStr = StringUtils.escapeString(dir.toString());
String dirs = get("mapred.input.dir");
- set("mapred.input.dir", dirs == null ? dirStr :
- dirs + StringUtils.COMMA_STR + dirStr);
+ set("mapred.input.dir", dirs == null ? dir.toString() : dirs + "," + dir);
}
/**
* Get the list of input {@link Path}s for the map-reduce job.
*
* @return the list of input {@link Path}s for the map-reduce job.
+ * @deprecated Use {@link FileInputFormat#getInputPaths(JobConf)}
*/
+ @Deprecated
public Path[] getInputPaths() {
String dirs = get("mapred.input.dir", "");
- String [] list = StringUtils.split(dirs);
- Path[] result = new Path[list.length];
- for (int i = 0; i < list.length; i++) {
- result[i] = new Path(StringUtils.unEscapeString(list[i]));
+ ArrayList<Object> list = Collections.list(new StringTokenizer(dirs, ","));
+ Path[] result = new Path[list.size()];
+ for (int i = 0; i < list.size(); i++) {
+ result[i] = new Path((String)list.get(i));
}
return result;
}
Modified: hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/jobcontrol/Job.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/jobcontrol/Job.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/jobcontrol/Job.java (original)
+++ hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/jobcontrol/Job.java Wed Apr 16 10:35:39 2008
@@ -19,6 +19,7 @@
package org.apache.hadoop.mapred.jobcontrol;
+import org.apache.hadoop.mapred.FileInputFormat;
import org.apache.hadoop.mapred.JobClient;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.RunningJob;
@@ -332,7 +333,7 @@
try {
if (theJobConf.getBoolean("create.empty.dir.if.nonexist", false)) {
FileSystem fs = FileSystem.get(theJobConf);
- Path inputPaths[] = theJobConf.getInputPaths();
+ Path inputPaths[] = FileInputFormat.getInputPaths(theJobConf);
for (int i = 0; i < inputPaths.length; i++) {
if (!fs.exists(inputPaths[i])) {
try {
Modified: hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/join/Parser.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/join/Parser.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/join/Parser.java (original)
+++ hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/join/Parser.java Wed Apr 16 10:35:39 2008
@@ -34,6 +34,7 @@
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.WritableComparator;
+import org.apache.hadoop.mapred.FileInputFormat;
import org.apache.hadoop.mapred.InputFormat;
import org.apache.hadoop.mapred.InputSplit;
import org.apache.hadoop.mapred.JobConf;
@@ -291,7 +292,7 @@
private JobConf getConf(JobConf job) {
JobConf conf = new JobConf(job);
- conf.setInputPath(new Path(indir));
+ FileInputFormat.setInputPaths(conf, indir);
return conf;
}
Modified: hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorJob.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorJob.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorJob.java (original)
+++ hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorJob.java Wed Apr 16 10:35:39 2008
@@ -24,6 +24,7 @@
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
+import org.apache.hadoop.mapred.FileInputFormat;
import org.apache.hadoop.mapred.FileOutputFormat;
import org.apache.hadoop.mapred.InputFormat;
import org.apache.hadoop.mapred.JobClient;
@@ -161,10 +162,7 @@
}
theJob.setJobName("ValueAggregatorJob: " + jobName);
- String[] inputDirsSpecs = inputDir.split(",");
- for (int i = 0; i < inputDirsSpecs.length; i++) {
- theJob.addInputPath(new Path(inputDirsSpecs[i]));
- }
+ FileInputFormat.addInputPaths(theJob, inputDir);
theJob.setInputFormat(theInputFormat);
Modified: hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/pipes/Submitter.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/pipes/Submitter.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/pipes/Submitter.java (original)
+++ hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/mapred/pipes/Submitter.java Wed Apr 16 10:35:39 2008
@@ -36,6 +36,7 @@
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.Text;
+import org.apache.hadoop.mapred.FileInputFormat;
import org.apache.hadoop.mapred.FileOutputFormat;
import org.apache.hadoop.mapred.InputFormat;
import org.apache.hadoop.mapred.JobClient;
@@ -354,7 +355,8 @@
conf.addResource(new Path((String) results.getValue("-conf")));
}
if (results.hasOption("-input")) {
- conf.setInputPath(new Path((String) results.getValue("-input")));
+ FileInputFormat.setInputPaths(conf,
+ (String) results.getValue("-input"));
}
if (results.hasOption("-output")) {
FileOutputFormat.setOutputPath(conf,
Modified: hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/tools/Logalyzer.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/tools/Logalyzer.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/tools/Logalyzer.java (original)
+++ hadoop/core/branches/branch-0.17/src/java/org/apache/hadoop/tools/Logalyzer.java Wed Apr 16 10:35:39 2008
@@ -35,6 +35,7 @@
import org.apache.hadoop.io.Text;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.io.WritableComparator;
+import org.apache.hadoop.mapred.FileInputFormat;
import org.apache.hadoop.mapred.FileOutputFormat;
import org.apache.hadoop.mapred.JobClient;
import org.apache.hadoop.mapred.JobConf;
@@ -213,7 +214,7 @@
JobConf grepJob = new JobConf(fsConfig);
grepJob.setJobName("logalyzer-grep-sort");
- grepJob.setInputPath(grepInput);
+ FileInputFormat.setInputPaths(grepJob, grepInput);
grepJob.setInputFormat(TextInputFormat.class);
grepJob.setMapperClass(LogRegexMapper.class);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/conf/TestJobConf.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/conf/TestJobConf.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/conf/TestJobConf.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/conf/TestJobConf.java Wed Apr 16 10:35:39 2008
@@ -20,9 +20,7 @@
import junit.framework.Assert;
import junit.framework.TestCase;
-import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.JobConf;
-import org.apache.hadoop.util.StringUtils;
public class TestJobConf extends TestCase {
@@ -50,41 +48,5 @@
configuration.set("mapred.task.profile.params", "test");
Assert.assertEquals("test", configuration.getProfileParams());
- }
-
- public void testInputPath() throws Exception {
- JobConf jobConf = new JobConf();
- Path path = new Path(jobConf.getWorkingDirectory(),
- "xx{y"+StringUtils.COMMA_STR+"z}");
- jobConf.setInputPath(path);
- Path[] paths = jobConf.getInputPaths();
- assertEquals(1, paths.length);
- assertEquals(path.toString(), paths[0].toString());
-
- StringBuilder pathStr = new StringBuilder();
- pathStr.append(StringUtils.ESCAPE_CHAR);
- pathStr.append(StringUtils.ESCAPE_CHAR);
- pathStr.append(StringUtils.COMMA);
- pathStr.append(StringUtils.COMMA);
- pathStr.append('a');
- path = new Path(jobConf.getWorkingDirectory(), pathStr.toString());
- jobConf.setInputPath(path);
- paths = jobConf.getInputPaths();
- assertEquals(1, paths.length);
- assertEquals(path.toString(), paths[0].toString());
-
- pathStr.setLength(0);
- pathStr.append(StringUtils.ESCAPE_CHAR);
- pathStr.append("xx");
- pathStr.append(StringUtils.ESCAPE_CHAR);
- path = new Path(jobConf.getWorkingDirectory(), pathStr.toString());
- Path path1 = new Path(jobConf.getWorkingDirectory(),
- "yy"+StringUtils.COMMA_STR+"zz");
- jobConf.setInputPath(path);
- jobConf.addInputPath(path1);
- paths = jobConf.getInputPaths();
- assertEquals(2, paths.length);
- assertEquals(path.toString(), paths[0].toString());
- assertEquals(path1.toString(), paths[1].toString());
}
}
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/dfs/NNBench.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/dfs/NNBench.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/dfs/NNBench.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/dfs/NNBench.java Wed Apr 16 10:35:39 2008
@@ -47,6 +47,7 @@
import org.apache.hadoop.io.SequenceFile.CompressionType;
import org.apache.hadoop.io.SequenceFile;
+import org.apache.hadoop.mapred.FileInputFormat;
import org.apache.hadoop.mapred.FileOutputFormat;
import org.apache.hadoop.mapred.Mapper;
import org.apache.hadoop.mapred.SequenceFileInputFormat;
@@ -464,7 +465,7 @@
JobConf job = new JobConf(config, NNBench.class);
job.setJobName("NNBench-" + operation);
- job.setInputPath(new Path(baseDir, CONTROL_DIR_NAME));
+ FileInputFormat.setInputPaths(job, new Path(baseDir, CONTROL_DIR_NAME));
job.setInputFormat(SequenceFileInputFormat.class);
// Explicitly set number of max map attempts to 1.
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/fs/DFSCIOTest.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/fs/DFSCIOTest.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/fs/DFSCIOTest.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/fs/DFSCIOTest.java Wed Apr 16 10:35:39 2008
@@ -267,7 +267,7 @@
) throws IOException {
JobConf job = new JobConf(fsConfig, DFSCIOTest.class);
- job.setInputPath(CONTROL_DIR);
+ FileInputFormat.setInputPaths(job, CONTROL_DIR);
job.setInputFormat(SequenceFileInputFormat.class);
job.setMapperClass(mapperClass);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/fs/DistributedFSCheck.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/fs/DistributedFSCheck.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/fs/DistributedFSCheck.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/fs/DistributedFSCheck.java Wed Apr 16 10:35:39 2008
@@ -188,7 +188,7 @@
private void runDistributedFSCheck() throws Exception {
JobConf job = new JobConf(fs.getConf(), DistributedFSCheck.class);
- job.setInputPath(MAP_INPUT_DIR);
+ FileInputFormat.setInputPaths(job, MAP_INPUT_DIR);
job.setInputFormat(SequenceFileInputFormat.class);
job.setMapperClass(DistributedFSCheckMapper.class);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/fs/TestDFSIO.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/fs/TestDFSIO.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/fs/TestDFSIO.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/fs/TestDFSIO.java Wed Apr 16 10:35:39 2008
@@ -223,7 +223,7 @@
) throws IOException {
JobConf job = new JobConf(fsConfig, TestDFSIO.class);
- job.setInputPath(CONTROL_DIR);
+ FileInputFormat.setInputPaths(job, CONTROL_DIR);
job.setInputFormat(SequenceFileInputFormat.class);
job.setMapperClass(mapperClass);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/fs/TestFileSystem.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/fs/TestFileSystem.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/fs/TestFileSystem.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/fs/TestFileSystem.java Wed Apr 16 10:35:39 2008
@@ -38,6 +38,7 @@
import org.apache.hadoop.io.UTF8;
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.io.SequenceFile.CompressionType;
+import org.apache.hadoop.mapred.FileInputFormat;
import org.apache.hadoop.mapred.FileOutputFormat;
import org.apache.hadoop.mapred.JobClient;
import org.apache.hadoop.mapred.JobConf;
@@ -222,7 +223,7 @@
JobConf job = new JobConf(conf, TestFileSystem.class);
job.setBoolean("fs.test.fastCheck", fastCheck);
- job.setInputPath(CONTROL_DIR);
+ FileInputFormat.setInputPaths(job, CONTROL_DIR);
job.setInputFormat(SequenceFileInputFormat.class);
job.setMapperClass(WriteMapper.class);
@@ -320,7 +321,7 @@
job.setBoolean("fs.test.fastCheck", fastCheck);
- job.setInputPath(CONTROL_DIR);
+ FileInputFormat.setInputPaths(job, CONTROL_DIR);
job.setInputFormat(SequenceFileInputFormat.class);
job.setMapperClass(ReadMapper.class);
@@ -416,7 +417,7 @@
JobConf job = new JobConf(conf, TestFileSystem.class);
job.setBoolean("fs.test.fastCheck", fastCheck);
- job.setInputPath(CONTROL_DIR);
+ FileInputFormat.setInputPaths(job,CONTROL_DIR);
job.setInputFormat(SequenceFileInputFormat.class);
job.setMapperClass(SeekMapper.class);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/io/FileBench.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/io/FileBench.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/io/FileBench.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/io/FileBench.java Wed Apr 16 10:35:39 2008
@@ -134,7 +134,7 @@
static long readBench(JobConf conf) throws IOException {
InputFormat inf = conf.getInputFormat();
final String fn = conf.get("test.filebench.name", "");
- Path pin = new Path(conf.getInputPaths()[0], fn);
+ Path pin = new Path(FileInputFormat.getInputPaths(conf)[0], fn);
FileStatus in = pin.getFileSystem(conf).getFileStatus(pin);
RecordReader rr = inf.getRecordReader(new FileSplit(pin, 0, in.getLen(),
(String[])null), conf, Reporter.NULL);
@@ -197,7 +197,7 @@
fillBlocks(job);
job.setOutputKeyClass(Text.class);
job.setOutputValueClass(Text.class);
- job.setInputPath(root);
+ FileInputFormat.setInputPaths(job, root);
FileOutputFormat.setOutputPath(job, root);
if (null == cc) cc = EnumSet.allOf(CCodec.class);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/BigMapOutput.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/BigMapOutput.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/BigMapOutput.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/BigMapOutput.java Wed Apr 16 10:35:39 2008
@@ -131,7 +131,7 @@
jobConf.setJobName("BigMapOutput");
jobConf.setInputFormat(NonSplitableSequenceFileInputFormat.class);
jobConf.setOutputFormat(SequenceFileOutputFormat.class);
- jobConf.setInputPath(bigMapInput);
+ FileInputFormat.setInputPaths(jobConf, bigMapInput);
if (fs.exists(outputPath)) {
fs.delete(outputPath, true);
}
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/GenericMRLoadGenerator.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/GenericMRLoadGenerator.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/GenericMRLoadGenerator.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/GenericMRLoadGenerator.java Wed Apr 16 10:35:39 2008
@@ -111,7 +111,7 @@
} else if ("-outdir".equals(argv[i])) {
FileOutputFormat.setOutputPath(job, new Path(argv[++i]));
} else if ("-indir".equals(argv[i])) {
- job.addInputPath(new Path(argv[++i]));
+ FileInputFormat.addInputPaths(job, argv[++i]);
} else if ("-inFormatIndirect".equals(argv[i])) {
job.setClass("mapred.indirect.input.format",
Class.forName(argv[++i]).asSubclass(InputFormat.class),
@@ -145,7 +145,7 @@
job.setOutputFormat(NullOutputFormat.class);
}
- if (0 == job.getInputPaths().length) {
+ if (0 == FileInputFormat.getInputPaths(job).length) {
// No input dir? Generate random data
System.err.println("No input path; ignoring InputFormat");
confRandom(job);
@@ -161,7 +161,7 @@
LongWritable.class, Text.class,
SequenceFile.CompressionType.NONE);
try {
- for (Path p : job.getInputPaths()) {
+ for (Path p : FileInputFormat.getInputPaths(job)) {
FileSystem fs = p.getFileSystem(job);
Stack<Path> pathstack = new Stack<Path>();
pathstack.push(p);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/MRBench.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/MRBench.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/MRBench.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/MRBench.java Wed Apr 16 10:35:39 2008
@@ -139,7 +139,7 @@
*/
private static JobConf setupJob(int numMaps, int numReduces, String jarFile) {
JobConf jobConf = new JobConf(MRBench.class);
- jobConf.addInputPath(INPUT_DIR);
+ FileInputFormat.addInputPath(jobConf, INPUT_DIR);
jobConf.setInputFormat(TextInputFormat.class);
jobConf.setOutputFormat(TextOutputFormat.class);
@@ -180,7 +180,7 @@
new Path(OUTPUT_DIR, "output_" + rand.nextInt()));
LOG.info("Running job " + i + ":" +
- " input=" + jobConf.getInputPaths()[0] +
+ " input=" + FileInputFormat.getInputPaths(jobConf)[0] +
" output=" + FileOutputFormat.getOutputPath(jobConf));
// run the mapred task now
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/MRCaching.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/MRCaching.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/MRCaching.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/MRCaching.java Wed Apr 16 10:35:39 2008
@@ -166,7 +166,7 @@
conf.setMapperClass(MRCaching.MapClass.class);
conf.setCombinerClass(MRCaching.ReduceClass.class);
conf.setReducerClass(MRCaching.ReduceClass.class);
- conf.setInputPath(inDir);
+ FileInputFormat.setInputPaths(conf, inDir);
FileOutputFormat.setOutputPath(conf, outDir);
conf.setNumMapTasks(1);
conf.setNumReduceTasks(1);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/NotificationTestCase.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/NotificationTestCase.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/NotificationTestCase.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/NotificationTestCase.java Wed Apr 16 10:35:39 2008
@@ -202,7 +202,7 @@
conf.setCombinerClass(WordCount.Reduce.class);
conf.setReducerClass(WordCount.Reduce.class);
- conf.setInputPath(inDir);
+ FileInputFormat.setInputPaths(conf, inDir);
FileOutputFormat.setOutputPath(conf, outDir);
conf.setNumMapTasks(numMaps);
conf.setNumReduceTasks(numReduces);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/PiEstimator.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/PiEstimator.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/PiEstimator.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/PiEstimator.java Wed Apr 16 10:35:39 2008
@@ -157,7 +157,7 @@
if (!fileSys.mkdirs(inDir)) {
throw new IOException("Mkdirs failed to create " + inDir.toString());
}
- jobConf.setInputPath(inDir);
+ FileInputFormat.setInputPaths(jobConf, inDir);
FileOutputFormat.setOutputPath(jobConf, outDir);
jobConf.setNumMapTasks(numMaps);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/SortValidator.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/SortValidator.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/SortValidator.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/SortValidator.java Wed Apr 16 10:35:39 2008
@@ -63,7 +63,7 @@
}
static private IntWritable deduceInputFile(JobConf job) {
- Path[] inputPaths = job.getInputPaths();
+ Path[] inputPaths = FileInputFormat.getInputPaths(job);
Path inputFile = new Path(job.get("map.input.file"));
// value == one for sort-input; value == two for sort-output
@@ -336,8 +336,8 @@
jobConf.setNumMapTasks(noSortReduceTasks);
jobConf.setNumReduceTasks(1);
- jobConf.setInputPath(sortInput);
- jobConf.addInputPath(sortOutput);
+ FileInputFormat.setInputPaths(jobConf, sortInput);
+ FileInputFormat.addInputPath(jobConf, sortOutput);
Path outputPath = new Path("/tmp/sortvalidate/recordstatschecker");
if (fs.exists(outputPath)) {
fs.delete(outputPath, true);
@@ -346,11 +346,11 @@
// Uncomment to run locally in a single process
//job_conf.set("mapred.job.tracker", "local");
-
+ Path[] inputPaths = FileInputFormat.getInputPaths(jobConf);
System.out.println("\nSortValidator.RecordStatsChecker: Validate sort " +
- "from " + jobConf.getInputPaths()[0] + " (" +
+ "from " + inputPaths[0] + " (" +
noSortInputpaths + " files), " +
- jobConf.getInputPaths()[1] + " (" +
+ inputPaths[1] + " (" +
noSortReduceTasks +
" files) into " +
FileOutputFormat.getOutputPath(jobConf) +
@@ -479,8 +479,8 @@
jobConf.setNumMapTasks(noMaps);
jobConf.setNumReduceTasks(noReduces);
- jobConf.setInputPath(sortInput);
- jobConf.addInputPath(sortOutput);
+ FileInputFormat.setInputPaths(jobConf, sortInput);
+ FileInputFormat.addInputPath(jobConf, sortOutput);
Path outputPath = new Path("/tmp/sortvalidate/recordchecker");
FileSystem fs = FileSystem.get(defaults);
if (fs.exists(outputPath)) {
@@ -490,12 +490,12 @@
// Uncomment to run locally in a single process
//job_conf.set("mapred.job.tracker", "local");
-
+ Path[] inputPaths = FileInputFormat.getInputPaths(jobConf);
System.out.println("\nSortValidator.RecordChecker: Running on " +
cluster.getTaskTrackers() +
- " nodes to validate sort from " +
- jobConf.getInputPaths()[0] + ", " +
- jobConf.getInputPaths()[1] + " into " +
+ " nodes to validate sort from " +
+ inputPaths[0] + ", " +
+ inputPaths[1] + " into " +
FileOutputFormat.getOutputPath(jobConf) +
" with " + noReduces + " reduces.");
Date startTime = new Date();
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestClusterMapReduceTestCase.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestClusterMapReduceTestCase.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestClusterMapReduceTestCase.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestClusterMapReduceTestCase.java Wed Apr 16 10:35:39 2008
@@ -55,7 +55,7 @@
conf.setMapperClass(org.apache.hadoop.mapred.lib.IdentityMapper.class);
conf.setReducerClass(org.apache.hadoop.mapred.lib.IdentityReducer.class);
- conf.setInputPath(getInputDir());
+ FileInputFormat.setInputPaths(conf, getInputDir());
FileOutputFormat.setOutputPath(conf, getOutputDir());
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestComparators.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestComparators.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestComparators.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestComparators.java Wed Apr 16 10:35:39 2008
@@ -296,7 +296,7 @@
FileSystem fs = FileSystem.get(conf);
fs.delete(testdir, true);
conf.setInputFormat(SequenceFileInputFormat.class);
- conf.setInputPath(inDir);
+ FileInputFormat.setInputPaths(conf, inDir);
FileOutputFormat.setOutputPath(conf, outDir);
conf.setOutputKeyClass(IntWritable.class);
conf.setOutputValueClass(Text.class);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestEmptyJobWithDFS.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestEmptyJobWithDFS.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestEmptyJobWithDFS.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestEmptyJobWithDFS.java Wed Apr 16 10:35:39 2008
@@ -76,7 +76,7 @@
conf.setOutputValueClass(IntWritable.class);
conf.setMapperClass(IdentityMapper.class);
conf.setReducerClass(IdentityReducer.class);
- conf.setInputPath(inDir);
+ FileInputFormat.setInputPaths(conf, inDir);
FileOutputFormat.setOutputPath(conf, outDir);
conf.setNumMapTasks(numMaps);
conf.setNumReduceTasks(numReduces);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestFieldSelection.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestFieldSelection.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestFieldSelection.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestFieldSelection.java Wed Apr 16 10:35:39 2008
@@ -89,7 +89,7 @@
System.out.println("inputData:");
System.out.println(inputData.toString());
JobConf job = new JobConf(conf, TestFieldSelection.class);
- job.setInputPath(INPUT_DIR);
+ FileInputFormat.setInputPaths(job, INPUT_DIR);
job.setInputFormat(TextInputFormat.class);
job.setMapperClass(FieldSelectionMapReduce.class);
job.setReducerClass(FieldSelectionMapReduce.class);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestFileInputFormatPathFilter.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestFileInputFormatPathFilter.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestFileInputFormatPathFilter.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestFileInputFormatPathFilter.java Wed Apr 16 10:35:39 2008
@@ -101,7 +101,7 @@
JobConf conf = new JobConf();
Path inputDir = (withGlob) ? new Path(workDir, "a*") : workDir;
- conf.setInputPath(inputDir);
+ FileInputFormat.setInputPaths(conf, inputDir);
conf.setInputFormat(DummyFileInputFormat.class);
if (withFilter) {
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestJavaSerialization.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestJavaSerialization.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestJavaSerialization.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestJavaSerialization.java Wed Apr 16 10:35:39 2008
@@ -117,7 +117,7 @@
conf.setMapperClass(TypeConverterMapper.class);
conf.setReducerClass(IdentityReducer.class);
- conf.setInputPath(getInputDir());
+ FileInputFormat.setInputPaths(conf, getInputDir());
FileOutputFormat.setOutputPath(conf, getOutputDir());
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestJobStatusPersistency.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestJobStatusPersistency.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestJobStatusPersistency.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestJobStatusPersistency.java Wed Apr 16 10:35:39 2008
@@ -49,7 +49,7 @@
conf.setMapperClass(org.apache.hadoop.mapred.lib.IdentityMapper.class);
conf.setReducerClass(org.apache.hadoop.mapred.lib.IdentityReducer.class);
- conf.setInputPath(getInputDir());
+ FileInputFormat.setInputPaths(conf, getInputDir());
FileOutputFormat.setOutputPath(conf, getOutputDir());
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestKeyValueTextInputFormat.java Wed Apr 16 10:35:39 2008
@@ -60,7 +60,7 @@
Random random = new Random(seed);
localFs.delete(workDir, true);
- job.setInputPath(workDir);
+ FileInputFormat.setInputPaths(job, workDir);
// for a variety of lengths
for (int length = 0; length < MAX_LENGTH;
@@ -206,7 +206,7 @@
"line-1\tthe quick\nline-2\tbrown\nline-3\tfox jumped\nline-4\tover\nline-5\t the lazy\nline-6\t dog\n");
writeFile(localFs, new Path(workDir, "part2.txt.gz"), gzip,
"line-1\tthis is a test\nline-1\tof gzip\n");
- job.setInputPath(workDir);
+ FileInputFormat.setInputPaths(job, workDir);
KeyValueTextInputFormat format = new KeyValueTextInputFormat();
format.configure(job);
InputSplit[] splits = format.getSplits(job, 100);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMapOutputType.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMapOutputType.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMapOutputType.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMapOutputType.java Wed Apr 16 10:35:39 2008
@@ -83,7 +83,7 @@
fs.delete(testdir, true);
conf.setInt("io.sort.mb", 1);
conf.setInputFormat(SequenceFileInputFormat.class);
- conf.setInputPath(inDir);
+ FileInputFormat.setInputPaths(conf, inDir);
FileOutputFormat.setOutputPath(conf, outDir);
conf.setMapperClass(TextGen.class);
conf.setReducerClass(TextReduce.class);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMapRed.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMapRed.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMapRed.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMapRed.java Wed Apr 16 10:35:39 2008
@@ -297,7 +297,7 @@
Path outDir = new Path(testdir, "out");
FileSystem fs = FileSystem.get(conf);
fs.delete(testdir, true);
- conf.setInputPath(inDir);
+ FileInputFormat.setInputPaths(conf, inDir);
FileOutputFormat.setOutputPath(conf, outDir);
conf.setMapperClass(MyMap.class);
conf.setReducerClass(MyReduce.class);
@@ -423,7 +423,7 @@
JobConf genJob = new JobConf(conf, TestMapRed.class);
- genJob.setInputPath(randomIns);
+ FileInputFormat.setInputPaths(genJob, randomIns);
genJob.setInputFormat(SequenceFileInputFormat.class);
genJob.setMapperClass(RandomGenMapper.class);
@@ -468,7 +468,7 @@
Path intermediateOuts = new Path(testdir, "intermediateouts");
fs.delete(intermediateOuts, true);
JobConf checkJob = new JobConf(conf, TestMapRed.class);
- checkJob.setInputPath(randomOuts);
+ FileInputFormat.setInputPaths(checkJob, randomOuts);
checkJob.setInputFormat(TextInputFormat.class);
checkJob.setMapperClass(RandomCheckMapper.class);
@@ -491,7 +491,7 @@
Path finalOuts = new Path(testdir, "finalouts");
fs.delete(finalOuts, true);
JobConf mergeJob = new JobConf(conf, TestMapRed.class);
- mergeJob.setInputPath(intermediateOuts);
+ FileInputFormat.setInputPaths(mergeJob, intermediateOuts);
mergeJob.setInputFormat(SequenceFileInputFormat.class);
mergeJob.setMapperClass(MergeMapper.class);
@@ -598,7 +598,7 @@
fs.delete(testdir, true);
conf.setInt("io.sort.mb", 1);
conf.setInputFormat(SequenceFileInputFormat.class);
- conf.setInputPath(inDir);
+ FileInputFormat.setInputPaths(conf, inDir);
FileOutputFormat.setOutputPath(conf, outDir);
conf.setMapperClass(IdentityMapper.class);
conf.setReducerClass(IdentityReducer.class);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMiniMRClasspath.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMiniMRClasspath.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMiniMRClasspath.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMiniMRClasspath.java Wed Apr 16 10:35:39 2008
@@ -66,7 +66,7 @@
conf.set("mapred.mapper.class", "testjar.ClassWordCount$MapClass");
conf.set("mapred.combine.class", "testjar.ClassWordCount$Reduce");
conf.set("mapred.reducer.class", "testjar.ClassWordCount$Reduce");
- conf.setInputPath(inDir);
+ FileInputFormat.setInputPaths(conf, inDir);
FileOutputFormat.setOutputPath(conf, outDir);
conf.setNumMapTasks(numMaps);
conf.setNumReduceTasks(numReduces);
@@ -119,7 +119,7 @@
// the values are the messages
conf.set("mapred.output.key.class", "testjar.ExternalWritable");
- conf.setInputPath(inDir);
+ FileInputFormat.setInputPaths(conf, inDir);
FileOutputFormat.setOutputPath(conf, outDir);
conf.setNumMapTasks(numMaps);
conf.setNumReduceTasks(numReduces);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMiniMRMapRedDebugScript.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMiniMRMapRedDebugScript.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMiniMRMapRedDebugScript.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMiniMRMapRedDebugScript.java Wed Apr 16 10:35:39 2008
@@ -133,7 +133,7 @@
conf.setNumMapTasks(1);
conf.setNumReduceTasks(0);
conf.setMapDebugScript(debugScript);
- conf.setInputPath(inDir);
+ FileInputFormat.setInputPaths(conf, inDir);
FileOutputFormat.setOutputPath(conf, outDir);
String TEST_ROOT_DIR = new Path(System.getProperty("test.build.data",
"/tmp")).toString().replace(' ', '+');
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMiniMRTaskTempDir.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMiniMRTaskTempDir.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMiniMRTaskTempDir.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMiniMRTaskTempDir.java Wed Apr 16 10:35:39 2008
@@ -113,7 +113,7 @@
conf.setReducerClass(IdentityReducer.class);
conf.setNumMapTasks(1);
conf.setNumReduceTasks(0);
- conf.setInputPath(inDir);
+ FileInputFormat.setInputPaths(conf, inDir);
FileOutputFormat.setOutputPath(conf, outDir);
String TEST_ROOT_DIR = new Path(System.getProperty("test.build.data",
"/tmp")).toString().replace(' ', '+');
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMiniMRWithDFS.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMiniMRWithDFS.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMiniMRWithDFS.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMiniMRWithDFS.java Wed Apr 16 10:35:39 2008
@@ -79,7 +79,7 @@
conf.setMapperClass(WordCount.MapClass.class);
conf.setCombinerClass(WordCount.Reduce.class);
conf.setReducerClass(WordCount.Reduce.class);
- conf.setInputPath(inDir);
+ FileInputFormat.setInputPaths(conf, inDir);
FileOutputFormat.setOutputPath(conf, outDir);
conf.setNumMapTasks(numMaps);
conf.setNumReduceTasks(numReduces);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMultiFileInputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMultiFileInputFormat.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMultiFileInputFormat.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestMultiFileInputFormat.java Wed Apr 16 10:35:39 2008
@@ -76,7 +76,7 @@
}
lengths.put(path.getName(), new Long(numBytes));
}
- job.setInputPath(multiFileDir);
+ FileInputFormat.setInputPaths(job, multiFileDir);
return multiFileDir;
}
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestRackAwareTaskPlacement.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestRackAwareTaskPlacement.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestRackAwareTaskPlacement.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestRackAwareTaskPlacement.java Wed Apr 16 10:35:39 2008
@@ -177,7 +177,7 @@
jobConf.setJobName("TestForRackAwareness");
jobConf.setInputFormat(NonSplitableSequenceFileInputFormat.class);
jobConf.setOutputFormat(SequenceFileOutputFormat.class);
- jobConf.setInputPath(inDir);
+ FileInputFormat.setInputPaths(jobConf, inDir);
FileOutputFormat.setOutputPath(jobConf, outputPath);
jobConf.setMapperClass(IdentityMapper.class);
jobConf.setReducerClass(IdentityReducer.class);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSequenceFileAsBinaryInputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSequenceFileAsBinaryInputFormat.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSequenceFileAsBinaryInputFormat.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSequenceFileAsBinaryInputFormat.java Wed Apr 16 10:35:39 2008
@@ -42,7 +42,7 @@
r.setSeed(seed);
fs.delete(dir, true);
- job.setInputPath(dir);
+ FileInputFormat.setInputPaths(job, dir);
Text tkey = new Text();
Text tval = new Text();
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSequenceFileAsTextInputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSequenceFileAsTextInputFormat.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSequenceFileAsTextInputFormat.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSequenceFileAsTextInputFormat.java Wed Apr 16 10:35:39 2008
@@ -48,7 +48,7 @@
fs.delete(dir, true);
- job.setInputPath(dir);
+ FileInputFormat.setInputPaths(job, dir);
// for a variety of lengths
for (int length = 0; length < MAX_LENGTH;
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSequenceFileInputFilter.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSequenceFileInputFilter.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSequenceFileInputFilter.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSequenceFileInputFilter.java Wed Apr 16 10:35:39 2008
@@ -41,7 +41,7 @@
private static final Reporter reporter = Reporter.NULL;
static {
- job.setInputPath(inDir);
+ FileInputFormat.setInputPaths(job, inDir);
try {
fs = FileSystem.getLocal(conf);
} catch (IOException e) {
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSequenceFileInputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSequenceFileInputFormat.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSequenceFileInputFormat.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSequenceFileInputFormat.java Wed Apr 16 10:35:39 2008
@@ -48,7 +48,7 @@
fs.delete(dir, true);
- job.setInputPath(dir);
+ FileInputFormat.setInputPaths(job, dir);
// for a variety of lengths
for (int length = 0; length < MAX_LENGTH;
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSpecialCharactersInOutputPath.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSpecialCharactersInOutputPath.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSpecialCharactersInOutputPath.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestSpecialCharactersInOutputPath.java Wed Apr 16 10:35:39 2008
@@ -74,7 +74,7 @@
conf.setOutputValueClass(Text.class);
conf.setMapperClass(IdentityMapper.class);
conf.setReducerClass(IdentityReducer.class);
- conf.setInputPath(inDir);
+ FileInputFormat.setInputPaths(conf, inDir);
FileOutputFormat.setOutputPath(conf, outDir);
conf.setNumMapTasks(numMaps);
conf.setNumReduceTasks(numReduces);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestTextInputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestTextInputFormat.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestTextInputFormat.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/TestTextInputFormat.java Wed Apr 16 10:35:39 2008
@@ -60,7 +60,7 @@
Random random = new Random(seed);
localFs.delete(workDir, true);
- job.setInputPath(workDir);
+ FileInputFormat.setInputPaths(job, workDir);
// for a variety of lengths
for (int length = 0; length < MAX_LENGTH;
@@ -205,7 +205,7 @@
"the quick\nbrown\nfox jumped\nover\n the lazy\n dog\n");
writeFile(localFs, new Path(workDir, "part2.txt.gz"), gzip,
"this is a test\nof gzip\n");
- job.setInputPath(workDir);
+ FileInputFormat.setInputPaths(job, workDir);
TextInputFormat format = new TextInputFormat();
format.configure(job);
InputSplit[] splits = format.getSplits(job, 100);
@@ -235,7 +235,7 @@
ReflectionUtils.setConf(gzip, job);
localFs.delete(workDir, true);
writeFile(localFs, new Path(workDir, "empty.gz"), gzip, "");
- job.setInputPath(workDir);
+ FileInputFormat.setInputPaths(job, workDir);
TextInputFormat format = new TextInputFormat();
format.configure(job);
InputSplit[] splits = format.getSplits(job, 100);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/ThreadedMapBenchmark.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/ThreadedMapBenchmark.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/ThreadedMapBenchmark.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/ThreadedMapBenchmark.java Wed Apr 16 10:35:39 2008
@@ -295,7 +295,7 @@
job.setMapperClass(IdentityMapper.class);
job.setReducerClass(IdentityReducer.class);
- job.addInputPath(INPUT_DIR);
+ FileInputFormat.addInputPath(job, INPUT_DIR);
FileOutputFormat.setOutputPath(job, OUTPUT_DIR);
JobClient client = new JobClient(job);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/jobcontrol/JobControlTestUtils.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/jobcontrol/JobControlTestUtils.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/jobcontrol/JobControlTestUtils.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/jobcontrol/JobControlTestUtils.java Wed Apr 16 10:35:39 2008
@@ -30,6 +30,7 @@
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.io.LongWritable;
import org.apache.hadoop.io.Text;
+import org.apache.hadoop.mapred.FileInputFormat;
import org.apache.hadoop.mapred.FileOutputFormat;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.MapReduceBase;
@@ -118,12 +119,7 @@
JobConf theJob = new JobConf(defaults, TestJobControl.class);
theJob.setJobName("DataMoveJob");
- theJob.setInputPath((Path) indirs.get(0));
- if (indirs.size() > 1) {
- for (int i = 1; i < indirs.size(); i++) {
- theJob.addInputPath((Path) indirs.get(i));
- }
- }
+ FileInputFormat.setInputPaths(theJob, indirs.toArray(new Path[0]));
theJob.setMapperClass(DataCopy.class);
FileOutputFormat.setOutputPath(theJob, outdir);
theJob.setOutputKeyClass(Text.class);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/lib/TestMultithreadedMapRunner.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/lib/TestMultithreadedMapRunner.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/lib/TestMultithreadedMapRunner.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/lib/TestMultithreadedMapRunner.java Wed Apr 16 10:35:39 2008
@@ -87,7 +87,7 @@
conf.setMapperClass(IDMap.class);
conf.setReducerClass(IDReduce.class);
- conf.setInputPath(inDir);
+ FileInputFormat.setInputPaths(conf, inDir);
FileOutputFormat.setOutputPath(conf, outDir);
conf.setMapRunnerClass(MultithreadedMapRunner.class);
Modified: hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/lib/aggregate/TestAggregates.java
URL: http://svn.apache.org/viewvc/hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/lib/aggregate/TestAggregates.java?rev=648765&r1=648764&r2=648765&view=diff
==============================================================================
--- hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/lib/aggregate/TestAggregates.java (original)
+++ hadoop/core/branches/branch-0.17/src/test/org/apache/hadoop/mapred/lib/aggregate/TestAggregates.java Wed Apr 16 10:35:39 2008
@@ -78,7 +78,7 @@
System.out.println("inputData:");
System.out.println(inputData.toString());
JobConf job = new JobConf(conf, TestAggregates.class);
- job.setInputPath(INPUT_DIR);
+ FileInputFormat.setInputPaths(job, INPUT_DIR);
job.setInputFormat(TextInputFormat.class);
FileOutputFormat.setOutputPath(job, OUTPUT_DIR);