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/04/15 20:52:22 UTC
[1/3] flink git commit: [FLINK-3732] [core] Fix potential null
deference in ExecutionConfig#equals()
Repository: flink
Updated Branches:
refs/heads/release-1.0 aadc5fad5 -> c1eb247e9
[FLINK-3732] [core] Fix potential null deference in ExecutionConfig#equals()
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/5b69dd8c
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/5b69dd8c
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/5b69dd8c
Branch: refs/heads/release-1.0
Commit: 5b69dd8ce5485d6f8cbd4d94d1ea1870efb53c6a
Parents: aadc5fa
Author: Tianji Li <ti...@alcatel-lucent.com>
Authored: Mon Apr 11 13:56:34 2016 -0400
Committer: Fabian Hueske <fh...@apache.org>
Committed: Fri Apr 15 14:07:42 2016 +0200
----------------------------------------------------------------------
.../main/java/org/apache/flink/api/common/ExecutionConfig.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/5b69dd8c/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java b/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java
index ffd30e9..c95b197 100644
--- a/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java
+++ b/flink-core/src/main/java/org/apache/flink/api/common/ExecutionConfig.java
@@ -650,7 +650,8 @@ public class ExecutionConfig implements Serializable {
Objects.equals(executionMode, other.executionMode) &&
useClosureCleaner == other.useClosureCleaner &&
parallelism == other.parallelism &&
- restartStrategyConfiguration.equals(other.restartStrategyConfiguration) &&
+ ((restartStrategyConfiguration == null && other.restartStrategyConfiguration == null) ||
+ (null != restartStrategyConfiguration && restartStrategyConfiguration.equals(other.restartStrategyConfiguration))) &&
forceKryo == other.forceKryo &&
objectReuse == other.objectReuse &&
autoTypeRegistrationEnabled == other.autoTypeRegistrationEnabled &&
[3/3] flink git commit: [FLINK-2544] [docs] Add Java 8 version for
building PowerMock tests to docs
Posted by fh...@apache.org.
[FLINK-2544] [docs] Add Java 8 version for building PowerMock tests to docs
Java 8 update 11 introduced a stricter bytecode verifier that leads
to failures in unit tests that use the PowerMock runner. The tests
run correctly in Java 8u51 or above.
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/c1eb247e
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/c1eb247e
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/c1eb247e
Branch: refs/heads/release-1.0
Commit: c1eb247e968a54f3f252ece792847c00b8ef5464
Parents: b4b08ca
Author: spkavuly <so...@intel.com>
Authored: Wed Apr 13 12:02:57 2016 -0700
Committer: Fabian Hueske <fh...@apache.org>
Committed: Fri Apr 15 14:08:24 2016 +0200
----------------------------------------------------------------------
README.md | 3 ++-
docs/setup/building.md | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/c1eb247e/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 1597a58..8fd533b 100644
--- a/README.md
+++ b/README.md
@@ -80,7 +80,8 @@ mvn clean package -DskipTests # this will take up to 10 minutes
Flink is now installed in `build-target`
-*NOTE: Maven 3.3.x can build Flink, but will not properly shade away certain dependencies. Maven 3.0.3 creates the libraries properly.*
+*NOTE: Maven 3.3.x can build Flink, but will not properly shade away certain dependencies. Maven 3.0.3 creates the libraries properly.
+To build unit tests with Java 8, use Java 8u51 or above to prevent failures in unit tests that use the PowerMock runner.*
## Developing Flink
http://git-wip-us.apache.org/repos/asf/flink/blob/c1eb247e/docs/setup/building.md
----------------------------------------------------------------------
diff --git a/docs/setup/building.md b/docs/setup/building.md
index a1e768b..1848466 100644
--- a/docs/setup/building.md
+++ b/docs/setup/building.md
@@ -34,6 +34,9 @@ In order to build Flink you need the source code. Either [download the source of
In addition you need **Maven 3** and a **JDK** (Java Development Kit). Flink requires **at least Java 7** to build. We recommend using Java 8.
+*NOTE: Maven 3.3.x can build Flink, but will not properly shade away certain dependencies. Maven 3.0.3 creates the libraries properly.
+To build unit tests with Java 8, use Java 8u51 or above to prevent failures in unit tests that use the PowerMock runner.*
+
To clone from git, enter:
~~~bash
[2/3] flink git commit: [FLINK-3762] [core] Enable Kryo reference
tracking
Posted by fh...@apache.org.
[FLINK-3762] [core] Enable Kryo reference tracking
Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/b4b08ca2
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/b4b08ca2
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/b4b08ca2
Branch: refs/heads/release-1.0
Commit: b4b08ca24f2dc4897565da59361ad71281910619
Parents: 5b69dd8
Author: Andrew Palumbo <ap...@apache.org>
Authored: Thu Apr 14 14:25:46 2016 -0400
Committer: Fabian Hueske <fh...@apache.org>
Committed: Fri Apr 15 14:08:21 2016 +0200
----------------------------------------------------------------------
.../flink/api/java/typeutils/runtime/kryo/KryoSerializer.java | 5 ++---
.../typeutils/runtime/kryo/KryoGenericTypeSerializerTest.java | 4 ++--
2 files changed, 4 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flink/blob/b4b08ca2/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializer.java
----------------------------------------------------------------------
diff --git a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializer.java b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializer.java
index 276ffc4..ef6ed10 100644
--- a/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializer.java
+++ b/flink-core/src/main/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoSerializer.java
@@ -323,9 +323,8 @@ public class KryoSerializer<T> extends TypeSerializer<T> {
if (this.kryo == null) {
this.kryo = getKryoInstance();
- // disable reference tracking. reference tracking is costly, usually unnecessary, and
- // inconsistent with Flink's own serialization (which does not do reference tracking)
- kryo.setReferences(false);
+ // Enable reference tracking.
+ kryo.setReferences(true);
// Throwable and all subclasses should be serialized via java serialization
kryo.addDefaultSerializer(Throwable.class, new JavaSerializer());
http://git-wip-us.apache.org/repos/asf/flink/blob/b4b08ca2/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoGenericTypeSerializerTest.java
----------------------------------------------------------------------
diff --git a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoGenericTypeSerializerTest.java b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoGenericTypeSerializerTest.java
index 8ff0b1b..12090f8 100644
--- a/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoGenericTypeSerializerTest.java
+++ b/flink-core/src/test/java/org/apache/flink/api/java/typeutils/runtime/kryo/KryoGenericTypeSerializerTest.java
@@ -160,9 +160,9 @@ public class KryoGenericTypeSerializerTest extends AbstractGenericTypeSerializer
}
@Test
- public void validateReferenceMappingDisabled() {
+ public void validateReferenceMappingEnabled() {
KryoSerializer<String> serializer = new KryoSerializer<>(String.class, new ExecutionConfig());
Kryo kryo = serializer.getKryo();
- assertFalse(kryo.getReferences());
+ assertTrue(kryo.getReferences());
}
}
\ No newline at end of file