You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by se...@apache.org on 2015/06/04 13:28:21 UTC
[3/4] flink git commit: [docs/javadoc][hotfix] Corrected Join hint
and misleadling pointer to Spargel
[docs/javadoc][hotfix] Corrected Join hint and misleadling pointer to Spargel
This closes #763
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7411343a
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7411343a
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7411343a
Branch: refs/heads/master
Commit: 7411343acc9ddfafdd6bb4d505f8ae2b03612424
Parents: 8e793f9
Author: andralungu <lu...@gmail.com>
Authored: Tue Jun 2 20:58:10 2015 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Thu Jun 4 13:27:22 2015 +0200
----------------------------------------------------------------------
docs/apis/iterations.md | 2 +-
.../apache/flink/api/common/operators/base/JoinOperatorBase.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/7411343a/docs/apis/iterations.md
----------------------------------------------------------------------
diff --git a/docs/apis/iterations.md b/docs/apis/iterations.md
index a83d403..54d1b24 100644
--- a/docs/apis/iterations.md
+++ b/docs/apis/iterations.md
@@ -24,7 +24,7 @@ Iterative algorithms occur in many domains of data analysis, such as *machine le
Flink programs implement iterative algorithms by defining a **step function** and embedding it into a special iteration operator. There are two variants of this operator: **Iterate** and **Delta Iterate**. Both operators repeatedly invoke the step function on the current iteration state until a certain termination condition is reached.
-Here, we provide background on both operator variants and outline their usage. The [programming guide](programming_guide.html) explain how to implement the operators in both Scala and Java. We also provide a **vertex-centric graph processing API** called [Spargel]({{site.baseurl}}/libs/spargel_guide.html).
+Here, we provide background on both operator variants and outline their usage. The [programming guide](programming_guide.html) explains how to implement the operators in both Scala and Java. We also support both **vertex-centric and gather-sum-apply iterations** through Flink's graph processing API, [Gelly]({{site.baseurl}}/libs/gelly_guide.html).
The following table provides an overview of both operators:
http://git-wip-us.apache.org/repos/asf/flink/blob/7411343a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/JoinOperatorBase.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/JoinOperatorBase.java b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/JoinOperatorBase.java
index 7f05c8f..799496c 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/operators/base/JoinOperatorBase.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/operators/base/JoinOperatorBase.java
@@ -68,7 +68,7 @@ public class JoinOperatorBase<IN1, IN2, OUT, FT extends FlatJoinFunction<IN1, IN
BROADCAST_HASH_FIRST,
/**
- * Hint that the second join input is much smaller than the second. This results in
+ * Hint that the second join input is much smaller than the first. This results in
* broadcasting and hashing the second input, unless the optimizer infers that
* prior existing partitioning is available that is even cheaper to exploit.
*/