Skip to content

Commit 4743666

Browse files
tsreaperxintongsong
authored andcommitted
[FLINK-23529][core][test] Add Flink 1.13 MigrationVersion
This closes apache#16636
1 parent 77b9a00 commit 4743666

File tree

263 files changed

+50
-15
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

263 files changed

+50
-15
lines changed

flink-connectors/flink-connector-kafka/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaConsumerBaseMigrationTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,8 @@ public static Collection<MigrationVersion> parameters() {
103103
MigrationVersion.v1_9,
104104
MigrationVersion.v1_10,
105105
MigrationVersion.v1_11,
106-
MigrationVersion.v1_12);
106+
MigrationVersion.v1_12,
107+
MigrationVersion.v1_13);
107108
}
108109

109110
public FlinkKafkaConsumerBaseMigrationTest(MigrationVersion testMigrateVersion) {

flink-connectors/flink-connector-kafka/src/test/java/org/apache/flink/streaming/connectors/kafka/FlinkKafkaProducerMigrationTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ public static Collection<MigrationVersion> parameters() {
4848
MigrationVersion.v1_9,
4949
MigrationVersion.v1_10,
5050
MigrationVersion.v1_11,
51-
MigrationVersion.v1_12);
51+
MigrationVersion.v1_12,
52+
MigrationVersion.v1_13);
5253
}
5354

5455
public FlinkKafkaProducerMigrationTest(MigrationVersion testMigrateVersion) {

flink-connectors/flink-connector-kinesis/src/test/java/org/apache/flink/streaming/connectors/kinesis/FlinkKinesisConsumerMigrationTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ public static Collection<MigrationVersion> parameters() {
106106
MigrationVersion.v1_9,
107107
MigrationVersion.v1_10,
108108
MigrationVersion.v1_11,
109-
MigrationVersion.v1_12);
109+
MigrationVersion.v1_12,
110+
MigrationVersion.v1_13);
110111
}
111112

112113
public FlinkKinesisConsumerMigrationTest(MigrationVersion testMigrateVersion) {

flink-core/src/test/java/org/apache/flink/api/common/typeutils/TypeSerializerUpgradeTestBase.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ public abstract class TypeSerializerUpgradeTestBase<PreviousElementT, UpgradedEl
5454
public static final MigrationVersion[] MIGRATION_VERSIONS =
5555
MigrationVersion.v1_11.orHigher().toArray(new MigrationVersion[0]);
5656

57-
public static final MigrationVersion CURRENT_VERSION = MigrationVersion.v1_12;
57+
public static final MigrationVersion CURRENT_VERSION = MigrationVersion.v1_13;
5858

5959
private final TestSpecification<PreviousElementT, UpgradedElementT> testSpecification;
6060

flink-core/src/test/java/org/apache/flink/testutils/migration/MigrationVersion.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ public enum MigrationVersion {
4444
v1_9("1.9"),
4545
v1_10("1.10"),
4646
v1_11("1.11"),
47-
v1_12("1.12");
47+
v1_12("1.12"),
48+
v1_13("1.13");
4849

4950
private final String versionStr;
5051

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

Binary file not shown.
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*
Binary file not shown.
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
��
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@���1��
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
@���1��
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
 ApacheFlink
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
B��y
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
B��y
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Hass�

flink-core/src/test/resources/kryo-type-serializer-changed-registration-order-1.13/test-data

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Hass�
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

flink-core/src/test/resources/null-value-serializer-1.13/test-data

Whitespace-only changes.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
%123456789012345678901234567890123456
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
$123456789012345678901234567890123456
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

flink-fs-tests/src/test/java/org/apache/flink/hdfstests/ContinuousFileProcessingMigrationTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,8 @@ public static Collection<Tuple2<MigrationVersion, Long>> parameters() {
8282
Tuple2.of(MigrationVersion.v1_9, 1567499868000L),
8383
Tuple2.of(MigrationVersion.v1_10, 1594559333000L),
8484
Tuple2.of(MigrationVersion.v1_11, 1594561663000L),
85-
Tuple2.of(MigrationVersion.v1_12, 1613720148000L));
85+
Tuple2.of(MigrationVersion.v1_12, 1613720148000L),
86+
Tuple2.of(MigrationVersion.v1_13, 1627550216000L));
8687
}
8788

8889
/**
Binary file not shown.

flink-libraries/flink-cep/src/test/java/org/apache/flink/cep/operator/CEPMigrationTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ public static Collection<MigrationVersion> parameters() {
7979
MigrationVersion.v1_9,
8080
MigrationVersion.v1_10,
8181
MigrationVersion.v1_11,
82-
MigrationVersion.v1_12);
82+
MigrationVersion.v1_12,
83+
MigrationVersion.v1_13);
8384
}
8485

8586
public CEPMigrationTest(MigrationVersion migrateVersion) {
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/WindowOperatorMigrationTest.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ public static Collection<MigrationVersion> parameters() {
9595
MigrationVersion.v1_9,
9696
MigrationVersion.v1_10,
9797
MigrationVersion.v1_11,
98-
MigrationVersion.v1_12);
98+
MigrationVersion.v1_12,
99+
MigrationVersion.v1_13);
99100
}
100101

101102
private static final TypeInformation<Tuple2<String, Integer>> STRING_INT_TUPLE =
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
flink
Binary file not shown.

flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/StatefulJobSavepointMigrationITCase.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,9 @@ public static Collection<Tuple2<MigrationVersion, String>> parameters() {
9595
Tuple2.of(MigrationVersion.v1_11, StateBackendLoader.MEMORY_STATE_BACKEND_NAME),
9696
Tuple2.of(MigrationVersion.v1_11, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME),
9797
Tuple2.of(MigrationVersion.v1_12, StateBackendLoader.MEMORY_STATE_BACKEND_NAME),
98-
Tuple2.of(MigrationVersion.v1_12, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME));
98+
Tuple2.of(MigrationVersion.v1_12, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME),
99+
Tuple2.of(MigrationVersion.v1_13, StateBackendLoader.MEMORY_STATE_BACKEND_NAME),
100+
Tuple2.of(MigrationVersion.v1_13, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME));
99101
}
100102

101103
private final MigrationVersion testMigrateVersion;

flink-tests/src/test/java/org/apache/flink/test/checkpointing/utils/StatefulJobWBroadcastStateMigrationITCase.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,9 @@ public static Collection<Tuple2<MigrationVersion, String>> parameters() {
7979
Tuple2.of(MigrationVersion.v1_11, StateBackendLoader.MEMORY_STATE_BACKEND_NAME),
8080
Tuple2.of(MigrationVersion.v1_11, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME),
8181
Tuple2.of(MigrationVersion.v1_12, StateBackendLoader.MEMORY_STATE_BACKEND_NAME),
82-
Tuple2.of(MigrationVersion.v1_12, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME));
82+
Tuple2.of(MigrationVersion.v1_12, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME),
83+
Tuple2.of(MigrationVersion.v1_13, StateBackendLoader.MEMORY_STATE_BACKEND_NAME),
84+
Tuple2.of(MigrationVersion.v1_13, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME));
8385
}
8486

8587
private final MigrationVersion testMigrateVersion;

flink-tests/src/test/java/org/apache/flink/test/migration/TypeSerializerSnapshotMigrationITCase.java

+3-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,9 @@ public static Collection<Tuple2<MigrationVersion, String>> parameters() {
9797
Tuple2.of(MigrationVersion.v1_11, StateBackendLoader.MEMORY_STATE_BACKEND_NAME),
9898
Tuple2.of(MigrationVersion.v1_11, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME),
9999
Tuple2.of(MigrationVersion.v1_12, StateBackendLoader.MEMORY_STATE_BACKEND_NAME),
100-
Tuple2.of(MigrationVersion.v1_12, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME));
100+
Tuple2.of(MigrationVersion.v1_12, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME),
101+
Tuple2.of(MigrationVersion.v1_13, StateBackendLoader.MEMORY_STATE_BACKEND_NAME),
102+
Tuple2.of(MigrationVersion.v1_13, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME));
101103
}
102104

103105
private final MigrationVersion testMigrateVersion;

flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/keyed/AbstractKeyedOperatorRestoreTestBase.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,8 @@ public static Collection<MigrationVersion> parameters() {
4949
MigrationVersion.v1_9,
5050
MigrationVersion.v1_10,
5151
MigrationVersion.v1_11,
52-
MigrationVersion.v1_12);
52+
MigrationVersion.v1_12,
53+
MigrationVersion.v1_13);
5354
}
5455

5556
public AbstractKeyedOperatorRestoreTestBase(MigrationVersion migrationVersion) {

flink-tests/src/test/java/org/apache/flink/test/state/operator/restore/unkeyed/AbstractNonKeyedOperatorRestoreTestBase.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,8 @@ public static Collection<MigrationVersion> parameters() {
5656
MigrationVersion.v1_9,
5757
MigrationVersion.v1_10,
5858
MigrationVersion.v1_11,
59-
MigrationVersion.v1_12);
59+
MigrationVersion.v1_12,
60+
MigrationVersion.v1_13);
6061
}
6162

6263
protected AbstractNonKeyedOperatorRestoreTestBase(MigrationVersion migrationVersion) {
Binary file not shown.
Binary file not shown.

flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobSavepointMigrationITCase.scala

+3-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ object StatefulJobSavepointMigrationITCase {
6868
(MigrationVersion.v1_11, StateBackendLoader.MEMORY_STATE_BACKEND_NAME),
6969
(MigrationVersion.v1_11, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME),
7070
(MigrationVersion.v1_12, StateBackendLoader.MEMORY_STATE_BACKEND_NAME),
71-
(MigrationVersion.v1_12, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME))
71+
(MigrationVersion.v1_12, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME),
72+
(MigrationVersion.v1_13, StateBackendLoader.MEMORY_STATE_BACKEND_NAME),
73+
(MigrationVersion.v1_13, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME))
7274
}
7375

7476
// TODO to generate savepoints for a specific Flink version / backend type,

flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobWBroadcastStateMigrationITCase.scala

+3-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,9 @@ object StatefulJobWBroadcastStateMigrationITCase {
6868
(MigrationVersion.v1_11, StateBackendLoader.MEMORY_STATE_BACKEND_NAME),
6969
(MigrationVersion.v1_11, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME),
7070
(MigrationVersion.v1_12, StateBackendLoader.MEMORY_STATE_BACKEND_NAME),
71-
(MigrationVersion.v1_12, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME))
71+
(MigrationVersion.v1_12, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME),
72+
(MigrationVersion.v1_13, StateBackendLoader.MEMORY_STATE_BACKEND_NAME),
73+
(MigrationVersion.v1_13, StateBackendLoader.ROCKSDB_STATE_BACKEND_NAME))
7274
}
7375

7476
// TODO to generate savepoints for a specific Flink version / backend type,

0 commit comments

Comments
 (0)