Return-Path: Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: (qmail 90170 invoked from network); 20 May 2010 05:45:01 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 20 May 2010 05:45:01 -0000 Received: (qmail 75921 invoked by uid 500); 20 May 2010 05:45:01 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 75843 invoked by uid 500); 20 May 2010 05:45:01 -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 75835 invoked by uid 99); 20 May 2010 05:45:01 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 20 May 2010 05:45:01 +0000 X-ASF-Spam-Status: No, hits=-1667.1 required=10.0 tests=ALL_TRUSTED,AWL,T_FILL_THIS_FORM_SHORT 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:44:54 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 1B4A623889E1; 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 [2/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.1B4A623889E1@eris.apache.org> Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobConfigurable.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobConfigurable.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobConfigurable.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobConfigurable.java Thu May 20 05:44:18 2010 @@ -18,8 +18,13 @@ package org.apache.hadoop.mapred; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; + /** That what may be configured. */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public interface JobConfigurable { /** Initializes a new instance from a {@link JobConf}. * Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobContext.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobContext.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobContext.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobContext.java Thu May 20 05:44:18 2010 @@ -18,12 +18,16 @@ package org.apache.hadoop.mapred; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.util.Progressable; /** * @deprecated Use {@link org.apache.hadoop.mapreduce.JobContext} instead. */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public interface JobContext extends org.apache.hadoop.mapreduce.JobContext { /** * Get the job Configuration Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobContextImpl.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobContextImpl.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobContextImpl.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobContextImpl.java Thu May 20 05:44:18 2010 @@ -17,12 +17,16 @@ package org.apache.hadoop.mapred; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.util.Progressable; /** * @deprecated Use {@link org.apache.hadoop.mapreduce.JobContext} instead. */ @Deprecated +@InterfaceAudience.Private +@InterfaceStability.Unstable public class JobContextImpl extends org.apache.hadoop.mapreduce.task.JobContextImpl implements JobContext { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobEndNotifier.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobEndNotifier.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobEndNotifier.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobEndNotifier.java Thu May 20 05:44:18 2010 @@ -30,7 +30,11 @@ import org.apache.commons.httpclient.URI import org.apache.commons.httpclient.methods.GetMethod; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; +@InterfaceAudience.Private +@InterfaceStability.Unstable public class JobEndNotifier { private static final Log LOG = LogFactory.getLog(JobEndNotifier.class.getName()); Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobID.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobID.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobID.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobID.java Thu May 20 05:44:18 2010 @@ -21,6 +21,9 @@ package org.apache.hadoop.mapred; import java.io.DataInput; import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; + /** * JobID represents the immutable and unique identifier for * the job. JobID consists of two parts. First part @@ -39,6 +42,8 @@ import java.io.IOException; * @see TaskAttemptID */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class JobID extends org.apache.hadoop.mapreduce.JobID { /** * Constructs a JobID object Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobInProgress.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobInProgress.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobInProgress.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobInProgress.java Thu May 20 05:44:18 2010 @@ -40,6 +40,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.FSDataOutputStream; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.LocalFileSystem; @@ -88,15 +90,13 @@ import org.apache.hadoop.security.token. import org.apache.hadoop.security.token.TokenIdentifier; import org.apache.hadoop.util.StringUtils; -/************************************************************* - * JobInProgress maintains all the info for keeping - * a Job on the straight and narrow. It keeps its JobProfile - * and its latest JobStatus, plus a set of tables for - * doing bookkeeping of its Tasks. - * *********************************************************** - * - * This is NOT a public interface! +/** + * JobInProgress maintains all the info for keeping a Job on the straight and + * narrow. It keeps its JobProfile and its latest JobStatus, plus a set of + * tables for doing bookkeeping of its Tasks. */ +@InterfaceAudience.LimitedPrivate({"MapReduce"}) +@InterfaceStability.Unstable public class JobInProgress { /** * Used when the a kill is issued to a job which is initializing. Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobPriority.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobPriority.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobPriority.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobPriority.java Thu May 20 05:44:18 2010 @@ -17,11 +17,16 @@ */ package org.apache.hadoop.mapred; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; + /** * Used to describe the priority of the running job. * @deprecated Use {@link org.apache.hadoop.mapreduce.JobPriority} instead */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public enum JobPriority { VERY_HIGH, Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobProfile.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobProfile.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobProfile.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobProfile.java Thu May 20 05:44:18 2010 @@ -22,6 +22,8 @@ import java.io.DataOutput; import java.io.IOException; import java.net.URL; +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.WritableFactories; @@ -32,6 +34,8 @@ import org.apache.hadoop.io.WritableFact * whether living or dead. * **************************************************/ +@InterfaceAudience.LimitedPrivate({"MapReduce"}) +@InterfaceStability.Unstable public class JobProfile implements Writable { static { // register a ctor Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobQueueInfo.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobQueueInfo.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobQueueInfo.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobQueueInfo.java Thu May 20 05:44:18 2010 @@ -21,6 +21,8 @@ import java.util.ArrayList; import java.util.List; import java.util.Properties; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.mapreduce.QueueInfo; import org.apache.hadoop.mapreduce.QueueState; @@ -30,6 +32,8 @@ import org.apache.hadoop.mapreduce.Queue * @deprecated Use {@link QueueInfo} instead */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class JobQueueInfo extends QueueInfo { /** Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobStatus.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobStatus.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobStatus.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobStatus.java Thu May 20 05:44:18 2010 @@ -19,6 +19,8 @@ package org.apache.hadoop.mapred; import java.util.Map; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.mapreduce.JobACL; import org.apache.hadoop.security.authorize.AccessControlList; @@ -30,6 +32,8 @@ import org.apache.hadoop.security.author *@deprecated Use {@link org.apache.hadoop.mapreduce.JobStatus} instead **/ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class JobStatus extends org.apache.hadoop.mapreduce.JobStatus { public static final int RUNNING = Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobTracker.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobTracker.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobTracker.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JobTracker.java Thu May 20 05:44:18 2010 @@ -52,6 +52,8 @@ import java.util.concurrent.CopyOnWriteA 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.FSDataInputStream; import org.apache.hadoop.fs.FSDataOutputStream; @@ -110,6 +112,8 @@ import org.apache.hadoop.util.VersionInf * tracking MR jobs in a network environment. * *******************************************************/ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class JobTracker implements MRConstants, InterTrackerProtocol, ClientProtocol, TaskTrackerManager, RefreshUserToGroupMappingsProtocol, RefreshAuthorizationPolicyProtocol, AdminOperationsProtocol, JTConfig { @@ -147,6 +151,8 @@ public class JobTracker implements MRCon private final float MIN_HEARTBEATS_SCALING_FACTOR = 0.01f; private final float DEFAULT_HEARTBEATS_SCALING_FACTOR = 1.0f; + @InterfaceAudience.Private + @InterfaceStability.Unstable public static enum State { INITIALIZING, RUNNING } State state = State.INITIALIZING; private static final int FS_ACCESS_RETRY_PERIOD = 10000; @@ -187,6 +193,8 @@ public class JobTracker implements MRCon /** * A client tried to submit a job before the Job Tracker was ready. */ + @InterfaceAudience.Private + @InterfaceStability.Unstable public static class IllegalStateException extends IOException { private static final long serialVersionUID = 1L; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JvmTask.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JvmTask.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JvmTask.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/JvmTask.java Thu May 20 05:44:18 2010 @@ -21,16 +21,16 @@ package org.apache.hadoop.mapred; 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.Writable; /** - * Task abstraction that can be serialized, implements the writable interface - * - * - * This method is intended only for use by the Map/Reduce framework and not - * for external users - * + * Task abstraction that can be serialized, implements the writable interface. */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class JvmTask implements Writable { Task t; boolean shouldDie; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/KeyValueLineRecordReader.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/KeyValueLineRecordReader.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/KeyValueLineRecordReader.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/KeyValueLineRecordReader.java Thu May 20 05:44:18 2010 @@ -20,6 +20,8 @@ package org.apache.hadoop.mapred; 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.io.LongWritable; import org.apache.hadoop.io.Text; @@ -35,6 +37,8 @@ import org.apache.hadoop.io.Text; * instead */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class KeyValueLineRecordReader implements RecordReader { private final LineRecordReader lineRecordReader; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/KeyValueTextInputFormat.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/KeyValueTextInputFormat.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/KeyValueTextInputFormat.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/KeyValueTextInputFormat.java Thu May 20 05:44:18 2010 @@ -20,6 +20,8 @@ package org.apache.hadoop.mapred; import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.io.Text; @@ -38,6 +40,8 @@ import org.apache.hadoop.io.compress.Spl * instead */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class KeyValueTextInputFormat extends FileInputFormat implements JobConfigurable { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/LineRecordReader.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/LineRecordReader.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/LineRecordReader.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/LineRecordReader.java Thu May 20 05:44:18 2010 @@ -21,6 +21,8 @@ package org.apache.hadoop.mapred; import java.io.IOException; import java.io.InputStream; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FSDataInputStream; import org.apache.hadoop.fs.FileSystem; @@ -43,6 +45,8 @@ import org.apache.commons.logging.Log; * {@link org.apache.hadoop.mapreduce.lib.input.LineRecordReader} instead. */ @Deprecated +@InterfaceAudience.LimitedPrivate({"MapReduce", "Pig"}) +@InterfaceStability.Unstable public class LineRecordReader implements RecordReader { private static final Log LOG = LogFactory.getLog(LineRecordReader.class.getName()); Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/LocalJobRunner.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/LocalJobRunner.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/LocalJobRunner.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/LocalJobRunner.java Thu May 20 05:44:18 2010 @@ -34,6 +34,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.conf.Configuration; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.LocalDirAllocator; @@ -59,7 +61,9 @@ import org.apache.hadoop.mapreduce.split import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.token.Token; -/** Implements MapReduce locally, in-process, for debugging. */ +/** Implements MapReduce locally, in-process, for debugging. */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class LocalJobRunner implements ClientProtocol { public static final Log LOG = LogFactory.getLog(LocalJobRunner.class); Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapFileOutputFormat.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapFileOutputFormat.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapFileOutputFormat.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapFileOutputFormat.java Thu May 20 05:44:18 2010 @@ -29,6 +29,8 @@ import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.SequenceFile.CompressionType; import org.apache.hadoop.io.compress.CompressionCodec; import org.apache.hadoop.io.compress.DefaultCodec; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.util.Progressable; import org.apache.hadoop.util.ReflectionUtils; @@ -38,6 +40,8 @@ import org.apache.hadoop.util.Reflection * {@link org.apache.hadoop.mapreduce.lib.output.MapFileOutputFormat} instead */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class MapFileOutputFormat extends FileOutputFormat { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapOutputFile.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapOutputFile.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapOutputFile.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapOutputFile.java Thu May 20 05:44:18 2010 @@ -20,6 +20,8 @@ package org.apache.hadoop.mapred; 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.fs.LocalDirAllocator; import org.apache.hadoop.fs.Path; @@ -27,17 +29,15 @@ import org.apache.hadoop.mapreduce.MRCon /** * Manipulate the working area for the transient store for maps and reduces. - * + * * This class is used by map and reduce tasks to identify the directories that - * they need to write to/read from for intermediate files. The callers of - * these methods are from child space and see mapreduce.cluster.local.dir as + * they need to write to/read from for intermediate files. The callers of + * these methods are from child space and see mapreduce.cluster.local.dir as * taskTracker/jobCache/jobId/attemptId * This class should not be used from TaskTracker space. - * - * - * This method is intended only for use by the Map/Reduce framework and not - * for external users - */ + */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class MapOutputFile { private JobConf conf; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapReduceBase.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapReduceBase.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapReduceBase.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapReduceBase.java Thu May 20 05:44:18 2010 @@ -20,6 +20,8 @@ package org.apache.hadoop.mapred; import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.io.Closeable; import org.apache.hadoop.mapred.JobConfigurable; @@ -30,6 +32,8 @@ import org.apache.hadoop.mapred.JobConfi * applications need to override some of them.

*/ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class MapReduceBase implements Closeable, JobConfigurable { /** Default implementation that does nothing. */ Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapReducePolicyProvider.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapReducePolicyProvider.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapReducePolicyProvider.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapReducePolicyProvider.java Thu May 20 05:44:18 2010 @@ -17,6 +17,8 @@ */ package org.apache.hadoop.mapred; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.mapreduce.protocol.ClientProtocol; import org.apache.hadoop.security.RefreshUserToGroupMappingsProtocol; import org.apache.hadoop.security.authorize.PolicyProvider; @@ -26,6 +28,8 @@ import org.apache.hadoop.security.author /** * {@link PolicyProvider} for Map-Reduce protocols. */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class MapReducePolicyProvider extends PolicyProvider { private static final Service[] mapReduceServices = new Service[] { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapRunnable.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapRunnable.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapRunnable.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapRunnable.java Thu May 20 05:44:18 2010 @@ -20,6 +20,9 @@ package org.apache.hadoop.mapred; import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; + /** * Expert: Generic interface for {@link Mapper}s. * @@ -30,6 +33,8 @@ import java.io.IOException; * @deprecated Use {@link org.apache.hadoop.mapreduce.Mapper} instead. */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public interface MapRunnable extends JobConfigurable { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapRunner.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapRunner.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapRunner.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapRunner.java Thu May 20 05:44:18 2010 @@ -20,9 +20,13 @@ package org.apache.hadoop.mapred; import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.util.ReflectionUtils; /** Default {@link MapRunnable} implementation.*/ +@InterfaceAudience.Public +@InterfaceStability.Stable public class MapRunner implements MapRunnable { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapTaskCompletionEventsUpdate.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapTaskCompletionEventsUpdate.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapTaskCompletionEventsUpdate.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MapTaskCompletionEventsUpdate.java Thu May 20 05:44:18 2010 @@ -21,17 +21,17 @@ 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.Writable; /** * A class that represents the communication between the tasktracker and child - * tasks w.r.t the map task completion events. It also indicates whether the + * tasks w.r.t the map task completion events. It also indicates whether the * child task should reset its events index. - * - * - * This method is intended only for use by the Map/Reduce framework and not - * for external users */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class MapTaskCompletionEventsUpdate implements Writable { TaskCompletionEvent[] events; boolean reset; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Mapper.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Mapper.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Mapper.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Mapper.java Thu May 20 05:44:18 2010 @@ -20,6 +20,8 @@ package org.apache.hadoop.mapred; import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.io.Closeable; import org.apache.hadoop.io.SequenceFile; @@ -130,6 +132,8 @@ import org.apache.hadoop.io.compress.Com * @deprecated Use {@link org.apache.hadoop.mapreduce.Mapper} instead. */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public interface Mapper extends JobConfigurable, Closeable { /** Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Merger.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Merger.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Merger.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Merger.java Thu May 20 05:44:18 2010 @@ -25,6 +25,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.fs.FSDataInputStream; import org.apache.hadoop.fs.ChecksumFileSystem; @@ -45,6 +47,8 @@ import org.apache.hadoop.util.Progressab * Merger is an utility class used by the Map and Reduce tasks for merging * both their memory and disk segments */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class Merger { private static final Log LOG = LogFactory.getLog(Merger.class); @@ -201,6 +205,8 @@ public class Merger { } } + @InterfaceAudience.Private + @InterfaceStability.Unstable public static class Segment { Reader reader = null; final DataInputBuffer key = new DataInputBuffer(); Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MultiFileInputFormat.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MultiFileInputFormat.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MultiFileInputFormat.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MultiFileInputFormat.java Thu May 20 05:44:18 2010 @@ -22,6 +22,8 @@ import java.io.IOException; import java.util.ArrayList; import java.util.List; +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; @@ -37,6 +39,8 @@ import org.apache.hadoop.fs.Path; * @deprecated Use {@link org.apache.hadoop.mapred.lib.CombineFileInputFormat} instead */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public abstract class MultiFileInputFormat extends FileInputFormat { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MultiFileSplit.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MultiFileSplit.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MultiFileSplit.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/MultiFileSplit.java Thu May 20 05:44:18 2010 @@ -24,6 +24,8 @@ import java.io.IOException; import java.util.HashSet; import java.util.Set; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -43,6 +45,8 @@ import org.apache.hadoop.mapred.lib.Comb * @deprecated Use {@link org.apache.hadoop.mapred.lib.CombineFileSplit} instead */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class MultiFileSplit extends CombineFileSplit { MultiFileSplit() {} Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/OutputCollector.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/OutputCollector.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/OutputCollector.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/OutputCollector.java Thu May 20 05:44:18 2010 @@ -20,6 +20,9 @@ package org.apache.hadoop.mapred; import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; + /** * Collects the <key, value> pairs output by {@link Mapper}s * and {@link Reducer}s. @@ -29,6 +32,8 @@ import java.io.IOException; * Mapper or the Reducer i.e. intermediate outputs * or the output of the job.

*/ +@InterfaceAudience.Public +@InterfaceStability.Stable public interface OutputCollector { /** Adds a key/value pair to the output. Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/OutputCommitter.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/OutputCommitter.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/OutputCommitter.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/OutputCommitter.java Thu May 20 05:44:18 2010 @@ -20,6 +20,9 @@ package org.apache.hadoop.mapred; import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; + /** * OutputCommitter describes the commit of task output for a * Map-Reduce job. @@ -56,6 +59,8 @@ import java.io.IOException; * @deprecated Use {@link org.apache.hadoop.mapreduce.OutputCommitter} instead. */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public abstract class OutputCommitter extends org.apache.hadoop.mapreduce.OutputCommitter { /** Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/OutputFormat.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/OutputFormat.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/OutputFormat.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/OutputFormat.java Thu May 20 05:44:18 2010 @@ -20,6 +20,8 @@ package org.apache.hadoop.mapred; import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.util.Progressable; @@ -45,6 +47,8 @@ import org.apache.hadoop.util.Progressab * @deprecated Use {@link org.apache.hadoop.mapreduce.OutputFormat} instead. */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public interface OutputFormat { /** Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/OutputLogFilter.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/OutputLogFilter.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/OutputLogFilter.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/OutputLogFilter.java Thu May 20 05:44:18 2010 @@ -18,6 +18,8 @@ package org.apache.hadoop.mapred; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.PathFilter; @@ -31,6 +33,8 @@ import org.apache.hadoop.fs.PathFilter; * {@link org.apache.hadoop.mapred.Utils.OutputFileUtils.OutputLogFilter} * instead. */ +@InterfaceAudience.Public +@InterfaceStability.Stable public class OutputLogFilter implements PathFilter { private static final PathFilter LOG_FILTER = new Utils.OutputFileUtils.OutputLogFilter(); Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Partitioner.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Partitioner.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Partitioner.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Partitioner.java Thu May 20 05:44:18 2010 @@ -18,6 +18,9 @@ package org.apache.hadoop.mapred; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; + /** * Partitions the key space. * @@ -32,6 +35,8 @@ package org.apache.hadoop.mapred; * @deprecated Use {@link org.apache.hadoop.mapreduce.Partitioner} instead. */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public interface Partitioner extends JobConfigurable { /** Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/RawKeyValueIterator.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/RawKeyValueIterator.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/RawKeyValueIterator.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/RawKeyValueIterator.java Thu May 20 05:44:18 2010 @@ -19,6 +19,8 @@ package org.apache.hadoop.mapred; 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.util.Progress; @@ -26,6 +28,8 @@ import org.apache.hadoop.util.Progress; * RawKeyValueIterator is an iterator used to iterate over * the raw keys and values during sort/merge of intermediate data. */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public interface RawKeyValueIterator { /** * Gets the current raw key. Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/RecordReader.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/RecordReader.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/RecordReader.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/RecordReader.java Thu May 20 05:44:18 2010 @@ -21,6 +21,9 @@ package org.apache.hadoop.mapred; import java.io.IOException; import java.io.DataInput; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; + /** * RecordReader reads <key, value> pairs from an * {@link InputSplit}. @@ -34,6 +37,8 @@ import java.io.DataInput; * @see InputSplit * @see InputFormat */ +@InterfaceAudience.Public +@InterfaceStability.Stable public interface RecordReader { /** * Reads the next key/value pair from the input for processing. Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/RecordWriter.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/RecordWriter.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/RecordWriter.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/RecordWriter.java Thu May 20 05:44:18 2010 @@ -20,6 +20,8 @@ package org.apache.hadoop.mapred; import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.fs.FileSystem; /** @@ -31,6 +33,8 @@ import org.apache.hadoop.fs.FileSystem; * * @see OutputFormat */ +@InterfaceAudience.Public +@InterfaceStability.Stable public interface RecordWriter { /** * Writes a key/value pair. Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/ReduceTask.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/ReduceTask.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/ReduceTask.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/ReduceTask.java Thu May 20 05:44:18 2010 @@ -29,6 +29,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.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; @@ -53,6 +55,8 @@ import org.apache.hadoop.util.Progressab import org.apache.hadoop.util.ReflectionUtils; /** A Reduce task. */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class ReduceTask extends Task { static { // register a ctor Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Reducer.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Reducer.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Reducer.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Reducer.java Thu May 20 05:44:18 2010 @@ -22,6 +22,8 @@ import java.io.IOException; import java.util.Iterator; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.io.Closeable; @@ -163,6 +165,8 @@ import org.apache.hadoop.io.Closeable; * @deprecated Use {@link org.apache.hadoop.mapreduce.Reducer} instead. */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public interface Reducer extends JobConfigurable, Closeable { /** Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Reporter.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Reporter.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Reporter.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Reporter.java Thu May 20 05:44:18 2010 @@ -18,6 +18,8 @@ package org.apache.hadoop.mapred; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.mapred.Counters.Counter; import org.apache.hadoop.util.Progressable; @@ -37,6 +39,8 @@ import org.apache.hadoop.util.Progressab * @see Progressable * @see Counters */ +@InterfaceAudience.Public +@InterfaceStability.Stable public interface Reporter extends Progressable { /** Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/RunningJob.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/RunningJob.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/RunningJob.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/RunningJob.java Thu May 20 05:44:18 2010 @@ -19,6 +19,9 @@ package org.apache.hadoop.mapred; import java.io.IOException; + +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; @@ -34,6 +37,8 @@ import org.apache.hadoop.conf.Configurat * @deprecated Use {@link org.apache.hadoop.mapreduce.Job} instead */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public interface RunningJob { /** Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileAsBinaryInputFormat.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileAsBinaryInputFormat.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileAsBinaryInputFormat.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileAsBinaryInputFormat.java Thu May 20 05:44:18 2010 @@ -19,6 +19,8 @@ package org.apache.hadoop.mapred; 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.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -39,6 +41,8 @@ import org.apache.hadoop.mapred.Sequence * instead */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class SequenceFileAsBinaryInputFormat extends SequenceFileInputFormat { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileAsBinaryOutputFormat.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileAsBinaryOutputFormat.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileAsBinaryOutputFormat.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileAsBinaryOutputFormat.java Thu May 20 05:44:18 2010 @@ -19,6 +19,8 @@ package org.apache.hadoop.mapred; import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -41,6 +43,8 @@ import org.apache.hadoop.util.Progressab * instead */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class SequenceFileAsBinaryOutputFormat extends SequenceFileOutputFormat { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileAsTextInputFormat.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileAsTextInputFormat.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileAsTextInputFormat.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileAsTextInputFormat.java Thu May 20 05:44:18 2010 @@ -20,6 +20,8 @@ package org.apache.hadoop.mapred; import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.io.Text; /** @@ -33,6 +35,8 @@ import org.apache.hadoop.io.Text; * instead */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class SequenceFileAsTextInputFormat extends SequenceFileInputFormat { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileAsTextRecordReader.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileAsTextRecordReader.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileAsTextRecordReader.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileAsTextRecordReader.java Thu May 20 05:44:18 2010 @@ -20,6 +20,8 @@ package org.apache.hadoop.mapred; 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.io.Text; import org.apache.hadoop.io.Writable; @@ -34,6 +36,8 @@ import org.apache.hadoop.io.WritableComp * instead */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class SequenceFileAsTextRecordReader implements RecordReader { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileInputFilter.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileInputFilter.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileInputFilter.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileInputFilter.java Thu May 20 05:44:18 2010 @@ -21,6 +21,8 @@ package org.apache.hadoop.mapred; import java.io.IOException; import java.util.regex.PatternSyntaxException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.util.ReflectionUtils; @@ -32,6 +34,8 @@ import org.apache.hadoop.util.Reflection * instead */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class SequenceFileInputFilter extends SequenceFileInputFormat { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileInputFormat.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileInputFormat.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileInputFormat.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileInputFormat.java Thu May 20 05:44:18 2010 @@ -20,6 +20,8 @@ package org.apache.hadoop.mapred; import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -33,6 +35,8 @@ import org.apache.hadoop.io.MapFile; * instead. */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class SequenceFileInputFormat extends FileInputFormat { public SequenceFileInputFormat() { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileOutputFormat.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileOutputFormat.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileOutputFormat.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileOutputFormat.java Thu May 20 05:44:18 2010 @@ -29,6 +29,8 @@ import org.apache.hadoop.io.SequenceFile import org.apache.hadoop.io.SequenceFile.CompressionType; import org.apache.hadoop.io.compress.CompressionCodec; import org.apache.hadoop.io.compress.DefaultCodec; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.util.*; @@ -38,6 +40,8 @@ import org.apache.hadoop.util.*; * instead. */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class SequenceFileOutputFormat extends FileOutputFormat { public RecordWriter getRecordWriter( Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileRecordReader.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileRecordReader.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileRecordReader.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SequenceFileRecordReader.java Thu May 20 05:44:18 2010 @@ -21,6 +21,8 @@ package org.apache.hadoop.mapred; 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.fs.FileSystem; import org.apache.hadoop.fs.Path; @@ -28,6 +30,8 @@ import org.apache.hadoop.io.*; import org.apache.hadoop.util.ReflectionUtils; /** An {@link RecordReader} for {@link SequenceFile}s. */ +@InterfaceAudience.Public +@InterfaceStability.Stable public class SequenceFileRecordReader implements RecordReader { private SequenceFile.Reader in; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SkipBadRecords.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SkipBadRecords.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SkipBadRecords.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/SkipBadRecords.java Thu May 20 05:44:18 2010 @@ -18,6 +18,8 @@ package org.apache.hadoop.mapred; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; @@ -48,6 +50,8 @@ import org.apache.hadoop.fs.Path; * If task crashes, the Task tracker knows which one was the last reported * range. On further attempts that range get skipped.

*/ +@InterfaceAudience.Public +@InterfaceStability.Stable public class SkipBadRecords { /** Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TIPStatus.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TIPStatus.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TIPStatus.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TIPStatus.java Thu May 20 05:44:18 2010 @@ -17,8 +17,13 @@ */ package org.apache.hadoop.mapred; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; + /** The states of a {@link TaskInProgress} as seen by the JobTracker. */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public enum TIPStatus { PENDING, RUNNING, COMPLETE, KILLED, FAILED; } \ No newline at end of file Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Task.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Task.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Task.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Task.java Thu May 20 05:44:18 2010 @@ -36,6 +36,8 @@ import javax.crypto.SecretKey; 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.fs.FileSystem; @@ -64,11 +66,11 @@ import org.apache.hadoop.util.Progressab import org.apache.hadoop.util.ReflectionUtils; import org.apache.hadoop.util.StringUtils; -/** +/** * Base class for tasks. - * - * This is NOT a public interface. */ +@InterfaceAudience.LimitedPrivate({"MapReduce"}) +@InterfaceStability.Unstable abstract public class Task implements Writable, Configurable { private static final Log LOG = LogFactory.getLog(Task.class); @@ -500,6 +502,8 @@ abstract public class Task implements Wr committer.setupTask(taskContext); } + @InterfaceAudience.Private + @InterfaceStability.Unstable protected class TaskReporter extends org.apache.hadoop.mapreduce.StatusReporter implements Runnable, Reporter { @@ -1077,6 +1081,8 @@ abstract public class Task implements Wr /** * OutputCollector for the combiner. */ + @InterfaceAudience.Private + @InterfaceStability.Unstable public static class CombineOutputCollector implements OutputCollector { private Writer writer; @@ -1206,6 +1212,8 @@ abstract public class Task implements Wr } /** Iterator to return Combined values */ + @InterfaceAudience.Private + @InterfaceStability.Unstable public static class CombineValuesIterator extends ValuesIterator { @@ -1262,6 +1270,8 @@ abstract public class Task implements Wr return reducerContext; } + @InterfaceAudience.Private + @InterfaceStability.Unstable protected static abstract class CombinerRunner { protected final Counters.Counter inputCounter; protected final JobConf job; @@ -1314,6 +1324,8 @@ abstract public class Task implements Wr } } + @InterfaceAudience.Private + @InterfaceStability.Unstable protected static class OldCombinerRunner extends CombinerRunner { private final Class> combinerClass; private final Class keyClass; @@ -1354,6 +1366,8 @@ abstract public class Task implements Wr } } + @InterfaceAudience.Private + @InterfaceStability.Unstable protected static class NewCombinerRunner extends CombinerRunner { private final Class> reducerClass; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskAttemptContext.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskAttemptContext.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskAttemptContext.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskAttemptContext.java Thu May 20 05:44:18 2010 @@ -18,6 +18,8 @@ package org.apache.hadoop.mapred; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.util.Progressable; /** @@ -25,6 +27,8 @@ import org.apache.hadoop.util.Progressab * instead. */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public interface TaskAttemptContext extends org.apache.hadoop.mapreduce.TaskAttemptContext { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskAttemptContextImpl.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskAttemptContextImpl.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskAttemptContextImpl.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskAttemptContextImpl.java Thu May 20 05:44:18 2010 @@ -17,6 +17,8 @@ package org.apache.hadoop.mapred; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.util.Progressable; /** @@ -24,6 +26,8 @@ import org.apache.hadoop.util.Progressab * instead. */ @Deprecated +@InterfaceAudience.Private +@InterfaceStability.Unstable public class TaskAttemptContextImpl extends org.apache.hadoop.mapreduce.task.TaskAttemptContextImpl implements TaskAttemptContext { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskAttemptID.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskAttemptID.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskAttemptID.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskAttemptID.java Thu May 20 05:44:18 2010 @@ -21,6 +21,8 @@ package org.apache.hadoop.mapred; import java.io.DataInput; import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.mapreduce.TaskType; /** @@ -44,6 +46,8 @@ import org.apache.hadoop.mapreduce.TaskT * @see TaskID */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class TaskAttemptID extends org.apache.hadoop.mapreduce.TaskAttemptID { /** Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskCompletionEvent.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskCompletionEvent.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskCompletionEvent.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskCompletionEvent.java Thu May 20 05:44:18 2010 @@ -18,6 +18,9 @@ package org.apache.hadoop.mapred; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; + /** * This is used to track task completion events on * job tracker. @@ -25,8 +28,12 @@ package org.apache.hadoop.mapred; * {@link org.apache.hadoop.mapreduce.TaskCompletionEvent} instead */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class TaskCompletionEvent extends org.apache.hadoop.mapreduce.TaskCompletionEvent { + @InterfaceAudience.Public + @InterfaceStability.Stable static public enum Status {FAILED, KILLED, SUCCEEDED, OBSOLETE, TIPFAILED}; public static final TaskCompletionEvent[] EMPTY_ARRAY = Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskController.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskController.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskController.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskController.java Thu May 20 05:44:18 2010 @@ -34,6 +34,7 @@ import org.apache.hadoop.mapreduce.MRCon import org.apache.hadoop.util.StringUtils; import org.apache.hadoop.util.Shell.ShellCommandExecutor; import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; /** * Controls initialization, finalization and clean up of tasks, and @@ -326,10 +327,8 @@ public abstract class TaskController imp } } - /** - * NOTE: This class is internal only class and not intended for users!! - * - */ + @InterfaceAudience.Private + @InterfaceStability.Unstable public static class InitializationContext { public File workDir; public String user; @@ -347,6 +346,8 @@ public abstract class TaskController imp * This is used for initializing the private localized files in distributed * cache. Initialization would involve changing permission, ownership and etc. */ + @InterfaceAudience.Private + @InterfaceStability.Unstable public static class DistributedCacheFileContext extends InitializationContext { // base directory under which file has been localized Path localizedBaseDir; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskGraphServlet.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskGraphServlet.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskGraphServlet.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskGraphServlet.java Thu May 20 05:44:18 2010 @@ -24,12 +24,16 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.mapred.JSPUtil.JobWithViewAccessCheck; import org.apache.hadoop.security.UserGroupInformation; /** The servlet that outputs svg graphics for map / reduce task * statuses */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class TaskGraphServlet extends HttpServlet { private static final long serialVersionUID = -1365683739392460020L; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskID.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskID.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskID.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskID.java Thu May 20 05:44:18 2010 @@ -21,6 +21,8 @@ package org.apache.hadoop.mapred; import java.io.DataInput; import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.mapreduce.TaskType; /** @@ -46,6 +48,8 @@ import org.apache.hadoop.mapreduce.TaskT * @see TaskAttemptID */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class TaskID extends org.apache.hadoop.mapreduce.TaskID { /** Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskLog.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskLog.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskLog.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskLog.java Thu May 20 05:44:18 2010 @@ -233,6 +233,7 @@ public class TaskLog { /** * The filter for userlogs. */ + @InterfaceAudience.Private public static enum LogName { /** Log on the stdout of the task. */ STDOUT ("stdout"), Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskLogAppender.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskLogAppender.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskLogAppender.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskLogAppender.java Thu May 20 05:44:18 2010 @@ -21,6 +21,7 @@ package org.apache.hadoop.mapred; import java.util.LinkedList; import java.util.Queue; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.log4j.FileAppender; import org.apache.log4j.spi.LoggingEvent; @@ -29,6 +30,7 @@ import org.apache.log4j.spi.LoggingEvent * map-reduce system logs. * */ +@InterfaceStability.Unstable public class TaskLogAppender extends FileAppender { private String taskId; //taskId should be managed as String rather than TaskID object //so that log4j can configure it from the configuration(log4j.properties). Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskLogServlet.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskLogServlet.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskLogServlet.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskLogServlet.java Thu May 20 05:44:18 2010 @@ -28,6 +28,8 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.Path; import org.apache.hadoop.mapreduce.JobACL; @@ -40,6 +42,8 @@ import org.apache.hadoop.util.StringUtil /** * A servlet that is run by the TaskTrackers to provide the task logs via http. */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class TaskLogServlet extends HttpServlet { private static final long serialVersionUID = -6615764817774487321L; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskReport.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskReport.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskReport.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskReport.java Thu May 20 05:44:18 2010 @@ -21,10 +21,15 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; + /** A report on the state of a task. * @deprecated Use {@link org.apache.hadoop.mapreduce.TaskReport} instead **/ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class TaskReport extends org.apache.hadoop.mapreduce.TaskReport { public TaskReport() { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskStatus.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskStatus.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskStatus.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskStatus.java Thu May 20 05:44:18 2010 @@ -24,6 +24,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.io.Text; import org.apache.hadoop.io.Writable; import org.apache.hadoop.io.WritableUtils; @@ -33,14 +35,20 @@ import org.apache.hadoop.util.StringUtil * not intended to be a comprehensive piece of data. * **************************************************/ +@InterfaceAudience.Private +@InterfaceStability.Unstable public abstract class TaskStatus implements Writable, Cloneable { static final Log LOG = LogFactory.getLog(TaskStatus.class.getName()); - //enumeration for reporting current phase of a task. + //enumeration for reporting current phase of a task. + @InterfaceAudience.Private + @InterfaceStability.Unstable public static enum Phase{STARTING, MAP, SHUFFLE, SORT, REDUCE, CLEANUP} // what state is the task in? + @InterfaceAudience.Private + @InterfaceStability.Unstable public static enum State {RUNNING, SUCCEEDED, FAILED, UNASSIGNED, KILLED, COMMIT_PENDING, FAILED_UNCLEAN, KILLED_UNCLEAN} Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskTracker.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskTracker.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskTracker.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskTracker.java Thu May 20 05:44:18 2010 @@ -52,6 +52,8 @@ import javax.servlet.http.HttpServletRes 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.DF; import org.apache.hadoop.fs.FSDataInputStream; @@ -116,6 +118,8 @@ import org.apache.hadoop.mapreduce.util. * for Task assignments and reporting results. * *******************************************************/ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class TaskTracker implements MRConstants, TaskUmbilicalProtocol, Runnable, TTConfig { /** @@ -3463,6 +3467,8 @@ public class TaskTracker * This class is used in TaskTracker's Jetty to serve the map outputs * to other nodes. */ + @InterfaceAudience.Private + @InterfaceStability.Unstable public static class MapOutputServlet extends HttpServlet { private static final long serialVersionUID = 1L; private static final int MAX_BYTES_TO_READ = 64 * 1024; Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskTrackerStatus.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskTrackerStatus.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskTrackerStatus.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskTrackerStatus.java Thu May 20 05:44:18 2010 @@ -19,20 +19,21 @@ package org.apache.hadoop.mapred; 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.io.*; import org.apache.hadoop.mapred.TaskStatus.State; import java.io.*; import java.util.*; -/************************************************** - * A TaskTrackerStatus is a MapReduce primitive. Keeps - * info on a TaskTracker. The JobTracker maintains a set - * of the most recent TaskTrackerStatus objects for each - * unique TaskTracker it knows about. - * - * This is NOT a public interface! - **************************************************/ +/** + * A TaskTrackerStatus is a MapReduce primitive. Keeps info on a TaskTracker. + * The JobTracker maintains a set of the most recent TaskTrackerStatus objects + * for each unique TaskTracker it knows about. + */ +@InterfaceAudience.Private +@InterfaceStability.Unstable public class TaskTrackerStatus implements Writable { public static final Log LOG = LogFactory.getLog(TaskTrackerStatus.class); Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskUmbilicalProtocol.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskUmbilicalProtocol.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskUmbilicalProtocol.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TaskUmbilicalProtocol.java Thu May 20 05:44:18 2010 @@ -20,6 +20,8 @@ package org.apache.hadoop.mapred; import java.io.IOException; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.ipc.VersionedProtocol; import org.apache.hadoop.mapred.JvmTask; import org.apache.hadoop.mapreduce.security.token.JobTokenSelector; @@ -30,6 +32,8 @@ import org.apache.hadoop.security.token. * reduce task and runs it as a child process. All communication between child * and parent is via this protocol. */ @TokenInfo(JobTokenSelector.class) +@InterfaceAudience.Private +@InterfaceStability.Stable public interface TaskUmbilicalProtocol extends VersionedProtocol { /** Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TextInputFormat.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TextInputFormat.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TextInputFormat.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TextInputFormat.java Thu May 20 05:44:18 2010 @@ -20,6 +20,8 @@ package org.apache.hadoop.mapred; import java.io.*; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.fs.*; import org.apache.hadoop.io.LongWritable; import org.apache.hadoop.io.Text; @@ -32,6 +34,8 @@ import org.apache.hadoop.io.compress.*; * instead. */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class TextInputFormat extends FileInputFormat implements JobConfigurable { Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TextOutputFormat.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TextOutputFormat.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/TextOutputFormat.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/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.fs.FileSystem; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.FSDataOutputStream; @@ -37,6 +39,8 @@ import org.apache.hadoop.util.*; * {@link org.apache.hadoop.mapreduce.lib.output.TextOutputFormat} instead. */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class TextOutputFormat extends FileOutputFormat { protected static class LineRecordWriter Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Utils.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Utils.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Utils.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/Utils.java Thu May 20 05:44:18 2010 @@ -18,6 +18,8 @@ package org.apache.hadoop.mapred; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.PathFilter; @@ -25,6 +27,8 @@ import org.apache.hadoop.fs.PathFilter; * A utility class. It provides * A path filter utility to filter out output/part files in the output dir */ +@InterfaceAudience.Public +@InterfaceStability.Stable public class Utils { public static class OutputFileUtils { /** Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/jobcontrol/Job.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/jobcontrol/Job.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/jobcontrol/Job.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/jobcontrol/Job.java Thu May 20 05:44:18 2010 @@ -25,6 +25,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.mapred.JobClient; import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapred.JobID; @@ -34,6 +36,8 @@ import org.apache.hadoop.mapreduce.lib.j * @deprecated Use {@link ControlledJob} instead. */ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class Job extends ControlledJob { static final Log LOG = LogFactory.getLog(Job.class); Modified: hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/jobcontrol/JobControl.java URL: http://svn.apache.org/viewvc/hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/jobcontrol/JobControl.java?rev=946533&r1=946532&r2=946533&view=diff ============================================================================== --- hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/jobcontrol/JobControl.java (original) +++ hadoop/mapreduce/branches/branch-0.21/src/java/org/apache/hadoop/mapred/jobcontrol/JobControl.java Thu May 20 05:44:18 2010 @@ -22,6 +22,8 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; +import org.apache.hadoop.classification.InterfaceAudience; +import org.apache.hadoop.classification.InterfaceStability; import org.apache.hadoop.mapreduce.lib.jobcontrol.ControlledJob; /** @@ -29,6 +31,8 @@ import org.apache.hadoop.mapreduce.lib.j *{@link org.apache.hadoop.mapreduce.lib.jobcontrol.JobControl} instead **/ @Deprecated +@InterfaceAudience.Public +@InterfaceStability.Stable public class JobControl extends org.apache.hadoop.mapreduce.lib.jobcontrol.JobControl {