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 to...@apache.org on 2010/06/18 23:22:04 UTC

svn commit: r956133 [2/2] - in /hadoop/mapreduce/branches/branch-0.21: ./ src/java/org/apache/hadoop/mapred/ src/java/org/apache/hadoop/mapred/jobcontrol/ src/java/org/apache/hadoop/mapred/join/ src/java/org/apache/hadoop/mapred/lib/ src/java/org/apach...

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/InputSampler.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/InputSampler.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/InputSampler.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/InputSampler.java Fri Jun 18 21:22:01 2010
@@ -25,11 +25,6 @@ import org.apache.hadoop.classification.
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapreduce.Job;
 
-/**
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.partition.InputSampler}
- */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class InputSampler<K,V> extends 

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/InverseMapper.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/InverseMapper.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/InverseMapper.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/InverseMapper.java Fri Jun 18 21:22:01 2010
@@ -28,10 +28,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
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class InverseMapper<K, V>

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/KeyFieldBasedComparator.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/KeyFieldBasedComparator.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/KeyFieldBasedComparator.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/KeyFieldBasedComparator.java Fri Jun 18 21:22:01 2010
@@ -38,11 +38,7 @@ import org.apache.hadoop.mapreduce.JobCo
  *  field). opts are ordering options (any of 'nr' as described above). 
  * We assume that the fields in the key are separated by
  * {@link JobContext#MAP_OUTPUT_KEY_FIELD_SEPERATOR} 
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.partition.KeyFieldBasedComparator} 
- * instead
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class KeyFieldBasedComparator<K, V> extends 

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/KeyFieldBasedPartitioner.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/KeyFieldBasedPartitioner.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/KeyFieldBasedPartitioner.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/KeyFieldBasedPartitioner.java Fri Jun 18 21:22:01 2010
@@ -34,11 +34,7 @@ import org.apache.hadoop.mapred.Partitio
   *  field's last character. If '.c' is omitted from pos1, it defaults to 1
   *  (the beginning of the field); if omitted from pos2, it defaults to 0 
   *  (the end of the field).
-  *  @deprecated Use 
-  *  {@link org.apache.hadoop.mapreduce.lib.partition.KeyFieldBasedPartitioner} 
-  *  instead
   */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class KeyFieldBasedPartitioner<K2, V2> extends 

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/LazyOutputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/LazyOutputFormat.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/LazyOutputFormat.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/LazyOutputFormat.java Fri Jun 18 21:22:01 2010
@@ -32,10 +32,7 @@ import org.apache.hadoop.util.Reflection
 
 /**
  * A Convenience class that creates output lazily. 
- * @deprecated Use 
- *   {@link org.apache.hadoop.mapreduce.lib.output.LazyOutputFormat} instead.
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class LazyOutputFormat<K, V> extends FilterOutputFormat<K, V> {

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/LongSumReducer.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/LongSumReducer.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/LongSumReducer.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/LongSumReducer.java Fri Jun 18 21:22:01 2010
@@ -31,10 +31,7 @@ import org.apache.hadoop.classification.
 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
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class LongSumReducer<K> extends MapReduceBase

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultipleInputs.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultipleInputs.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultipleInputs.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultipleInputs.java Fri Jun 18 21:22:01 2010
@@ -32,10 +32,7 @@ import org.apache.hadoop.util.Reflection
 /**
  * This class supports MapReduce jobs that have multiple input paths with
  * a different {@link InputFormat} and {@link Mapper} for each path 
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.input.MultipleInputs} instead
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class MultipleInputs {

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultipleOutputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultipleOutputFormat.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultipleOutputFormat.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultipleOutputFormat.java Fri Jun 18 21:22:01 2010
@@ -50,11 +50,7 @@ import org.apache.hadoop.util.Progressab
  * 
  * Case three: This class is used for a map only job. The job wants to use an
  * output file name that depends on both the keys and the input file name,
- * 
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.output.MultipleOutputs} instead
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public abstract class MultipleOutputFormat<K, V>

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultipleOutputs.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultipleOutputs.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultipleOutputs.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultipleOutputs.java Fri Jun 18 21:22:01 2010
@@ -114,10 +114,7 @@ import java.util.*;
  *
  * }
  * </pre>
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.output.MultipleOutputs} instead
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class MultipleOutputs {

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultipleSequenceFileOutputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultipleSequenceFileOutputFormat.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultipleSequenceFileOutputFormat.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultipleSequenceFileOutputFormat.java Fri Jun 18 21:22:01 2010
@@ -31,10 +31,7 @@ import org.apache.hadoop.util.Progressab
 /**
  * This class extends the MultipleOutputFormat, allowing to write the output data 
  * to different output files in sequence file output format. 
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.output.MultipleOutputs} instead
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class MultipleSequenceFileOutputFormat <K,V>

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultipleTextOutputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultipleTextOutputFormat.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultipleTextOutputFormat.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultipleTextOutputFormat.java Fri Jun 18 21:22:01 2010
@@ -31,10 +31,7 @@ import org.apache.hadoop.util.Progressab
 /**
  * This class extends the MultipleOutputFormat, allowing to write the output
  * data to different output files in Text output format.
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.output.MultipleOutputs} instead
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class MultipleTextOutputFormat<K, V>

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/MultithreadedMapRunner.java Fri Jun 18 21:22:01 2010
@@ -50,9 +50,7 @@ import java.util.concurrent.*;
  * <code>mapred.map.multithreadedrunner.threads</code> property, its default
  * value is 10 threads.
  * <p>
- * @deprecated Use {@link MultithreadedMapper} instead.
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class MultithreadedMapRunner<K1, V1, K2, V2>

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/NLineInputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/NLineInputFormat.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/NLineInputFormat.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/NLineInputFormat.java Fri Jun 18 21:22:01 2010
@@ -52,10 +52,7 @@ import org.apache.hadoop.mapred.Reporter
  * a value to one map task, and key is the offset.
  * i.e. (k,v) is (LongWritable, Text).
  * The location hints will span the whole mapred cluster.
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.input.NLineInputFormat} instead
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class NLineInputFormat extends FileInputFormat<LongWritable, Text> 

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/NullOutputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/NullOutputFormat.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/NullOutputFormat.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/NullOutputFormat.java Fri Jun 18 21:22:01 2010
@@ -29,10 +29,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
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class NullOutputFormat<K, V> implements OutputFormat<K, V> {

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/RegexMapper.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/RegexMapper.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/RegexMapper.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/RegexMapper.java Fri Jun 18 21:22:01 2010
@@ -34,9 +34,7 @@ import org.apache.hadoop.mapred.Reporter
 
 
 /** A {@link Mapper} that extracts text matching a regular expression.
- * @deprecated Use {@link org.apache.hadoop.mapreduce.lib.map.RegexMapper}
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class RegexMapper<K> extends MapReduceBase

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/TaggedInputSplit.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/TaggedInputSplit.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/TaggedInputSplit.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/TaggedInputSplit.java Fri Jun 18 21:22:01 2010
@@ -33,10 +33,7 @@ import org.apache.hadoop.util.Reflection
 /**
  * An {@link InputSplit} that tags another InputSplit with extra data for use
  * by {@link DelegatingInputFormat}s and {@link DelegatingMapper}s.
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.input.TaggedInputSplit} instead
  */
-@Deprecated
 class TaggedInputSplit implements Configurable, InputSplit {
 
   private Class<? extends InputSplit> inputSplitClass;

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/TokenCountMapper.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/TokenCountMapper.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/TokenCountMapper.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/TokenCountMapper.java Fri Jun 18 21:22:01 2010
@@ -33,10 +33,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
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class TokenCountMapper<K> extends MapReduceBase

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/TotalOrderPartitioner.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/TotalOrderPartitioner.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/TotalOrderPartitioner.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/TotalOrderPartitioner.java Fri Jun 18 21:22:01 2010
@@ -28,10 +28,7 @@ import org.apache.hadoop.mapred.Partitio
 /**
  * Partitioner effecting a total order by reading split points from
  * an externally generated source.
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.partition.TotalOrderPartitioner}
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class TotalOrderPartitioner<K extends WritableComparable<?>,V>

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/DoubleValueSum.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/DoubleValueSum.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/DoubleValueSum.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/DoubleValueSum.java Fri Jun 18 21:22:01 2010
@@ -24,11 +24,7 @@ import org.apache.hadoop.classification.
 /**
  * This class implements a value aggregator that sums up a sequence of double
  * values.
- * 
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.aggregate.DoubleValueSum} instead 
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class DoubleValueSum 

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/LongValueMax.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/LongValueMax.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/LongValueMax.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/LongValueMax.java Fri Jun 18 21:22:01 2010
@@ -25,11 +25,7 @@ import org.apache.hadoop.classification.
 /**
  * This class implements a value aggregator that maintain the maximum of 
  * a sequence of long values.
- * 
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.aggregate.LongValueMax} instead
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class LongValueMax 

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/LongValueMin.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/LongValueMin.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/LongValueMin.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/LongValueMin.java Fri Jun 18 21:22:01 2010
@@ -24,11 +24,7 @@ import org.apache.hadoop.classification.
 /**
  * This class implements a value aggregator that maintain the minimum of 
  * a sequence of long values.
- * 
- *@deprecated Use 
- *{@link org.apache.hadoop.mapreduce.lib.aggregate.LongValueMin} instead
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class LongValueMin 

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/LongValueSum.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/LongValueSum.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/LongValueSum.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/LongValueSum.java Fri Jun 18 21:22:01 2010
@@ -24,11 +24,7 @@ import org.apache.hadoop.classification.
 /**
  * This class implements a value aggregator that sums up 
  * a sequence of long values.
- * 
- *@deprecated Use 
- *{@link org.apache.hadoop.mapreduce.lib.aggregate.LongValueSum} instead 
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class LongValueSum 

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/StringValueMax.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/StringValueMax.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/StringValueMax.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/StringValueMax.java Fri Jun 18 21:22:01 2010
@@ -24,11 +24,7 @@ import org.apache.hadoop.classification.
 /**
  * This class implements a value aggregator that maintain the biggest of 
  * a sequence of strings.
- * 
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.aggregate.StringValueMax} instead
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class StringValueMax 

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/StringValueMin.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/StringValueMin.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/StringValueMin.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/StringValueMin.java Fri Jun 18 21:22:01 2010
@@ -24,11 +24,7 @@ import org.apache.hadoop.classification.
 /**
  * This class implements a value aggregator that maintain the smallest of 
  * a sequence of strings.
- * 
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.aggregate.StringValueMin} instead 
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class StringValueMin 

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/UniqValueCount.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/UniqValueCount.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/UniqValueCount.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/UniqValueCount.java Fri Jun 18 21:22:01 2010
@@ -23,11 +23,7 @@ import org.apache.hadoop.classification.
 
 /**
  * This class implements a value aggregator that dedupes a sequence of objects.
- * 
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.aggregate.UniqValueCount} instead 
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class UniqValueCount 

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/UserDefinedValueAggregatorDescriptor.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/UserDefinedValueAggregatorDescriptor.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/UserDefinedValueAggregatorDescriptor.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/UserDefinedValueAggregatorDescriptor.java Fri Jun 18 21:22:01 2010
@@ -27,12 +27,7 @@ import org.apache.hadoop.mapred.JobConf;
  * It servs two functions: One is to create an object of ValueAggregatorDescriptor from the
  * name of a user defined class that may be dynamically loaded. The other is to
  * deligate inviokations of generateKeyValPairs function to the created object.
- * 
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.aggregate.UserDefinedValueAggregatorDescriptor}
- * instead
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class UserDefinedValueAggregatorDescriptor extends org.apache.hadoop.

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregator.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregator.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregator.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregator.java Fri Jun 18 21:22:01 2010
@@ -23,11 +23,7 @@ import org.apache.hadoop.classification.
 
 /**
  * This interface defines the minimal protocol for value aggregators.
- * 
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.aggregate.ValueAggregator} instead
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public interface ValueAggregator<E> extends 

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorBaseDescriptor.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorBaseDescriptor.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorBaseDescriptor.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorBaseDescriptor.java Fri Jun 18 21:22:01 2010
@@ -28,12 +28,7 @@ import org.apache.hadoop.mapred.JobConf;
 /** 
  * This class implements the common functionalities of 
  * the subclasses of ValueAggregatorDescriptor class.
- * 
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.aggregate.ValueAggregatorBaseDescriptor}
- * instead
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class ValueAggregatorBaseDescriptor extends org.apache.hadoop.mapreduce.

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorCombiner.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorCombiner.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorCombiner.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorCombiner.java Fri Jun 18 21:22:01 2010
@@ -32,11 +32,7 @@ import org.apache.hadoop.mapred.Reporter
 
 /**
  * This class implements the generic combiner of Aggregate.
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.aggregate.ValueAggregatorCombiner}
- * instead
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class ValueAggregatorCombiner<K1 extends WritableComparable,

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorDescriptor.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorDescriptor.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorDescriptor.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorDescriptor.java Fri Jun 18 21:22:01 2010
@@ -33,12 +33,7 @@ import org.apache.hadoop.mapred.JobConf;
  * ValueAggregatorDescriptor objects at configuration time. For each input
  * key/value pair, the mapper will use those objects to create aggregation
  * id/value pairs.
- * 
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.aggregate.ValueAggregatorDescriptor}
- * instead 
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public interface ValueAggregatorDescriptor extends 

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorJob.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorJob.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorJob.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorJob.java Fri Jun 18 21:22:01 2010
@@ -78,11 +78,7 @@ import org.apache.hadoop.util.GenericOpt
  * framework. The function takes the following parameters: input directory spec
  * input format (text or sequence file) output directory a file specifying the
  * user plugin class
- * 
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.aggregate.ValueAggregatorJob} instead
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class ValueAggregatorJob {

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorJobBase.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorJobBase.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorJobBase.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorJobBase.java Fri Jun 18 21:22:01 2010
@@ -33,11 +33,7 @@ import org.apache.hadoop.mapred.Reducer;
 /**
  * This abstract class implements some common functionalities of the
  * the generic mapper, reducer and combiner classes of Aggregate.
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.aggregate.ValueAggregatorJobBase}
- * instead
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public abstract class ValueAggregatorJobBase<K1 extends WritableComparable,

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorMapper.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorMapper.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorMapper.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorMapper.java Fri Jun 18 21:22:01 2010
@@ -32,11 +32,7 @@ import org.apache.hadoop.mapred.Reporter
 
 /**
  * This class implements the generic mapper of Aggregate.
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.aggregate.ValueAggregatorMapper}
- * instead
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class ValueAggregatorMapper<K1 extends WritableComparable,

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorReducer.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorReducer.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorReducer.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueAggregatorReducer.java Fri Jun 18 21:22:01 2010
@@ -31,12 +31,7 @@ import org.apache.hadoop.mapred.Reporter
 
 /**
  * This class implements the generic reducer of Aggregate.
- * 
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.aggregate.ValueAggregatorReducer}
- * instead
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class ValueAggregatorReducer<K1 extends WritableComparable,

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueHistogram.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueHistogram.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueHistogram.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/aggregate/ValueHistogram.java Fri Jun 18 21:22:01 2010
@@ -24,11 +24,7 @@ import org.apache.hadoop.classification.
 /**
  * This class implements a value aggregator that computes the 
  * histogram of a sequence of strings.
- * 
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.aggregate.ValueHistogram} instead
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class ValueHistogram 

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/db/DBConfiguration.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/db/DBConfiguration.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/db/DBConfiguration.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/db/DBConfiguration.java Fri Jun 18 21:22:01 2010
@@ -23,10 +23,7 @@ import org.apache.hadoop.classification.
 import org.apache.hadoop.mapred.JobConf;
 
 /**
- * @deprecated Use 
- * {@link org.apache.hadoop.mapreduce.lib.db.DBConfiguration} instead 
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class DBConfiguration extends 

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/db/DBInputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/db/DBInputFormat.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/db/DBInputFormat.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/db/DBInputFormat.java Fri Jun 18 21:22:01 2010
@@ -37,10 +37,7 @@ import org.apache.hadoop.mapred.Reporter
 import org.apache.hadoop.mapreduce.Job;
 
 /**
- * @deprecated 
- * Use {@link org.apache.hadoop.mapreduce.lib.db.DBInputFormat} instead.
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class DBInputFormat<T  extends DBWritable>

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/db/DBOutputFormat.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/db/DBOutputFormat.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/db/DBOutputFormat.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/db/DBOutputFormat.java Fri Jun 18 21:22:01 2010
@@ -37,9 +37,7 @@ import org.apache.hadoop.mapreduce.task.
 import org.apache.hadoop.util.Progressable;
 
 /**
- * @deprecated Use org.apache.hadoop.mapreduce.lib.db.DBOutputFormat instead
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public class DBOutputFormat<K  extends DBWritable, V> 

Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/db/DBWritable.java
URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/db/DBWritable.java?rev=956133&r1=956132&r2=956133&view=diff
==============================================================================
--- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/db/DBWritable.java (original)
+++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/lib/db/DBWritable.java Fri Jun 18 21:22:01 2010
@@ -21,10 +21,7 @@ import org.apache.hadoop.classification.
 import org.apache.hadoop.classification.InterfaceStability;
 
 /**
- * @deprecated 
- * Use {@link org.apache.hadoop.mapreduce.lib.db.DBWritable} instead
  */
-@Deprecated
 @InterfaceAudience.Public
 @InterfaceStability.Stable
 public interface DBWritable