svn commit: r1374899 - in /giraph/trunk: CHANGELOG src/main/java/org/apache/giraph/GiraphRunner.java

[aching]

Author: aching
Date: Mon Aug 20 02:55:57 2012
New Revision: 1374899

URL: http://svn.apache.org/viewvc?rev=1374899&view=rev
Log:
GIRAPH-305: Adding an argument to GiraphRunner for Master Compute
classes. (Sean Choi via aching)

Modified:
    giraph/trunk/CHANGELOG
    giraph/trunk/src/main/java/org/apache/giraph/GiraphRunner.java

Modified: giraph/trunk/CHANGELOG
URL: 
http://svn.apache.org/viewvc/giraph/trunk/CHANGELOG?rev=1374899&r1=1374898&r2=1374899&view=diff
==============================================================================
--- giraph/trunk/CHANGELOG (original)
+++ giraph/trunk/CHANGELOG Mon Aug 20 02:55:57 2012
@@ -1,6 +1,10 @@
 Giraph Change Log
 
 Release 0.2.0 - unreleased
+
+  GIRAPH-305: Adding an argument to GiraphRunner for Master Compute
+  classes. (Sean Choi via aching)
+
   GIRAPH-302: Thread safety issue with sending partitions around.
   (aching via apresta)
 

Modified: giraph/trunk/src/main/java/org/apache/giraph/GiraphRunner.java
URL: 
http://svn.apache.org/viewvc/giraph/trunk/src/main/java/org/apache/giraph/GiraphRunner.java?rev=1374899&r1=1374898&r2=1374899&view=diff
==============================================================================
--- giraph/trunk/src/main/java/org/apache/giraph/GiraphRunner.java (original)
+++ giraph/trunk/src/main/java/org/apache/giraph/GiraphRunner.java Mon Aug 20 
02:55:57 2012
@@ -84,6 +84,7 @@ public class GiraphRunner implements Too
     options.addOption("c", "combiner", true, "VertexCombiner class");
     options.addOption("wc", "workerContext", true, "WorkerContext class");
     options.addOption("aw", "aggregatorWriter", true, "AggregatorWriter 
class");
+    options.addOption("mc", "masterCompute", true, "MasterCompute class");
     options.addOption("cf", "cacheFile", true, "Files for distributed cache");
     options.addOption("ca", "customArguments", true, "provide custom" +
         " arguments for the job configuration in the form:" +
@@ -191,6 +192,10 @@ public class GiraphRunner implements Too
       job.setWorkerContextClass(Class.forName(cmd.getOptionValue("wc")));
     }
 
+    if (cmd.hasOption("mc")) {
+      job.setMasterComputeClass(Class.forName(cmd.getOptionValue("mc")));
+    }
+
     if (cmd.hasOption("aw")) {
       job.setAggregatorWriterClass(Class.forName(cmd.getOptionValue("aw")));
     }