From da1a0f3ad375222fa1a69dc0fd361289974153e3 Mon Sep 17 00:00:00 2001 From: Stepan Stepanishchev Date: Mon, 22 Jun 2026 15:48:55 +0700 Subject: [PATCH 1/2] [FLINK-37404][API / Core] Reenable Migration Tests for Filnk 2.x --- .../typeutils/base/VariantSerializerUpgradeTest.java | 8 +------- .../org/apache/flink/cep/operator/CEPMigrationTest.java | 8 +------- .../table/api/typeutils/OptionSerializerUpgradeTest.java | 2 -- .../api/typeutils/ScalaEitherSerializerUpgradeTest.java | 2 -- .../api/typeutils/ScalaTrySerializerUpgradeTest.java | 2 -- .../api/typeutils/EnumValueSerializerUpgradeTest.scala | 2 -- .../typeutils/ScalaCaseClassSerializerUpgradeTest.scala | 2 -- 7 files changed, 2 insertions(+), 24 deletions(-) diff --git a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/VariantSerializerUpgradeTest.java b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/VariantSerializerUpgradeTest.java index 1f9771cd5254a..59c199153ae76 100644 --- a/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/VariantSerializerUpgradeTest.java +++ b/flink-core/src/test/java/org/apache/flink/api/common/typeutils/base/VariantSerializerUpgradeTest.java @@ -29,17 +29,11 @@ import org.apache.flink.types.variant.VariantBuilder; import org.assertj.core.api.Condition; -import org.junit.jupiter.api.Disabled; import java.util.ArrayList; import java.util.Collection; -/** - * A {@link TypeSerializerUpgradeTestBase} for {@link VariantSerializerSnapshot}. The test is - * disabled because Variant is introduced in Flink 2.1. We should restore the test when there is a - * Flink 2.2 which should test compatibility with Flink 2.1 - */ -@Disabled("FLINK-37951") +/** A {@link TypeSerializerUpgradeTestBase} for {@link VariantSerializerSnapshot}. */ class VariantSerializerUpgradeTest extends TypeSerializerUpgradeTestBase { private static final String SPEC_NAME = "variant-serializer"; 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 index a17291525149c..20011b2428e3d 100644 --- 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 @@ -36,7 +36,6 @@ import org.apache.flink.streaming.util.OperatorSnapshotUtil; import org.apache.flink.test.util.MigrationTest; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -54,14 +53,9 @@ * Tests for checking whether CEP operator can restore from snapshots that were done using previous * Flink versions. * - *

NOTE: Due to major upgrades of serializers, Flink 2.0 is not compatible with saved state from - * Flink 1.x, and this test is temporarily disabled. This test should be reinstated for future - * versions of Flink, such as Flink 2.1, that promise compatibility with older releases. - * *

For regenerating the binary snapshot file of previous versions you have to run the {@code * write*()} method on the corresponding Flink release-* branch. */ -@Ignore("Flink 2.0 is not compatible with saved state from Flink 1.x") @RunWith(Parameterized.class) public class CEPMigrationTest implements MigrationTest { @@ -70,7 +64,7 @@ public class CEPMigrationTest implements MigrationTest { @Parameterized.Parameters(name = "Migration Savepoint: {0}") public static Collection parameters() { return FlinkVersion.rangeOf( - FlinkVersion.v1_20, MigrationTest.getMostRecentlyPublishedVersion()); + FlinkVersion.v2_0, MigrationTest.getMostRecentlyPublishedVersion()); } public CEPMigrationTest(FlinkVersion migrateVersion) { diff --git a/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/OptionSerializerUpgradeTest.java b/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/OptionSerializerUpgradeTest.java index 1933cb026a916..b6663b318945c 100644 --- a/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/OptionSerializerUpgradeTest.java +++ b/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/OptionSerializerUpgradeTest.java @@ -27,7 +27,6 @@ import org.apache.flink.test.util.MigrationTest; import org.assertj.core.api.Condition; -import org.junit.jupiter.api.Disabled; import java.util.ArrayList; import java.util.Collection; @@ -38,7 +37,6 @@ * A {@link org.apache.flink.api.common.typeutils.TypeSerializerUpgradeTestBase} for {@link * ScalaEitherSerializerSnapshot}. */ -@Disabled("FLINK-36334") class OptionSerializerUpgradeTest extends TypeSerializerUpgradeTestBase, Option> { diff --git a/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/ScalaEitherSerializerUpgradeTest.java b/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/ScalaEitherSerializerUpgradeTest.java index 118502f377847..b10e1dd756140 100644 --- a/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/ScalaEitherSerializerUpgradeTest.java +++ b/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/ScalaEitherSerializerUpgradeTest.java @@ -28,7 +28,6 @@ import org.apache.flink.test.util.MigrationTest; import org.assertj.core.api.Condition; -import org.junit.jupiter.api.Disabled; import java.util.ArrayList; import java.util.Collection; @@ -37,7 +36,6 @@ import scala.util.Right; /** A {@link TypeSerializerUpgradeTestBase} for {@link ScalaEitherSerializerSnapshot}. */ -@Disabled("FLINK-36334") class ScalaEitherSerializerUpgradeTest extends TypeSerializerUpgradeTestBase, Either> { diff --git a/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/ScalaTrySerializerUpgradeTest.java b/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/ScalaTrySerializerUpgradeTest.java index 378df473faaa5..b54ad3c889394 100644 --- a/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/ScalaTrySerializerUpgradeTest.java +++ b/flink-table/flink-table-api-scala/src/test/java/org/apache/flink/table/api/typeutils/ScalaTrySerializerUpgradeTest.java @@ -28,7 +28,6 @@ import org.apache.flink.test.util.MigrationTest; import org.assertj.core.api.Condition; -import org.junit.jupiter.api.Disabled; import java.util.ArrayList; import java.util.Collection; @@ -38,7 +37,6 @@ import scala.util.Try; /** A {@link TypeSerializerUpgradeTestBase} for {@link TrySerializer}. */ -@Disabled("FLINK-36334") class ScalaTrySerializerUpgradeTest extends TypeSerializerUpgradeTestBase, Try> { diff --git a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/EnumValueSerializerUpgradeTest.scala b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/EnumValueSerializerUpgradeTest.scala index aad403472a5a4..78cc4eb8b0e2a 100644 --- a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/EnumValueSerializerUpgradeTest.scala +++ b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/EnumValueSerializerUpgradeTest.scala @@ -24,13 +24,11 @@ import org.apache.flink.table.api.typeutils.EnumValueSerializerUpgradeTest.{Enum import org.apache.flink.test.util.MigrationTest import org.assertj.core.api.Condition -import org.junit.jupiter.api.Disabled import java.util import java.util.Objects /** A [[TypeSerializerUpgradeTestBase]] for [[EnumValueSerializer]]. */ -@Disabled("FLINK-36334") class EnumValueSerializerUpgradeTest extends TypeSerializerUpgradeTestBase[Letters.Value, Letters.Value] { diff --git a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/ScalaCaseClassSerializerUpgradeTest.scala b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/ScalaCaseClassSerializerUpgradeTest.scala index 832fe7226f932..16886e9971706 100644 --- a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/ScalaCaseClassSerializerUpgradeTest.scala +++ b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/ScalaCaseClassSerializerUpgradeTest.scala @@ -27,12 +27,10 @@ import org.apache.flink.table.types.CustomCaseClass import org.apache.flink.test.util.MigrationTest import org.assertj.core.api.Condition -import org.junit.jupiter.api.Disabled import java.util /** A [[TypeSerializerUpgradeTestBase]] for [[ScalaCaseClassSerializer]]. */ -@Disabled("FLINK-36334") class ScalaCaseClassSerializerUpgradeTest extends TypeSerializerUpgradeTestBase[CustomCaseClass, CustomCaseClass] { From f31b10772d1a0b92a7f82edda8e797499a0b5049 Mon Sep 17 00:00:00 2001 From: Stepan Stepanishchev Date: Tue, 23 Jun 2026 22:15:14 +0700 Subject: [PATCH 2/2] Trigger CI