Repository: giraph Updated Branches: refs/heads/trunk 28dac9e5a -> 0c345c6a7
GIRAPH-894: make giraphconfiguration available to workercontext (pavanka) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/0c345c6a Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/0c345c6a Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/0c345c6a Branch: refs/heads/trunk Commit: 0c345c6a7754c4db9928ad6c5775495d68261536 Parents: 28dac9e Author: Pavan Kumar <[email protected]> Authored: Sun Jun 8 11:45:02 2014 -0700 Committer: Pavan Kumar <[email protected]> Committed: Sun Jun 8 11:45:02 2014 -0700 ---------------------------------------------------------------------- CHANGELOG | 2 ++ .../src/main/java/org/apache/giraph/worker/WorkerContext.java | 7 +++++-- 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/0c345c6a/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index de277ea..dc87f48 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,8 @@ Giraph Change Log Release 1.1.0 - unreleased + GIRAPH-894: make giraphconfiguration available to workercontext (pavanka) + GIRAPH-910: removing unnecessary boxing in some places in giraph-core (pavanka) GIRAPH-908: support for partitioned input in giraph (pavanka) http://git-wip-us.apache.org/repos/asf/giraph/blob/0c345c6a/giraph-core/src/main/java/org/apache/giraph/worker/WorkerContext.java ---------------------------------------------------------------------- diff --git a/giraph-core/src/main/java/org/apache/giraph/worker/WorkerContext.java b/giraph-core/src/main/java/org/apache/giraph/worker/WorkerContext.java index 729ba14..17347db 100644 --- a/giraph-core/src/main/java/org/apache/giraph/worker/WorkerContext.java +++ b/giraph-core/src/main/java/org/apache/giraph/worker/WorkerContext.java @@ -18,6 +18,7 @@ package org.apache.giraph.worker; +import org.apache.giraph.conf.DefaultImmutableClassesGiraphConfigurable; import org.apache.giraph.graph.GraphState; import org.apache.hadoop.io.Writable; import org.apache.hadoop.mapreduce.Mapper; @@ -27,7 +28,9 @@ import org.apache.hadoop.mapreduce.Mapper; * on a per-worker basis. There's one WorkerContext per worker. */ @SuppressWarnings("rawtypes") -public abstract class WorkerContext implements WorkerAggregatorUsage { +public abstract class WorkerContext + extends DefaultImmutableClassesGiraphConfigurable + implements WorkerAggregatorUsage { /** Global graph state */ private GraphState graphState; /** Worker aggregator usage */ @@ -36,7 +39,7 @@ public abstract class WorkerContext implements WorkerAggregatorUsage { /** * Set the graph state. * - * @param graphState Used to set the graph state. + * @param graphState Used to set the graph state. */ public void setGraphState(GraphState graphState) { this.graphState = graphState;
