Repository: giraph Updated Branches: refs/heads/trunk 8af7670c3 -> 9d20d69fd
GIRAPH-967: (Strongly Connected Components) bug fix (mhan via majakabiljo) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/9d20d69f Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/9d20d69f Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/9d20d69f Branch: refs/heads/trunk Commit: 9d20d69fdb0be53a5410711489173f808fbe6f4e Parents: 8af7670 Author: Maja Kabiljo <[email protected]> Authored: Fri Jan 16 10:07:01 2015 -0800 Committer: Maja Kabiljo <[email protected]> Committed: Fri Jan 16 10:07:01 2015 -0800 ---------------------------------------------------------------------- CHANGELOG | 1 + .../org/apache/giraph/examples/scc/SccPhaseMasterCompute.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/9d20d69f/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index d487874..6b5f59f 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ Giraph Change Log Release 1.2.0 - unreleased + GIRAPH-967: (Strongly Connected Components) bug fix (mhan via majakabiljo) GIRAPH-980 Way to disable checkpoints for particular job and on particular supersteps (edunov) http://git-wip-us.apache.org/repos/asf/giraph/blob/9d20d69f/giraph-examples/src/main/java/org/apache/giraph/examples/scc/SccPhaseMasterCompute.java ---------------------------------------------------------------------- diff --git a/giraph-examples/src/main/java/org/apache/giraph/examples/scc/SccPhaseMasterCompute.java b/giraph-examples/src/main/java/org/apache/giraph/examples/scc/SccPhaseMasterCompute.java index f5fd82b..39152fb 100644 --- a/giraph-examples/src/main/java/org/apache/giraph/examples/scc/SccPhaseMasterCompute.java +++ b/giraph-examples/src/main/java/org/apache/giraph/examples/scc/SccPhaseMasterCompute.java @@ -17,7 +17,7 @@ */ package org.apache.giraph.examples.scc; -import org.apache.giraph.aggregators.BooleanOverwriteAggregator; +import org.apache.giraph.aggregators.BooleanOrAggregator; import org.apache.giraph.aggregators.IntOverwriteAggregator; import org.apache.giraph.master.DefaultMasterCompute; import org.apache.hadoop.io.BooleanWritable; @@ -64,8 +64,8 @@ public class SccPhaseMasterCompute extends DefaultMasterCompute { public void initialize() throws InstantiationException, IllegalAccessException { registerPersistentAggregator(PHASE, IntOverwriteAggregator.class); - registerAggregator(NEW_MAXIMUM, BooleanOverwriteAggregator.class); - registerAggregator(CONVERGED, BooleanOverwriteAggregator.class); + registerAggregator(NEW_MAXIMUM, BooleanOrAggregator.class); + registerAggregator(CONVERGED, BooleanOrAggregator.class); } @Override
