You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by ch...@apache.org on 2018/03/05 16:56:17 UTC
[1/6] flink git commit: [hotfix][docs] Remove reference to
CheckpointedRestoring
Repository: flink
Updated Branches:
refs/heads/release-1.5 1602b63ce -> c401edf84
[hotfix][docs] Remove reference to CheckpointedRestoring
This closes #5627.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/c401edf8
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/c401edf8
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/c401edf8
Branch: refs/heads/release-1.5
Commit: c401edf84f6690b46f37e61aad988eb53787a61f
Parents: 302781d
Author: Stephen Parente <we...@gmail.com>
Authored: Fri Mar 2 14:20:10 2018 -0800
Committer: zentol <ch...@apache.org>
Committed: Mon Mar 5 17:55:41 2018 +0100
----------------------------------------------------------------------
docs/dev/stream/state/state.md | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/c401edf8/docs/dev/stream/state/state.md
----------------------------------------------------------------------
diff --git a/docs/dev/stream/state/state.md b/docs/dev/stream/state/state.md
index 3ea9b7a..a26e24d 100644
--- a/docs/dev/stream/state/state.md
+++ b/docs/dev/stream/state/state.md
@@ -386,8 +386,7 @@ public class BufferingSink
{% highlight scala %}
class BufferingSink(threshold: Int = 0)
extends SinkFunction[(String, Int)]
- with CheckpointedFunction
- with CheckpointedRestoring[List[(String, Int)]] {
+ with CheckpointedFunction {
@transient
private var checkpointedState: ListState[(String, Int)] = _
@@ -426,9 +425,6 @@ class BufferingSink(threshold: Int = 0)
}
}
- override def restoreState(state: List[(String, Int)]): Unit = {
- bufferedElements ++= state
- }
}
{% endhighlight %}
</div>
[6/6] flink git commit: [hotfix][REST] Fix CONTENT_TYPE header
Posted by ch...@apache.org.
[hotfix][REST] Fix CONTENT_TYPE header
This closes #5590.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/9bd4a408
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/9bd4a408
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/9bd4a408
Branch: refs/heads/release-1.5
Commit: 9bd4a408384f841cbfed2e4c941767999e0fcbaf
Parents: 2749175
Author: zentol <ch...@apache.org>
Authored: Tue Feb 27 16:04:57 2018 +0100
Committer: zentol <ch...@apache.org>
Committed: Mon Mar 5 17:55:41 2018 +0100
----------------------------------------------------------------------
.../apache/flink/runtime/webmonitor/WebRuntimeMonitorITCase.java | 2 +-
.../org/apache/flink/runtime/rest/handler/util/HandlerUtils.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/9bd4a408/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitorITCase.java
----------------------------------------------------------------------
diff --git a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitorITCase.java b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitorITCase.java
index e6cfdda..d4fe93a 100644
--- a/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitorITCase.java
+++ b/flink-runtime-web/src/test/java/org/apache/flink/runtime/webmonitor/WebRuntimeMonitorITCase.java
@@ -334,7 +334,7 @@ public class WebRuntimeMonitorITCase extends TestLogger {
HttpTestClient.SimpleHttpResponse response = client.getNextResponse();
assertEquals(HttpResponseStatus.SERVICE_UNAVAILABLE, response.getStatus());
- assertEquals(MimeTypes.getMimeTypeForExtension("json"), response.getType());
+ assertEquals("application/json; charset=UTF-8", response.getType());
assertTrue(response.getContent().contains("refresh"));
}
}
http://git-wip-us.apache.org/repos/asf/flink/blob/9bd4a408/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/util/HandlerUtils.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/util/HandlerUtils.java b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/util/HandlerUtils.java
index 604c0b8..a69f4aa 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/util/HandlerUtils.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/rest/handler/util/HandlerUtils.java
@@ -21,6 +21,7 @@ package org.apache.flink.runtime.rest.handler.util;
import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.runtime.rest.messages.ErrorResponseBody;
import org.apache.flink.runtime.rest.messages.ResponseBody;
+import org.apache.flink.runtime.rest.util.RestConstants;
import org.apache.flink.runtime.rest.util.RestMapperUtils;
import org.apache.flink.shaded.jackson2.com.fasterxml.jackson.databind.ObjectMapper;
@@ -149,7 +150,7 @@ public class HandlerUtils {
@Nonnull Map<String, String> headers) {
HttpResponse response = new DefaultHttpResponse(HTTP_1_1, statusCode);
- response.headers().set(CONTENT_TYPE, "application/json");
+ response.headers().set(CONTENT_TYPE, RestConstants.REST_CONTENT_TYPE);
for (Map.Entry<String, String> headerEntry : headers.entrySet()) {
response.headers().set(headerEntry.getKey(), headerEntry.getValue());
[3/6] flink git commit: [hotfix] Fix javadoc link in
ClusterClient#triggerSavepoint
Posted by ch...@apache.org.
[hotfix] Fix javadoc link in ClusterClient#triggerSavepoint
This closes #5592.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/f34bd8ab
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/f34bd8ab
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/f34bd8ab
Branch: refs/heads/release-1.5
Commit: f34bd8ab4ed63690a8b0f228bd8d0cf421147333
Parents: 1602b63
Author: Matrix42 <93...@qq.com>
Authored: Wed Feb 28 10:51:42 2018 +0800
Committer: zentol <ch...@apache.org>
Committed: Mon Mar 5 17:55:41 2018 +0100
----------------------------------------------------------------------
.../main/java/org/apache/flink/client/program/ClusterClient.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/f34bd8ab/flink-clients/src/main/java/org/apache/flink/client/program/ClusterClient.java
----------------------------------------------------------------------
diff --git a/flink-clients/src/main/java/org/apache/flink/client/program/ClusterClient.java b/flink-clients/src/main/java/org/apache/flink/client/program/ClusterClient.java
index 7817f8f..a4880db 100644
--- a/flink-clients/src/main/java/org/apache/flink/client/program/ClusterClient.java
+++ b/flink-clients/src/main/java/org/apache/flink/client/program/ClusterClient.java
@@ -663,7 +663,7 @@ public abstract class ClusterClient<T> {
/**
* Triggers a savepoint for the job identified by the job id. The savepoint will be written to the given savepoint
- * directory, or {@link org.apache.flink.configuration.CoreOptions#SAVEPOINT_DIRECTORY} if it is null.
+ * directory, or {@link org.apache.flink.configuration.CheckpointingOptions#SAVEPOINT_DIRECTORY} if it is null.
*
* @param jobId job id
* @param savepointDirectory directory the savepoint should be written to
[2/6] flink git commit: [FLINK-8849][docs] Fix links to chaining docs
Posted by ch...@apache.org.
[FLINK-8849][docs] Fix links to chaining docs
This closes #5630.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/e19b9fd9
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/e19b9fd9
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/e19b9fd9
Branch: refs/heads/release-1.5
Commit: e19b9fd9debcc56747b1ba364cbe1d5837274d86
Parents: 9bd4a40
Author: Ken Krugler <ke...@transpac.com>
Authored: Sun Mar 4 09:27:11 2018 -0800
Committer: zentol <ch...@apache.org>
Committed: Mon Mar 5 17:55:41 2018 +0100
----------------------------------------------------------------------
docs/concepts/runtime.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/e19b9fd9/docs/concepts/runtime.md
----------------------------------------------------------------------
diff --git a/docs/concepts/runtime.md b/docs/concepts/runtime.md
index cb6d58f..1c7c281 100644
--- a/docs/concepts/runtime.md
+++ b/docs/concepts/runtime.md
@@ -31,7 +31,7 @@ under the License.
For distributed execution, Flink *chains* operator subtasks together into *tasks*. Each task is executed by one thread.
Chaining operators together into tasks is a useful optimization: it reduces the overhead of thread-to-thread
handover and buffering, and increases overall throughput while decreasing latency.
-The chaining behavior can be configured; see the [chaining docs](../dev/datastream_api.html#task-chaining-and-resource-groups) for details.
+The chaining behavior can be configured; see the [chaining docs](../dev/stream/operators/#task-chaining-and-resource-groups) for details.
The sample dataflow in the figure below is executed with five subtasks, and hence with five parallel threads.
@@ -98,7 +98,7 @@ job. Allowing this *slot sharing* has two main benefits:
<img src="../fig/slot_sharing.svg" alt="TaskManagers with shared Task Slots" class="offset" width="80%" />
-The APIs also include a *[resource group](../dev/datastream_api.html#task-chaining-and-resource-groups)* mechanism which can be used to prevent undesirable slot sharing.
+The APIs also include a *[resource group](../dev/stream/operators/#task-chaining-and-resource-groups)* mechanism which can be used to prevent undesirable slot sharing.
As a rule-of-thumb, a good default number of task slots would be the number of CPU cores.
With hyper-threading, each slot then takes 2 or more hardware thread contexts.
[5/6] flink git commit: [FLINK-8857][hbase] Remove redundant
execute() call in hbase example
Posted by ch...@apache.org.
[FLINK-8857][hbase] Remove redundant execute() call in hbase example
This closes #5633.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/302781df
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/302781df
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/302781df
Branch: refs/heads/release-1.5
Commit: 302781dfe5d9e0a6b9246732ac3227db2ced64f6
Parents: e19b9fd
Author: neoremind <xu...@gmail.com>
Authored: Mon Mar 5 16:50:37 2018 +0800
Committer: zentol <ch...@apache.org>
Committed: Mon Mar 5 17:55:41 2018 +0100
----------------------------------------------------------------------
.../org/apache/flink/addons/hbase/example/HBaseReadExample.java | 3 ---
1 file changed, 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/302781df/flink-connectors/flink-hbase/src/test/java/org/apache/flink/addons/hbase/example/HBaseReadExample.java
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-hbase/src/test/java/org/apache/flink/addons/hbase/example/HBaseReadExample.java b/flink-connectors/flink-hbase/src/test/java/org/apache/flink/addons/hbase/example/HBaseReadExample.java
index 817ae09..8475fb8 100644
--- a/flink-connectors/flink-hbase/src/test/java/org/apache/flink/addons/hbase/example/HBaseReadExample.java
+++ b/flink-connectors/flink-hbase/src/test/java/org/apache/flink/addons/hbase/example/HBaseReadExample.java
@@ -86,9 +86,6 @@ public class HBaseReadExample {
hbaseDs.print();
- // kick off execution.
- env.execute();
-
}
}
[4/6] flink git commit: [hotfix][docs] Drop the incorrect parallel
remark in windowAll
Posted by ch...@apache.org.
[hotfix][docs] Drop the incorrect parallel remark in windowAll
This closes #5607.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/2749175b
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/2749175b
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/2749175b
Branch: refs/heads/release-1.5
Commit: 2749175b2e5c5283f0fb173406656e59c8373bc9
Parents: f34bd8a
Author: Piotr Nowojski <pi...@gmail.com>
Authored: Thu Mar 1 10:40:20 2018 +0100
Committer: zentol <ch...@apache.org>
Committed: Mon Mar 5 17:55:41 2018 +0100
----------------------------------------------------------------------
.../streaming/api/datastream/DataStream.java | 25 ++++++++------------
1 file changed, 10 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/2749175b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java
----------------------------------------------------------------------
diff --git a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java
index a357eda..7fecdb0 100644
--- a/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java
+++ b/flink-streaming-java/src/main/java/org/apache/flink/streaming/api/datastream/DataStream.java
@@ -717,9 +717,8 @@ public class DataStream<T> {
* {@code .window(TumblingProcessingTimeWindows.of(size))} depending on the time characteristic
* set using
*
- * <p>Note: This operation can be inherently non-parallel since all elements have to pass through
- * the same operator instance. (Only for special cases, such as aligned time windows is
- * it possible to perform this operation in parallel).
+ * <p>Note: This operation is inherently non-parallel since all elements have to pass through
+ * the same operator instance.
*
* {@link org.apache.flink.streaming.api.environment.StreamExecutionEnvironment#setStreamTimeCharacteristic(org.apache.flink.streaming.api.TimeCharacteristic)}
*
@@ -741,9 +740,8 @@ public class DataStream<T> {
* set using
* {@link org.apache.flink.streaming.api.environment.StreamExecutionEnvironment#setStreamTimeCharacteristic(org.apache.flink.streaming.api.TimeCharacteristic)}
*
- * <p>Note: This operation can be inherently non-parallel since all elements have to pass through
- * the same operator instance. (Only for special cases, such as aligned time windows is
- * it possible to perform this operation in parallel).
+ * <p>Note: This operation is inherently non-parallel since all elements have to pass through
+ * the same operator instance.
*
* @param size The size of the window.
*/
@@ -758,9 +756,8 @@ public class DataStream<T> {
/**
* Windows this {@code DataStream} into tumbling count windows.
*
- * <p>Note: This operation can be inherently non-parallel since all elements have to pass through
- * the same operator instance. (Only for special cases, such as aligned time windows is
- * it possible to perform this operation in parallel).
+ * <p>Note: This operation is inherently non-parallel since all elements have to pass through
+ * the same operator instance.
*
* @param size The size of the windows in number of elements.
*/
@@ -771,9 +768,8 @@ public class DataStream<T> {
/**
* Windows this {@code DataStream} into sliding count windows.
*
- * <p>Note: This operation can be inherently non-parallel since all elements have to pass through
- * the same operator instance. (Only for special cases, such as aligned time windows is
- * it possible to perform this operation in parallel).
+ * <p>Note: This operation is inherently non-parallel since all elements have to pass through
+ * the same operator instance.
*
* @param size The size of the windows in number of elements.
* @param slide The slide interval in number of elements.
@@ -794,9 +790,8 @@ public class DataStream<T> {
* when windows are evaluated. However, {@code WindowAssigners} have a default {@code Trigger}
* that is used if a {@code Trigger} is not specified.
*
- * <p>Note: This operation can be inherently non-parallel since all elements have to pass through
- * the same operator instance. (Only for special cases, such as aligned time windows is
- * it possible to perform this operation in parallel).
+ * <p>Note: This operation is inherently non-parallel since all elements have to pass through
+ * the same operator instance.
*
* @param assigner The {@code WindowAssigner} that assigns elements to windows.
* @return The trigger windows data stream.