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 2017/05/25 18:49:46 UTC

[5/5] flink git commit: [FLINK-5892] Enable 1.2 keyed state test

[FLINK-5892] Enable 1.2 keyed state test

This closes #3842.


Project: http://git-wip-us.apache.org/repos/asf/flink/repo
Commit: http://git-wip-us.apache.org/repos/asf/flink/commit/79b86949
Tree: http://git-wip-us.apache.org/repos/asf/flink/tree/79b86949
Diff: http://git-wip-us.apache.org/repos/asf/flink/diff/79b86949

Branch: refs/heads/master
Commit: 79b869498c82c83baf44465aff5acac3bd948bf5
Parents: 8dfc9f9
Author: zentol <ch...@apache.org>
Authored: Mon May 8 11:56:57 2017 +0200
Committer: zentol <ch...@apache.org>
Committed: Thu May 25 16:00:32 2017 +0200

----------------------------------------------------------------------
 .../state/operator/restore/keyed/KeyedJob.java  |  14 ++++++--------
 .../operatorstate/complexKeyed/_metadata        | Bin 137490 -> 134953 bytes
 2 files changed, 6 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/flink/blob/79b86949/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/keyed/KeyedJob.java
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/keyed/KeyedJob.java b/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/keyed/KeyedJob.java
index 6add7b2..3c28c3b 100644
--- a/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/keyed/KeyedJob.java
+++ b/flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/keyed/KeyedJob.java
@@ -97,10 +97,9 @@ public class KeyedJob {
 			.map(new StatefulStringStoringMap(mode, "first"))
 			.setParallelism(4);
 
-		// TODO: re-enable this when generating the actual 1.2 savepoint
-		//if (mode == ExecutionMode.MIGRATE || mode == ExecutionMode.RESTORE) {
-		map.uid("first");
-		//}
+		if (mode == ExecutionMode.MIGRATE || mode == ExecutionMode.RESTORE) {
+			map.uid("first");
+		}
 
 		return map;
 	}
@@ -110,10 +109,9 @@ public class KeyedJob {
 			.map(new StatefulStringStoringMap(mode, "second"))
 			.setParallelism(4);
 
-		// TODO: re-enable this when generating the actual 1.2 savepoint
-		//if (mode == ExecutionMode.MIGRATE || mode == ExecutionMode.RESTORE) {
-		map.uid("second");
-		//}
+		if (mode == ExecutionMode.MIGRATE || mode == ExecutionMode.RESTORE) {
+			map.uid("second");
+		}
 
 		return map;
 	}

http://git-wip-us.apache.org/repos/asf/flink/blob/79b86949/flink-tests/src/test/resources/operatorstate/complexKeyed/_metadata
----------------------------------------------------------------------
diff --git a/flink-tests/src/test/resources/operatorstate/complexKeyed/_metadata b/flink-tests/src/test/resources/operatorstate/complexKeyed/_metadata
index 9e03876..0a1ed10 100644
Binary files a/flink-tests/src/test/resources/operatorstate/complexKeyed/_metadata and b/flink-tests/src/test/resources/operatorstate/complexKeyed/_metadata differ