You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by va...@apache.org on 2015/04/10 10:29:26 UTC
[2/4] flink git commit: [FLINK-1694] [gelly] fixed typo and a small
code simplification
[FLINK-1694] [gelly] fixed typo and a small code simplification
This closes #547
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/48713a8a
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/48713a8a
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/48713a8a
Branch: refs/heads/master
Commit: 48713a8a8f328d3880c823a754b9ff6abc618b2a
Parents: e98bd85
Author: vasia <va...@gmail.com>
Authored: Thu Apr 9 22:04:55 2015 +0200
Committer: vasia <va...@apache.org>
Committed: Fri Apr 10 10:54:46 2015 +0300
----------------------------------------------------------------------
docs/gelly_guide.md | 2 +-
.../src/main/java/org/apache/flink/graph/Graph.java | 8 ++------
2 files changed, 3 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/48713a8a/docs/gelly_guide.md
----------------------------------------------------------------------
diff --git a/docs/gelly_guide.md b/docs/gelly_guide.md
index 203cffa..cc85296 100644
--- a/docs/gelly_guide.md
+++ b/docs/gelly_guide.md
@@ -373,7 +373,7 @@ and can be specified using the `setName()` method.
* <strong>Parallelism</strong>: The parallelism for the iteration. It can be set using the `setParallelism()` method.
-* <strong>Solution set in unmanaged memory</strong>: Defines whether the solution set is kept in managed memory (Flink's internal way of keeping object in serialized form) or as a simple object map. By default, the solution set runs in managed memory. This property can be set using the `setSolutionSetUnmanagedMemory()` method.
+* <strong>Solution set in unmanaged memory</strong>: Defines whether the solution set is kept in managed memory (Flink's internal way of keeping objects in serialized form) or as a simple object map. By default, the solution set runs in managed memory. This property can be set using the `setSolutionSetUnmanagedMemory()` method.
* <strong>Aggregators</strong>: Iteration aggregators can be registered using the `registerAggregator()` method. An iteration aggregator combines
all aggregates globally once per superstep and makes them available in the next superstep. Registered aggregators can be accessed inside the user-defined `VertexUpdateFunction` and `MessagingFunction`.
http://git-wip-us.apache.org/repos/asf/flink/blob/48713a8a/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/Graph.java
----------------------------------------------------------------------
diff --git a/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/Graph.java b/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/Graph.java
index 8280ba9..c84eb12 100644
--- a/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/Graph.java
+++ b/flink-staging/flink-gelly/src/main/java/org/apache/flink/graph/Graph.java
@@ -1165,12 +1165,8 @@ public class Graph<K extends Comparable<K> & Serializable, VV extends Serializab
MessagingFunction<K, VV, M, EV> messagingFunction,
int maximumNumberOfIterations) {
- VertexCentricIteration<K, VV, M, EV> iteration = VertexCentricIteration.withEdges(
- edges, vertexUpdateFunction, messagingFunction, maximumNumberOfIterations);
-
- DataSet<Vertex<K, VV>> newVertices = vertices.runOperation(iteration);
-
- return new Graph<K, VV, EV>(newVertices, this.edges, this.context);
+ return this.runVertexCentricIteration(vertexUpdateFunction, messagingFunction,
+ maximumNumberOfIterations, null);
}
/**