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/05/05 18:28:45 UTC

svn commit: r400104 - in /lucene/hadoop/trunk/src: examples/org/apache/hadoop/examples/ExampleDriver.java java/org/apache/hadoop/mapred/ClusterStatus.java java/org/apache/hadoop/mapred/JobClient.java

Author: cutting
Date: Fri May  5 09:28:40 2006
New Revision: 400104

URL: http://svn.apache.org/viewcvs?rev=400104&view=rev
Log:
HADOOP-198.  Add more example programs to example driver.  Also fix another WritableFactories-related error.  Contributed by Mahadev.

Modified:
    lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/ExampleDriver.java
    lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/ClusterStatus.java
    lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobClient.java

Modified: lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/ExampleDriver.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/ExampleDriver.java?rev=400104&r1=400103&r2=400104&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/ExampleDriver.java (original)
+++ lucene/hadoop/trunk/src/examples/org/apache/hadoop/examples/ExampleDriver.java Fri May  5 09:28:40 2006
@@ -33,7 +33,10 @@
 			 "A map/reduce program that counts the words in the input files.");
 	    pgd.addClass("grep", Grep.class, 
 			 "A map/reduce program that counts the matches of a regex in the input.");
-	    pgd.driver(argv);
+	    pgd.addClass("randomwriter", RandomWriter.class, 
+                        "A random writer benchmark that writes 10GB per node.");
+            pgd.addClass("sort", Sort.class, "A sort benchmark that sorts the data written by the random writer.");
+            pgd.driver(argv);
 	}
 	catch(Throwable e){
 	    e.printStackTrace();

Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/ClusterStatus.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/ClusterStatus.java?rev=400104&r1=400103&r2=400104&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/ClusterStatus.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/ClusterStatus.java Fri May  5 09:28:40 2006
@@ -27,7 +27,7 @@
   private int reduce_tasks;
   private int max_tasks;
 
-  private ClusterStatus() {}
+  ClusterStatus() {}
   
   ClusterStatus(int trackers, int maps, int reduces, int max) {
     task_trackers = trackers;

Modified: lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobClient.java
URL: http://svn.apache.org/viewcvs/lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobClient.java?rev=400104&r1=400103&r2=400104&view=diff
==============================================================================
--- lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobClient.java (original)
+++ lucene/hadoop/trunk/src/java/org/apache/hadoop/mapred/JobClient.java Fri May  5 09:28:40 2006
@@ -39,7 +39,7 @@
     static long MAX_JOBPROFILE_AGE = 1000 * 2;
 
     // required for unknown reason to make WritableFactories work distributed
-    static { new JobStatus(); new JobProfile(); }
+    static { new JobStatus(); new JobProfile(); new ClusterStatus(); }
 
     /**
      * A NetworkedJob is an implementation of RunningJob.  It holds