svn commit: r1403957 - in /giraph/trunk: CHANGELOG giraph/src/main/java/org/apache/giraph/graph/BspServiceWorker.java

[aching]

Author: aching
Date: Wed Oct 31 02:49:11 2012
New Revision: 1403957

URL: http://svn.apache.org/viewvc?rev=1403957&view=rev
Log:
GIRAPH-393: Number of input split threads should always be >= 1
(aching)

Modified:
    giraph/trunk/CHANGELOG
    
giraph/trunk/giraph/src/main/java/org/apache/giraph/graph/BspServiceWorker.java

Modified: giraph/trunk/CHANGELOG
URL: 
http://svn.apache.org/viewvc/giraph/trunk/CHANGELOG?rev=1403957&r1=1403956&r2=1403957&view=diff
==============================================================================
--- giraph/trunk/CHANGELOG (original)
+++ giraph/trunk/CHANGELOG Wed Oct 31 02:49:11 2012
@@ -1,6 +1,9 @@
 Giraph Change Log
 
 Release 0.2.0 - unreleased
+  GIRAPH-393: Number of input split threads should always be >= 1
+  (aching)
+
   GIRAPH-388: Improve the way we keep outgoing messages (majakabiljo
   via aching).
 

Modified: 
giraph/trunk/giraph/src/main/java/org/apache/giraph/graph/BspServiceWorker.java
URL: 
http://svn.apache.org/viewvc/giraph/trunk/giraph/src/main/java/org/apache/giraph/graph/BspServiceWorker.java?rev=1403957&r1=1403956&r2=1403957&view=diff
==============================================================================
--- 
giraph/trunk/giraph/src/main/java/org/apache/giraph/graph/BspServiceWorker.java 
(original)
+++ 
giraph/trunk/giraph/src/main/java/org/apache/giraph/graph/BspServiceWorker.java 
Wed Oct 31 02:49:11 2012
@@ -216,7 +216,8 @@ public class BspServiceWorker<I extends 
         INPUT_SUPERSTEP, 0, 0, getContext(), getGraphMapper(),
         null);
     int maxInputSplitThreads =
-        inputSplitPathList.size() / getConfiguration().getMaxWorkers();
+        Math.max(
+            inputSplitPathList.size() / getConfiguration().getMaxWorkers(), 1);
     int numThreads =
         Math.min(getConfiguration().getNumInputSplitsThreads(),
             maxInputSplitThreads);