svn commit: r1197396 - in /incubator/hama/trunk/core/src: main/java/org/apache/hama/bsp/BSPPeerImpl.java test/java/org/apache/hama/bsp/TestBSPMasterGroomServer.java test/java/testjar/ClassSerializePrinting.java

[edwardyoon]

Author: edwardyoon
Date: Fri Nov  4 03:07:05 2011
New Revision: 1197396

URL: http://svn.apache.org/viewvc?rev=1197396&view=rev
Log:
Fix bugs and build fails.

Modified:
    incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPPeerImpl.java
    
incubator/hama/trunk/core/src/test/java/org/apache/hama/bsp/TestBSPMasterGroomServer.java
    incubator/hama/trunk/core/src/test/java/testjar/ClassSerializePrinting.java

Modified: 
incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPPeerImpl.java
URL: 
http://svn.apache.org/viewvc/incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPPeerImpl.java?rev=1197396&r1=1197395&r2=1197396&view=diff
==============================================================================
--- 
incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPPeerImpl.java 
(original)
+++ 
incubator/hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPPeerImpl.java 
Fri Nov  4 03:07:05 2011
@@ -122,11 +122,7 @@ public class BSPPeerImpl<KEYIN, VALUEIN,
     this.splitClass = splitClass;
     this.split = split;
 
-    FileSystem fs = null;
-    if (conf.getBoolean("bsp.checkpoint.enabled", false)) {
-      fs = FileSystem.get(conf);
-    }
-    this.dfs = fs;
+    this.dfs = FileSystem.get(conf);
 
     String bindAddress = conf.get(Constants.PEER_HOST,
         Constants.DEFAULT_PEER_HOST);

Modified: 
incubator/hama/trunk/core/src/test/java/org/apache/hama/bsp/TestBSPMasterGroomServer.java
URL: 
http://svn.apache.org/viewvc/incubator/hama/trunk/core/src/test/java/org/apache/hama/bsp/TestBSPMasterGroomServer.java?rev=1197396&r1=1197395&r2=1197396&view=diff
==============================================================================
--- 
incubator/hama/trunk/core/src/test/java/org/apache/hama/bsp/TestBSPMasterGroomServer.java
 (original)
+++ 
incubator/hama/trunk/core/src/test/java/org/apache/hama/bsp/TestBSPMasterGroomServer.java
 Fri Nov  4 03:07:05 2011
@@ -81,7 +81,7 @@ public class TestBSPMasterGroomServer ex
       int tasks) throws Exception {
     for (int i = 0; i < tasks; i++) {
       SequenceFile.Reader reader = new SequenceFile.Reader(fileSys, new Path(
-          TMP_OUTPUT + i), conf);
+          TMP_OUTPUT + "part-0000" +i), conf);
       LongWritable timestamp = new LongWritable();
       Text message = new Text();
       reader.next(timestamp, message);

Modified: 
incubator/hama/trunk/core/src/test/java/testjar/ClassSerializePrinting.java
URL: 
http://svn.apache.org/viewvc/incubator/hama/trunk/core/src/test/java/testjar/ClassSerializePrinting.java?rev=1197396&r1=1197395&r2=1197396&view=diff
==============================================================================
--- incubator/hama/trunk/core/src/test/java/testjar/ClassSerializePrinting.java 
(original)
+++ incubator/hama/trunk/core/src/test/java/testjar/ClassSerializePrinting.java 
Fri Nov  4 03:07:05 2011
@@ -44,8 +44,9 @@ public class ClassSerializePrinting {
     private FileSystem fileSys;
     private int num;
 
-    public void bsp(BSPPeer<NullWritable, NullWritable, NullWritable, 
NullWritable> bspPeer) throws IOException,
-        KeeperException, InterruptedException {
+    public void bsp(
+        BSPPeer<NullWritable, NullWritable, NullWritable, NullWritable> 
bspPeer)
+        throws IOException, KeeperException, InterruptedException {
 
       int i = 0;
       for (String otherPeer : bspPeer.getAllPeerNames()) {
@@ -62,8 +63,8 @@ public class ClassSerializePrinting {
 
     private void writeLogToFile(String string, int i) throws IOException {
       SequenceFile.Writer writer = SequenceFile.createWriter(fileSys, conf,
-          new Path(TMP_OUTPUT,i+""), LongWritable.class, Text.class,
-          CompressionType.NONE);
+          new Path(TMP_OUTPUT, "part-0000" + i), LongWritable.class,
+          Text.class, CompressionType.NONE);
       writer.append(new LongWritable(System.currentTimeMillis()), new Text(
           "Hello BSP from " + (i + 1) + " of " + num + ": " + string));
       writer.close();