svn commit: r720760 - in /incubator/hama/trunk: CHANGES.txt src/java/org/apache/hama/mapred/BlockingMapRed.java

[ed...@apache.org]

Author: edwardyoon
Date: Tue Nov 25 23:37:29 2008
New Revision: 720760

URL: http://svn.apache.org/viewvc?rev=720760&view=rev
Log:
Remove unwanted code

Modified:
    incubator/hama/trunk/CHANGES.txt
    incubator/hama/trunk/src/java/org/apache/hama/mapred/BlockingMapRed.java

Modified: incubator/hama/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/CHANGES.txt?rev=720760&r1=720759&r2=720760&view=diff
==============================================================================
--- incubator/hama/trunk/CHANGES.txt (original)
+++ incubator/hama/trunk/CHANGES.txt Tue Nov 25 23:37:29 2008
@@ -33,6 +33,7 @@
     
   IMPROVEMENTS
     
+    HAMA-114: Remove unwanted code (edwardyoon)
     HAMA-107: Blocking job should be a map/reduce job (samuel via edwardyoon)
     HAMA-99: Implement setColumn(int column, Vector vector) (edwardyoon)
     HAMA-108: Implement add(int i, int j, double value) (edwardyoon)

Modified: incubator/hama/trunk/src/java/org/apache/hama/mapred/BlockingMapRed.java
URL: http://svn.apache.org/viewvc/incubator/hama/trunk/src/java/org/apache/hama/mapred/BlockingMapRed.java?rev=720760&r1=720759&r2=720760&view=diff
==============================================================================
--- incubator/hama/trunk/src/java/org/apache/hama/mapred/BlockingMapRed.java (original)
+++ incubator/hama/trunk/src/java/org/apache/hama/mapred/BlockingMapRed.java Tue Nov 25 23:37:29 2008
@@ -23,19 +23,18 @@
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.hadoop.fs.Path;
 import org.apache.hadoop.io.DataInputBuffer;
 import org.apache.hadoop.io.IntWritable;
 import org.apache.hadoop.io.RawComparator;
 import org.apache.hadoop.io.WritableComparable;
 import org.apache.hadoop.mapred.FileInputFormat;
-import org.apache.hadoop.mapred.FileOutputFormat;
 import org.apache.hadoop.mapred.JobConf;
 import org.apache.hadoop.mapred.MapReduceBase;
 import org.apache.hadoop.mapred.Mapper;
 import org.apache.hadoop.mapred.OutputCollector;
 import org.apache.hadoop.mapred.Reducer;
 import org.apache.hadoop.mapred.Reporter;
+import org.apache.hadoop.mapred.lib.NullOutputFormat;
 import org.apache.hama.Constants;
 import org.apache.hama.DenseMatrix;
 import org.apache.hama.DenseVector;
@@ -53,7 +52,6 @@
   /** Parameter of the path of the matrix to be blocked **/
   public static final String BLOCKING_MATRIX = "hama.blocking.matrix";
   
-  protected static final String TEMP_OUTPUT_DIR = "/tmp/hama/";
   /** 
    * Initialize a job to blocking a table
    * 
@@ -68,10 +66,7 @@
     job.setInputFormat(VectorInputFormat.class);
     job.setMapOutputKeyClass(BlockRowId.class);
     job.setMapOutputValueClass(VectorWritable.class);
-    
-    // TODO: we don't need an output
-    FileOutputFormat.setOutputPath(job, new Path(TEMP_OUTPUT_DIR + System.currentTimeMillis()));
-    
+    job.setOutputFormat(NullOutputFormat.class);
     job.setOutputValueGroupingComparator(GroupingComparator.class);
     
     job.set(BLOCKING_MATRIX, matrixPath);
@@ -154,10 +149,7 @@
       }
       
       matrix.setBlock(blkId.getRow(), blkId.getColumn(), subMatrix);
-      
-      // we will not collect anything here.
     }
-    
   }
   
   /**
@@ -274,7 +266,5 @@
       sb.append(">");
       return sb.toString();
     }
-    
   }
-
 }