svn commit: r1482677 - in /hama/trunk: CHANGES.txt core/src/main/java/org/apache/hama/bsp/BSPJobClient.java core/src/main/java/org/apache/hama/bsp/NonSplitSequenceFileInputFormat.java

[ed...@apache.org]

Author: edwardyoon
Date: Wed May 15 04:29:37 2013
New Revision: 1482677

URL: http://svn.apache.org/r1482677
Log:
HAMA-757: The partitioning job output should be un-splitable (MaoYuan Xian via edwardyoon)

Added:
    hama/trunk/core/src/main/java/org/apache/hama/bsp/NonSplitSequenceFileInputFormat.java
Modified:
    hama/trunk/CHANGES.txt
    hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPJobClient.java

Modified: hama/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hama/trunk/CHANGES.txt?rev=1482677&r1=1482676&r2=1482677&view=diff
==============================================================================
--- hama/trunk/CHANGES.txt (original)
+++ hama/trunk/CHANGES.txt Wed May 15 04:29:37 2013
@@ -13,7 +13,8 @@ Release 0.7 (unreleased changes)
    HAMA-750: Fix bug of comma separated input paths (edwardyoon)
 
   IMPROVEMENTS
-   
+
+   HAMA-757: The partitioning job output should be un-splitable (MaoYuan Xian via edwardyoon)
    HAMA-754: PartitioningRunner should write raw records to partition files (edwardyoon)
    HAMA-707: BSPMessageBundle should be able to encapsulate messages serialized in ByteBuffer (surajsmenon) 
    HAMA-722: Messaging queue should construct sender and receiver queue (surajsmenon)

Modified: hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPJobClient.java
URL: http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPJobClient.java?rev=1482677&r1=1482676&r2=1482677&view=diff
==============================================================================
--- hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPJobClient.java (original)
+++ hama/trunk/core/src/main/java/org/apache/hama/bsp/BSPJobClient.java Wed May 15 04:29:37 2013
@@ -459,7 +459,7 @@ public class BSPJobClient extends Config
             job.setInputPath(partitionDir);
           }
           job.setBoolean("input.has.partitioned", true);
-          job.setInputFormat(SequenceFileInputFormat.class);
+          job.setInputFormat(NonSplitSequenceFileInputFormat.class);
         } else {
           LOG.error("Error partitioning the input path.");
           throw new IOException("Runtime partition failed for the job.");

Added: hama/trunk/core/src/main/java/org/apache/hama/bsp/NonSplitSequenceFileInputFormat.java
URL: http://svn.apache.org/viewvc/hama/trunk/core/src/main/java/org/apache/hama/bsp/NonSplitSequenceFileInputFormat.java?rev=1482677&view=auto
==============================================================================
--- hama/trunk/core/src/main/java/org/apache/hama/bsp/NonSplitSequenceFileInputFormat.java (added)
+++ hama/trunk/core/src/main/java/org/apache/hama/bsp/NonSplitSequenceFileInputFormat.java Wed May 15 04:29:37 2013
@@ -0,0 +1,32 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.hama.bsp;
+
+import org.apache.hadoop.fs.Path;
+
+/**
+ * Only for input partitioning job.
+ */
+public class NonSplitSequenceFileInputFormat<K, V> extends
+    SequenceFileInputFormat<K, V> {
+
+  @Override
+  protected boolean isSplitable(BSPJob job, Path path) {
+    return false;
+  }
+}