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 2014/02/04 11:25:53 UTC
svn commit: r1564245 -
/hama/trunk/examples/src/test/java/org/apache/hama/examples/SemiClusterMatchingTest.java
Author: edwardyoon
Date: Tue Feb 4 10:25:53 2014
New Revision: 1564245
URL: http://svn.apache.org/r1564245
Log:
use multiple tasks in SemiClusterMatchingTest.
Modified:
hama/trunk/examples/src/test/java/org/apache/hama/examples/SemiClusterMatchingTest.java
Modified: hama/trunk/examples/src/test/java/org/apache/hama/examples/SemiClusterMatchingTest.java
URL: http://svn.apache.org/viewvc/hama/trunk/examples/src/test/java/org/apache/hama/examples/SemiClusterMatchingTest.java?rev=1564245&r1=1564244&r2=1564245&view=diff
==============================================================================
--- hama/trunk/examples/src/test/java/org/apache/hama/examples/SemiClusterMatchingTest.java (original)
+++ hama/trunk/examples/src/test/java/org/apache/hama/examples/SemiClusterMatchingTest.java Tue Feb 4 10:25:53 2014
@@ -23,6 +23,7 @@ import java.io.BufferedWriter;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
+import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
@@ -139,28 +140,32 @@ public class SemiClusterMatchingTest ext
public static Map<String, List<String>> outputClusterLoader()
throws IOException {
FileStatus[] files = fs.globStatus(new Path(OUTPUT + "/part-*"));
- assertTrue("Not enough files found: " + files.length, files.length == 1);
- BufferedReader br = new BufferedReader(new FileReader(OUTPUT
- + "/part-00000"));
String line, vertexId, clusterId, clusterList;
List<String> tm;
Map<String, List<String>> mp = new HashMap<String, List<String>>();
- while ((line = br.readLine()) != null) {
- StringTokenizer st1 = new StringTokenizer(line, "\t");
- vertexId = st1.nextToken();
- clusterList = st1.nextToken().toString().replaceAll("[\\[\\] ]", "");
- StringTokenizer st2 = new StringTokenizer(clusterList, ",");
- while (st2.hasMoreTokens()) {
- clusterId = st2.nextToken();
- if (!mp.containsKey(clusterId)) {
- tm = new ArrayList<String>();
+
+ for (FileStatus file : files) {
+ BufferedReader reader = new BufferedReader(new InputStreamReader(
+ fs.open(file.getPath())));
+ while ((line = reader.readLine()) != null) {
+ StringTokenizer st1 = new StringTokenizer(line, "\t");
+ vertexId = st1.nextToken();
+ clusterList = st1.nextToken().toString().replaceAll("[\\[\\] ]", "");
+ StringTokenizer st2 = new StringTokenizer(clusterList, ",");
+ while (st2.hasMoreTokens()) {
+ clusterId = st2.nextToken();
+ if (!mp.containsKey(clusterId)) {
+ tm = new ArrayList<String>();
+ mp.put(clusterId, tm);
+ } else
+ tm = mp.get(clusterId);
+ tm.add(vertexId);
mp.put(clusterId, tm);
- } else
- tm = mp.get(clusterId);
- tm.add(vertexId);
- mp.put(clusterId, tm);
+ }
}
+ reader.close();
}
+
Iterator it = mp.entrySet().iterator();
while (it.hasNext()) {
Map.Entry pairs = (Map.Entry) it.next();
@@ -169,7 +174,6 @@ public class SemiClusterMatchingTest ext
it.remove();
}
}
- br.close();
return mp;
}
@@ -244,6 +248,7 @@ public class SemiClusterMatchingTest ext
semiClusterJob.setOutputFormat(TextOutputFormat.class);
semiClusterJob.setOutputKeyClass(Text.class);
semiClusterJob.setOutputValueClass(Text.class);
+ semiClusterJob.setNumBspTask(5);
long startTime = System.currentTimeMillis();
if (semiClusterJob.waitForCompletion(true)) {
System.out.println("Job Finished in "