diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/089594ed-2f58-4d20-aa9a-da9d018ae002 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/089594ed-2f58-4d20-aa9a-da9d018ae002
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/089594ed-2f58-4d20-aa9a-da9d018ae002 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/13345fae-1542-4ea6-bfae-e29a8d2872ba b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/13345fae-1542-4ea6-bfae-e29a8d2872ba
new file mode 100644
index 0000000000000..35de83319c267
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/13345fae-1542-4ea6-bfae-e29a8d2872ba differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/200e50e2-6909-4571-bc02-4ec64f2c52f4 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/200e50e2-6909-4571-bc02-4ec64f2c52f4
new file mode 100644
index 0000000000000..0d97a9a40bb80
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/200e50e2-6909-4571-bc02-4ec64f2c52f4 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/32243c1b-33e2-4c51-86ca-5600282722b5 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/32243c1b-33e2-4c51-86ca-5600282722b5
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/32243c1b-33e2-4c51-86ca-5600282722b5 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/326e2e77-5e4a-4763-89e4-f9331eea0f0b b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/326e2e77-5e4a-4763-89e4-f9331eea0f0b
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/326e2e77-5e4a-4763-89e4-f9331eea0f0b differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/5562f012-828d-4421-a727-7972235a66c0 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/5562f012-828d-4421-a727-7972235a66c0
new file mode 100644
index 0000000000000..bd10233b3ef5b
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/5562f012-828d-4421-a727-7972235a66c0 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/6a97d964-d395-46b9-a3f7-f728673e77a8 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/6a97d964-d395-46b9-a3f7-f728673e77a8
new file mode 100644
index 0000000000000..15af506b529db
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/6a97d964-d395-46b9-a3f7-f728673e77a8 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/92aa11ad-122f-4ed2-8215-2a4c81a78139 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/92aa11ad-122f-4ed2-8215-2a4c81a78139
new file mode 100644
index 0000000000000..9222dc9787dd7
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/92aa11ad-122f-4ed2-8215-2a4c81a78139 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/_metadata b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/_metadata
new file mode 100644
index 0000000000000..72fa6835e3cd8
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/_metadata differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/ab35adb3-8649-43e6-b2c4-e00b260b5705 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/ab35adb3-8649-43e6-b2c4-e00b260b5705
new file mode 100644
index 0000000000000..dcc75877a2fbd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/ab35adb3-8649-43e6-b2c4-e00b260b5705 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/b9dad9f3-dfe1-4c9c-8485-b4a7a50e2c22 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/b9dad9f3-dfe1-4c9c-8485-b4a7a50e2c22
new file mode 100644
index 0000000000000..14f1caef6511f
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/b9dad9f3-dfe1-4c9c-8485-b4a7a50e2c22 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/ca0fc48a-1ec3-4128-8961-b484916e7a5f b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/ca0fc48a-1ec3-4128-8961-b484916e7a5f
new file mode 100644
index 0000000000000..6c75666c413fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/ca0fc48a-1ec3-4128-8961-b484916e7a5f differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/d9c140d6-bf78-4d51-9fee-8bd0a3911a76 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/d9c140d6-bf78-4d51-9fee-8bd0a3911a76
new file mode 100644
index 0000000000000..bd10233b3ef5b
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/d9c140d6-bf78-4d51-9fee-8bd0a3911a76 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/e9732c32-2338-4a31-8b53-77695d60df60 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/e9732c32-2338-4a31-8b53-77695d60df60
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/e9732c32-2338-4a31-8b53-77695d60df60 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/f0760787-e6e2-4392-a22f-2e5fead874fc b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/f0760787-e6e2-4392-a22f-2e5fead874fc
new file mode 100644
index 0000000000000..3bb46dfbb2b75
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-checkpoint/f0760787-e6e2-4392-a22f-2e5fead874fc differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/1446d2b3-88a3-42df-8fc0-0cbf314286f9 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/1446d2b3-88a3-42df-8fc0-0cbf314286f9
new file mode 100644
index 0000000000000..3bb46dfbb2b75
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/1446d2b3-88a3-42df-8fc0-0cbf314286f9 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/4d4f766e-12bf-4af2-a00e-9720e012cdb8 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/4d4f766e-12bf-4af2-a00e-9720e012cdb8
new file mode 100644
index 0000000000000..15af506b529db
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/4d4f766e-12bf-4af2-a00e-9720e012cdb8 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/5ee1b4b3-0eb6-405a-9c38-bd58dfdd00c7 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/5ee1b4b3-0eb6-405a-9c38-bd58dfdd00c7
new file mode 100644
index 0000000000000..dcc75877a2fbd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/5ee1b4b3-0eb6-405a-9c38-bd58dfdd00c7 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/5f89eafd-abcb-4f3d-86f0-9d57df1da496 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/5f89eafd-abcb-4f3d-86f0-9d57df1da496
new file mode 100644
index 0000000000000..14f1caef6511f
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/5f89eafd-abcb-4f3d-86f0-9d57df1da496 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/6cc27fc4-30d3-46ed-baa3-ce603fe4fd1e b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/6cc27fc4-30d3-46ed-baa3-ce603fe4fd1e
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/6cc27fc4-30d3-46ed-baa3-ce603fe4fd1e differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/927da194-6e71-4aa2-a483-b2ba478e1e91 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/927da194-6e71-4aa2-a483-b2ba478e1e91
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/927da194-6e71-4aa2-a483-b2ba478e1e91 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/9a91e108-133b-4511-8f10-60063f15f37f b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/9a91e108-133b-4511-8f10-60063f15f37f
new file mode 100644
index 0000000000000..0d97a9a40bb80
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/9a91e108-133b-4511-8f10-60063f15f37f differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/_metadata b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/_metadata
new file mode 100644
index 0000000000000..8d73ae258c67d
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/_metadata differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/aba9de6f-ae0d-46b7-bd9b-3463c4bd650d b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/aba9de6f-ae0d-46b7-bd9b-3463c4bd650d
new file mode 100644
index 0000000000000..9222dc9787dd7
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/aba9de6f-ae0d-46b7-bd9b-3463c4bd650d differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/b8f765a4-9d97-40b2-a313-f2959c671cc3 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/b8f765a4-9d97-40b2-a313-f2959c671cc3
new file mode 100644
index 0000000000000..bd10233b3ef5b
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/b8f765a4-9d97-40b2-a313-f2959c671cc3 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/bdfd9f5e-35eb-42bf-b53c-a8c26048ed58 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/bdfd9f5e-35eb-42bf-b53c-a8c26048ed58
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/bdfd9f5e-35eb-42bf-b53c-a8c26048ed58 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/c13e50cd-6b0c-4e9c-9a7c-49b7c1900f88 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/c13e50cd-6b0c-4e9c-9a7c-49b7c1900f88
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/c13e50cd-6b0c-4e9c-9a7c-49b7c1900f88 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/e3dd146d-784e-4faf-94f2-f730911248b2 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/e3dd146d-784e-4faf-94f2-f730911248b2
new file mode 100644
index 0000000000000..6c75666c413fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/e3dd146d-784e-4faf-94f2-f730911248b2 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/f6c5156e-8a2c-4770-a19a-c2b03ffb5afc b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/f6c5156e-8a2c-4770-a19a-c2b03ffb5afc
new file mode 100644
index 0000000000000..35de83319c267
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/f6c5156e-8a2c-4770-a19a-c2b03ffb5afc differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/f95821e0-3472-4d17-ad28-c8d6885cd3f9 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/f95821e0-3472-4d17-ad28-c8d6885cd3f9
new file mode 100644
index 0000000000000..bd10233b3ef5b
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint-native/f95821e0-3472-4d17-ad28-c8d6885cd3f9 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/0fad68a0-1901-4c76-a351-8d1f0e18818d b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/0fad68a0-1901-4c76-a351-8d1f0e18818d
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/0fad68a0-1901-4c76-a351-8d1f0e18818d differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/2ec2051b-ef79-4264-afb1-966daa2c7978 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/2ec2051b-ef79-4264-afb1-966daa2c7978
new file mode 100644
index 0000000000000..bd10233b3ef5b
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/2ec2051b-ef79-4264-afb1-966daa2c7978 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/35b11c9d-d021-468a-9fab-e3f95309fa5c b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/35b11c9d-d021-468a-9fab-e3f95309fa5c
new file mode 100644
index 0000000000000..8e11972deb00e
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/35b11c9d-d021-468a-9fab-e3f95309fa5c differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/409fcc80-3c59-4ae2-b57b-2f21dd6ee84b b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/409fcc80-3c59-4ae2-b57b-2f21dd6ee84b
new file mode 100644
index 0000000000000..1b666d3a8a513
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/409fcc80-3c59-4ae2-b57b-2f21dd6ee84b differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/6068c6fc-2625-425b-b0df-45eb9d99a7d1 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/6068c6fc-2625-425b-b0df-45eb9d99a7d1
new file mode 100644
index 0000000000000..1b666d3a8a513
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/6068c6fc-2625-425b-b0df-45eb9d99a7d1 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/6c52ea22-1f78-4cd3-bd3d-d0009bb95c9d b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/6c52ea22-1f78-4cd3-bd3d-d0009bb95c9d
new file mode 100644
index 0000000000000..de94a3fae7820
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/6c52ea22-1f78-4cd3-bd3d-d0009bb95c9d differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/78d03aaa-5112-4385-8547-1e13f4b44485 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/78d03aaa-5112-4385-8547-1e13f4b44485
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/78d03aaa-5112-4385-8547-1e13f4b44485 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/7aa365eb-859f-403c-bc55-02fca134002e b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/7aa365eb-859f-403c-bc55-02fca134002e
new file mode 100644
index 0000000000000..9077574d5c93d
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/7aa365eb-859f-403c-bc55-02fca134002e differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/7b68e813-44c9-42a2-847b-09bbe06abbd4 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/7b68e813-44c9-42a2-847b-09bbe06abbd4
new file mode 100644
index 0000000000000..bd10233b3ef5b
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/7b68e813-44c9-42a2-847b-09bbe06abbd4 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/7e8d60e1-bee8-4b12-acbe-f46d953927b9 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/7e8d60e1-bee8-4b12-acbe-f46d953927b9
new file mode 100644
index 0000000000000..1b666d3a8a513
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/7e8d60e1-bee8-4b12-acbe-f46d953927b9 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/88e0e19a-4a9f-4061-9ae3-a9aad1459135 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/88e0e19a-4a9f-4061-9ae3-a9aad1459135
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/88e0e19a-4a9f-4061-9ae3-a9aad1459135 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/8a7978d3-38cf-4587-8d62-49582820882a b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/8a7978d3-38cf-4587-8d62-49582820882a
new file mode 100644
index 0000000000000..8e34f49acda59
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/8a7978d3-38cf-4587-8d62-49582820882a differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/_metadata b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/_metadata
new file mode 100644
index 0000000000000..f4f66155f311b
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/_metadata differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/adab88ff-f874-4ba6-ab7a-f646b98ef645 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/adab88ff-f874-4ba6-ab7a-f646b98ef645
new file mode 100644
index 0000000000000..1b666d3a8a513
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/adab88ff-f874-4ba6-ab7a-f646b98ef645 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/b310fe20-cd1c-4f3e-96af-b3a5dc72aa11 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/b310fe20-cd1c-4f3e-96af-b3a5dc72aa11
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-hashmap-savepoint/b310fe20-cd1c-4f3e-96af-b3a5dc72aa11 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/0ef22927-6cc8-43fb-9c51-ad1b660e4f0a b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/0ef22927-6cc8-43fb-9c51-ad1b660e4f0a
new file mode 100644
index 0000000000000..be607db66ba7b
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/0ef22927-6cc8-43fb-9c51-ad1b660e4f0a differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/144220e2-a4cd-48b2-9d52-b04f1b4b65b2 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/144220e2-a4cd-48b2-9d52-b04f1b4b65b2
new file mode 100644
index 0000000000000..4af5a029fa349
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/144220e2-a4cd-48b2-9d52-b04f1b4b65b2 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/1cb1461e-70a4-448d-91d9-3a6eae981d71 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/1cb1461e-70a4-448d-91d9-3a6eae981d71
new file mode 100644
index 0000000000000..1b666d3a8a513
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/1cb1461e-70a4-448d-91d9-3a6eae981d71 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/1ebaeb6e-7f31-4d6a-88e5-11a25182a1c8 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/1ebaeb6e-7f31-4d6a-88e5-11a25182a1c8
new file mode 100644
index 0000000000000..bd10233b3ef5b
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/1ebaeb6e-7f31-4d6a-88e5-11a25182a1c8 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/267a46e2-3a6d-47fd-8455-fde983d35a6d b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/267a46e2-3a6d-47fd-8455-fde983d35a6d
new file mode 100644
index 0000000000000..1b666d3a8a513
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/267a46e2-3a6d-47fd-8455-fde983d35a6d differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/3161a920-833b-4dd5-9c93-8e79bef3c4f8 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/3161a920-833b-4dd5-9c93-8e79bef3c4f8
new file mode 100644
index 0000000000000..85be259754efa
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/3161a920-833b-4dd5-9c93-8e79bef3c4f8 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/4f0730bc-8130-4895-b8eb-ff56fdbec35c b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/4f0730bc-8130-4895-b8eb-ff56fdbec35c
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/4f0730bc-8130-4895-b8eb-ff56fdbec35c differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/6395fb41-c202-4c8a-a5ca-7adefe1d9484 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/6395fb41-c202-4c8a-a5ca-7adefe1d9484
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/6395fb41-c202-4c8a-a5ca-7adefe1d9484 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/6558d958-50c9-40d1-80bd-42a9e63ea771 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/6558d958-50c9-40d1-80bd-42a9e63ea771
new file mode 100644
index 0000000000000..1b666d3a8a513
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/6558d958-50c9-40d1-80bd-42a9e63ea771 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/7dc70b15-e411-4fd7-b3ba-7ad12fd825ad b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/7dc70b15-e411-4fd7-b3ba-7ad12fd825ad
new file mode 100644
index 0000000000000..8b78aee8e0558
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/7dc70b15-e411-4fd7-b3ba-7ad12fd825ad differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/_metadata b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/_metadata
new file mode 100644
index 0000000000000..061691580e3a6
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/_metadata differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/a0af6b4f-40b7-4ab3-8206-4f098b479341 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/a0af6b4f-40b7-4ab3-8206-4f098b479341
new file mode 100644
index 0000000000000..1b666d3a8a513
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/a0af6b4f-40b7-4ab3-8206-4f098b479341 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/d9ff078e-0fb7-46ef-b101-9daecc1764c9 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/d9ff078e-0fb7-46ef-b101-9daecc1764c9
new file mode 100644
index 0000000000000..bd10233b3ef5b
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/d9ff078e-0fb7-46ef-b101-9daecc1764c9 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/e490edee-f26b-457e-9d6c-1f891b60cb3d b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/e490edee-f26b-457e-9d6c-1f891b60cb3d
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/e490edee-f26b-457e-9d6c-1f891b60cb3d differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/f14cead0-85af-4fd5-a5db-2dc42bf0e015 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/f14cead0-85af-4fd5-a5db-2dc42bf0e015
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/f14cead0-85af-4fd5-a5db-2dc42bf0e015 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/f290d4b3-e794-4d7b-9a09-7f2887554096 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/f290d4b3-e794-4d7b-9a09-7f2887554096
new file mode 100644
index 0000000000000..df879cf49534a
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-checkpoint/f290d4b3-e794-4d7b-9a09-7f2887554096 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/1557601a-5d6b-4b14-a335-9376bbfb4d5e b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/1557601a-5d6b-4b14-a335-9376bbfb4d5e
new file mode 100644
index 0000000000000..1b666d3a8a513
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/1557601a-5d6b-4b14-a335-9376bbfb4d5e differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/26492598-2324-42a6-8928-5bfbcd042363 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/26492598-2324-42a6-8928-5bfbcd042363
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/26492598-2324-42a6-8928-5bfbcd042363 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/2f5b12bd-8799-4dfe-8324-fd4a6504f08c b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/2f5b12bd-8799-4dfe-8324-fd4a6504f08c
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/2f5b12bd-8799-4dfe-8324-fd4a6504f08c differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/3185c5ab-8487-42c4-a6c3-bf876c3d34b6 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/3185c5ab-8487-42c4-a6c3-bf876c3d34b6
new file mode 100644
index 0000000000000..4af5a029fa349
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/3185c5ab-8487-42c4-a6c3-bf876c3d34b6 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/33ae051d-a3b6-4679-9a7a-a0a3b1fcc760 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/33ae051d-a3b6-4679-9a7a-a0a3b1fcc760
new file mode 100644
index 0000000000000..1b666d3a8a513
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/33ae051d-a3b6-4679-9a7a-a0a3b1fcc760 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/365ea4cd-fc2e-487a-b92b-c0b19c25284e b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/365ea4cd-fc2e-487a-b92b-c0b19c25284e
new file mode 100644
index 0000000000000..bd10233b3ef5b
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/365ea4cd-fc2e-487a-b92b-c0b19c25284e differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/3bc07879-f7b7-4ba8-bb83-75f9242f2ab1 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/3bc07879-f7b7-4ba8-bb83-75f9242f2ab1
new file mode 100644
index 0000000000000..8b78aee8e0558
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/3bc07879-f7b7-4ba8-bb83-75f9242f2ab1 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/3f36e1b7-cd00-48c9-bf03-751cf31105a4 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/3f36e1b7-cd00-48c9-bf03-751cf31105a4
new file mode 100644
index 0000000000000..bd10233b3ef5b
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/3f36e1b7-cd00-48c9-bf03-751cf31105a4 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/4561d5a6-cdc1-4f1e-b955-080848886d28 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/4561d5a6-cdc1-4f1e-b955-080848886d28
new file mode 100644
index 0000000000000..be607db66ba7b
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/4561d5a6-cdc1-4f1e-b955-080848886d28 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/4dc23227-dacd-4935-a9d1-fbb56d83d56a b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/4dc23227-dacd-4935-a9d1-fbb56d83d56a
new file mode 100644
index 0000000000000..1b666d3a8a513
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/4dc23227-dacd-4935-a9d1-fbb56d83d56a differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/6272644a-8712-4184-8da3-9a6f55b739d0 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/6272644a-8712-4184-8da3-9a6f55b739d0
new file mode 100644
index 0000000000000..1b666d3a8a513
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/6272644a-8712-4184-8da3-9a6f55b739d0 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/6e94ede7-bd02-41cd-9df5-ee886ac9bf92 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/6e94ede7-bd02-41cd-9df5-ee886ac9bf92
new file mode 100644
index 0000000000000..85be259754efa
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/6e94ede7-bd02-41cd-9df5-ee886ac9bf92 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/_metadata b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/_metadata
new file mode 100644
index 0000000000000..aff9e2e5fa4f2
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/_metadata differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/a0f766b5-ffa2-46d4-bacf-8e3a04615d70 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/a0f766b5-ffa2-46d4-bacf-8e3a04615d70
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/a0f766b5-ffa2-46d4-bacf-8e3a04615d70 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/ac3f91da-37f1-4e78-b32a-5fd38ae9c5f6 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/ac3f91da-37f1-4e78-b32a-5fd38ae9c5f6
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint-native/ac3f91da-37f1-4e78-b32a-5fd38ae9c5f6 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/02586ed4-d176-400b-9d9f-4354eaf17d3a b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/02586ed4-d176-400b-9d9f-4354eaf17d3a
new file mode 100644
index 0000000000000..85be259754efa
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/02586ed4-d176-400b-9d9f-4354eaf17d3a differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/2c2a2989-45bf-42b2-8d10-0bda18005cad b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/2c2a2989-45bf-42b2-8d10-0bda18005cad
new file mode 100644
index 0000000000000..1b666d3a8a513
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/2c2a2989-45bf-42b2-8d10-0bda18005cad differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/3e165f95-5fd5-41e4-aab4-06bb5d4d6e2a b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/3e165f95-5fd5-41e4-aab4-06bb5d4d6e2a
new file mode 100644
index 0000000000000..1b666d3a8a513
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/3e165f95-5fd5-41e4-aab4-06bb5d4d6e2a differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/3e30006c-3ded-4f4a-8d2b-7bd12d8ad4e5 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/3e30006c-3ded-4f4a-8d2b-7bd12d8ad4e5
new file mode 100644
index 0000000000000..be607db66ba7b
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/3e30006c-3ded-4f4a-8d2b-7bd12d8ad4e5 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/40364545-b01c-4ba2-840e-f238962a9275 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/40364545-b01c-4ba2-840e-f238962a9275
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/40364545-b01c-4ba2-840e-f238962a9275 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/51256c24-e03e-441b-b231-462ba12578e3 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/51256c24-e03e-441b-b231-462ba12578e3
new file mode 100644
index 0000000000000..1b666d3a8a513
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/51256c24-e03e-441b-b231-462ba12578e3 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/69321ddb-ad04-4d6d-9cb8-f97d1127f900 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/69321ddb-ad04-4d6d-9cb8-f97d1127f900
new file mode 100644
index 0000000000000..bd10233b3ef5b
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/69321ddb-ad04-4d6d-9cb8-f97d1127f900 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/71d3ac2f-832b-4b34-8a92-7437a29a4353 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/71d3ac2f-832b-4b34-8a92-7437a29a4353
new file mode 100644
index 0000000000000..1b666d3a8a513
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/71d3ac2f-832b-4b34-8a92-7437a29a4353 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/83aca333-876f-4456-af39-5b415bd1143a b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/83aca333-876f-4456-af39-5b415bd1143a
new file mode 100644
index 0000000000000..bd10233b3ef5b
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/83aca333-876f-4456-af39-5b415bd1143a differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/952bdc9c-22d8-41cd-a0fb-87ec0198d41c b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/952bdc9c-22d8-41cd-a0fb-87ec0198d41c
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/952bdc9c-22d8-41cd-a0fb-87ec0198d41c differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/9c73207a-38c3-4b0a-a466-132ff523fd67 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/9c73207a-38c3-4b0a-a466-132ff523fd67
new file mode 100644
index 0000000000000..8b78aee8e0558
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/9c73207a-38c3-4b0a-a466-132ff523fd67 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/_metadata b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/_metadata
new file mode 100644
index 0000000000000..fa3fcc1427b72
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/_metadata differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/d615b86f-720a-49ba-91fd-b02d2fa3abf2 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/d615b86f-720a-49ba-91fd-b02d2fa3abf2
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/d615b86f-720a-49ba-91fd-b02d2fa3abf2 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/ee8233be-d753-4ce5-9904-1bf77f2397c3 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/ee8233be-d753-4ce5-9904-1bf77f2397c3
new file mode 100644
index 0000000000000..4af5a029fa349
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/ee8233be-d753-4ce5-9904-1bf77f2397c3 differ
diff --git a/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/fcc430a6-9e68-4eff-b1a6-47d1ad355061 b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/fcc430a6-9e68-4eff-b1a6-47d1ad355061
new file mode 100644
index 0000000000000..f9e0531cdd9fd
Binary files /dev/null and b/flink-tests/src/test/resources/stateful-scala-with-broadcast-udf-migration-itcase-flink1.15-rocksdb-savepoint/fcc430a6-9e68-4eff-b1a6-47d1ad355061 differ
diff --git a/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobWBroadcastStateMigrationITCase.scala b/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobWBroadcastStateMigrationITCase.scala
index ce6c485a44a28..6cfe427fff69f 100644
--- a/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobWBroadcastStateMigrationITCase.scala
+++ b/flink-tests/src/test/scala/org/apache/flink/api/scala/migration/StatefulJobWBroadcastStateMigrationITCase.scala
@@ -54,7 +54,7 @@ import scala.util.{Failure, Try}
 object StatefulJobWBroadcastStateMigrationITCase {
 
   // TODO increase this to newer version to create and test snapshot migration for newer versions
-  val currentVersion = FlinkVersion.v1_14
+  val currentVersion = FlinkVersion.v1_15
 
   // TODO change this to CREATE_SNAPSHOT to (re)create binary snapshots
   // TODO Note: You should generate the snapshot based on the release branch instead of the