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 to...@apache.org on 2011/01/05 23:38:03 UTC
svn commit: r1055670 - in /hadoop/common/branches/branch-0.20: ./
src/mapred/org/apache/hadoop/mapred/ src/mapred/org/apache/hadoop/mapred/lib/
Author: todd
Date: Wed Jan 5 22:38:01 2011
New Revision: 1055670
URL: http://svn.apache.org/viewvc?rev=1055670&view=rev
Log:
MAPREDUCE-1734. Un-deprecate the old MapReduce API in the 0.20 branch. Contributed by Todd Lipcon
Modified:
hadoop/common/branches/branch-0.20/CHANGES.txt
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Counters.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/FileInputFormat.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/FileSplit.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/ID.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InputFormat.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InputSplit.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobConf.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobConfigurable.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobContext.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobID.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/LineRecordReader.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/MapReduceBase.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/MapRunnable.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Mapper.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/OutputCommitter.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/OutputFormat.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Partitioner.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Reducer.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/SequenceFileInputFormat.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/SequenceFileOutputFormat.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskAttemptContext.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskAttemptID.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskID.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TextInputFormat.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TextOutputFormat.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/HashPartitioner.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/IdentityMapper.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/IdentityReducer.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/InverseMapper.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/LongSumReducer.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/NullOutputFormat.java
hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/TokenCountMapper.java
Modified: hadoop/common/branches/branch-0.20/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/CHANGES.txt?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/CHANGES.txt (original)
+++ hadoop/common/branches/branch-0.20/CHANGES.txt Wed Jan 5 22:38:01 2011
@@ -89,6 +89,9 @@ Release 0.20.3 - 2011-1-5
MAPREDUCE-1832. Allow file sizes less than 1MB in DFSIO benchmark. (shv)
+ MAPREDUCE-1734. Un-deprecate the old MapReduce API in the 0.20 branch.
+ (todd)
+
Release 0.20.2 - 2010-2-19
NEW FEATURES
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Counters.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Counters.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Counters.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Counters.java Wed Jan 5 22:38:01 2011
@@ -47,9 +47,7 @@ import org.apache.hadoop.util.StringUtil
*
* <p><code>Counters</code> are bunched into {@link Group}s, each comprising of
* counters from a particular <code>Enum</code> class.
- * @deprecated Use {@link org.apache.hadoop.mapreduce.Counters} instead.
*/
-@Deprecated
public class Counters implements Writable, Iterable<Counters.Group> {
private static final Log LOG = LogFactory.getLog(Counters.class);
private static final char GROUP_OPEN = '{';
@@ -110,7 +108,6 @@ public class Counters implements Writabl
}
// Checks for (content) equality of two (basic) counters
- @Deprecated
synchronized boolean contentEquals(Counter c) {
return this.equals(c);
}
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/FileInputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/FileInputFormat.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/FileInputFormat.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/FileInputFormat.java Wed Jan 5 22:38:01 2011
@@ -51,10 +51,7 @@ import org.apache.hadoop.util.StringUtil
* Subclasses of <code>FileInputFormat</code> can also override the
* {@link #isSplitable(FileSystem, Path)} method to ensure input-files are
* not split-up and are processed as a whole by {@link Mapper}s.
- * @deprecated Use {@link org.apache.hadoop.mapreduce.lib.input.FileInputFormat}
- * instead.
*/
-@Deprecated
public abstract class FileInputFormat<K, V> implements InputFormat<K, V> {
public static final Log LOG =
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/FileSplit.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/FileSplit.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/FileSplit.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/FileSplit.java Wed Jan 5 22:38:01 2011
@@ -28,10 +28,7 @@ import org.apache.hadoop.fs.Path;
/** A section of an input file. Returned by {@link
* InputFormat#getSplits(JobConf, int)} and passed to
* {@link InputFormat#getRecordReader(InputSplit,JobConf,Reporter)}.
- * @deprecated Use {@link org.apache.hadoop.mapreduce.lib.input.FileSplit}
- * instead.
*/
-@Deprecated
public class FileSplit extends org.apache.hadoop.mapreduce.InputSplit
implements InputSplit {
private Path file;
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/ID.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/ID.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/ID.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/ID.java Wed Jan 5 22:38:01 2011
@@ -27,7 +27,6 @@ package org.apache.hadoop.mapred;
* @see TaskID
* @see TaskAttemptID
*/
-@Deprecated
public abstract class ID extends org.apache.hadoop.mapreduce.ID {
/** constructs an ID object from the given int */
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InputFormat.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InputFormat.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InputFormat.java Wed Jan 5 22:38:01 2011
@@ -61,9 +61,7 @@ import org.apache.hadoop.fs.FileSystem;
* @see RecordReader
* @see JobClient
* @see FileInputFormat
- * @deprecated Use {@link org.apache.hadoop.mapreduce.InputFormat} instead.
*/
-@Deprecated
public interface InputFormat<K, V> {
/**
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InputSplit.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InputSplit.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InputSplit.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/InputSplit.java Wed Jan 5 22:38:01 2011
@@ -31,9 +31,7 @@ import org.apache.hadoop.io.Writable;
*
* @see InputFormat
* @see RecordReader
- * @deprecated Use {@link org.apache.hadoop.mapreduce.InputSplit} instead.
*/
-@Deprecated
public interface InputSplit extends Writable {
/**
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobConf.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobConf.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobConf.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobConf.java Wed Jan 5 22:38:01 2011
@@ -99,9 +99,7 @@ import org.apache.hadoop.util.Tool;
* @see ClusterStatus
* @see Tool
* @see DistributedCache
- * @deprecated Use {@link Configuration} instead
*/
-@Deprecated
public class JobConf extends Configuration {
private static final Log LOG = LogFactory.getLog(JobConf.class);
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobConfigurable.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobConfigurable.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobConfigurable.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobConfigurable.java Wed Jan 5 22:38:01 2011
@@ -19,7 +19,6 @@
package org.apache.hadoop.mapred;
/** That what may be configured. */
-@Deprecated
public interface JobConfigurable {
/** Initializes a new instance from a {@link JobConf}.
*
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobContext.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobContext.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobContext.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobContext.java Wed Jan 5 22:38:01 2011
@@ -19,10 +19,6 @@ package org.apache.hadoop.mapred;
import org.apache.hadoop.util.Progressable;
-/**
- * @deprecated Use {@link org.apache.hadoop.mapreduce.JobContext} instead.
- */
-@Deprecated
public class JobContext extends org.apache.hadoop.mapreduce.JobContext {
private JobConf job;
private Progressable progress;
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobID.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobID.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobID.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/JobID.java Wed Jan 5 22:38:01 2011
@@ -38,7 +38,6 @@ import java.io.IOException;
* @see TaskID
* @see TaskAttemptID
*/
-@Deprecated
public class JobID extends org.apache.hadoop.mapreduce.JobID {
/**
* Constructs a JobID object
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/LineRecordReader.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/LineRecordReader.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/LineRecordReader.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/LineRecordReader.java Wed Jan 5 22:38:01 2011
@@ -34,10 +34,7 @@ import org.apache.commons.logging.Log;
/**
* Treats keys as offset in file and value as line.
- * @deprecated Use
- * {@link org.apache.hadoop.mapreduce.lib.input.LineRecordReader} instead.
*/
-@Deprecated
public class LineRecordReader implements RecordReader<LongWritable, Text> {
private static final Log LOG
= LogFactory.getLog(LineRecordReader.class.getName());
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/MapReduceBase.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/MapReduceBase.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/MapReduceBase.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/MapReduceBase.java Wed Jan 5 22:38:01 2011
@@ -29,7 +29,6 @@ import org.apache.hadoop.mapred.JobConfi
* <p>Provides default no-op implementations for a few methods, most non-trivial
* applications need to override some of them.</p>
*/
-@Deprecated
public class MapReduceBase implements Closeable, JobConfigurable {
/** Default implementation that does nothing. */
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/MapRunnable.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/MapRunnable.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/MapRunnable.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/MapRunnable.java Wed Jan 5 22:38:01 2011
@@ -27,9 +27,7 @@ import java.io.IOException;
* control on map processing e.g. multi-threaded, asynchronous mappers etc.</p>
*
* @see Mapper
- * @deprecated Use {@link org.apache.hadoop.mapreduce.Mapper} instead.
*/
-@Deprecated
public interface MapRunnable<K1, V1, K2, V2>
extends JobConfigurable {
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Mapper.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Mapper.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Mapper.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Mapper.java Wed Jan 5 22:38:01 2011
@@ -127,9 +127,7 @@ import org.apache.hadoop.io.compress.Com
* @see MapReduceBase
* @see MapRunnable
* @see SequenceFile
- * @deprecated Use {@link org.apache.hadoop.mapreduce.Mapper} instead.
*/
-@Deprecated
public interface Mapper<K1, V1, K2, V2> extends JobConfigurable, Closeable {
/**
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/OutputCommitter.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/OutputCommitter.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/OutputCommitter.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/OutputCommitter.java Wed Jan 5 22:38:01 2011
@@ -53,9 +53,7 @@ import java.io.IOException;
* @see FileOutputCommitter
* @see JobContext
* @see TaskAttemptContext
- * @deprecated Use {@link org.apache.hadoop.mapreduce.OutputCommitter} instead.
*/
-@Deprecated
public abstract class OutputCommitter
extends org.apache.hadoop.mapreduce.OutputCommitter {
/**
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/OutputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/OutputFormat.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/OutputFormat.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/OutputFormat.java Wed Jan 5 22:38:01 2011
@@ -42,9 +42,7 @@ import org.apache.hadoop.util.Progressab
*
* @see RecordWriter
* @see JobConf
- * @deprecated Use {@link org.apache.hadoop.mapreduce.OutputFormat} instead.
*/
-@Deprecated
public interface OutputFormat<K, V> {
/**
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Partitioner.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Partitioner.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Partitioner.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Partitioner.java Wed Jan 5 22:38:01 2011
@@ -29,9 +29,7 @@ package org.apache.hadoop.mapred;
* record) is sent for reduction.</p>
*
* @see Reducer
- * @deprecated Use {@link org.apache.hadoop.mapreduce.Partitioner} instead.
*/
-@Deprecated
public interface Partitioner<K2, V2> extends JobConfigurable {
/**
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Reducer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Reducer.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Reducer.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/Reducer.java Wed Jan 5 22:38:01 2011
@@ -160,9 +160,7 @@ import org.apache.hadoop.io.Closeable;
* @see Partitioner
* @see Reporter
* @see MapReduceBase
- * @deprecated Use {@link org.apache.hadoop.mapreduce.Reducer} instead.
*/
-@Deprecated
public interface Reducer<K2, V2, K3, V3> extends JobConfigurable, Closeable {
/**
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/SequenceFileInputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/SequenceFileInputFormat.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/SequenceFileInputFormat.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/SequenceFileInputFormat.java Wed Jan 5 22:38:01 2011
@@ -28,11 +28,7 @@ import org.apache.hadoop.io.SequenceFile
import org.apache.hadoop.io.MapFile;
/** An {@link InputFormat} for {@link SequenceFile}s.
- * @deprecated Use
- * {@link org.apache.hadoop.mapreduce.lib.input.SequenceFileInputFormat}
- * instead.
*/
-@Deprecated
public class SequenceFileInputFormat<K, V> extends FileInputFormat<K, V> {
public SequenceFileInputFormat() {
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/SequenceFileOutputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/SequenceFileOutputFormat.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/SequenceFileOutputFormat.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/SequenceFileOutputFormat.java Wed Jan 5 22:38:01 2011
@@ -33,11 +33,7 @@ import org.apache.hadoop.conf.Configurat
import org.apache.hadoop.util.*;
/** An {@link OutputFormat} that writes {@link SequenceFile}s.
- * @deprecated Use
- * {@link org.apache.hadoop.mapreduce.lib.output.SequenceFileOutputFormat}
- * instead.
*/
-@Deprecated
public class SequenceFileOutputFormat <K,V> extends FileOutputFormat<K, V> {
public RecordWriter<K, V> getRecordWriter(
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskAttemptContext.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskAttemptContext.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskAttemptContext.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskAttemptContext.java Wed Jan 5 22:38:01 2011
@@ -19,11 +19,6 @@ package org.apache.hadoop.mapred;
import org.apache.hadoop.util.Progressable;
-/**
- * @deprecated Use {@link org.apache.hadoop.mapreduce.TaskAttemptContext}
- * instead.
- */
-@Deprecated
public class TaskAttemptContext
extends org.apache.hadoop.mapreduce.TaskAttemptContext {
private Progressable progress;
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskAttemptID.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskAttemptID.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskAttemptID.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskAttemptID.java Wed Jan 5 22:38:01 2011
@@ -41,7 +41,6 @@ import java.io.IOException;
* @see JobID
* @see TaskID
*/
-@Deprecated
public class TaskAttemptID extends org.apache.hadoop.mapreduce.TaskAttemptID {
/**
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskID.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskID.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskID.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TaskID.java Wed Jan 5 22:38:01 2011
@@ -43,7 +43,6 @@ import java.io.IOException;
* @see JobID
* @see TaskAttemptID
*/
-@Deprecated
public class TaskID extends org.apache.hadoop.mapreduce.TaskID {
/**
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TextInputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TextInputFormat.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TextInputFormat.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TextInputFormat.java Wed Jan 5 22:38:01 2011
@@ -28,10 +28,7 @@ import org.apache.hadoop.io.compress.*;
/** An {@link InputFormat} for plain text files. Files are broken into lines.
* Either linefeed or carriage-return are used to signal end of line. Keys are
* the position in the file, and values are the line of text..
- * @deprecated Use {@link org.apache.hadoop.mapreduce.lib.input.TextInputFormat}
- * instead.
*/
-@Deprecated
public class TextInputFormat extends FileInputFormat<LongWritable, Text>
implements JobConfigurable {
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TextOutputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TextOutputFormat.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TextOutputFormat.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/TextOutputFormat.java Wed Jan 5 22:38:01 2011
@@ -33,10 +33,7 @@ import org.apache.hadoop.io.compress.Gzi
import org.apache.hadoop.util.*;
/** An {@link OutputFormat} that writes plain text files.
- * @deprecated Use
- * {@link org.apache.hadoop.mapreduce.lib.output.TextOutputFormat} instead.
*/
-@Deprecated
public class TextOutputFormat<K, V> extends FileOutputFormat<K, V> {
protected static class LineRecordWriter<K, V>
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/HashPartitioner.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/HashPartitioner.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/HashPartitioner.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/HashPartitioner.java Wed Jan 5 22:38:01 2011
@@ -22,10 +22,7 @@ import org.apache.hadoop.mapred.Partitio
import org.apache.hadoop.mapred.JobConf;
/** Partition keys by their {@link Object#hashCode()}.
- * @deprecated Use
- * {@link org.apache.hadoop.mapreduce.lib.partition.HashPartitioner} instead.
*/
-@Deprecated
public class HashPartitioner<K2, V2> implements Partitioner<K2, V2> {
public void configure(JobConf job) {}
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/IdentityMapper.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/IdentityMapper.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/IdentityMapper.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/IdentityMapper.java Wed Jan 5 22:38:01 2011
@@ -26,9 +26,7 @@ import org.apache.hadoop.mapred.Reporter
import org.apache.hadoop.mapred.MapReduceBase;
/** Implements the identity function, mapping inputs directly to outputs.
- * @deprecated Use {@link org.apache.hadoop.mapreduce.Mapper} instead.
*/
-@Deprecated
public class IdentityMapper<K, V>
extends MapReduceBase implements Mapper<K, V, K, V> {
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/IdentityReducer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/IdentityReducer.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/IdentityReducer.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/IdentityReducer.java Wed Jan 5 22:38:01 2011
@@ -28,9 +28,7 @@ import org.apache.hadoop.mapred.Reporter
import org.apache.hadoop.mapred.MapReduceBase;
/** Performs no reduction, writing all input values directly to the output.
- * @deprecated Use {@link org.apache.hadoop.mapreduce.Reducer} instead.
*/
-@Deprecated
public class IdentityReducer<K, V>
extends MapReduceBase implements Reducer<K, V, K, V> {
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/InverseMapper.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/InverseMapper.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/InverseMapper.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/InverseMapper.java Wed Jan 5 22:38:01 2011
@@ -26,10 +26,7 @@ import org.apache.hadoop.mapred.OutputCo
import org.apache.hadoop.mapred.Reporter;
/** A {@link Mapper} that swaps keys and values.
- * @deprecated Use {@link org.apache.hadoop.mapreduce.lib.map.InverseMapper}
- * instead.
*/
-@Deprecated
public class InverseMapper<K, V>
extends MapReduceBase implements Mapper<K, V, V, K> {
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/LongSumReducer.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/LongSumReducer.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/LongSumReducer.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/LongSumReducer.java Wed Jan 5 22:38:01 2011
@@ -29,10 +29,7 @@ import org.apache.hadoop.mapred.MapReduc
import org.apache.hadoop.io.LongWritable;
/** A {@link Reducer} that sums long values.
- * @deprecated Use {@link org.apache.hadoop.mapreduce.lib.reduce.LongSumReducer}
- * instead.
*/
-@Deprecated
public class LongSumReducer<K> extends MapReduceBase
implements Reducer<K, LongWritable, K, LongWritable> {
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/NullOutputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/NullOutputFormat.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/NullOutputFormat.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/NullOutputFormat.java Wed Jan 5 22:38:01 2011
@@ -27,10 +27,7 @@ import org.apache.hadoop.util.Progressab
/**
* Consume all outputs and put them in /dev/null.
- * @deprecated Use
- * {@link org.apache.hadoop.mapreduce.lib.output.NullOutputFormat} instead.
*/
-@Deprecated
public class NullOutputFormat<K, V> implements OutputFormat<K, V> {
public RecordWriter<K, V> getRecordWriter(FileSystem ignored, JobConf job,
Modified: hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/TokenCountMapper.java
URL: http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/TokenCountMapper.java?rev=1055670&r1=1055669&r2=1055670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/TokenCountMapper.java (original)
+++ hadoop/common/branches/branch-0.20/src/mapred/org/apache/hadoop/mapred/lib/TokenCountMapper.java Wed Jan 5 22:38:01 2011
@@ -31,10 +31,7 @@ import org.apache.hadoop.mapred.Reporter
/** A {@link Mapper} that maps text values into <token,freq> pairs. Uses
* {@link StringTokenizer} to break text into tokens.
- * @deprecated Use
- * {@link org.apache.hadoop.mapreduce.lib.map.TokenCounterMapper} instead.
*/
-@Deprecated
public class TokenCountMapper<K> extends MapReduceBase
implements Mapper<K, Text, Text, LongWritable> {