Updated Branches: refs/heads/trunk 549789aaf -> 188f6ed72
GIRAPH-542: Progress calls in aggregate (majakabiljo) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/188f6ed7 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/188f6ed7 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/188f6ed7 Branch: refs/heads/trunk Commit: 188f6ed7218120284e1ec9421be5f03b6582ef83 Parents: 549789a Author: Maja Kabiljo <[email protected]> Authored: Tue Feb 26 14:43:39 2013 -0800 Committer: Maja Kabiljo <[email protected]> Committed: Tue Feb 26 14:44:15 2013 -0800 ---------------------------------------------------------------------- .../giraph/worker/WorkerAggregatorHandler.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/188f6ed7/giraph-core/src/main/java/org/apache/giraph/worker/WorkerAggregatorHandler.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/worker/WorkerAggregatorHandler.java b/giraph-core/src/main/java/org/apache/giraph/worker/WorkerAggregatorHandler.java index 861add0..001cf59 100644 --- a/giraph-core/src/main/java/org/apache/giraph/worker/WorkerAggregatorHandler.java +++ b/giraph-core/src/main/java/org/apache/giraph/worker/WorkerAggregatorHandler.java @@ -93,6 +93,7 @@ public class WorkerAggregatorHandler implements WorkerThreadAggregatorUsage { public <A extends Writable> void aggregate(String name, A value) { Aggregator<Writable> aggregator = currentAggregatorMap.get(name); if (aggregator != null) { + progressable.progress(); synchronized (aggregator) { aggregator.aggregate(value); } @@ -276,6 +277,7 @@ public class WorkerAggregatorHandler implements WorkerThreadAggregatorUsage { public <A extends Writable> void aggregate(String name, A value) { Aggregator<Writable> aggregator = threadAggregatorMap.get(name); if (aggregator != null) { + progressable.progress(); aggregator.aggregate(value); } else { throw new IllegalStateException("aggregate: " +
