You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by fh...@apache.org on 2016/12/06 12:46:06 UTC
[1/2] flink git commit: [FLINK-5249] [docs] Fix description of
datastream rescaling to match the figure.
Repository: flink
Updated Branches:
refs/heads/release-1.1 c7db532ab -> 7bb6b696c
[FLINK-5249] [docs] Fix description of datastream rescaling to match the figure.
This closes #2932.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/c567b0c2
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/c567b0c2
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/c567b0c2
Branch: refs/heads/release-1.1
Commit: c567b0c285a848e89cef2553a78e790a6cc20804
Parents: c7db532
Author: David Anderson <da...@alpinegizmo.com>
Authored: Sun Dec 4 15:32:23 2016 +0100
Committer: Fabian Hueske <fh...@apache.org>
Committed: Tue Dec 6 13:45:03 2016 +0100
----------------------------------------------------------------------
docs/apis/streaming/index.md | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/c567b0c2/docs/apis/streaming/index.md
----------------------------------------------------------------------
diff --git a/docs/apis/streaming/index.md b/docs/apis/streaming/index.md
index 806ae4b..abc5df5 100644
--- a/docs/apis/streaming/index.md
+++ b/docs/apis/streaming/index.md
@@ -1016,19 +1016,18 @@ dataStream.rebalance();
The subset of downstream operations to which the upstream operation sends
elements depends on the degree of parallelism of both the upstream and downstream operation.
For example, if the upstream operation has parallelism 2 and the downstream operation
- has parallelism 4, then one upstream operation would distribute elements to two
+ has parallelism 6, then one upstream operation would distribute elements to three
downstream operations while the other upstream operation would distribute to the other
- two downstream operations. If, on the other hand, the downstream operation has parallelism
- 2 while the upstream operation has parallelism 4 then two upstream operations would
- distribute to one downstream operation while the other two upstream operations would
- distribute to the other downstream operations.
+ three downstream operations. If, on the other hand, the downstream operation has parallelism
+ 2 while the upstream operation has parallelism 6 then three upstream operations would
+ distribute to one downstream operation while the other three upstream operations would
+ distribute to the other downstream operation.
</p>
<p>
In cases where the different parallelisms are not multiples of each other one or several
downstream operations will have a differing number of inputs from upstream operations.
-
- </p>
</p>
+ <p>
Please see this figure for a visualization of the connection pattern in the above
example:
</p>
[2/2] flink git commit: [FLINK-5259] [docs] Fix wrong execution
environment in batch retry delays example.
Posted by fh...@apache.org.
[FLINK-5259] [docs] Fix wrong execution environment in batch retry delays example.
This closes #2943.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/7bb6b696
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/7bb6b696
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/7bb6b696
Branch: refs/heads/release-1.1
Commit: 7bb6b696cfc0ff90416ea371f263abd03143e8f3
Parents: c567b0c
Author: David Anderson <da...@alpinegizmo.com>
Authored: Mon Dec 5 11:39:46 2016 +0100
Committer: Fabian Hueske <fh...@apache.org>
Committed: Tue Dec 6 13:45:14 2016 +0100
----------------------------------------------------------------------
docs/apis/batch/fault_tolerance.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/7bb6b696/docs/apis/batch/fault_tolerance.md
----------------------------------------------------------------------
diff --git a/docs/apis/batch/fault_tolerance.md b/docs/apis/batch/fault_tolerance.md
index 51a6b41..6132b639a 100644
--- a/docs/apis/batch/fault_tolerance.md
+++ b/docs/apis/batch/fault_tolerance.md
@@ -79,13 +79,13 @@ You can set the retry delay for each program as follows (the sample shows the Da
<div class="codetabs" markdown="1">
<div data-lang="java" markdown="1">
{% highlight java %}
-StreamExecutionEnvironment env = StreamExecutionEnvironment.getExecutionEnvironment();
+ExecutionEnvironment env = ExecutionEnvironment.getExecutionEnvironment();
env.getConfig().setExecutionRetryDelay(5000); // 5000 milliseconds delay
{% endhighlight %}
</div>
<div data-lang="scala" markdown="1">
{% highlight scala %}
-val env = StreamExecutionEnvironment.getExecutionEnvironment()
+val env = ExecutionEnvironment.getExecutionEnvironment()
env.getConfig.setExecutionRetryDelay(5000) // 5000 milliseconds delay
{% endhighlight %}
</div>