You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by cu...@apache.org on 2006/02/07 21:37:10 UTC
svn commit: r375685 - in /lucene/hadoop/trunk: ./
src/java/org/apache/hadoop/mapred/ src/site/
Author: cutting
Date: Tue Feb 7 12:37:07 2006
New Revision: 375685
URL: http://svn.apache.org/viewcvs?rev=375685&view=rev
Log:
Clean up javadoc, reduce number of public classes.
Modified:
lucene/hadoop/trunk/ (props changed)
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/InterTrackerProtocol.java
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobInProgress.java
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobProfile.java
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobStatus.java
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobSubmissionProtocol.java
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobTrackerInfoServer.java
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/LocalJobRunner.java
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MRConstants.java
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapFileOutputFormat.java
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapOutputFile.java
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapOutputLocation.java
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapOutputProtocol.java
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapTask.java
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/ReduceTask.java
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/SequenceFileOutputFormat.java
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/Task.java
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskStatus.java
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskTrackerStatus.java
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskUmbilicalProtocol.java
lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TextOutputFormat.java
lucene/hadoop/trunk/src/site/ (props changed)
Propchange: lucene/hadoop/trunk/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Tue Feb 7 12:37:07 2006
@@ -1 +1,3 @@
build
+logs
+
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/InterTrackerProtocol.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/InterTrackerProtocol.java?rev=375685&r1=375684&r2=375685&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/InterTrackerProtocol.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/InterTrackerProtocol.java Tue Feb 7 12:37:07 2006
@@ -22,7 +22,7 @@
* Protocol that a TaskTracker and the central JobTracker use to communicate.
* The JobTracker is the Server, which implements this protocol.
*/
-public interface InterTrackerProtocol {
+interface InterTrackerProtocol {
public final static int TRACKERS_OK = 0;
public final static int UNKNOWN_TASKTRACKER = 1;
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobInProgress.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobInProgress.java?rev=375685&r1=375684&r2=375685&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobInProgress.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobInProgress.java Tue Feb 7 12:37:07 2006
@@ -29,7 +29,7 @@
// and its latest JobStatus, plus a set of tables for
// doing bookkeeping of its Tasks.
///////////////////////////////////////////////////////
-public class JobInProgress {
+class JobInProgress {
public static final Logger LOG = LogFormatter.getLogger("org.apache.hadoop.mapred.JobInProgress");
JobProfile profile;
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobProfile.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobProfile.java?rev=375685&r1=375684&r2=375685&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobProfile.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobProfile.java Tue Feb 7 12:37:07 2006
@@ -26,7 +26,16 @@
*
* @author Mike Cafarella
**************************************************/
-public class JobProfile implements Writable {
+class JobProfile implements Writable {
+
+ static { // register a ctor
+ WritableFactories.setFactory
+ (JobProfile.class,
+ new WritableFactory() {
+ public Writable newInstance() { return new JobProfile(); }
+ });
+ }
+
String jobid;
String jobFile;
String url;
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobStatus.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobStatus.java?rev=375685&r1=375684&r2=375685&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobStatus.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobStatus.java Tue Feb 7 12:37:07 2006
@@ -26,7 +26,16 @@
*
* @author Mike Cafarella
**************************************************/
-public class JobStatus implements Writable {
+class JobStatus implements Writable {
+
+ static { // register a ctor
+ WritableFactories.setFactory
+ (JobStatus.class,
+ new WritableFactory() {
+ public Writable newInstance() { return new JobStatus(); }
+ });
+ }
+
public static final int RUNNING = 1;
public static final int SUCCEEDED = 2;
public static final int FAILED = 3;
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobSubmissionProtocol.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobSubmissionProtocol.java?rev=375685&r1=375684&r2=375685&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobSubmissionProtocol.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobSubmissionProtocol.java Tue Feb 7 12:37:07 2006
@@ -24,7 +24,7 @@
* JobClient can use these methods to submit a Job for execution, and learn about
* the current system status.
*/
-public interface JobSubmissionProtocol {
+interface JobSubmissionProtocol {
/**
* Submit a Job for execution. Returns the latest profile for
* that job.
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobTrackerInfoServer.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobTrackerInfoServer.java?rev=375685&r1=375684&r2=375685&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobTrackerInfoServer.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobTrackerInfoServer.java Tue Feb 7 12:37:07 2006
@@ -29,7 +29,7 @@
*
* @author Mike Cafarella
*******************************************************/
-public class JobTrackerInfoServer {
+class JobTrackerInfoServer {
public static class RedirectHandler extends AbstractHttpHandler {
public void handle(String pathInContext, String pathParams, HttpRequest request, HttpResponse response) throws HttpException, IOException {
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/LocalJobRunner.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/LocalJobRunner.java?rev=375685&r1=375684&r2=375685&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/LocalJobRunner.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/LocalJobRunner.java Tue Feb 7 12:37:07 2006
@@ -25,7 +25,7 @@
import org.apache.hadoop.util.LogFormatter;
/** Implements MapReduce locally, in-process, for debugging. */
-public class LocalJobRunner implements JobSubmissionProtocol {
+class LocalJobRunner implements JobSubmissionProtocol {
public static final Logger LOG =
LogFormatter.getLogger("org.apache.hadoop.mapred.LocalJobRunner");
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MRConstants.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MRConstants.java?rev=375685&r1=375684&r2=375685&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MRConstants.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MRConstants.java Tue Feb 7 12:37:07 2006
@@ -20,7 +20,7 @@
*
* @author Mike Cafarella
*******************************/
-public interface MRConstants {
+interface MRConstants {
//
// Timeouts, constants
//
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapFileOutputFormat.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapFileOutputFormat.java?rev=375685&r1=375684&r2=375685&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapFileOutputFormat.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapFileOutputFormat.java Tue Feb 7 12:37:07 2006
@@ -27,6 +27,7 @@
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.conf.Configuration;
+/** An {@link OutputFormat} that writes {@link MapFile}s. */
public class MapFileOutputFormat implements OutputFormat {
public RecordWriter getRecordWriter(FileSystem fs, JobConf job,
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapOutputFile.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapOutputFile.java?rev=375685&r1=375684&r2=375685&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapOutputFile.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapOutputFile.java Tue Feb 7 12:37:07 2006
@@ -24,7 +24,16 @@
import org.apache.hadoop.conf.*;
/** A local file to be transferred via the {@link MapOutputProtocol}. */
-public class MapOutputFile implements Writable, Configurable {
+class MapOutputFile implements Writable, Configurable {
+
+ static { // register a ctor
+ WritableFactories.setFactory
+ (MapOutputFile.class,
+ new WritableFactory() {
+ public Writable newInstance() { return new MapOutputFile(); }
+ });
+ }
+
private String mapTaskId;
private String reduceTaskId;
private int partition;
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapOutputLocation.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapOutputLocation.java?rev=375685&r1=375684&r2=375685&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapOutputLocation.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapOutputLocation.java Tue Feb 7 12:37:07 2006
@@ -23,7 +23,16 @@
/** The location of a map output file, as passed to a reduce task via the
* {@link InterTrackerProtocol}. */
-public class MapOutputLocation implements Writable {
+class MapOutputLocation implements Writable {
+
+ static { // register a ctor
+ WritableFactories.setFactory
+ (MapOutputLocation.class,
+ new WritableFactory() {
+ public Writable newInstance() { return new MapOutputLocation(); }
+ });
+ }
+
private String mapTaskId;
private String host;
private int port;
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapOutputProtocol.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapOutputProtocol.java?rev=375685&r1=375684&r2=375685&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapOutputProtocol.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapOutputProtocol.java Tue Feb 7 12:37:07 2006
@@ -22,7 +22,7 @@
/** Protocol that a reduce task uses to retrieve output data from a map task's
* tracker. */
-public interface MapOutputProtocol {
+interface MapOutputProtocol {
/** Returns the output from the named map task destined for this partition.*/
MapOutputFile getFile(String mapTaskId, String reduceTaskId,
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapTask.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapTask.java?rev=375685&r1=375684&r2=375685&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapTask.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/MapTask.java Tue Feb 7 12:37:07 2006
@@ -23,7 +23,16 @@
import org.apache.hadoop.fs.FileSystem;
/** A Map task. */
-public class MapTask extends Task {
+class MapTask extends Task {
+
+ static { // register a ctor
+ WritableFactories.setFactory
+ (MapTask.class,
+ new WritableFactory() {
+ public Writable newInstance() { return new MapTask(); }
+ });
+ }
+
private FileSplit split;
private MapOutputFile mapOutputFile;
private Configuration conf;
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/ReduceTask.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/ReduceTask.java?rev=375685&r1=375684&r2=375685&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/ReduceTask.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/ReduceTask.java Tue Feb 7 12:37:07 2006
@@ -26,7 +26,16 @@
import java.text.*;
/** A Reduce task. */
-public class ReduceTask extends Task {
+class ReduceTask extends Task {
+
+ static { // register a ctor
+ WritableFactories.setFactory
+ (ReduceTask.class,
+ new WritableFactory() {
+ public Writable newInstance() { return new ReduceTask(); }
+ });
+ }
+
private String[][] mapTaskIds;
private int partition;
private boolean sortComplete;
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/SequenceFileOutputFormat.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/SequenceFileOutputFormat.java?rev=375685&r1=375684&r2=375685&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/SequenceFileOutputFormat.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/SequenceFileOutputFormat.java Tue Feb 7 12:37:07 2006
@@ -27,6 +27,7 @@
import org.apache.hadoop.io.Writable;
import org.apache.hadoop.conf.Configuration;
+/** An {@link OutputFormat} that writes {@link SequenceFile}s. */
public class SequenceFileOutputFormat implements OutputFormat {
public RecordWriter getRecordWriter(FileSystem fs, JobConf job,
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/Task.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/Task.java?rev=375685&r1=375684&r2=375685&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/Task.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/Task.java Tue Feb 7 12:37:07 2006
@@ -23,7 +23,7 @@
import java.io.*;
/** Base class for tasks. */
-public abstract class Task implements Writable, Configurable {
+abstract class Task implements Writable, Configurable {
////////////////////////////////////////////
// Fields
////////////////////////////////////////////
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskStatus.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskStatus.java?rev=375685&r1=375684&r2=375685&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskStatus.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskStatus.java Tue Feb 7 12:37:07 2006
@@ -25,7 +25,7 @@
*
* @author Mike Cafarella
**************************************************/
-public class TaskStatus implements Writable {
+class TaskStatus implements Writable {
public static final int RUNNING = 0;
public static final int SUCCEEDED = 1;
public static final int FAILED = 2;
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskTrackerStatus.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskTrackerStatus.java?rev=375685&r1=375684&r2=375685&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskTrackerStatus.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskTrackerStatus.java Tue Feb 7 12:37:07 2006
@@ -28,7 +28,16 @@
*
* @author Mike Cafarella
**************************************************/
-public class TaskTrackerStatus implements Writable {
+class TaskTrackerStatus implements Writable {
+
+ static { // register a ctor
+ WritableFactories.setFactory
+ (TaskTrackerStatus.class,
+ new WritableFactory() {
+ public Writable newInstance() { return new TaskTrackerStatus(); }
+ });
+ }
+
String trackerName;
String host;
int port;
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskUmbilicalProtocol.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskUmbilicalProtocol.java?rev=375685&r1=375684&r2=375685&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskUmbilicalProtocol.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TaskUmbilicalProtocol.java Tue Feb 7 12:37:07 2006
@@ -22,7 +22,7 @@
* parent is a daemon which which polls the central master for a new map or
* reduce task and runs it as a child process. All communication between child
* and parent is via this protocol. */
-public interface TaskUmbilicalProtocol {
+interface TaskUmbilicalProtocol {
/** Called when a child task process starts, to get its task.*/
Task getTask(String taskid) throws IOException;
Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TextOutputFormat.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TextOutputFormat.java?rev=375685&r1=375684&r2=375685&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TextOutputFormat.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/TextOutputFormat.java Tue Feb 7 12:37:07 2006
@@ -25,6 +25,7 @@
import org.apache.hadoop.io.WritableComparable;
import org.apache.hadoop.io.Writable;
+/** An {@link OutputFormat} that writes plain text files. */
public class TextOutputFormat implements OutputFormat {
public RecordWriter getRecordWriter(FileSystem fs, JobConf job,
Propchange: lucene/hadoop/trunk/src/site/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Feb 7 12:37:07 2006
@@ -0,0 +1 @@
+build