Updated Branches: refs/heads/trunk 2c89b9702 -> d644af866
GIRAPH-777: Fix bug from GIRAPH-775 (majakabiljo) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/d644af86 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/d644af86 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/d644af86 Branch: refs/heads/trunk Commit: d644af86642b5efbf889731139a880d68eedd153 Parents: 2c89b97 Author: Maja Kabiljo <[email protected]> Authored: Thu Oct 10 12:51:38 2013 -0700 Committer: Maja Kabiljo <[email protected]> Committed: Thu Oct 10 12:52:23 2013 -0700 ---------------------------------------------------------------------- CHANGELOG | 2 ++ .../apache/giraph/comm/requests/SendWorkerVerticesRequest.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/d644af86/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index ec91f33..18d956c 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 1.1.0 - unreleased + GIRAPH-777: Fix bug from GIRAPH-775 (majakabiljo) + GIRAPH-776: Update Giraph to use HiveIO 0.18 (gmalewicz via majakabiljo) GIRAPH-775: Vertex value combiner (aching) http://git-wip-us.apache.org/repos/asf/giraph/blob/d644af86/giraph-core/src/main/java/org/apache/giraph/comm/requests/SendWorkerVerticesRequest.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/comm/requests/SendWorkerVerticesRequest.java b/giraph-core/src/main/java/org/apache/giraph/comm/requests/SendWorkerVerticesRequest.java index 386e0ee..69fae83 100644 --- a/giraph-core/src/main/java/org/apache/giraph/comm/requests/SendWorkerVerticesRequest.java +++ b/giraph-core/src/main/java/org/apache/giraph/comm/requests/SendWorkerVerticesRequest.java @@ -115,7 +115,8 @@ public class SendWorkerVerticesRequest<I extends WritableComparable, @Override public int getSerializedSize() { - int size = 0; + // 4 for number of partitions + int size = super.getSerializedSize() + 4; PairList<Integer, ExtendedDataOutput>.Iterator iterator = workerPartitions.getIterator(); while (iterator.hasNext()) {
