hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tomwh...@apache.org
Subject svn commit: r1235551 - in /hadoop/common/branches/branch-1.0: ./ src/core/org/apache/hadoop/conf/ src/core/org/apache/hadoop/io/ src/mapred/org/apache/hadoop/mapreduce/ src/mapred/org/apache/hadoop/mapreduce/lib/db/ src/mapred/org/apache/hadoop/mapredu...
Date Tue, 24 Jan 2012 23:30:15 GMT
Author: tomwhite
Date: Tue Jan 24 23:30:12 2012
New Revision: 1235551

URL: http://svn.apache.org/viewvc?rev=1235551&view=rev
Log:
Merge -r 1235547:1235548 from branch-1 to branch-1.0. Fixes: MAPREDUCE-3607

Added:
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/db/
      - copied from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/db/BigDecimalSplitter.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/BigDecimalSplitter.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/db/BooleanSplitter.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/BooleanSplitter.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/db/DBConfiguration.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/DBConfiguration.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/db/DBInputFormat.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/DBInputFormat.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/db/DBOutputFormat.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/DBOutputFormat.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/db/DBRecordReader.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/DBRecordReader.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/db/DBSplitter.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/DBSplitter.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/db/DBWritable.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/DBWritable.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/db/DataDrivenDBInputFormat.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/DataDrivenDBInputFormat.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/db/DataDrivenDBRecordReader.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/DataDrivenDBRecordReader.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/db/DateSplitter.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/DateSplitter.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/db/FloatSplitter.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/FloatSplitter.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/db/IntegerSplitter.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/IntegerSplitter.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/db/MySQLDBRecordReader.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/MySQLDBRecordReader.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/db/MySQLDataDrivenDBRecordReader.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/MySQLDataDrivenDBRecordReader.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/db/OracleDBRecordReader.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/OracleDBRecordReader.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/db/OracleDataDrivenDBInputFormat.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/OracleDataDrivenDBInputFormat.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/db/OracleDataDrivenDBRecordReader.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/OracleDataDrivenDBRecordReader.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/db/OracleDateSplitter.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/OracleDateSplitter.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/db/TextSplitter.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/db/TextSplitter.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/fieldsel/
      - copied from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/fieldsel/
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/fieldsel/FieldSelectionHelper.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/fieldsel/FieldSelectionHelper.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/fieldsel/FieldSelectionMapper.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/fieldsel/FieldSelectionMapper.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/fieldsel/FieldSelectionReducer.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/fieldsel/FieldSelectionReducer.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/input/CombineFileInputFormat.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/input/CombineFileInputFormat.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/input/CombineFileRecordReader.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/input/CombineFileRecordReader.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/input/CombineFileSplit.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/input/CombineFileSplit.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/input/DelegatingInputFormat.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/input/DelegatingInputFormat.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/input/DelegatingMapper.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/input/DelegatingMapper.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/input/DelegatingRecordReader.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/input/DelegatingRecordReader.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/input/KeyValueLineRecordReader.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/input/KeyValueLineRecordReader.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/input/KeyValueTextInputFormat.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/input/KeyValueTextInputFormat.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/input/MultipleInputs.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/input/MultipleInputs.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/input/NLineInputFormat.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/input/NLineInputFormat.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/input/SequenceFileAsBinaryInputFormat.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/input/SequenceFileAsBinaryInputFormat.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/input/SequenceFileAsTextInputFormat.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/input/SequenceFileAsTextInputFormat.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/input/SequenceFileAsTextRecordReader.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/input/SequenceFileAsTextRecordReader.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/input/SequenceFileInputFilter.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/input/SequenceFileInputFilter.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/input/TaggedInputSplit.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/input/TaggedInputSplit.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/jobcontrol/
      - copied from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/jobcontrol/
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/jobcontrol/ControlledJob.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/jobcontrol/ControlledJob.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/jobcontrol/JobControl.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/jobcontrol/JobControl.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/output/FilterOutputFormat.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/output/FilterOutputFormat.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/output/LazyOutputFormat.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/output/LazyOutputFormat.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/output/MultipleOutputs.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/output/MultipleOutputs.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/output/SequenceFileAsBinaryOutputFormat.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/output/SequenceFileAsBinaryOutputFormat.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/partition/BinaryPartitioner.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/partition/BinaryPartitioner.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/partition/InputSampler.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/partition/InputSampler.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/partition/KeyFieldBasedComparator.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/partition/KeyFieldBasedComparator.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/partition/KeyFieldBasedPartitioner.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/partition/KeyFieldBasedPartitioner.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/partition/KeyFieldHelper.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/partition/KeyFieldHelper.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/partition/TotalOrderPartitioner.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/mapred/org/apache/hadoop/mapreduce/lib/partition/TotalOrderPartitioner.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/TestMapReduceLazyOutput.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/TestMapReduceLazyOutput.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/db/
      - copied from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/db/
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/db/TestDBJob.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/db/TestDBJob.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/db/TestDBOutputFormat.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/db/TestDBOutputFormat.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/db/TestDataDrivenDBInputFormat.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/db/TestDataDrivenDBInputFormat.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/db/TestIntegerSplitter.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/db/TestIntegerSplitter.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/db/TestTextSplitter.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/db/TestTextSplitter.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/fieldsel/
      - copied from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/fieldsel/
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/fieldsel/TestMRFieldSelection.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/fieldsel/TestMRFieldSelection.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/input/TestCombineFileInputFormat.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/input/TestDelegatingInputFormat.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/input/TestDelegatingInputFormat.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/input/TestKeyValueTextInputFormat.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/input/TestKeyValueTextInputFormat.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileAsBinaryInputFormat.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileAsBinaryInputFormat.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileAsTextInputFormat.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileAsTextInputFormat.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileInputFilter.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/input/TestMRSequenceFileInputFilter.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/input/TestMultipleInputs.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/input/TestMultipleInputs.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/input/TestNLineInputFormat.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/input/TestNLineInputFormat.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/jobcontrol/
      - copied from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/jobcontrol/
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/jobcontrol/TestControlledJob.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/jobcontrol/TestControlledJob.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/jobcontrol/TestMapReduceJobControlWithMocks.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/jobcontrol/TestMapReduceJobControlWithMocks.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/output/TestMRSequenceFileAsBinaryOutputFormat.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/output/TestMRSequenceFileAsBinaryOutputFormat.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/output/TestMultipleOutputs.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/output/TestMultipleOutputs.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/partition/
      - copied from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/partition/
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/partition/TestBinaryPartitioner.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/partition/TestBinaryPartitioner.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/partition/TestInputSampler.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/partition/TestInputSampler.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/partition/TestKeyFieldHelper.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/partition/TestKeyFieldHelper.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/partition/TestMRKeyFieldBasedPartitioner.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/partition/TestMRKeyFieldBasedPartitioner.java
    hadoop/common/branches/branch-1.0/src/test/org/apache/hadoop/mapreduce/lib/partition/TestTotalOrderPartitioner.java
      - copied unchanged from r1235548, hadoop/common/branches/branch-1/src/test/org/apache/hadoop/mapreduce/lib/partition/TestTotalOrderPartitioner.java
Modified:
    hadoop/common/branches/branch-1.0/CHANGES.txt
    hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/conf/Configuration.java
    hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/io/WritableComparator.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/Job.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/input/FileInputFormat.java
    hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/output/FileOutputFormat.java

Modified: hadoop/common/branches/branch-1.0/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/CHANGES.txt?rev=1235551&r1=1235550&r2=1235551&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/CHANGES.txt (original)
+++ hadoop/common/branches/branch-1.0/CHANGES.txt Tue Jan 24 23:30:12 2012
@@ -6,6 +6,8 @@ Release 1.0.1 - unreleased
 
   IMPROVEMENTS
 
+    MAPREDUCE-3607. Port missing new API mapreduce lib classes to 1.x. (tomwhite)
+
   BUG FIXES
 
     HADOOP-7964. Deadlock in NetUtils and SecurityUtil class initialization.

Modified: hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/conf/Configuration.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/conf/Configuration.java?rev=1235551&r1=1235550&r2=1235551&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/conf/Configuration.java (original)
+++ hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/conf/Configuration.java Tue
Jan 24 23:30:12 2012
@@ -61,6 +61,7 @@ import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.WritableUtils;
+import org.apache.hadoop.util.ReflectionUtils;
 import org.apache.hadoop.util.StringUtils;
 import org.codehaus.jackson.JsonFactory;
 import org.codehaus.jackson.JsonGenerator;
@@ -899,6 +900,31 @@ public class Configuration implements It
     }
   }
 
+  /**
+   * Get the value of the <code>name</code> property as a <code>List</code>
+   * of objects implementing the interface specified by <code>xface</code>.
+   * 
+   * An exception is thrown if any of the classes does not exist, or if it does
+   * not implement the named interface.
+   * 
+   * @param name the property name.
+   * @param xface the interface implemented by the classes named by
+   *        <code>name</code>.
+   * @return a <code>List</code> of objects implementing <code>xface</code>.
+   */
+  @SuppressWarnings("unchecked")
+  public <U> List<U> getInstances(String name, Class<U> xface) {
+    List<U> ret = new ArrayList<U>();
+    Class<?>[] classes = getClasses(name);
+    for (Class<?> cl: classes) {
+      if (!xface.isAssignableFrom(cl)) {
+        throw new RuntimeException(cl + " does not implement " + xface);
+      }
+      ret.add((U)ReflectionUtils.newInstance(cl, this));
+    }
+    return ret;
+  }
+
   /** 
    * Set the value of the <code>name</code> property to the name of a 
    * <code>theClass</code> implementing the given interface <code>xface</code>.

Modified: hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/io/WritableComparator.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/io/WritableComparator.java?rev=1235551&r1=1235550&r2=1235551&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/io/WritableComparator.java
(original)
+++ hadoop/common/branches/branch-1.0/src/core/org/apache/hadoop/io/WritableComparator.java
Tue Jan 24 23:30:12 2012
@@ -133,14 +133,19 @@ public class WritableComparator implemen
     }
     return l1 - l2;
   }
-
+  
   /** Compute hash for binary data. */
-  public static int hashBytes(byte[] bytes, int length) {
+  public static int hashBytes(byte[] bytes, int offset, int length) {
     int hash = 1;
-    for (int i = 0; i < length; i++)
+    for (int i = offset; i < offset + length; i++)
       hash = (31 * hash) + (int)bytes[i];
     return hash;
   }
+  
+  /** Compute hash for binary data. */
+  public static int hashBytes(byte[] bytes, int length) {
+    return hashBytes(bytes, 0, length);
+  }
 
   /** Parse an unsigned short from a byte array. */
   public static int readUnsignedShort(byte[] bytes, int start) {

Modified: hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/Job.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/Job.java?rev=1235551&r1=1235550&r2=1235551&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/Job.java (original)
+++ hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/Job.java Tue
Jan 24 23:30:12 2012
@@ -262,6 +262,41 @@ public class Job extends JobContext {  
     ensureState(JobState.DEFINE);
     conf.setJobName(name);
   }
+  
+  /**
+   * Turn speculative execution on or off for this job. 
+   * 
+   * @param speculativeExecution <code>true</code> if speculative execution 
+   *                             should be turned on, else <code>false</code>.
+   */
+  public void setSpeculativeExecution(boolean speculativeExecution) {
+    ensureState(JobState.DEFINE);
+    conf.setSpeculativeExecution(speculativeExecution);
+  }
+
+  /**
+   * Turn speculative execution on or off for this job for map tasks. 
+   * 
+   * @param speculativeExecution <code>true</code> if speculative execution 
+   *                             should be turned on for map tasks,
+   *                             else <code>false</code>.
+   */
+  public void setMapSpeculativeExecution(boolean speculativeExecution) {
+    ensureState(JobState.DEFINE);
+    conf.setMapSpeculativeExecution(speculativeExecution);
+  }
+
+  /**
+   * Turn speculative execution on or off for this job for reduce tasks. 
+   * 
+   * @param speculativeExecution <code>true</code> if speculative execution 
+   *                             should be turned on for reduce tasks,
+   *                             else <code>false</code>.
+   */
+  public void setReduceSpeculativeExecution(boolean speculativeExecution) {
+    ensureState(JobState.DEFINE);
+    conf.setReduceSpeculativeExecution(speculativeExecution);
+  }
 
   /**
    * Get the URL where some job progress information will be displayed.

Modified: hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/input/FileInputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/input/FileInputFormat.java?rev=1235551&r1=1235550&r2=1235551&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/input/FileInputFormat.java
(original)
+++ hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/input/FileInputFormat.java
Tue Jan 24 23:30:12 2012
@@ -422,6 +422,7 @@ public abstract class FileInputFormat<K,
    */
   public static Path[] getInputPaths(JobContext context) {
     String dirs = context.getConfiguration().get("mapred.input.dir", "");
+    System.out.println("****" + dirs);
     String [] list = StringUtils.split(dirs);
     Path[] result = new Path[list.length];
     for (int i = 0; i < list.length; i++) {

Modified: hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/output/FileOutputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/output/FileOutputFormat.java?rev=1235551&r1=1235550&r2=1235551&view=diff
==============================================================================
--- hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/output/FileOutputFormat.java
(original)
+++ hadoop/common/branches/branch-1.0/src/mapred/org/apache/hadoop/mapreduce/lib/output/FileOutputFormat.java
Tue Jan 24 23:30:12 2012
@@ -39,6 +39,9 @@ import org.apache.hadoop.mapreduce.secur
 
 /** A base class for {@link OutputFormat}s that read from {@link FileSystem}s.*/
 public abstract class FileOutputFormat<K, V> extends OutputFormat<K, V> {
+  
+  protected static final String BASE_OUTPUT_NAME = "mapreduce.output.basename";
+  protected static final String PART = "part";
 
   public static enum Counter { 
     BYTES_WRITTEN
@@ -263,8 +266,22 @@ public abstract class FileOutputFormat<K
                                  String extension) throws IOException{
     FileOutputCommitter committer = 
       (FileOutputCommitter) getOutputCommitter(context);
-    return new Path(committer.getWorkPath(), getUniqueFile(context, "part", 
-                                                           extension));
+    return new Path(committer.getWorkPath(), getUniqueFile(context, 
+        getOutputName(context), extension));
+  }
+  
+  /**
+   * Get the base output name for the output file.
+   */
+  protected static String getOutputName(JobContext job) {
+    return job.getConfiguration().get(BASE_OUTPUT_NAME, PART);
+  }
+
+  /**
+   * Set the base output name for output file to be created.
+   */
+  protected static void setOutputName(JobContext job, String name) {
+    job.getConfiguration().set(BASE_OUTPUT_NAME, name);
   }
 
   public synchronized 



Mime
View raw message