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 2017/10/08 19:42:30 UTC
[1/3] flink git commit: [hotfix] [docs] Fix broken links
Repository: flink
Updated Branches:
refs/heads/release-1.3 9861bb278 -> 1651482ae
[hotfix] [docs] Fix broken links
This closes #4755
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/67d9b01f
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/67d9b01f
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/67d9b01f
Branch: refs/heads/release-1.3
Commit: 67d9b01f7a3113efbe06ad70fb7e50a8396e4990
Parents: 9861bb2
Author: Gary Yao <gy...@garyyao.com>
Authored: Sun Oct 1 14:11:17 2017 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Fri Oct 6 19:57:32 2017 +0200
----------------------------------------------------------------------
docs/dev/connectors/index.md | 2 +-
docs/dev/table/common.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/67d9b01f/docs/dev/connectors/index.md
----------------------------------------------------------------------
diff --git a/docs/dev/connectors/index.md b/docs/dev/connectors/index.md
index 177e601..d702b2c 100644
--- a/docs/dev/connectors/index.md
+++ b/docs/dev/connectors/index.md
@@ -31,7 +31,7 @@ under the License.
## Predefined Sources and Sinks
A few basic data sources and sinks are built into Flink and are always available.
-The [predefined data sources]({{ site.baseurll }}/dev/datastream_api.html#data-sources) include reading from files, directories, and sockets, and
+The [predefined data sources]({{ site.baseurl }}/dev/datastream_api.html#data-sources) include reading from files, directories, and sockets, and
ingesting data from collections and iterators.
The [predefined data sinks]({{ site.baseurl }}/dev/datastream_api.html#data-sinks) support writing to files, to stdout and stderr, and to sockets.
http://git-wip-us.apache.org/repos/asf/flink/blob/67d9b01f/docs/dev/table/common.md
----------------------------------------------------------------------
diff --git a/docs/dev/table/common.md b/docs/dev/table/common.md
index fed2b6d..0511200 100644
--- a/docs/dev/table/common.md
+++ b/docs/dev/table/common.md
@@ -286,7 +286,7 @@ The Table API is a language-integrated query API for Scala and Java. In contrast
The API is based on the `Table` class which represents a table (streaming or batch) and offers methods to apply relational operations. These methods return a new `Table` object, which represents the result of applying the relational operation on the input `Table`. Some relational operations are composed of multiple method calls such as `table.groupBy(...).select()`, where `groupBy(...)` specifies a grouping of `table`, and `select(...)` the projection on the grouping of `table`.
-The [Table API]({{ site.baseurl }}/dev/table/tableapi.html) document describes all Table API operations that are supported on streaming and batch tables.
+The [Table API]({{ site.baseurl }}/dev/table/tableApi.html) document describes all Table API operations that are supported on streaming and batch tables.
The following example shows a simple Table API aggregation query:
[3/3] flink git commit: [FLINK-7739] [kafka connector] Fix test
instabilities
Posted by se...@apache.org.
[FLINK-7739] [kafka connector] Fix test instabilities
- Set shorter heartbeats intervals. Default pause value of 60seconds is
too large (tests would timeout before akka react)
- Exclude netty dependency from zookeeper. Zookeeper was pulling in
conflicting Netty version. Conflict was extremly subtle - TaskManager in
Kafka tests was deadlocking in some rare corner cases.
This closes #4775
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/1651482a
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/1651482a
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/1651482a
Branch: refs/heads/release-1.3
Commit: 1651482ae8a8c41066c13da597888173b3280630
Parents: c845ba0
Author: Piotr Nowojski <pi...@gmail.com>
Authored: Fri Sep 29 18:23:29 2017 +0200
Committer: Stephan Ewen <se...@apache.org>
Committed: Fri Oct 6 19:57:59 2017 +0200
----------------------------------------------------------------------
.../apache/flink/streaming/connectors/kafka/KafkaTestBase.java | 3 +++
pom.xml | 6 ++++++
2 files changed, 9 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/1651482a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestBase.java
----------------------------------------------------------------------
diff --git a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestBase.java b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestBase.java
index 1837af6..d70797e 100644
--- a/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestBase.java
+++ b/flink-connectors/flink-connector-kafka-base/src/test/java/org/apache/flink/streaming/connectors/kafka/KafkaTestBase.java
@@ -18,6 +18,7 @@
package org.apache.flink.streaming.connectors.kafka;
import org.apache.flink.client.program.ProgramInvocationException;
+import org.apache.flink.configuration.AkkaOptions;
import org.apache.flink.configuration.ConfigConstants;
import org.apache.flink.configuration.Configuration;
import org.apache.flink.configuration.MetricOptions;
@@ -120,6 +121,8 @@ public abstract class KafkaTestBase extends TestLogger {
protected static Configuration getFlinkConfiguration() {
Configuration flinkConfig = new Configuration();
+ flinkConfig.setString(AkkaOptions.WATCH_HEARTBEAT_PAUSE, "5 s");
+ flinkConfig.setString(AkkaOptions.WATCH_HEARTBEAT_INTERVAL, "1 s");
flinkConfig.setInteger(ConfigConstants.LOCAL_NUMBER_TASK_MANAGER, NUM_TMS);
flinkConfig.setInteger(ConfigConstants.TASK_MANAGER_NUM_TASK_SLOTS, TM_SLOTS);
flinkConfig.setLong(TaskManagerOptions.MANAGED_MEMORY_SIZE, 16L);
http://git-wip-us.apache.org/repos/asf/flink/blob/1651482a/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 91c8cd3..e240e43 100644
--- a/pom.xml
+++ b/pom.xml
@@ -436,6 +436,12 @@ under the License.
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
+ <!-- Netty from zookeeper is conflicting with akka's, which can cause occasional deadlock inside
+ Netty threads -->
+ <exclusion>
+ <groupId>io.netty</groupId>
+ <artifactId>netty</artifactId>
+ </exclusion>
</exclusions>
</dependency>
[2/3] flink git commit: [FLINK-7742] [java api] [runtime] Fix array
index out of bounds exceptions
Posted by se...@apache.org.
[FLINK-7742] [java api] [runtime] Fix array index out of bounds exceptions
This closes #4754
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/c845ba09
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/c845ba09
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/c845ba09
Branch: refs/heads/release-1.3
Commit: c845ba09a25f577356e5b74c279c3e7653c4885a
Parents: 67d9b01
Author: yew1eb <ye...@gmail.com>
Authored: Sat Sep 30 14:50:59 2017 +0800
Committer: Stephan Ewen <se...@apache.org>
Committed: Fri Oct 6 19:57:39 2017 +0200
----------------------------------------------------------------------
flink-java/src/main/java/org/apache/flink/api/java/Utils.java | 2 +-
.../runtime/query/netty/message/KvStateRequestSerializer.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/c845ba09/flink-java/src/main/java/org/apache/flink/api/java/Utils.java
----------------------------------------------------------------------
diff --git a/flink-java/src/main/java/org/apache/flink/api/java/Utils.java b/flink-java/src/main/java/org/apache/flink/api/java/Utils.java
index 36ccb23..5d8b0dc 100644
--- a/flink-java/src/main/java/org/apache/flink/api/java/Utils.java
+++ b/flink-java/src/main/java/org/apache/flink/api/java/Utils.java
@@ -53,7 +53,7 @@ public final class Utils {
public static String getCallLocationName(int depth) {
StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
- if (stackTrace.length < depth) {
+ if (stackTrace.length <= depth) {
return "<unknown>";
}
http://git-wip-us.apache.org/repos/asf/flink/blob/c845ba09/flink-runtime/src/main/java/org/apache/flink/runtime/query/netty/message/KvStateRequestSerializer.java
----------------------------------------------------------------------
diff --git a/flink-runtime/src/main/java/org/apache/flink/runtime/query/netty/message/KvStateRequestSerializer.java b/flink-runtime/src/main/java/org/apache/flink/runtime/query/netty/message/KvStateRequestSerializer.java
index bc830e1..00ad5d4 100644
--- a/flink-runtime/src/main/java/org/apache/flink/runtime/query/netty/message/KvStateRequestSerializer.java
+++ b/flink-runtime/src/main/java/org/apache/flink/runtime/query/netty/message/KvStateRequestSerializer.java
@@ -223,7 +223,7 @@ public final class KvStateRequestSerializer {
// Get the message type
int msgType = buf.readInt();
KvStateRequestType[] values = KvStateRequestType.values();
- if (msgType >= 0 && msgType <= values.length) {
+ if (msgType >= 0 && msgType < values.length) {
return values[msgType];
} else {
throw new IllegalArgumentException("Illegal message type with index " + msgType);