You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by ac...@apache.org on 2013/09/27 22:04:31 UTC
svn commit: r1527054 - in
/hadoop/common/branches/branch-2/hadoop-mapreduce-project: CHANGES.txt
hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/TotalOrderPartitioner.java
Author: acmurthy
Date: Fri Sep 27 20:04:31 2013
New Revision: 1527054
URL: http://svn.apache.org/r1527054
Log:
Merge -c 1527048 from trunk to branch-2 to fix MAPREDUCE-5529. Fix compat with hadoop-1 in mapred.TotalOrderPartitioner by re-introducing (get,set)PartitionFile which takes in JobConf. Contributed by Robert Kanter.
Modified:
hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/TotalOrderPartitioner.java
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt?rev=1527054&r1=1527053&r2=1527054&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/CHANGES.txt Fri Sep 27 20:04:31 2013
@@ -104,6 +104,10 @@ Release 2.1.2 - UNRELEASED
MAPREDUCE-5545. org.apache.hadoop.mapred.TestTaskAttemptListenerImpl.testCommitWindow
times out (Robert Kanter via jlowe)
+ MAPREDUCE-5529. Fix compat with hadoop-1 in mapred.TotalOrderPartitioner
+ by re-introducing (get,set)PartitionFile which takes in JobConf. (Robert
+ Kanter via acmurthy)
+
Release 2.1.1-beta - 2013-09-23
INCOMPATIBLE CHANGES
Modified: hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/TotalOrderPartitioner.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/TotalOrderPartitioner.java?rev=1527054&r1=1527053&r2=1527054&view=diff
==============================================================================
--- hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/TotalOrderPartitioner.java (original)
+++ hadoop/common/branches/branch-2/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-core/src/main/java/org/apache/hadoop/mapred/lib/TotalOrderPartitioner.java Fri Sep 27 20:04:31 2013
@@ -22,6 +22,7 @@ package org.apache.hadoop.mapred.lib;
import org.apache.hadoop.classification.InterfaceAudience;
import org.apache.hadoop.classification.InterfaceStability;
import org.apache.hadoop.io.WritableComparable;
+import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.Partitioner;
@@ -41,4 +42,30 @@ public class TotalOrderPartitioner<K ext
super.setConf(job);
}
+ /**
+ * Set the path to the SequenceFile storing the sorted partition keyset.
+ * It must be the case that for <tt>R</tt> reduces, there are <tt>R-1</tt>
+ * keys in the SequenceFile.
+ * @deprecated Use
+ * {@link #setPartitionFile(Configuration, Path)}
+ * instead
+ */
+ @Deprecated
+ public static void setPartitionFile(JobConf job, Path p) {
+ org.apache.hadoop.mapreduce.lib.partition.TotalOrderPartitioner.
+ setPartitionFile(job, p);
+ }
+
+ /**
+ * Get the path to the SequenceFile storing the sorted partition keyset.
+ * @see #setPartitionFile(JobConf,Path)
+ * @deprecated Use
+ * {@link #getPartitionFile(Configuration)}
+ * instead
+ */
+ @Deprecated
+ public static String getPartitionFile(JobConf job) {
+ return org.apache.hadoop.mapreduce.lib.partition.TotalOrderPartitioner.
+ getPartitionFile(job);
+ }
}