incubator-hama-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From edwardy...@apache.org
Subject svn commit: r829736 - in /incubator/hama/trunk: ./ src/java/org/apache/hama/matrix/ src/java/org/apache/hama/util/
Date Mon, 26 Oct 2009 09:20:43 GMT
Author: edwardyoon
Date: Mon Oct 26 09:20:42 2009
New Revision: 829736

URL: http://svn.apache.org/viewvc?rev=829736&view=rev
Log:
Removing JobManager in util package

Removed:
    incubator/hama/trunk/src/java/org/apache/hama/util/JobManager.java
Modified:
    incubator/hama/trunk/CHANGES.txt
    incubator/hama/trunk/src/java/org/apache/hama/matrix/AbstractMatrix.java
    incubator/hama/trunk/src/java/org/apache/hama/matrix/DenseMatrix.java
    incubator/hama/trunk/src/java/org/apache/hama/matrix/SparseMatrix.java

Modified: incubator/hama/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/CHANGES.txt?rev=829736&r1=829735&r2=829736&view=diff
==============================================================================
--- incubator/hama/trunk/CHANGES.txt (original)
+++ incubator/hama/trunk/CHANGES.txt Mon Oct 26 09:20:42 2009
@@ -42,6 +42,7 @@
 
   IMPROVEMENTS
 
+    HAMA-216: Removing JobManager in util package (edwardyoon)
     HAMA-215: Removing hama shell from version 0.2 (edwardyoon)
     HAMA-204: Replacement of TransposeMap/Reduce (edwardyoon)
     HAMA-213: Replacement of TableReadMapper (edwardyoon)

Modified: incubator/hama/trunk/src/java/org/apache/hama/matrix/AbstractMatrix.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/matrix/AbstractMatrix.java?rev=829736&r1=829735&r2=829736&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/matrix/AbstractMatrix.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/matrix/AbstractMatrix.java Mon Oct 26 09:20:42
2009
@@ -47,6 +47,7 @@
 import org.apache.hadoop.io.MapWritable;
 import org.apache.hadoop.io.SequenceFile;
 import org.apache.hadoop.mapred.FileOutputFormat;
+import org.apache.hadoop.mapred.JobClient;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapreduce.Job;
 import org.apache.hama.Constants;
@@ -69,7 +70,6 @@
 import org.apache.hama.matrix.algebra.MatrixNormMapRed.MatrixOneNormMapper;
 import org.apache.hama.matrix.algebra.MatrixNormMapRed.MatrixOneNormReducer;
 import org.apache.hama.util.BytesUtil;
-import org.apache.hama.util.JobManager;
 import org.apache.hama.util.RandomVariable;
 import org.apache.log4j.Logger;
 
@@ -200,7 +200,7 @@
 
     // update the out put dir of the job
     outDir = FileOutputFormat.getOutputPath(jobConf);
-    JobManager.execute(jobConf);
+    JobClient.runJob(jobConf);
 
     // read outputs
     Path inFile = new Path(outDir, "reduce-out");
@@ -236,7 +236,7 @@
 
     // update the out put dir of the job
     outDir = FileOutputFormat.getOutputPath(jobConf);
-    JobManager.execute(jobConf);
+    JobClient.runJob(jobConf);
 
     // read outputs
     Path inFile = new Path(outDir, "part-00000");
@@ -273,7 +273,7 @@
     // update the out put dir of the job
     outDir = FileOutputFormat.getOutputPath(jobConf);
 
-    JobManager.execute(jobConf);
+    JobClient.runJob(jobConf);
 
     // read outputs
     Path inFile = new Path(outDir, "part-00000");
@@ -310,7 +310,7 @@
     // update the out put dir of the job
     outDir = FileOutputFormat.getOutputPath(jobConf);
 
-    JobManager.execute(jobConf);
+    JobClient.runJob(jobConf);
 
     // read outputs
     Path inFile = new Path(outDir, "part-00000");

Modified: incubator/hama/trunk/src/java/org/apache/hama/matrix/DenseMatrix.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/matrix/DenseMatrix.java?rev=829736&r1=829735&r2=829736&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/matrix/DenseMatrix.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/matrix/DenseMatrix.java Mon Oct 26 09:20:42
2009
@@ -43,6 +43,7 @@
 import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.SequenceFile.CompressionType;
 import org.apache.hadoop.mapred.FileOutputFormat;
+import org.apache.hadoop.mapred.JobClient;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.SequenceFileOutputFormat;
 import org.apache.hadoop.mapred.lib.NullOutputFormat;
@@ -69,7 +70,6 @@
 import org.apache.hama.matrix.algebra.RowCyclicAdditionMap;
 import org.apache.hama.matrix.algebra.RowCyclicAdditionReduce;
 import org.apache.hama.util.BytesUtil;
-import org.apache.hama.util.JobManager;
 import org.apache.hama.util.RandomVariable;
 
 /**
@@ -454,8 +454,7 @@
         MapWritable.class, jobConf);
     RowCyclicAdditionReduce.initJob(result.getPath(),
         RowCyclicAdditionReduce.class, jobConf);
-
-    JobManager.execute(jobConf);
+    JobClient.runJob(jobConf);
     return result;
   }
 
@@ -501,7 +500,7 @@
     RowCyclicAdditionReduce.initJob(result.getPath(),
         RowCyclicAdditionReduce.class, jobConf);
 
-    JobManager.execute(jobConf);
+    JobClient.runJob(jobConf);
     return result;
   }
 
@@ -542,7 +541,7 @@
           jobConf);
       DenseMatrixVectorMultReduce.initJob(result.getPath(),
           DenseMatrixVectorMultReduce.class, jobConf);
-      JobManager.execute(jobConf);
+      JobClient.runJob(jobConf);
     }
 
     return result;
@@ -582,7 +581,7 @@
     BlockMultiplyReduce.initJob(result.getPath(), BlockMultiplyReduce.class,
         jobConf);
 
-    JobManager.execute(jobConf);
+     JobClient.runJob(jobConf);
     hamaAdmin.delete(collectionTable);
     return result;
   }
@@ -703,7 +702,7 @@
     CollectBlocksMapper.initJob(collectionTable, bool, block_size, this
         .getRows(), this.getColumns(), jobConf);
 
-    JobManager.execute(jobConf);
+    JobClient.runJob(jobConf);
   }
 
   /**
@@ -739,7 +738,7 @@
     jobConf.setMapOutputKeyClass(IntWritable.class);
     jobConf.setMapOutputValueClass(MapWritable.class);
 
-    JobManager.execute(jobConf);
+    JobClient.runJob(jobConf);
 
     final FileSystem fs = FileSystem.get(jobConf);
     Pair pivotPair = new Pair();
@@ -788,7 +787,7 @@
       // update the out put dir of the job
       outDir = FileOutputFormat.getOutputPath(jobConf);
 
-      JobManager.execute(jobConf);
+      JobClient.runJob(jobConf);
 
       // read outputs
       Path inFile = new Path(outDir, "part-00000");
@@ -867,7 +866,7 @@
           .addInputPaths(jobConf, getPath());
       jobConf.setOutputFormat(NullOutputFormat.class);
 
-      JobManager.execute(jobConf);
+      JobClient.runJob(jobConf);
 
       // rotate eigenvectors
       LOG.info("rotating eigenvector");

Modified: incubator/hama/trunk/src/java/org/apache/hama/matrix/SparseMatrix.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/matrix/SparseMatrix.java?rev=829736&r1=829735&r2=829736&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/matrix/SparseMatrix.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/matrix/SparseMatrix.java Mon Oct 26 09:20:42
2009
@@ -35,6 +35,7 @@
 import org.apache.hadoop.io.SequenceFile;
 import org.apache.hadoop.io.Writable;
 import org.apache.hadoop.io.SequenceFile.CompressionType;
+import org.apache.hadoop.mapred.JobClient;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapreduce.Job;
 import org.apache.hadoop.mapreduce.lib.input.FileInputFormat;
@@ -47,7 +48,6 @@
 import org.apache.hama.matrix.algebra.SparseMatrixVectorMultMap;
 import org.apache.hama.matrix.algebra.SparseMatrixVectorMultReduce;
 import org.apache.hama.util.BytesUtil;
-import org.apache.hama.util.JobManager;
 import org.apache.hama.util.RandomVariable;
 
 public class SparseMatrix extends AbstractMatrix implements Matrix {
@@ -262,7 +262,7 @@
           MapWritable.class, jobConf);
       SparseMatrixVectorMultReduce.initJob(result.getPath(),
           SparseMatrixVectorMultReduce.class, jobConf);
-      JobManager.execute(jobConf);
+      JobClient.runJob(jobConf);
     }
 
     return result;



Mime
View raw message