Return-Path: Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: (qmail 90660 invoked from network); 20 May 2010 05:45:33 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 20 May 2010 05:45:33 -0000 Received: (qmail 78702 invoked by uid 500); 20 May 2010 05:45:33 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 78677 invoked by uid 500); 20 May 2010 05:45:32 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 78669 invoked by uid 99); 20 May 2010 05:45:32 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 May 2010 05:45:32 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 May 2010 05:45:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 343062388AB9; Thu, 20 May 2010 05:44:34 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r946533 [6/7] - in /hadoop/mapreduce/branches/branch-0.21: ./ conf/ src/c++/ src/contrib/ src/contrib/block_forensics/ src/contrib/capacity-scheduler/ src/contrib/data_join/ src/contrib/dynamic-scheduler/ src/contrib/eclipse-plugin/ src/con... Date: Thu, 20 May 2010 05:44:28 -0000 To: mapreduce-commits@hadoop.apache.org From: acmurthy@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100520054434.343062388AB9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/map/MultithreadedMapper.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/map/MultithreadedMapper.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/map/MultithreadedMapper.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/map/MultithreadedMapper.java Thu May 20 05:44:18 2010 @@ -19,6 +19,8 @@ package org.apache.hadoop.mapreduce.lib.map; import org.apache.hadoop.util.ReflectionUtils; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.Counter; import org.apache.hadoop.mapreduce.InputSplit; @@ -54,6 +56,8 @@ import java.util.List; * value is 10 threads. *

*/ +@InterfaceAudience.Public +@InterfaceStability.Stable public class MultithreadedMapper extends Mapper { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/map/RegexMapper.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/map/RegexMapper.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/map/RegexMapper.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/map/RegexMapper.java Thu May 20 05:44:18 2010 @@ -22,6 +22,8 @@ import java.io.IOException; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; @@ -29,6 +31,8 @@ import org.apache.hadoop.mapreduce.Mappe /** A {@link Mapper} that extracts text matching a regular expression. */ +@InterfaceAudience.Public +@InterfaceStability.Stable public class RegexMapper extends Mapper { public static String PATTERN = "mapreduce.mapper.regex"; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/map/TokenCounterMapper.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/map/TokenCounterMapper.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/map/TokenCounterMapper.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/map/TokenCounterMapper.java Thu May 20 05:44:18 2010 @@ -21,6 +21,8 @@ package org.apache.hadoop.mapreduce.lib. import java.io.IOException; import java.util.StringTokenizer; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.io.IntWritable; import org.apache.hadoop.io.Text; import org.apache.hadoop.mapreduce.Mapper; @@ -28,6 +30,8 @@ import org.apache.hadoop.mapreduce.Mappe /** * Tokenize the input values and emit each word with a count of 1. */ +@InterfaceAudience.Public +@InterfaceStability.Stable public class TokenCounterMapper extends Mapper{ private final static IntWritable one = new IntWritable(1); Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/map/WrappedMapper.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/map/WrappedMapper.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/map/WrappedMapper.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/map/WrappedMapper.java Thu May 20 05:44:18 2010 @@ -21,6 +21,8 @@ package org.apache.hadoop.mapreduce.lib. import java.io.IOException; import java.net.URI; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration.IntegerRanges; import org.apache.hadoop.fs.Path; @@ -41,6 +43,8 @@ import org.apache.hadoop.mapreduce.TaskA * A {@link Mapper} which wraps a given one to allow custom * {@link Mapper.Context} implementations. */ +@InterfaceAudience.Public +@InterfaceStability.Evolving public class WrappedMapper extends Mapper { @@ -54,6 +58,7 @@ public class WrappedMapper.Context { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/FileOutputCommitter.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/FileOutputCommitter.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/FileOutputCommitter.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/FileOutputCommitter.java Thu May 20 05:44:18 2010 @@ -23,6 +23,8 @@ import java.net.URI; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; @@ -38,6 +40,8 @@ import org.apache.hadoop.util.StringUtil /** An {@link OutputCommitter} that commits files specified * in job output directory i.e. ${mapreduce.output.fileoutputformat.outputdir}. **/ +@InterfaceAudience.Public +@InterfaceStability.Stable public class FileOutputCommitter extends OutputCommitter { private static final Log LOG = LogFactory.getLog(FileOutputCommitter.class); Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/FileOutputFormat.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/FileOutputFormat.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/FileOutputFormat.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/FileOutputFormat.java Thu May 20 05:44:18 2010 @@ -21,6 +21,8 @@ package org.apache.hadoop.mapreduce.lib. import java.io.IOException; import java.text.NumberFormat; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -38,6 +40,8 @@ import org.apache.hadoop.mapreduce.TaskI import org.apache.hadoop.mapreduce.security.TokenCache; /** A base class for {@link OutputFormat}s that read from {@link FileSystem}s.*/ +@InterfaceAudience.Public +@InterfaceStability.Stable public abstract class FileOutputFormat extends OutputFormat { /** Construct output file names so that, when an output directory listing is Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/FilterOutputFormat.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/FilterOutputFormat.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/FilterOutputFormat.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/FilterOutputFormat.java Thu May 20 05:44:18 2010 @@ -20,6 +20,8 @@ package org.apache.hadoop.mapreduce.lib. import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.mapreduce.JobContext; import org.apache.hadoop.mapreduce.OutputCommitter; import org.apache.hadoop.mapreduce.OutputFormat; @@ -29,6 +31,8 @@ import org.apache.hadoop.mapreduce.TaskA /** * FilterOutputFormat is a convenience class that wraps OutputFormat. */ +@InterfaceAudience.Public +@InterfaceStability.Stable public class FilterOutputFormat extends OutputFormat { protected OutputFormat baseOut; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/LazyOutputFormat.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/LazyOutputFormat.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/LazyOutputFormat.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/LazyOutputFormat.java Thu May 20 05:44:18 2010 @@ -20,6 +20,8 @@ package org.apache.hadoop.mapreduce.lib. import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.JobContext; @@ -32,6 +34,8 @@ import org.apache.hadoop.util.Reflection /** * A Convenience class that creates output lazily. */ +@InterfaceAudience.Public +@InterfaceStability.Stable public class LazyOutputFormat extends FilterOutputFormat { public static String OUTPUT_FORMAT = "mapreduce.output.lazyoutputformat.outputformat"; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/MapFileOutputFormat.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/MapFileOutputFormat.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/MapFileOutputFormat.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/MapFileOutputFormat.java Thu May 20 05:44:18 2010 @@ -35,12 +35,16 @@ import org.apache.hadoop.mapreduce.Parti import org.apache.hadoop.mapreduce.RecordWriter; import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.hadoop.util.ReflectionUtils; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; /** * An {@link org.apache.hadoop.mapreduce.OutputFormat} that writes * {@link MapFile}s. */ +@InterfaceAudience.Public +@InterfaceStability.Stable public class MapFileOutputFormat extends FileOutputFormat, Writable> { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/MultipleOutputs.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/MultipleOutputs.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/MultipleOutputs.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/MultipleOutputs.java Thu May 20 05:44:18 2010 @@ -17,6 +17,8 @@ */ package org.apache.hadoop.mapreduce.lib.output; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableComparable; @@ -108,6 +110,8 @@ import java.util.*; * } * */ +@InterfaceAudience.Public +@InterfaceStability.Stable public class MultipleOutputs { private static final String MULTIPLE_OUTPUTS = "mapreduce.multipleoutputs"; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/NullOutputFormat.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/NullOutputFormat.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/NullOutputFormat.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/NullOutputFormat.java Thu May 20 05:44:18 2010 @@ -18,6 +18,8 @@ package org.apache.hadoop.mapreduce.lib.output; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.mapreduce.JobContext; import org.apache.hadoop.mapreduce.OutputCommitter; import org.apache.hadoop.mapreduce.OutputFormat; @@ -27,6 +29,8 @@ import org.apache.hadoop.mapreduce.TaskA /** * Consume all outputs and put them in /dev/null. */ +@InterfaceAudience.Public +@InterfaceStability.Stable public class NullOutputFormat extends OutputFormat { @Override Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/SequenceFileAsBinaryOutputFormat.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/SequenceFileAsBinaryOutputFormat.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/SequenceFileAsBinaryOutputFormat.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/SequenceFileAsBinaryOutputFormat.java Thu May 20 05:44:18 2010 @@ -20,6 +20,8 @@ package org.apache.hadoop.mapreduce.lib. import java.io.IOException; import java.io.DataOutputStream; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.io.WritableComparable; import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.BytesWritable; @@ -36,6 +38,8 @@ import org.apache.hadoop.mapreduce.TaskA * An {@link org.apache.hadoop.mapreduce.OutputFormat} that writes keys, * values to {@link SequenceFile}s in binary(raw) format */ +@InterfaceAudience.Public +@InterfaceStability.Stable public class SequenceFileAsBinaryOutputFormat extends SequenceFileOutputFormat { public static String KEY_CLASS = "mapreduce.output.seqbinaryoutputformat.key.class"; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/SequenceFileOutputFormat.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/SequenceFileOutputFormat.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/SequenceFileOutputFormat.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/SequenceFileOutputFormat.java Thu May 20 05:44:18 2010 @@ -33,9 +33,13 @@ import org.apache.hadoop.mapreduce.Outpu import org.apache.hadoop.mapreduce.RecordWriter; import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.hadoop.util.ReflectionUtils; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; /** An {@link OutputFormat} that writes {@link SequenceFile}s. */ +@InterfaceAudience.Public +@InterfaceStability.Stable public class SequenceFileOutputFormat extends FileOutputFormat { protected SequenceFile.Writer getSequenceWriter(TaskAttemptContext context, Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/TextOutputFormat.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/TextOutputFormat.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/TextOutputFormat.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/output/TextOutputFormat.java Thu May 20 05:44:18 2010 @@ -22,6 +22,8 @@ import java.io.DataOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -37,6 +39,8 @@ import org.apache.hadoop.mapreduce.TaskA import org.apache.hadoop.util.*; /** An {@link OutputFormat} that writes plain text files. */ +@InterfaceAudience.Public +@InterfaceStability.Stable public class TextOutputFormat extends FileOutputFormat { public static String SEPERATOR = "mapreduce.output.textoutputformat.separator"; protected static class LineRecordWriter Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/BinaryPartitioner.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/BinaryPartitioner.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/BinaryPartitioner.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/BinaryPartitioner.java Thu May 20 05:44:18 2010 @@ -18,6 +18,8 @@ package org.apache.hadoop.mapreduce.lib.partition; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.BinaryComparable; @@ -64,6 +66,8 @@ import org.apache.hadoop.mapreduce.Parti *

  • {@link #setRightOffset}
    • *

    */ +@InterfaceAudience.Public +@InterfaceStability.Evolving public class BinaryPartitioner extends Partitioner implements Configurable { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/HashPartitioner.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/HashPartitioner.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/HashPartitioner.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/HashPartitioner.java Thu May 20 05:44:18 2010 @@ -18,9 +18,13 @@ package org.apache.hadoop.mapreduce.lib.partition; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.mapreduce.Partitioner; /** Partition keys by their {@link Object#hashCode()}. */ +@InterfaceAudience.Public +@InterfaceStability.Stable public class HashPartitioner extends Partitioner { /** Use {@link Object#hashCode()} to partition. */ Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/InputSampler.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/InputSampler.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/InputSampler.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/InputSampler.java Thu May 20 05:44:18 2010 @@ -27,6 +27,8 @@ import java.util.Random; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.fs.FileSystem; @@ -51,6 +53,8 @@ import org.apache.hadoop.util.ToolRunner * Utility for collecting samples and writing a partition file for * {@link TotalOrderPartitioner}. */ +@InterfaceAudience.Public +@InterfaceStability.Stable public class InputSampler extends Configured implements Tool { private static final Log LOG = LogFactory.getLog(InputSampler.class); Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/KeyFieldBasedComparator.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/KeyFieldBasedComparator.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/KeyFieldBasedComparator.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/KeyFieldBasedComparator.java Thu May 20 05:44:18 2010 @@ -20,6 +20,8 @@ package org.apache.hadoop.mapreduce.lib. import java.util.List; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.WritableComparator; @@ -46,7 +48,8 @@ import org.apache.hadoop.mapreduce.lib.p * We assume that the fields in the key are separated by * {@link JobContext#MAP_OUTPUT_KEY_FIELD_SEPERATOR}. */ - +@InterfaceAudience.Public +@InterfaceStability.Stable public class KeyFieldBasedComparator extends WritableComparator implements Configurable { private KeyFieldHelper keyFieldHelper = new KeyFieldHelper(); Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/KeyFieldBasedPartitioner.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/KeyFieldBasedPartitioner.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/KeyFieldBasedPartitioner.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/KeyFieldBasedPartitioner.java Thu May 20 05:44:18 2010 @@ -23,6 +23,8 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.Job; @@ -44,6 +46,8 @@ import org.apache.hadoop.mapreduce.lib.p * (the end of the field). * */ +@InterfaceAudience.Public +@InterfaceStability.Stable public class KeyFieldBasedPartitioner extends Partitioner implements Configurable { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/TotalOrderPartitioner.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/TotalOrderPartitioner.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/TotalOrderPartitioner.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/partition/TotalOrderPartitioner.java Thu May 20 05:44:18 2010 @@ -23,6 +23,8 @@ import java.lang.reflect.Array; import java.util.ArrayList; import java.util.Arrays; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configurable; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; @@ -40,6 +42,8 @@ import org.apache.hadoop.util.Reflection * Partitioner effecting a total order by reading split points from * an externally generated source. */ +@InterfaceAudience.Public +@InterfaceStability.Stable public class TotalOrderPartitioner,V> extends Partitioner implements Configurable { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/reduce/IntSumReducer.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/reduce/IntSumReducer.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/reduce/IntSumReducer.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/reduce/IntSumReducer.java Thu May 20 05:44:18 2010 @@ -20,9 +20,13 @@ package org.apache.hadoop.mapreduce.lib. import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.io.IntWritable; import org.apache.hadoop.mapreduce.Reducer; +@InterfaceAudience.Public +@InterfaceStability.Stable public class IntSumReducer extends Reducer { private IntWritable result = new IntWritable(); Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/reduce/LongSumReducer.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/reduce/LongSumReducer.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/reduce/LongSumReducer.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/reduce/LongSumReducer.java Thu May 20 05:44:18 2010 @@ -19,9 +19,14 @@ package org.apache.hadoop.mapreduce.lib.reduce; import java.io.IOException; + +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.mapreduce.Reducer; +@InterfaceAudience.Public +@InterfaceStability.Stable public class LongSumReducer extends Reducer { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/reduce/WrappedReducer.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/reduce/WrappedReducer.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/reduce/WrappedReducer.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/lib/reduce/WrappedReducer.java Thu May 20 05:44:18 2010 @@ -21,6 +21,8 @@ package org.apache.hadoop.mapreduce.lib. import java.io.IOException; import java.net.URI; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration.IntegerRanges; import org.apache.hadoop.fs.Path; @@ -40,6 +42,8 @@ import org.apache.hadoop.mapreduce.TaskA * A {@link Reducer} which wraps a given one to allow for custom * {@link Reducer.Context} implementations. */ +@InterfaceAudience.Public +@InterfaceStability.Evolving public class WrappedReducer extends Reducer { @@ -53,6 +57,7 @@ public class WrappedReducer.Context { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/protocol/ClientProtocol.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/protocol/ClientProtocol.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/protocol/ClientProtocol.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/protocol/ClientProtocol.java Thu May 20 05:44:18 2010 @@ -20,7 +20,8 @@ package org.apache.hadoop.mapreduce.prot import java.io.IOException; - +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.hdfs.security.token.delegation.DelegationTokenSelector; import org.apache.hadoop.io.Text; import org.apache.hadoop.ipc.VersionedProtocol; @@ -50,6 +51,8 @@ import org.apache.hadoop.security.token. */ @KerberosInfo(MRJobConfig.JOB_JOBTRACKER_ID) @TokenInfo(DelegationTokenSelector.class) +@InterfaceAudience.Private +@InterfaceStability.Stable public interface ClientProtocol extends VersionedProtocol { /* *Changing the versionID to 2L since the getTaskCompletionEvents method has Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/SecureShuffleUtils.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/SecureShuffleUtils.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/SecureShuffleUtils.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/SecureShuffleUtils.java Thu May 20 05:44:18 2010 @@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletReq import org.apache.commons.codec.binary.Base64; import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.mapreduce.security.token.JobTokenSecretManager; import org.apache.hadoop.record.Utils; @@ -37,6 +38,7 @@ import org.apache.hadoop.record.Utils; * */ @InterfaceAudience.Private +@InterfaceStability.Unstable public class SecureShuffleUtils { public static final String HTTP_HEADER_URL_HASH = "UrlHash"; public static final String HTTP_HEADER_REPLY_URL_HASH = "ReplyHash"; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/TokenCache.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/TokenCache.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/TokenCache.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/TokenCache.java Thu May 20 05:44:18 2010 @@ -50,6 +50,7 @@ import org.apache.hadoop.security.UserGr * The secrets can be stored just before submission of jobs and read during * the task execution. */ +@InterfaceAudience.Public @InterfaceStability.Evolving public class TokenCache { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/DelegationTokenRenewal.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/DelegationTokenRenewal.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/DelegationTokenRenewal.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/DelegationTokenRenewal.java Thu May 20 05:44:18 2010 @@ -34,6 +34,7 @@ import java.util.TimerTask; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.hdfs.DistributedFileSystem; @@ -47,6 +48,7 @@ import org.apache.hadoop.security.token. @InterfaceAudience.Private +@InterfaceStability.Unstable public class DelegationTokenRenewal { private static final Log LOG = LogFactory.getLog(DelegationTokenRenewal.class); public static final String SCHEME = "hdfs"; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/JobTokenIdentifier.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/JobTokenIdentifier.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/JobTokenIdentifier.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/JobTokenIdentifier.java Thu May 20 05:44:18 2010 @@ -23,6 +23,7 @@ import java.io.DataOutput; import java.io.IOException; import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.io.Text; import org.apache.hadoop.security.token.TokenIdentifier; import org.apache.hadoop.security.UserGroupInformation; @@ -31,6 +32,7 @@ import org.apache.hadoop.security.UserGr * The token identifier for job token */ @InterfaceAudience.Private +@InterfaceStability.Unstable public class JobTokenIdentifier extends TokenIdentifier { private Text jobid; final static Text KIND_NAME = new Text("mapreduce.job"); Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/JobTokenSecretManager.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/JobTokenSecretManager.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/JobTokenSecretManager.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/JobTokenSecretManager.java Thu May 20 05:44:18 2010 @@ -24,6 +24,7 @@ import java.util.TreeMap; import javax.crypto.SecretKey; import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.security.token.SecretManager; import org.apache.hadoop.security.token.Token; @@ -31,6 +32,7 @@ import org.apache.hadoop.security.token. * SecretManager for job token. It can be used to cache generated job tokens. */ @InterfaceAudience.Private +@InterfaceStability.Unstable public class JobTokenSecretManager extends SecretManager { private final SecretKey masterKey; private final Map currentJobTokens; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/JobTokenSelector.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/JobTokenSelector.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/JobTokenSelector.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/JobTokenSelector.java Thu May 20 05:44:18 2010 @@ -21,6 +21,7 @@ package org.apache.hadoop.mapreduce.secu import java.util.Collection; import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.io.Text; import org.apache.hadoop.security.token.Token; import org.apache.hadoop.security.token.TokenIdentifier; @@ -31,6 +32,7 @@ import org.apache.hadoop.security.token. * and return it. */ @InterfaceAudience.Private +@InterfaceStability.Unstable public class JobTokenSelector implements TokenSelector { @SuppressWarnings("unchecked") Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/delegation/DelegationTokenIdentifier.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/delegation/DelegationTokenIdentifier.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/delegation/DelegationTokenIdentifier.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/delegation/DelegationTokenIdentifier.java Thu May 20 05:44:18 2010 @@ -19,6 +19,7 @@ package org.apache.hadoop.mapreduce.security.token.delegation; import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.io.Text; import org.apache.hadoop.security.token.delegation.AbstractDelegationTokenIdentifier; @@ -26,6 +27,7 @@ import org.apache.hadoop.security.token. * A delegation token identifier that is specific to MapReduce. */ @InterfaceAudience.Private +@InterfaceStability.Unstable public class DelegationTokenIdentifier extends AbstractDelegationTokenIdentifier { static final Text MAPREDUCE_DELEGATION_KIND = Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/delegation/DelegationTokenSecretManager.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/delegation/DelegationTokenSecretManager.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/delegation/DelegationTokenSecretManager.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/delegation/DelegationTokenSecretManager.java Thu May 20 05:44:18 2010 @@ -19,6 +19,7 @@ package org.apache.hadoop.mapreduce.security.token.delegation; import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.security.token.delegation.AbstractDelegationTokenSecretManager; /** @@ -27,6 +28,7 @@ import org.apache.hadoop.security.token. * for each token. */ @InterfaceAudience.Private +@InterfaceStability.Unstable public class DelegationTokenSecretManager extends AbstractDelegationTokenSecretManager { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/delegation/DelegationTokenSelector.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/delegation/DelegationTokenSelector.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/delegation/DelegationTokenSelector.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/security/token/delegation/DelegationTokenSelector.java Thu May 20 05:44:18 2010 @@ -18,12 +18,14 @@ package org.apache.hadoop.mapreduce.security.token.delegation; import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.security.token.delegation.AbstractDelegationTokenSelector; /** * A delegation token that is specialized for MapReduce */ @InterfaceAudience.Private +@InterfaceStability.Unstable public class DelegationTokenSelector extends AbstractDelegationTokenSelector{ Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/jobtracker/JTConfig.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/jobtracker/JTConfig.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/jobtracker/JTConfig.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/jobtracker/JTConfig.java Thu May 20 05:44:18 2010 @@ -17,6 +17,8 @@ */ package org.apache.hadoop.mapreduce.server.jobtracker; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.mapreduce.MRConfig; /** @@ -24,6 +26,8 @@ import org.apache.hadoop.mapreduce.MRCon * * The keys should have "mapreduce.jobtracker." as the prefix */ +@InterfaceAudience.Private +@InterfaceStability.Evolving public interface JTConfig extends MRConfig { // JobTracker configuration parameters public static final String JT_IPC_ADDRESS = "mapreduce.jobtracker.address"; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/jobtracker/JobTrackerJspHelper.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/jobtracker/JobTrackerJspHelper.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/jobtracker/JobTrackerJspHelper.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/jobtracker/JobTrackerJspHelper.java Thu May 20 05:44:18 2010 @@ -25,6 +25,8 @@ import java.text.DecimalFormat; import javax.servlet.jsp.JspWriter; import javax.servlet.http.*; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.mapred.ClusterStatus; import org.apache.hadoop.mapred.JobInProgress; import org.apache.hadoop.mapred.JobProfile; @@ -38,6 +40,8 @@ import org.apache.hadoop.util.StringUtil /** * Methods to help format output for JobTracker XML JSPX */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class JobTrackerJspHelper { public JobTrackerJspHelper() { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/jobtracker/State.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/jobtracker/State.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/jobtracker/State.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/jobtracker/State.java Thu May 20 05:44:18 2010 @@ -17,9 +17,14 @@ */ package org.apache.hadoop.mapreduce.server.jobtracker; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; + /** * Describes the state of JobTracker */ +@InterfaceAudience.Public +@InterfaceStability.Evolving public enum State { INITIALIZING, RUNNING; } Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/jobtracker/TaskTracker.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/jobtracker/TaskTracker.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/jobtracker/TaskTracker.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/jobtracker/TaskTracker.java Thu May 20 05:44:18 2010 @@ -19,6 +19,8 @@ package org.apache.hadoop.mapreduce.serv import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.mapred.JobInProgress; import org.apache.hadoop.mapred.JobTracker; import org.apache.hadoop.mapred.TaskTrackerStatus; @@ -29,6 +31,8 @@ import org.apache.hadoop.mapreduce.TaskT * The representation of a single TaskTracker as seen by * the {@link JobTracker}. */ +@InterfaceAudience.LimitedPrivate("MapReduce") +@InterfaceStability.Unstable public class TaskTracker { static final Log LOG = LogFactory.getLog(TaskTracker.class); Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/tasktracker/Localizer.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/tasktracker/Localizer.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/tasktracker/Localizer.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/tasktracker/Localizer.java Thu May 20 05:44:18 2010 @@ -25,6 +25,8 @@ import java.util.concurrent.atomic.Atomi import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileUtil; import org.apache.hadoop.fs.Path; @@ -34,10 +36,8 @@ import org.apache.hadoop.mapred.TaskTrac import org.apache.hadoop.mapred.TaskController.InitializationContext; import org.apache.hadoop.mapreduce.JobID; -/** - * - * NOTE: This class is internal only and not intended for users!! - */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class Localizer { static final Log LOG = LogFactory.getLog(Localizer.class); @@ -59,10 +59,8 @@ public class Localizer { taskController = tc; } - /** - * NOTE: This class is internal only class and not intended for users!! - * - */ + @InterfaceAudience.Private + @InterfaceStability.Unstable public static class PermissionsHandler { /** * Permission information useful for setting permissions for a given path. @@ -71,6 +69,8 @@ public class Localizer { * be set together, i.e. permissions for group cannot be set different from * those for others and vice versa. */ + @InterfaceAudience.Private + @InterfaceStability.Unstable public static class PermissionsInfo { public boolean readPermissions; public boolean writePermissions; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/tasktracker/TTConfig.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/tasktracker/TTConfig.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/tasktracker/TTConfig.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/server/tasktracker/TTConfig.java Thu May 20 05:44:18 2010 @@ -17,6 +17,8 @@ */ package org.apache.hadoop.mapreduce.server.tasktracker; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.mapreduce.MRConfig; /** @@ -24,7 +26,8 @@ import org.apache.hadoop.mapreduce.MRCon * * The keys should have "mapreduce.tasktracker." as the prefix */ - +@InterfaceAudience.Private +@InterfaceStability.Evolving public interface TTConfig extends MRConfig { // Task-tracker configuration properties Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/split/JobSplit.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/split/JobSplit.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/split/JobSplit.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/split/JobSplit.java Thu May 20 05:44:18 2010 @@ -27,6 +27,7 @@ import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableUtils; import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; /** * This class groups the fundamental classes associated with @@ -43,6 +44,7 @@ import org.apache.hadoop.classification. * file. */ @InterfaceAudience.Private +@InterfaceStability.Unstable public class JobSplit { static final int META_SPLIT_VERSION = 1; static final byte[] META_SPLIT_FILE_HEADER; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/split/JobSplitWriter.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/split/JobSplitWriter.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/split/JobSplitWriter.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/split/JobSplitWriter.java Thu May 20 05:44:18 2010 @@ -36,12 +36,14 @@ import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.JobSubmissionFiles; import org.apache.hadoop.mapreduce.split.JobSplit.SplitMetaInfo; import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; -@InterfaceAudience.Private /** * The class that is used by the Job clients to write splits (both the meta * and the raw bytes parts) */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class JobSplitWriter { private static final int splitVersion = JobSplit.META_SPLIT_VERSION; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/split/SplitMetaInfoReader.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/split/SplitMetaInfoReader.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/split/SplitMetaInfoReader.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/split/SplitMetaInfoReader.java Thu May 20 05:44:18 2010 @@ -31,13 +31,14 @@ import org.apache.hadoop.mapreduce.JobID import org.apache.hadoop.mapreduce.JobSubmissionFiles; import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig; import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; -@InterfaceAudience.Private /** * A utility that reads the split meta info and creates * split meta info objects */ - +@InterfaceAudience.Private +@InterfaceStability.Unstable public class SplitMetaInfoReader { public static JobSplit.TaskSplitMetaInfo[] readSplitMetaInfo( Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/JobContextImpl.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/JobContextImpl.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/JobContextImpl.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/JobContextImpl.java Thu May 20 05:44:18 2010 @@ -21,6 +21,8 @@ package org.apache.hadoop.mapreduce.task import java.io.IOException; import java.net.URI; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration.IntegerRanges; import org.apache.hadoop.fs.Path; @@ -42,6 +44,8 @@ import org.apache.hadoop.mapreduce.lib.p * A read-only view of the job that is provided to the tasks while they * are running. */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class JobContextImpl implements JobContext { protected final org.apache.hadoop.mapred.JobConf conf; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/MapContextImpl.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/MapContextImpl.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/MapContextImpl.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/MapContextImpl.java Thu May 20 05:44:18 2010 @@ -20,6 +20,8 @@ package org.apache.hadoop.mapreduce.task import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.mapreduce.MapContext; @@ -37,6 +39,8 @@ import org.apache.hadoop.mapreduce.TaskA * @param the key output type from the Mapper * @param the value output type from the Mapper */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class MapContextImpl extends TaskInputOutputContextImpl implements MapContext { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/ReduceContextImpl.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/ReduceContextImpl.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/ReduceContextImpl.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/ReduceContextImpl.java Thu May 20 05:44:18 2010 @@ -23,6 +23,8 @@ import java.io.IOException; import java.util.Iterator; import java.util.NoSuchElementException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.BytesWritable; import org.apache.hadoop.io.DataInputBuffer; @@ -49,6 +51,8 @@ import org.apache.hadoop.util.Progressab * @param the class of the output keys * @param the class of the output values */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class ReduceContextImpl extends TaskInputOutputContextImpl implements ReduceContext { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/TaskAttemptContextImpl.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/TaskAttemptContextImpl.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/TaskAttemptContextImpl.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/TaskAttemptContextImpl.java Thu May 20 05:44:18 2010 @@ -18,6 +18,8 @@ package org.apache.hadoop.mapreduce.task; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.TaskAttemptContext; import org.apache.hadoop.mapreduce.TaskAttemptID; @@ -25,6 +27,8 @@ import org.apache.hadoop.mapreduce.TaskA /** * The context for task attempts. */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class TaskAttemptContextImpl extends JobContextImpl implements TaskAttemptContext { private final TaskAttemptID taskId; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/TaskInputOutputContextImpl.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/TaskInputOutputContextImpl.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/TaskInputOutputContextImpl.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/TaskInputOutputContextImpl.java Thu May 20 05:44:18 2010 @@ -20,6 +20,8 @@ package org.apache.hadoop.mapreduce.task import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.Counter; import org.apache.hadoop.mapreduce.OutputCommitter; @@ -38,6 +40,8 @@ import org.apache.hadoop.mapreduce.Reduc * @param the output key type for the task * @param the output value type for the task */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public abstract class TaskInputOutputContextImpl extends TaskAttemptContextImpl implements TaskInputOutputContext { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/reduce/InMemoryReader.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/reduce/InMemoryReader.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/reduce/InMemoryReader.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/reduce/InMemoryReader.java Thu May 20 05:44:18 2010 @@ -22,6 +22,8 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.io.DataInputBuffer; import org.apache.hadoop.mapred.IFile.Reader; import org.apache.hadoop.mapreduce.TaskAttemptID; @@ -29,6 +31,8 @@ import org.apache.hadoop.mapreduce.TaskA /** * IFile.InMemoryReader to read map-outputs present in-memory. */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class InMemoryReader extends Reader { private final TaskAttemptID taskAttemptId; private final MergeManager merger; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/reduce/InMemoryWriter.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/reduce/InMemoryWriter.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/reduce/InMemoryWriter.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/reduce/InMemoryWriter.java Thu May 20 05:44:18 2010 @@ -20,6 +20,8 @@ package org.apache.hadoop.mapreduce.task import java.io.DataOutputStream; import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.io.BoundedByteArrayOutputStream; import org.apache.hadoop.io.DataInputBuffer; import org.apache.hadoop.io.WritableUtils; @@ -27,6 +29,8 @@ import org.apache.hadoop.mapred.IFile; import org.apache.hadoop.mapred.IFileOutputStream; import org.apache.hadoop.mapred.IFile.Writer; +@InterfaceAudience.Private +@InterfaceStability.Unstable public class InMemoryWriter extends Writer { private DataOutputStream out; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/reduce/MergeManager.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/reduce/MergeManager.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/reduce/MergeManager.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/reduce/MergeManager.java Thu May 20 05:44:18 2010 @@ -27,6 +27,8 @@ import java.util.TreeSet; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.fs.ChecksumFileSystem; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.LocalDirAllocator; @@ -58,7 +60,8 @@ import org.apache.hadoop.util.Progress; import org.apache.hadoop.util.ReflectionUtils; @SuppressWarnings(value={"unchecked", "deprecation"}) - +@InterfaceAudience.Private +@InterfaceStability.Unstable public class MergeManager { private static final Log LOG = LogFactory.getLog(MergeManager.class); Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/reduce/Shuffle.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/reduce/Shuffle.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/reduce/Shuffle.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/reduce/Shuffle.java Thu May 20 05:44:18 2010 @@ -21,6 +21,8 @@ import java.io.IOException; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.LocalDirAllocator; import org.apache.hadoop.io.compress.CompressionCodec; @@ -37,6 +39,8 @@ import org.apache.hadoop.mapreduce.MRJob import org.apache.hadoop.mapreduce.TaskAttemptID; import org.apache.hadoop.util.Progress; +@InterfaceAudience.Private +@InterfaceStability.Unstable public class Shuffle implements ExceptionReporter { private static final Log LOG = LogFactory.getLog(Shuffle.class); private static final int PROGRESS_FREQUENCY = 2000; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/reduce/ShuffleHeader.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/reduce/ShuffleHeader.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/reduce/ShuffleHeader.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/task/reduce/ShuffleHeader.java Thu May 20 05:44:18 2010 @@ -21,6 +21,8 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.io.Text; import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableUtils; @@ -30,6 +32,8 @@ import org.apache.hadoop.io.WritableUtil * deciphered by the Fetcher thread of Reduce task * */ +@InterfaceAudience.Private +@InterfaceStability.Stable public class ShuffleHeader implements Writable { /** Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/tools/CLI.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/tools/CLI.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/tools/CLI.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/tools/CLI.java Thu May 20 05:44:18 2010 @@ -23,6 +23,8 @@ import java.util.List; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.ipc.RemoteException; @@ -47,6 +49,8 @@ import org.apache.hadoop.util.ToolRunner /** * Interprets the map reduce cli options */ +@InterfaceAudience.Public +@InterfaceStability.Stable public class CLI extends Configured implements Tool { private static final Log LOG = LogFactory.getLog(CLI.class); Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ConfigUtil.java Thu May 20 05:44:18 2010 @@ -17,6 +17,8 @@ */ package org.apache.hadoop.mapreduce.util; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.Job; import org.apache.hadoop.mapreduce.MRConfig; @@ -27,6 +29,8 @@ import org.apache.hadoop.mapreduce.serve /** * Place holder for deprecated keys in the framework */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class ConfigUtil { /** Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/LinuxMemoryCalculatorPlugin.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/LinuxMemoryCalculatorPlugin.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/LinuxMemoryCalculatorPlugin.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/LinuxMemoryCalculatorPlugin.java Thu May 20 05:44:18 2010 @@ -18,6 +18,9 @@ package org.apache.hadoop.mapreduce.util; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; + /** * Plugin to calculate virtual and physical memories on Linux systems. * @deprecated @@ -25,6 +28,8 @@ package org.apache.hadoop.mapreduce.util * instead */ @Deprecated +@InterfaceAudience.Private +@InterfaceStability.Unstable public class LinuxMemoryCalculatorPlugin extends MemoryCalculatorPlugin { private LinuxResourceCalculatorPlugin resourceCalculatorPlugin; // Use everything from LinuxResourceCalculatorPlugin Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/LinuxResourceCalculatorPlugin.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/LinuxResourceCalculatorPlugin.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/LinuxResourceCalculatorPlugin.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/LinuxResourceCalculatorPlugin.java Thu May 20 05:44:18 2010 @@ -27,11 +27,15 @@ import java.util.regex.Pattern; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.mapred.TaskTrackerStatus; /** * Plugin to calculate resource information on Linux systems. */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class LinuxResourceCalculatorPlugin extends ResourceCalculatorPlugin { private static final Log LOG = LogFactory.getLog(LinuxResourceCalculatorPlugin.class); Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/MRAsyncDiskService.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/MRAsyncDiskService.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/MRAsyncDiskService.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/MRAsyncDiskService.java Thu May 20 05:44:18 2010 @@ -33,6 +33,7 @@ import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.util.AsyncDiskService; import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; /** * This class is a container of multiple thread pools, each for a volume, @@ -49,6 +50,7 @@ import org.apache.hadoop.classification. * thread pools. */ @InterfaceAudience.Private +@InterfaceStability.Unstable public class MRAsyncDiskService { public static final Log LOG = LogFactory.getLog(MRAsyncDiskService.class); Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/MemoryCalculatorPlugin.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/MemoryCalculatorPlugin.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/MemoryCalculatorPlugin.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/MemoryCalculatorPlugin.java Thu May 20 05:44:18 2010 @@ -18,6 +18,8 @@ package org.apache.hadoop.mapreduce.util; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.util.ReflectionUtils; @@ -29,6 +31,8 @@ import org.apache.hadoop.util.Reflection * instead */ @Deprecated +@InterfaceAudience.Private +@InterfaceStability.Unstable public abstract class MemoryCalculatorPlugin extends Configured { /** Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ProcessTree.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ProcessTree.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ProcessTree.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ProcessTree.java Thu May 20 05:44:18 2010 @@ -24,6 +24,8 @@ import java.util.Arrays; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.Shell.ExitCodeException; import org.apache.hadoop.util.Shell.ShellCommandExecutor; @@ -31,6 +33,8 @@ import org.apache.hadoop.util.Shell.Shel /** * Process tree related operations */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class ProcessTree { private static final Log LOG = LogFactory.getLog(ProcessTree.class); Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ProcfsBasedProcessTree.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ProcfsBasedProcessTree.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ProcfsBasedProcessTree.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ProcfsBasedProcessTree.java Thu May 20 05:44:18 2010 @@ -33,12 +33,16 @@ import java.util.LinkedList; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.util.Shell.ShellCommandExecutor; import org.apache.hadoop.util.StringUtils; /** * A Proc file-system based ProcessTree. Works only on Linux. */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class ProcfsBasedProcessTree extends ProcessTree { static final Log LOG = LogFactory Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ResourceCalculatorPlugin.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ResourceCalculatorPlugin.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ResourceCalculatorPlugin.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapreduce/util/ResourceCalculatorPlugin.java Thu May 20 05:44:18 2010 @@ -18,6 +18,8 @@ package org.apache.hadoop.mapreduce.util; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.util.ReflectionUtils; @@ -26,6 +28,8 @@ import org.apache.hadoop.util.Reflection * Plugin to calculate resource information on the system. * */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public abstract class ResourceCalculatorPlugin extends Configured { /** Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/util/LinuxMemoryCalculatorPlugin.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/util/LinuxMemoryCalculatorPlugin.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/util/LinuxMemoryCalculatorPlugin.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/util/LinuxMemoryCalculatorPlugin.java Thu May 20 05:44:18 2010 @@ -18,6 +18,9 @@ package org.apache.hadoop.util; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; + /** * Plugin to calculate virtual and physical memories on Linux systems. * @@ -26,6 +29,8 @@ package org.apache.hadoop.util; * instead */ @Deprecated +@InterfaceAudience.Private +@InterfaceStability.Unstable public class LinuxMemoryCalculatorPlugin extends org.apache.hadoop.mapreduce.util.LinuxMemoryCalculatorPlugin { // Inherits everything from the super class Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/util/MemoryCalculatorPlugin.java Thu May 20 05:44:18 2010 @@ -18,6 +18,8 @@ package org.apache.hadoop.util; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; /** @@ -29,6 +31,8 @@ import org.apache.hadoop.conf.Configurat * */ @Deprecated +@InterfaceAudience.Private +@InterfaceStability.Unstable public abstract class MemoryCalculatorPlugin extends org.apache.hadoop.mapreduce.util.MemoryCalculatorPlugin { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/util/ProcessTree.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/util/ProcessTree.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/util/ProcessTree.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/util/ProcessTree.java Thu May 20 05:44:18 2010 @@ -18,12 +18,17 @@ package org.apache.hadoop.util; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; + /** * Process tree related operations * * @deprecated Use {@link org.apache.hadoop.mapreduce.util.ProcessTree} instead */ @Deprecated +@InterfaceAudience.Private +@InterfaceStability.Unstable public class ProcessTree extends org.apache.hadoop.mapreduce.util.ProcessTree { // Inherits everything from the super class } Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/util/ProcfsBasedProcessTree.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/util/ProcfsBasedProcessTree.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/util/ProcfsBasedProcessTree.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/util/ProcfsBasedProcessTree.java Thu May 20 05:44:18 2010 @@ -18,6 +18,9 @@ package org.apache.hadoop.util; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; + /** * A Proc file-system based ProcessTree. Works only on Linux. * @@ -26,6 +29,8 @@ package org.apache.hadoop.util; * instead */ @Deprecated +@InterfaceAudience.Private +@InterfaceStability.Unstable public class ProcfsBasedProcessTree extends org.apache.hadoop.mapreduce.util.ProcfsBasedProcessTree { Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 20 05:44:18 2010 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/test/mapred:713112 /hadoop/core/trunk/src/test/mapred:776175-785643 -/hadoop/mapreduce/trunk/src/test/mapred:940364 +/hadoop/mapreduce/trunk/src/test/mapred:940364,946526 Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/fs/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 20 05:44:18 2010 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/fs:713112 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/fs:776175-785643 -/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs:817878-835934,940364 +/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/fs:817878-835934,940364,946526 Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/hdfs/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 20 05:44:18 2010 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/hdfs:713112 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/hdfs:776175-785643 -/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/hdfs:817878-835934,940364 +/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/hdfs:817878-835934,940364,946526 Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/io/FileBench.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 20 05:44:18 2010 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/io/FileBench.java:713112 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/io/FileBench.java:776175-785643 -/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/FileBench.java:817878-835934,940364 +/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/FileBench.java:817878-835934,940364,946526 Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 20 05:44:18 2010 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:713112 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:776175-785643 -/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:817878-835934,940364 +/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/io/TestSequenceFileMergeProgress.java:817878-835934,940364,946526 Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/ipc/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 20 05:44:18 2010 @@ -1,4 +1,4 @@ /hadoop/core/branches/branch-0.19/hdfs/src/test/hdfs-with-mr/org/apache/hadoop/ipc:713112 /hadoop/core/trunk/src/test/hdfs-with-mr/org/apache/hadoop/ipc:776175-784663 /hadoop/hdfs/branches/HDFS-265/src/test/hdfs-with-mr/org/apache/hadoop/ipc:796829-820463 -/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/ipc:940364 +/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/ipc:940364,946526 Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 20 05:44:18 2010 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:713112 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:776175-785643 -/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:817878-835934,940364 +/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/security/authorize/TestServiceLevelAuthorization.java:817878-835934,940364,946526 Propchange: hadoop/mapreduce/branches/branch-0.21/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Thu May 20 05:44:18 2010 @@ -1,3 +1,3 @@ /hadoop/core/branches/branch-0.19/mapred/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:713112 /hadoop/core/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:776175-785643 -/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:817878-835934,940364 +/hadoop/mapreduce/trunk/src/test/mapred/org/apache/hadoop/test/MapredTestDriver.java:817878-835934,940364,946526