Updated Branches: refs/heads/trunk 52c88d8d9 -> 7ea62d9c1
GIRAPH-695: Add getCombiner and getComputation methods for MasterCompute (aching) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/7ea62d9c Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/7ea62d9c Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/7ea62d9c Branch: refs/heads/trunk Commit: 7ea62d9c123c8a1865187e76b65da2aac936281c Parents: 52c88d8 Author: Avery Ching <[email protected]> Authored: Sat Jun 22 07:35:42 2013 -0700 Committer: Avery Ching <[email protected]> Committed: Mon Jun 24 10:18:43 2013 -0700 ---------------------------------------------------------------------- CHANGELOG | 5 ++++- .../org/apache/giraph/master/MasterCompute.java | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/7ea62d9c/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index 9db2013..36693ab 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,9 +1,12 @@ Giraph Change Log Release 1.1.0 - unreleased + GIRAPH-695: Add getCombiner and getComputation methods for + MasterCompute (aching) + GIRAPH-623: Website Documentation: table of parameters (armax00 via nitay) - GIRAPH-694 Setting configuration in GiraphConfiguration causes + GIRAPH-694: Setting configuration in GiraphConfiguration causes non thread safe copies (aching) GIRAPH-683: Jython for Computation (nitay) http://git-wip-us.apache.org/repos/asf/giraph/blob/7ea62d9c/giraph-core/src/main/java/org/apache/giraph/master/MasterCompute.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/master/MasterCompute.java b/giraph-core/src/main/java/org/apache/giraph/master/MasterCompute.java index 1f244bb..310cb26 100644 --- a/giraph-core/src/main/java/org/apache/giraph/master/MasterCompute.java +++ b/giraph-core/src/main/java/org/apache/giraph/master/MasterCompute.java @@ -129,6 +129,15 @@ public abstract class MasterCompute } /** + * Get Computation class to be used + * + * @return Computation class + */ + public final Class<? extends Computation> getComputation() { + return superstepClasses.getComputationClass(); + } + + /** * Set Combiner class to be used * * @param combinerClass Combiner class @@ -137,6 +146,15 @@ public abstract class MasterCompute superstepClasses.setCombinerClass(combinerClass); } + /** + * Get Combiner class to be used + * + * @return Combiner class + */ + public final Class<? extends Combiner> getCombiner() { + return superstepClasses.getCombinerClass(); + } + @Override public final <A extends Writable> boolean registerAggregator( String name, Class<? extends Aggregator<A>> aggregatorClass)
