You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hama.apache.org by ed...@apache.org on 2009/01/06 18:10:24 UTC
svn commit: r732008 - in /incubator/hama/trunk/src/java/org/apache/hama:
DenseMatrix.java mapred/RandomMatrixMap.java mapred/RandomMatrixReduce.java
mapred/VectorOutputFormat.java
Author: edwardyoon
Date: Tue Jan 6 09:10:24 2009
New Revision: 732008
URL: http://svn.apache.org/viewvc?rev=732008&view=rev
Log: (empty)
Modified:
incubator/hama/trunk/src/java/org/apache/hama/DenseMatrix.java
incubator/hama/trunk/src/java/org/apache/hama/mapred/RandomMatrixMap.java
incubator/hama/trunk/src/java/org/apache/hama/mapred/RandomMatrixReduce.java
incubator/hama/trunk/src/java/org/apache/hama/mapred/VectorOutputFormat.java
Modified: incubator/hama/trunk/src/java/org/apache/hama/DenseMatrix.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/DenseMatrix.java?rev=732008&r1=732007&r2=732008&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/DenseMatrix.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/DenseMatrix.java Tue Jan 6 09:10:24 2009
@@ -251,7 +251,8 @@
DenseMatrix rand = new DenseMatrix(conf);
LOG.info("Create the " + m + " * " + n + " random matrix : "
+ rand.getPath());
-
+ rand.setDimension(m, n);
+
JobConf jobConf = new JobConf(conf);
jobConf.setJobName("random matrix MR job : " + rand.getPath());
@@ -294,7 +295,6 @@
}
JobClient.runJob(jobConf);
- rand.setDimension(m, n);
fs.delete(TMP_DIR, true);
return rand;
}
Modified: incubator/hama/trunk/src/java/org/apache/hama/mapred/RandomMatrixMap.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/mapred/RandomMatrixMap.java?rev=732008&r1=732007&r2=732008&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/mapred/RandomMatrixMap.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/mapred/RandomMatrixMap.java Tue Jan 6 09:10:24 2009
@@ -39,7 +39,8 @@
Mapper<IntWritable, IntWritable, IntWritable, VectorWritable> {
static final Logger LOG = Logger.getLogger(RandomMatrixMap.class);
protected int column;
- protected DenseVector vector = new DenseVector();;
+ protected DenseVector vector = new DenseVector();
+
@Override
public void map(IntWritable key, IntWritable value,
OutputCollector<IntWritable, VectorWritable> output, Reporter report)
Modified: incubator/hama/trunk/src/java/org/apache/hama/mapred/RandomMatrixReduce.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/mapred/RandomMatrixReduce.java?rev=732008&r1=732007&r2=732008&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/mapred/RandomMatrixReduce.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/mapred/RandomMatrixReduce.java Tue Jan 6 09:10:24 2009
@@ -59,10 +59,11 @@
OutputCollector<IntWritable, VectorUpdate> output, Reporter reporter)
throws IOException {
VectorUpdate update = new VectorUpdate(key.get());
- while (values.hasNext()) {
- update.putAll(values.next().entrySet());
- output.collect(key, update);
- }
+ update.putAll(values.next().entrySet());
+ output.collect(key, update);
+
+ if(values.hasNext())
+ throw new IOException("Unexpected data.");
}
}
Modified: incubator/hama/trunk/src/java/org/apache/hama/mapred/VectorOutputFormat.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/mapred/VectorOutputFormat.java?rev=732008&r1=732007&r2=732008&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/mapred/VectorOutputFormat.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/mapred/VectorOutputFormat.java Tue Jan 6 09:10:24 2009
@@ -45,7 +45,7 @@
private final static Log LOG = LogFactory.getLog(VectorOutputFormat.class);
/**
- * Convert Reduce output (key, value) to (HStoreKey, KeyedDataArrayWritable)
+ * Convert Reduce output (key, value) to (IntWritable, VectorUpdate)
* and write to an HBase table
*/
protected static class TableRecordWriter implements