From 2633946d92c3c783d4cea7d4b9859166930a9b48 Mon Sep 17 00:00:00 2001 From: Stepan Stepanishchev Date: Fri, 26 Jun 2026 15:28:56 +0700 Subject: [PATCH] [FLINK-36334][tests] Enable TraversableSerializerUpgradeTest --- .../serializer-snapshot | Bin 0 -> 320 bytes .../test-data | Bin .../serializer-snapshot | Bin 0 -> 320 bytes .../test-data | Bin .../serializer-snapshot | Bin 0 -> 320 bytes .../test-data | Bin .../serializer-snapshot | Bin 322 -> 0 bytes .../serializer-snapshot | Bin 322 -> 0 bytes .../serializer-snapshot | Bin 322 -> 0 bytes .../TraversableSerializerUpgradeTest.scala | 18 ++++++++---------- 10 files changed, 8 insertions(+), 10 deletions(-) create mode 100644 flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.0/serializer-snapshot rename flink-table/flink-table-api-scala/src/test/resources/{traversable-serializer-mutable-list-2.0 => traversable-serializer-list-buffer-2.0}/test-data (100%) create mode 100644 flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.1/serializer-snapshot rename flink-table/flink-table-api-scala/src/test/resources/{traversable-serializer-mutable-list-2.1 => traversable-serializer-list-buffer-2.1}/test-data (100%) create mode 100644 flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.2/serializer-snapshot rename flink-table/flink-table-api-scala/src/test/resources/{traversable-serializer-mutable-list-2.2 => traversable-serializer-list-buffer-2.2}/test-data (100%) delete mode 100644 flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.0/serializer-snapshot delete mode 100644 flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.1/serializer-snapshot delete mode 100644 flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.2/serializer-snapshot diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.0/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.0/serializer-snapshot new file mode 100644 index 0000000000000000000000000000000000000000..976c3c220a4043f38633e7cf233c507cd7efb6d6 GIT binary patch literal 320 zcmZ{fy=uci49C@^Yqvarhm1xK;X)x0y10zp z34Q;60I-6}hZE93=FHfuxCRI(m)f$( qzAP3;{~2#v*c`sHriUMUU2x8X##@_p-9bBwjQP) literal 0 HcmV?d00001 diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.0/test-data b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.0/test-data similarity index 100% rename from flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.0/test-data rename to flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.0/test-data diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.1/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.1/serializer-snapshot new file mode 100644 index 0000000000000000000000000000000000000000..976c3c220a4043f38633e7cf233c507cd7efb6d6 GIT binary patch literal 320 zcmZ{fy=uci49C@^Yqvarhm1xK;X)x0y10zp z34Q;60I-6}hZE93=FHfuxCRI(m)f$( qzAP3;{~2#v*c`sHriUMUU2x8X##@_p-9bBwjQP) literal 0 HcmV?d00001 diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.1/test-data b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.1/test-data similarity index 100% rename from flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.1/test-data rename to flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.1/test-data diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.2/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.2/serializer-snapshot new file mode 100644 index 0000000000000000000000000000000000000000..976c3c220a4043f38633e7cf233c507cd7efb6d6 GIT binary patch literal 320 zcmZ{fy=uci49C@^Yqvarhm1xK;X)x0y10zp z34Q;60I-6}hZE93=FHfuxCRI(m)f$( qzAP3;{~2#v*c`sHriUMUU2x8X##@_p-9bBwjQP) literal 0 HcmV?d00001 diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.2/test-data b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.2/test-data similarity index 100% rename from flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.2/test-data rename to flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-list-buffer-2.2/test-data diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.0/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.0/serializer-snapshot deleted file mode 100644 index 5b74ce2bb36b29fa56fe8e2b87a205098f1ac612..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 322 zcmZ{fO%6dp49DwZYv%wKmeNCzNF>;hSjbz{C>ouamzjAI&fuO-Au(7WFBWan@Ba?~ znlSWXk5rO5Fz!^`5fg2cb4f6rORkb=#ATophxqI)I0&g+I4m5M@!%5xw4ifq=h%d+ z*iywv((^hRQbOZZ*(C7}_w4ev!4bJ(CAu94Z|hUGdP|tS<5Xf=Ph2Vnz3d0Q+SPya jMFHK_J*#TGY+fUMG8%7fR`x;NP-M)HKAioZ?3?-l3&L?e diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.1/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.1/serializer-snapshot deleted file mode 100644 index 5b74ce2bb36b29fa56fe8e2b87a205098f1ac612..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 322 zcmZ{fO%6dp49DwZYv%wKmeNCzNF>;hSjbz{C>ouamzjAI&fuO-Au(7WFBWan@Ba?~ znlSWXk5rO5Fz!^`5fg2cb4f6rORkb=#ATophxqI)I0&g+I4m5M@!%5xw4ifq=h%d+ z*iywv((^hRQbOZZ*(C7}_w4ev!4bJ(CAu94Z|hUGdP|tS<5Xf=Ph2Vnz3d0Q+SPya jMFHK_J*#TGY+fUMG8%7fR`x;NP-M)HKAioZ?3?-l3&L?e diff --git a/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.2/serializer-snapshot b/flink-table/flink-table-api-scala/src/test/resources/traversable-serializer-mutable-list-2.2/serializer-snapshot deleted file mode 100644 index 5b74ce2bb36b29fa56fe8e2b87a205098f1ac612..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 322 zcmZ{fO%6dp49DwZYv%wKmeNCzNF>;hSjbz{C>ouamzjAI&fuO-Au(7WFBWan@Ba?~ znlSWXk5rO5Fz!^`5fg2cb4f6rORkb=#ATophxqI)I0&g+I4m5M@!%5xw4ifq=h%d+ z*iywv((^hRQbOZZ*(C7}_w4ev!4bJ(CAu94Z|hUGdP|tS<5Xf=Ph2Vnz3d0Q+SPya jMFHK_J*#TGY+fUMG8%7fR`x;NP-M)HKAioZ?3?-l3&L?e diff --git a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/TraversableSerializerUpgradeTest.scala b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/TraversableSerializerUpgradeTest.scala index 2a89f5f78234e1..d9d531ae879918 100644 --- a/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/TraversableSerializerUpgradeTest.scala +++ b/flink-table/flink-table-api-scala/src/test/scala/org/apache/flink/table/api/typeutils/TraversableSerializerUpgradeTest.scala @@ -28,7 +28,6 @@ import org.apache.flink.table.api.typeutils.TraversableSerializerUpgradeTest.Typ 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 @@ -37,7 +36,6 @@ import java.util.function.Supplier import scala.collection.{mutable, BitSet, LinearSeq} /** A [[TypeSerializerUpgradeTestBase]] for [[TraversableSerializer]]. */ -@Disabled("FLINK-36334") class TraversableSerializerUpgradeTest extends TypeSerializerUpgradeTestBase[TraversableOnce[_], TraversableOnce[_]] { @@ -71,10 +69,10 @@ class TraversableSerializerUpgradeTest classOf[MapSerializerVerifier])) testSpecifications.add( new TestSpecification[mutable.ListBuffer[Int], mutable.ListBuffer[Int]]( - "traversable-serializer-mutable-list", + "traversable-serializer-list-buffer", migrationVersion, - classOf[MutableListSerializerSetup], - classOf[MutableListSerializerVerifier])) + classOf[ListBufferSerializerSetup], + classOf[ListBufferSerializerVerifier])) testSpecifications.add( new TestSpecification[Seq[Int], Seq[Int]]( "traversable-serializer-seq", @@ -130,7 +128,7 @@ object TraversableSerializerUpgradeTest { val mapTypeInfo = implicitly[TypeInformation[Map[String, Int]]] val setTypeInfo = implicitly[TypeInformation[Set[Int]]] val bitsetTypeInfo = implicitly[TypeInformation[BitSet]] - val mutableListTypeInfo = + val listBufferTypeInfo = implicitly[TypeInformation[mutable.ListBuffer[Int]]] val seqTupleTypeInfo = implicitly[TypeInformation[Seq[(Int, String)]]] val seqPojoTypeInfo = implicitly[TypeInformation[Seq[Pojo]]] @@ -224,18 +222,18 @@ object TraversableSerializerUpgradeTest { TypeSerializerConditions.isCompatibleAsIs[Map[String, Int]]() } - final class MutableListSerializerSetup + final class ListBufferSerializerSetup extends TypeSerializerUpgradeTestBase.PreUpgradeSetup[mutable.ListBuffer[Int]] { override def createPriorSerializer: TypeSerializer[mutable.ListBuffer[Int]] = - new TypeSerializerSupplier(mutableListTypeInfo).get() + new TypeSerializerSupplier(listBufferTypeInfo).get() override def createTestData: mutable.ListBuffer[Int] = mutable.ListBuffer(1, 2, 3) } - final class MutableListSerializerVerifier + final class ListBufferSerializerVerifier extends TypeSerializerUpgradeTestBase.UpgradeVerifier[mutable.ListBuffer[Int]] { override def createUpgradedSerializer: TypeSerializer[mutable.ListBuffer[Int]] = - new TypeSerializerSupplier(mutableListTypeInfo).get() + new TypeSerializerSupplier(listBufferTypeInfo).get() override def testDataCondition: Condition[mutable.ListBuffer[Int]] = new Condition[mutable.ListBuffer[Int]](