giraph-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pava...@apache.org
Subject git commit: updated refs/heads/trunk to ffdddff
Date Tue, 10 Jun 2014 23:12:37 GMT
Repository: giraph
Updated Branches:
  refs/heads/trunk 372c35ebc -> ffdddff32


GIRAPH-918: GIRAPH-908 has a small bug reg counting entries (pavanka)


Project: http://git-wip-us.apache.org/repos/asf/giraph/repo
Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/ffdddff3
Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/ffdddff3
Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/ffdddff3

Branch: refs/heads/trunk
Commit: ffdddff32e7ac6e2cbb5ae8471c1192c69ac6a94
Parents: 372c35e
Author: Pavan Kumar <pavanka@fb.com>
Authored: Tue Jun 10 16:12:23 2014 -0700
Committer: Pavan Kumar <pavanka@fb.com>
Committed: Tue Jun 10 16:12:23 2014 -0700

----------------------------------------------------------------------
 CHANGELOG                                                |  2 ++
 .../java/org/apache/giraph/worker/BspServiceWorker.java  | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/giraph/blob/ffdddff3/CHANGELOG
----------------------------------------------------------------------
diff --git a/CHANGELOG b/CHANGELOG
index ec1f798..f35d4ba 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,8 @@
 Giraph Change Log
 
 Release 1.1.0 - unreleased
+  GIRAPH-918: GIRAPH-908 has a small bug reg counting entries (pavanka)
+
   GIRAPH-842: option to dump histogram of memory usage when heap is low on memory (pavanka)
 
   GIRAPH-904: Giraph can hang when hostnames include uppercase letters (netj via pavanka)

http://git-wip-us.apache.org/repos/asf/giraph/blob/ffdddff3/giraph-core/src/main/java/org/apache/giraph/worker/BspServiceWorker.java
----------------------------------------------------------------------
diff --git a/giraph-core/src/main/java/org/apache/giraph/worker/BspServiceWorker.java b/giraph-core/src/main/java/org/apache/giraph/worker/BspServiceWorker.java
index a89da24..8dcf19a 100644
--- a/giraph-core/src/main/java/org/apache/giraph/worker/BspServiceWorker.java
+++ b/giraph-core/src/main/java/org/apache/giraph/worker/BspServiceWorker.java
@@ -320,7 +320,7 @@ public class BspServiceWorker<I extends WritableComparable,
    *
    * @return Count of mapping entries loaded
    */
-  private Integer loadMapping() throws KeeperException,
+  private long loadMapping() throws KeeperException,
     InterruptedException {
     List<String> inputSplitPathList =
         getZkExt().getChildrenExt(mappingInputSplitsPaths.getPath(),
@@ -341,7 +341,7 @@ public class BspServiceWorker<I extends WritableComparable,
             this,
             getZkExt());
 
-    int entriesLoaded = 0;
+    long entriesLoaded = 0;
     // Determine how many threads to use based on the number of input splits
     int maxInputSplitThreads = inputSplitPathList.size();
     int numThreads = Math.min(getConfiguration().getNumInputSplitsThreads(),
@@ -577,7 +577,7 @@ public class BspServiceWorker<I extends WritableComparable,
     aggregatorHandler.prepareSuperstep(workerAggregatorRequestProcessor);
 
     VertexEdgeCount vertexEdgeCount;
-    int entriesLoaded = 0;
+    long entriesLoaded;
 
     if (getConfiguration().hasMappingInputFormat()) {
       // Ensure the mapping InputSplits are ready for processing
@@ -673,13 +673,14 @@ public class BspServiceWorker<I extends WritableComparable,
       }
     }
 
+    // remove mapping store if possible
+    localData.removeMappingStoreIfPossible();
+
     if (getConfiguration().hasEdgeInputFormat()) {
       // Move edges from temporary storage to their source vertices.
       getServerData().getEdgeStore().moveEdgesToVertices();
     }
 
-    localData.removeMappingStoreIfPossible();
-
     // Generate the partition stats for the input superstep and process
     // if necessary
     List<PartitionStats> partitionStatsList =


Mime
View raw message