[FLINK-10139][tests] Update compatibility tests for 1.6

sceee · Aug 20, 2018 · ebceca1 · ebceca1
1 parent 70e1a5e
commit ebceca1
Show file tree

Hide file tree

Showing 35 changed files with 39 additions and 9 deletions.
diff --git a/...t/java/org/apache/flink/streaming/connectors/fs/bucketing/BucketingSinkMigrationTest.java b/...t/java/org/apache/flink/streaming/connectors/fs/bucketing/BucketingSinkMigrationTest.java
@@ -89,7 +89,8 @@ public static Collection<Tuple2<MigrationVersion, String>> parameters () {
 			Tuple2.of(MigrationVersion.v1_2, "/var/folders/v_/ry2wp5fx0y7c1rvr41xy9_700000gn/T/junit9160378385359106772/junit479663758539998903/1970-01-01--01/part-0-"),
 			Tuple2.of(MigrationVersion.v1_3, "/var/folders/tv/b_1d8fvx23dgk1_xs8db_95h0000gn/T/junit4273542175898623023/junit3801102997056424640/1970-01-01--01/part-0-"),
 			Tuple2.of(MigrationVersion.v1_4, "/var/folders/tv/b_1d8fvx23dgk1_xs8db_95h0000gn/T/junit3198043255809479705/junit8947526563966405708/1970-01-01--01/part-0-"),
-			Tuple2.of(MigrationVersion.v1_5, "/tmp/junit4927100426019463155/junit2465610012100182280/1970-01-01--00/part-0-"));
+			Tuple2.of(MigrationVersion.v1_5, "/tmp/junit4927100426019463155/junit2465610012100182280/1970-01-01--00/part-0-"),
+			Tuple2.of(MigrationVersion.v1_6, "/tmp/junit3459711376354834545/junit5114611885650086135/1970-01-01--00/part-0-"));
 	}
 
 	private final MigrationVersion testMigrateVersion;

diff --git a/...k-connector-filesystem/src/test/resources/bucketing-sink-migration-test-flink1.6-snapshot b/...k-connector-filesystem/src/test/resources/bucketing-sink-migration-test-flink1.6-snapshot
diff --git a/...java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaConsumerBaseMigrationTest.java b/...java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaConsumerBaseMigrationTest.java
@@ -93,7 +93,12 @@ public class FlinkKafkaConsumerBaseMigrationTest {
 
 	@Parameterized.Parameters(name = "Migration Savepoint: {0}")
 	public static Collection<MigrationVersion> parameters () {
-		return Arrays.asList(MigrationVersion.v1_2, MigrationVersion.v1_3, MigrationVersion.v1_4, MigrationVersion.v1_5);
+		return Arrays.asList(
+			MigrationVersion.v1_2,
+			MigrationVersion.v1_3,
+			MigrationVersion.v1_4,
+			MigrationVersion.v1_5,
+			MigrationVersion.v1_6);
 	}
 
 	public FlinkKafkaConsumerBaseMigrationTest(MigrationVersion testMigrateVersion) {

diff --git a/...kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.6-empty-state-snapshot b/...kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.6-empty-state-snapshot
diff --git a/...k-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.6-snapshot b/...k-connector-kafka-base/src/test/resources/kafka-consumer-migration-test-flink1.6-snapshot
diff --git a/...tests/src/test/java/org/apache/flink/hdfstests/ContinuousFileProcessingMigrationTest.java b/...tests/src/test/java/org/apache/flink/hdfstests/ContinuousFileProcessingMigrationTest.java
@@ -79,7 +79,8 @@ public static Collection<Tuple2<MigrationVersion, Long>> parameters () {
 			Tuple2.of(MigrationVersion.v1_2, 1493116191000L),
 			Tuple2.of(MigrationVersion.v1_3, 1496532000000L),
 			Tuple2.of(MigrationVersion.v1_4, 1516897628000L),
-			Tuple2.of(MigrationVersion.v1_5, 1533639934000L));
+			Tuple2.of(MigrationVersion.v1_5, 1533639934000L),
+			Tuple2.of(MigrationVersion.v1_6, 1534696817000L));
 	}
 
 	/**

diff --git a/...sts/src/test/resources/monitoring-function-migration-test-1534696817000-flink1.6-snapshot b/...sts/src/test/resources/monitoring-function-migration-test-1534696817000-flink1.6-snapshot
diff --git a/flink-fs-tests/src/test/resources/reader-migration-test-flink1.6-snapshot b/flink-fs-tests/src/test/resources/reader-migration-test-flink1.6-snapshot
diff --git a/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/operator/CEPMigrationTest.java b/flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/operator/CEPMigrationTest.java
@@ -71,7 +71,11 @@ public class CEPMigrationTest {
 
 	@Parameterized.Parameters(name = "Migration Savepoint: {0}")
 	public static Collection<MigrationVersion> parameters () {
-		return Arrays.asList(MigrationVersion.v1_3, MigrationVersion.v1_4, MigrationVersion.v1_5);
+		return Arrays.asList(
+			MigrationVersion.v1_3,
+			MigrationVersion.v1_4,
+			MigrationVersion.v1_5,
+			MigrationVersion.v1_6);
 	}
 
 	public CEPMigrationTest(MigrationVersion migrateVersion) {

diff --git a/flink-libraries/flink-cep/src/test/resources/cep-migration-after-branching-flink1.6-snapshot b/flink-libraries/flink-cep/src/test/resources/cep-migration-after-branching-flink1.6-snapshot
diff --git a/flink-libraries/flink-cep/src/test/resources/cep-migration-conditions-flink1.6-snapshot b/flink-libraries/flink-cep/src/test/resources/cep-migration-conditions-flink1.6-snapshot
diff --git a/...es/flink-cep/src/test/resources/cep-migration-single-pattern-afterwards-flink1.6-snapshot b/...es/flink-cep/src/test/resources/cep-migration-single-pattern-afterwards-flink1.6-snapshot
diff --git a/...braries/flink-cep/src/test/resources/cep-migration-starting-new-pattern-flink1.6-snapshot b/...braries/flink-cep/src/test/resources/cep-migration-starting-new-pattern-flink1.6-snapshot
diff --git a/...a/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorMigrationTest.java b/...a/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorMigrationTest.java
@@ -86,7 +86,12 @@ public class WindowOperatorMigrationTest {
 
 	@Parameterized.Parameters(name = "Migration Savepoint: {0}")
 	public static Collection<MigrationVersion> parameters () {
-		return Arrays.asList(MigrationVersion.v1_2, MigrationVersion.v1_3, MigrationVersion.v1_4, MigrationVersion.v1_5);
+		return Arrays.asList(
+			MigrationVersion.v1_2,
+			MigrationVersion.v1_3,
+			MigrationVersion.v1_4,
+			MigrationVersion.v1_5,
+			MigrationVersion.v1_6);
 	}
 
 	private static final TypeInformation<Tuple2<String, Integer>> STRING_INT_TUPLE =

diff --git a/...treaming-java/src/test/resources/win-op-migration-test-apply-event-time-flink1.6-snapshot b/...treaming-java/src/test/resources/win-op-migration-test-apply-event-time-flink1.6-snapshot
diff --git a/...ing-java/src/test/resources/win-op-migration-test-apply-processing-time-flink1.6-snapshot b/...ing-java/src/test/resources/win-op-migration-test-apply-processing-time-flink1.6-snapshot
diff --git a/...aming-java/src/test/resources/win-op-migration-test-kryo-serialized-key-flink1.6-snapshot b/...aming-java/src/test/resources/win-op-migration-test-kryo-serialized-key-flink1.6-snapshot
diff --git a/...reaming-java/src/test/resources/win-op-migration-test-reduce-event-time-flink1.6-snapshot b/...reaming-java/src/test/resources/win-op-migration-test-reduce-event-time-flink1.6-snapshot
diff --git a/...ng-java/src/test/resources/win-op-migration-test-reduce-processing-time-flink1.6-snapshot b/...ng-java/src/test/resources/win-op-migration-test-reduce-processing-time-flink1.6-snapshot
diff --git a/.../src/test/resources/win-op-migration-test-session-with-stateful-trigger-flink1.6-snapshot b/.../src/test/resources/win-op-migration-test-session-with-stateful-trigger-flink1.6-snapshot
diff --git a/...test/resources/win-op-migration-test-session-with-stateful-trigger-mint-flink1.6-snapshot b/...test/resources/win-op-migration-test-session-with-stateful-trigger-mint-flink1.6-snapshot
diff --git a/...t/java/org/apache/flink/test/checkpointing/utils/StatefulJobSavepointMigrationITCase.java b/...t/java/org/apache/flink/test/checkpointing/utils/StatefulJobSavepointMigrationITCase.java
@@ -80,7 +80,9 @@ public static Collection<Tuple2<MigrationVersion, String>> parameters () {
 			Tuple2.of(MigrationVersion.v1_4, StateBackendLoader.MEMORY_STATE_BACKEND_NAME),
 			Tuple2.of(MigrationVersion.v1_4, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME),
 			Tuple2.of(MigrationVersion.v1_5, StateBackendLoader.MEMORY_STATE_BACKEND_NAME),
-			Tuple2.of(MigrationVersion.v1_5, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME));
+			Tuple2.of(MigrationVersion.v1_5, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME),
+			Tuple2.of(MigrationVersion.v1_6, StateBackendLoader.MEMORY_STATE_BACKEND_NAME),
+			Tuple2.of(MigrationVersion.v1_6, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME));
 	}
 
 	private final MigrationVersion testMigrateVersion;

diff --git a/.../apache/flink/test/state/operator/restore/keyed/AbstractKeyedOperatorRestoreTestBase.java b/.../apache/flink/test/state/operator/restore/keyed/AbstractKeyedOperatorRestoreTestBase.java
@@ -41,7 +41,12 @@ public abstract class AbstractKeyedOperatorRestoreTestBase extends AbstractOpera
 
 	@Parameterized.Parameters(name = "Migrate Savepoint: {0}")
 	public static Collection<MigrationVersion> parameters () {
-		return Arrays.asList(MigrationVersion.v1_2, MigrationVersion.v1_3, MigrationVersion.v1_4, MigrationVersion.v1_5);
+		return Arrays.asList(
+			MigrationVersion.v1_2,
+			MigrationVersion.v1_3,
+			MigrationVersion.v1_4,
+			MigrationVersion.v1_5,
+			MigrationVersion.v1_6);
 	}
 
 	public AbstractKeyedOperatorRestoreTestBase(MigrationVersion migrationVersion) {

diff --git a/...he/flink/test/state/operator/restore/unkeyed/AbstractNonKeyedOperatorRestoreTestBase.java b/...he/flink/test/state/operator/restore/unkeyed/AbstractNonKeyedOperatorRestoreTestBase.java
@@ -47,7 +47,12 @@ public abstract class AbstractNonKeyedOperatorRestoreTestBase extends AbstractOp
 
 	@Parameterized.Parameters(name = "Migrate Savepoint: {0}")
 	public static Collection<MigrationVersion> parameters () {
-		return Arrays.asList(MigrationVersion.v1_2, MigrationVersion.v1_3, MigrationVersion.v1_4, MigrationVersion.v1_5);
+		return Arrays.asList(
+			MigrationVersion.v1_2,
+			MigrationVersion.v1_3,
+			MigrationVersion.v1_4,
+			MigrationVersion.v1_5,
+			MigrationVersion.v1_6);
 	}
 
 	protected AbstractNonKeyedOperatorRestoreTestBase(MigrationVersion migrationVersion) {

diff --git a/...esources/new-stateful-broadcast-udf-migration-itcase-flink1.6-rocksdb-savepoint/_metadata b/...esources/new-stateful-broadcast-udf-migration-itcase-flink1.6-rocksdb-savepoint/_metadata
diff --git a/...c/test/resources/new-stateful-broadcast-udf-migration-itcase-flink1.6-savepoint/_metadata b/...c/test/resources/new-stateful-broadcast-udf-migration-itcase-flink1.6-savepoint/_metadata
diff --git a/...src/test/resources/new-stateful-udf-migration-itcase-flink1.6-rocksdb-savepoint/_metadata b/...src/test/resources/new-stateful-udf-migration-itcase-flink1.6-rocksdb-savepoint/_metadata
diff --git a/...k-tests/src/test/resources/new-stateful-udf-migration-itcase-flink1.6-savepoint/_metadata b/...k-tests/src/test/resources/new-stateful-udf-migration-itcase-flink1.6-savepoint/_metadata
diff --git a/flink-tests/src/test/resources/operatorstate/complexKeyed-flink1.6/_metadata b/flink-tests/src/test/resources/operatorstate/complexKeyed-flink1.6/_metadata
diff --git a/flink-tests/src/test/resources/operatorstate/nonKeyed-flink1.6/_metadata b/flink-tests/src/test/resources/operatorstate/nonKeyed-flink1.6/_metadata
diff --git a/...ful-scala-with-broadcast2.11-udf-migration-itcase-flink1.6-jobmanager-savepoint/_metadata b/...ful-scala-with-broadcast2.11-udf-migration-itcase-flink1.6-jobmanager-savepoint/_metadata
diff --git a/...ateful-scala-with-broadcast2.11-udf-migration-itcase-flink1.6-rocksdb-savepoint/_metadata b/...ateful-scala-with-broadcast2.11-udf-migration-itcase-flink1.6-rocksdb-savepoint/_metadata
diff --git a/...resources/stateful-scala2.11-udf-migration-itcase-flink1.6-jobmanager-savepoint/_metadata b/...resources/stateful-scala2.11-udf-migration-itcase-flink1.6-jobmanager-savepoint/_metadata
diff --git a/...st/resources/stateful-scala2.11-udf-migration-itcase-flink1.6-rocksdb-savepoint/_metadata b/...st/resources/stateful-scala2.11-udf-migration-itcase-flink1.6-rocksdb-savepoint/_metadata
diff --git a/...test/scala/org/apache/flink/api/scala/migration/StatefulJobSavepointMigrationITCase.scala b/...test/scala/org/apache/flink/api/scala/migration/StatefulJobSavepointMigrationITCase.scala
@@ -56,7 +56,9 @@ object StatefulJobSavepointMigrationITCase {
       (MigrationVersion.v1_3, StateBackendLoader.MEMORY_STATE_BACKEND_NAME),
       (MigrationVersion.v1_3, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME),
       (MigrationVersion.v1_4, StateBackendLoader.MEMORY_STATE_BACKEND_NAME),
-      (MigrationVersion.v1_4, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME))
+      (MigrationVersion.v1_4, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME),
+      (MigrationVersion.v1_6, StateBackendLoader.MEMORY_STATE_BACKEND_NAME),
+      (MigrationVersion.v1_6, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME))
   }
 
   // TODO to generate savepoints for a specific Flink version / backend type,