This is an automated email from the ASF dual-hosted git repository. dwysakowicz pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit 45c47ba1b5f34929e383f1b84ac83861351f60e0 Author: Gustavo de Morais <[email protected]> AuthorDate: Tue Sep 30 09:31:27 2025 +0200 [FLINK-38211][table] Regenerate description restore tests --- ...-complex-preserves-upsert-key-with-restore.json | 82 ++++++++++----------- .../savepoint/_metadata | Bin 24057 -> 24069 bytes ...our-way-complex-updating-join-with-restore.json | 13 +++- .../savepoint/_metadata | Bin 35513 -> 35527 bytes ...r-way-join-no-common-join-key-with-restore.json | 21 +++++- .../savepoint/_metadata | Bin 38180 -> 38180 bytes .../plan/three-way-inner-join-with-restore.json | 13 +++- .../savepoint/_metadata | Bin 21331 -> 21336 bytes ...way-inner-join-with-ttl-hints-with-restore.json | 2 +- .../savepoint/_metadata | Bin 21743 -> 21743 bytes ...way-join-with-time-attributes-with-restore.json | 13 +++- .../savepoint/_metadata | Bin 23917 -> 23912 bytes .../three-way-left-outer-join-with-restore.json | 13 +++- .../savepoint/_metadata | Bin 21583 -> 21588 bytes ...hree-way-upsert-preserves-key-with-restore.json | 54 +++++++------- .../savepoint/_metadata | Bin 20839 -> 20841 bytes ...eft-join-preserves-upsert-key-with-restore.json | 42 +++++------ .../savepoint/_metadata | Bin 12484 -> 12496 bytes 18 files changed, 157 insertions(+), 96 deletions(-) diff --git a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-complex-preserves-upsert-key-with-restore/plan/four-way-complex-preserves-upsert-key-with-restore.json b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-complex-preserves-upsert-key-with-restore/plan/four-way-complex-preserves-upsert-key-with-restore.json index 905eceda6be..037c4e6afdf 100644 --- a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-complex-preserves-upsert-key-with-restore/plan/four-way-complex-preserves-upsert-key-with-restore.json +++ b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-complex-preserves-upsert-key-with-restore/plan/four-way-complex-preserves-upsert-key-with-restore.json @@ -1,7 +1,7 @@ { "flinkVersion" : "2.2", "nodes" : [ { - "id" : 1, + "id" : 68, "type" : "stream-exec-table-source-scan_1", "scanTableSource" : { "table" : { @@ -27,7 +27,7 @@ "outputType" : "ROW<`user_id_0` VARCHAR(2147483647) NOT NULL, `name` VARCHAR(2147483647)>", "description" : "TableSourceScan(table=[[default_catalog, default_database, Users]], fields=[user_id_0, name])" }, { - "id" : 2, + "id" : 69, "type" : "stream-exec-exchange_1", "inputProperties" : [ { "requiredDistribution" : { @@ -40,7 +40,7 @@ "outputType" : "ROW<`user_id_0` VARCHAR(2147483647) NOT NULL, `name` VARCHAR(2147483647)>", "description" : "Exchange(distribution=[hash[user_id_0]])" }, { - "id" : 3, + "id" : 70, "type" : "stream-exec-table-source-scan_1", "scanTableSource" : { "table" : { @@ -73,7 +73,7 @@ "outputType" : "ROW<`order_id` VARCHAR(2147483647) NOT NULL, `user_id_1` VARCHAR(2147483647) NOT NULL, `product` VARCHAR(2147483647)>", "description" : "TableSourceScan(table=[[default_catalog, default_database, Orders, filter=[]]], fields=[order_id, user_id_1, product])" }, { - "id" : 4, + "id" : 71, "type" : "stream-exec-calc_1", "projection" : [ { "kind" : "INPUT_REF", @@ -105,7 +105,7 @@ "outputType" : "ROW<`order_id` VARCHAR(2147483647) NOT NULL, `user_id_1` VARCHAR(2147483647) NOT NULL>", "description" : "Calc(select=[order_id, user_id_1], where=[product IS NOT NULL])" }, { - "id" : 5, + "id" : 72, "type" : "stream-exec-exchange_1", "inputProperties" : [ { "requiredDistribution" : { @@ -118,7 +118,7 @@ "outputType" : "ROW<`order_id` VARCHAR(2147483647) NOT NULL, `user_id_1` VARCHAR(2147483647) NOT NULL>", "description" : "Exchange(distribution=[hash[user_id_1]])" }, { - "id" : 6, + "id" : 73, "type" : "stream-exec-table-source-scan_1", "scanTableSource" : { "table" : { @@ -151,7 +151,7 @@ "outputType" : "ROW<`payment_id` VARCHAR(2147483647) NOT NULL, `user_id_2` VARCHAR(2147483647) NOT NULL, `price` INT>", "description" : "TableSourceScan(table=[[default_catalog, default_database, Payments, filter=[]]], fields=[payment_id, user_id_2, price])" }, { - "id" : 7, + "id" : 74, "type" : "stream-exec-calc_1", "projection" : [ { "kind" : "INPUT_REF", @@ -187,7 +187,7 @@ "outputType" : "ROW<`payment_id` VARCHAR(2147483647) NOT NULL, `user_id_2` VARCHAR(2147483647) NOT NULL>", "description" : "Calc(select=[payment_id, user_id_2], where=[(price >= 0)])" }, { - "id" : 8, + "id" : 75, "type" : "stream-exec-exchange_1", "inputProperties" : [ { "requiredDistribution" : { @@ -200,7 +200,7 @@ "outputType" : "ROW<`payment_id` VARCHAR(2147483647) NOT NULL, `user_id_2` VARCHAR(2147483647) NOT NULL>", "description" : "Exchange(distribution=[hash[user_id_2]])" }, { - "id" : 9, + "id" : 76, "type" : "stream-exec-table-source-scan_1", "scanTableSource" : { "table" : { @@ -230,7 +230,7 @@ "outputType" : "ROW<`user_id_3` VARCHAR(2147483647) NOT NULL, `location` VARCHAR(2147483647)>", "description" : "TableSourceScan(table=[[default_catalog, default_database, Address, filter=[]]], fields=[user_id_3, location])" }, { - "id" : 10, + "id" : 77, "type" : "stream-exec-calc_1", "projection" : [ { "kind" : "INPUT_REF", @@ -262,7 +262,7 @@ "outputType" : "ROW<`user_id_3` VARCHAR(2147483647) NOT NULL, `location` VARCHAR(2147483647)>", "description" : "Calc(select=[user_id_3, location], where=[location IS NOT NULL])" }, { - "id" : 11, + "id" : 78, "type" : "stream-exec-exchange_1", "inputProperties" : [ { "requiredDistribution" : { @@ -275,7 +275,7 @@ "outputType" : "ROW<`user_id_3` VARCHAR(2147483647) NOT NULL, `location` VARCHAR(2147483647)>", "description" : "Exchange(distribution=[hash[user_id_3]])" }, { - "id" : 12, + "id" : 79, "type" : "stream-exec-multi-join_1", "joinTypes" : [ "INNER", "INNER", "INNER", "INNER" ], "joinConditions" : [ { @@ -458,9 +458,9 @@ "priority" : 3 } ], "outputType" : "ROW<`user_id_0` VARCHAR(2147483647) NOT NULL, `name` VARCHAR(2147483647), `order_id` VARCHAR(2147483647) NOT NULL, `user_id_1` VARCHAR(2147483647) NOT NULL, `payment_id` VARCHAR(2147483647) NOT NULL, `user_id_2` VARCHAR(2147483647) NOT NULL, `user_id_3` VARCHAR(2147483647) NOT NULL, `location` VARCHAR(2147483647)>", - "description" : "MultiJoin(joinFilter=[AND(=($0, $6), =($0, $5), =($0, $3))], joinTypes=[[INNER, INNER, INNER, INNER]], joinConditions=[[true, =($0, $3), =($0, $5), =($0, $6)]], joinAttributeMap=[{0=[LeftInputId:-1;LeftFieldIndex:-1;RightInputId:0;RightFieldIndex:0;, LeftInputId:-1;LeftFieldIndex:-1;RightInputId:0;RightFieldIndex:0;, LeftInputId:-1;LeftFieldIndex:-1;RightInputId:0;RightFieldIndex:0;], 1=[LeftInputId:0;LeftFieldIndex:0;RightInputId:1;RightFieldIndex:1;], 2=[LeftInputI [...] + "description" : "MultiJoin(commonJoinKey=[user_id_0], joinTypes=[INNER, INNER, INNER], inputUniqueKeys=[(user_id_0), (order_id, user_id_1), (payment_id, user_id_2), (user_id_3)], joinConditions=[(user_id_0 = user_id_1), (user_id_0 = user_id_2), (user_id_0 = user_id_3)], select=[user_id_0,name,order_id,user_id_1,payment_id,user_id_2,user_id_3,location], rowType=[RecordType(VARCHAR(2147483647) user_id_0, VARCHAR(2147483647) name, VARCHAR(2147483647) order_id, VARCHAR(2147483647) user_i [...] }, { - "id" : 13, + "id" : 80, "type" : "stream-exec-calc_1", "projection" : [ { "kind" : "INPUT_REF", @@ -502,7 +502,7 @@ "outputType" : "ROW<`user_id_0` VARCHAR(2147483647) NOT NULL, `order_id` VARCHAR(2147483647) NOT NULL, `user_id_1` VARCHAR(2147483647) NOT NULL, `payment_id` VARCHAR(2147483647) NOT NULL, `user_id_2` VARCHAR(2147483647) NOT NULL, `name` VARCHAR(2147483647), `location` VARCHAR(2147483647)>", "description" : "Calc(select=[user_id_0, order_id, user_id_1, payment_id, user_id_2, name, location])" }, { - "id" : 14, + "id" : 81, "type" : "stream-exec-sink_1", "configuration" : { "table.exec.sink.keyed-shuffle" : "AUTO", @@ -560,92 +560,92 @@ "description" : "Sink(table=[default_catalog.default_database.sink], fields=[user_id_0, order_id, user_id_1, payment_id, user_id_2, name, location])" } ], "edges" : [ { - "source" : 1, - "target" : 2, + "source" : 68, + "target" : 69, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 3, - "target" : 4, + "source" : 70, + "target" : 71, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 4, - "target" : 5, + "source" : 71, + "target" : 72, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 6, - "target" : 7, + "source" : 73, + "target" : 74, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 7, - "target" : 8, + "source" : 74, + "target" : 75, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 9, - "target" : 10, + "source" : 76, + "target" : 77, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 10, - "target" : 11, + "source" : 77, + "target" : 78, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 2, - "target" : 12, + "source" : 69, + "target" : 79, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 5, - "target" : 12, + "source" : 72, + "target" : 79, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 8, - "target" : 12, + "source" : 75, + "target" : 79, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 11, - "target" : 12, + "source" : 78, + "target" : 79, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 12, - "target" : 13, + "source" : 79, + "target" : 80, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 13, - "target" : 14, + "source" : 80, + "target" : 81, "shuffle" : { "type" : "FORWARD" }, diff --git a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-complex-preserves-upsert-key-with-restore/savepoint/_metadata b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-complex-preserves-upsert-key-with-restore/savepoint/_metadata index 5005f767c1d..742b3e9fc4b 100644 Binary files a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-complex-preserves-upsert-key-with-restore/savepoint/_metadata and b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-complex-preserves-upsert-key-with-restore/savepoint/_metadata differ diff --git a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-complex-updating-join-with-restore/plan/four-way-complex-updating-join-with-restore.json b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-complex-updating-join-with-restore/plan/four-way-complex-updating-join-with-restore.json index f25678040a6..7da2dc1cdf6 100644 --- a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-complex-updating-join-with-restore/plan/four-way-complex-updating-join-with-restore.json +++ b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-complex-updating-join-with-restore/plan/four-way-complex-updating-join-with-restore.json @@ -380,6 +380,17 @@ "type" : "BOOLEAN" }, "joinAttributeMap" : { + "0" : [ { + "leftInputId" : -1, + "leftFieldIndex" : -1, + "rightInputId" : 0, + "rightFieldIndex" : 1 + }, { + "leftInputId" : -1, + "leftFieldIndex" : -1, + "rightInputId" : 0, + "rightFieldIndex" : 1 + } ], "1" : [ { "leftInputId" : 0, "leftFieldIndex" : 1, @@ -447,7 +458,7 @@ "priority" : 3 } ], "outputType" : "ROW<`name` VARCHAR(2147483647), `user_id_0` VARCHAR(2147483647) NOT NULL, `cash` INT, `order_id` VARCHAR(2147483647), `user_id_1` VARCHAR(2147483647), `user_id_2` VARCHAR(2147483647), `payment_id` VARCHAR(2147483647) NOT NULL, `price` INT, `location` VARCHAR(2147483647), `user_id_3` VARCHAR(2147483647)>", - "description" : "MultiJoin(commonJoinKey=[user_id_0], joinTypes=[INNER, LEFT, INNER, LEFT], inputUniqueKeys=[(user_id_0), (order_id), (payment_id), noUniqueKey], joinConditions=[true, (user_id_0 = user_id_1), ((user_id_0 = user_id_2) AND ((cash >= price) OR (price < 0))), (user_id_2 = user_id_3)], joinFilter=[((user_id_0 = user_id_2) AND ((cash >= price) OR (price < 0)))], select=[name,user_id_0,cash,order_id,user_id_1,user_id_2,payment_id,price,location,user_id_3], outputRowType=[Re [...] + "description" : "MultiJoin(commonJoinKey=[user_id_0], joinTypes=[LEFT, INNER, LEFT], inputUniqueKeys=[(user_id_0), (order_id), (payment_id), noUniqueKey], joinConditions=[(user_id_0 = user_id_1), ((user_id_0 = user_id_2) AND ((cash >= price) OR (price < 0))), (user_id_2 = user_id_3)], select=[name,user_id_0,cash,order_id,user_id_1,user_id_2,payment_id,price,location,user_id_3], rowType=[RecordType(VARCHAR(2147483647) name, VARCHAR(2147483647) user_id_0, INTEGER cash, VARCHAR(21474836 [...] }, { "id" : 30, "type" : "stream-exec-calc_1", diff --git a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-complex-updating-join-with-restore/savepoint/_metadata b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-complex-updating-join-with-restore/savepoint/_metadata index d7a9f9d0137..726814add3e 100644 Binary files a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-complex-updating-join-with-restore/savepoint/_metadata and b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-complex-updating-join-with-restore/savepoint/_metadata differ diff --git a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-join-no-common-join-key-with-restore/plan/four-way-join-no-common-join-key-with-restore.json b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-join-no-common-join-key-with-restore/plan/four-way-join-no-common-join-key-with-restore.json index e0ab1634be5..2b2930725b8 100644 --- a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-join-no-common-join-key-with-restore/plan/four-way-join-no-common-join-key-with-restore.json +++ b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-join-no-common-join-key-with-restore/plan/four-way-join-no-common-join-key-with-restore.json @@ -262,6 +262,17 @@ "type" : "BOOLEAN" }, "joinAttributeMap" : { + "0" : [ { + "leftInputId" : -1, + "leftFieldIndex" : -1, + "rightInputId" : 0, + "rightFieldIndex" : 1 + }, { + "leftInputId" : -1, + "leftFieldIndex" : -1, + "rightInputId" : 0, + "rightFieldIndex" : 1 + } ], "1" : [ { "leftInputId" : 0, "leftFieldIndex" : 1, @@ -312,7 +323,7 @@ "priority" : 2 } ], "outputType" : "ROW<`name` VARCHAR(2147483647), `user_id_0` VARCHAR(2147483647) NOT NULL, `order_id` VARCHAR(2147483647), `user_id_1` VARCHAR(2147483647), `user_id_2` VARCHAR(2147483647), `payment_id` VARCHAR(2147483647) NOT NULL>", - "description" : "MultiJoin(commonJoinKey=[user_id_0], joinTypes=[INNER, LEFT, INNER], inputUniqueKeys=[(user_id_0), (order_id), (payment_id)], joinConditions=[true, (user_id_0 = user_id_1), (user_id_0 = user_id_2)], joinFilter=[(user_id_0 = user_id_2)], select=[name,user_id_0,order_id,user_id_1,user_id_2,payment_id], outputRowType=[RecordType(VARCHAR(2147483647) name, VARCHAR(2147483647) user_id_0, VARCHAR(2147483647) order_id, VARCHAR(2147483647) user_id_1, VARCHAR(2147483647) user_ [...] + "description" : "MultiJoin(commonJoinKey=[user_id_0], joinTypes=[LEFT, INNER], inputUniqueKeys=[(user_id_0), (order_id), (payment_id)], joinConditions=[(user_id_0 = user_id_1), (user_id_0 = user_id_2)], select=[name,user_id_0,order_id,user_id_1,user_id_2,payment_id], rowType=[RecordType(VARCHAR(2147483647) name, VARCHAR(2147483647) user_id_0, VARCHAR(2147483647) order_id, VARCHAR(2147483647) user_id_1, VARCHAR(2147483647) user_id_2, VARCHAR(2147483647) payment_id)])" }, { "id" : 41, "type" : "stream-exec-calc_1", @@ -429,6 +440,12 @@ "type" : "BOOLEAN" }, "joinAttributeMap" : { + "0" : [ { + "leftInputId" : -1, + "leftFieldIndex" : -1, + "rightInputId" : 0, + "rightFieldIndex" : 3 + } ], "1" : [ { "leftInputId" : 0, "leftFieldIndex" : 3, @@ -462,7 +479,7 @@ "priority" : 1 } ], "outputType" : "ROW<`name` VARCHAR(2147483647), `user_id_0` VARCHAR(2147483647) NOT NULL, `order_id` VARCHAR(2147483647), `payment_id` VARCHAR(2147483647) NOT NULL, `location` VARCHAR(2147483647), `user_id_3` VARCHAR(2147483647)>", - "description" : "MultiJoin(commonJoinKey=[payment_id], joinTypes=[INNER, LEFT], inputUniqueKeys=[noUniqueKey, noUniqueKey], joinConditions=[true, (payment_id = user_id_3)], joinFilter=[true], select=[name,user_id_0,order_id,payment_id,location,user_id_3], outputRowType=[RecordType(VARCHAR(2147483647) name, VARCHAR(2147483647) user_id_0, VARCHAR(2147483647) order_id, VARCHAR(2147483647) payment_id, VARCHAR(2147483647) location, VARCHAR(2147483647) user_id_3)])" + "description" : "MultiJoin(commonJoinKey=[payment_id], joinTypes=[LEFT], inputUniqueKeys=[noUniqueKey, noUniqueKey], joinConditions=[(payment_id = user_id_3)], select=[name,user_id_0,order_id,payment_id,location,user_id_3], rowType=[RecordType(VARCHAR(2147483647) name, VARCHAR(2147483647) user_id_0, VARCHAR(2147483647) order_id, VARCHAR(2147483647) payment_id, VARCHAR(2147483647) location, VARCHAR(2147483647) user_id_3)])" }, { "id" : 46, "type" : "stream-exec-calc_1", diff --git a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-join-no-common-join-key-with-restore/savepoint/_metadata b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-join-no-common-join-key-with-restore/savepoint/_metadata index 60cec499366..e9f406aa175 100644 Binary files a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-join-no-common-join-key-with-restore/savepoint/_metadata and b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/four-way-join-no-common-join-key-with-restore/savepoint/_metadata differ diff --git a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-inner-join-with-restore/plan/three-way-inner-join-with-restore.json b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-inner-join-with-restore/plan/three-way-inner-join-with-restore.json index b1cd1345b66..4b00a7d9410 100644 --- a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-inner-join-with-restore/plan/three-way-inner-join-with-restore.json +++ b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-inner-join-with-restore/plan/three-way-inner-join-with-restore.json @@ -175,6 +175,17 @@ "type" : "BOOLEAN" }, "joinAttributeMap" : { + "0" : [ { + "leftInputId" : -1, + "leftFieldIndex" : -1, + "rightInputId" : 0, + "rightFieldIndex" : 0 + }, { + "leftInputId" : -1, + "leftFieldIndex" : -1, + "rightInputId" : 0, + "rightFieldIndex" : 0 + } ], "1" : [ { "leftInputId" : 0, "leftFieldIndex" : 0, @@ -225,7 +236,7 @@ "priority" : 2 } ], "outputType" : "ROW<`user_id` VARCHAR(2147483647), `name` VARCHAR(2147483647), `user_id0` VARCHAR(2147483647), `order_id` VARCHAR(2147483647), `user_id1` VARCHAR(2147483647), `payment_id` VARCHAR(2147483647)>", - "description" : "MultiJoin(commonJoinKey=[user_id], joinTypes=[INNER, INNER, INNER], inputUniqueKeys=[noUniqueKey, noUniqueKey, noUniqueKey], joinConditions=[true, (user_id = user_id0), (user_id = user_id1)], joinFilter=[((user_id = user_id1) AND (user_id = user_id0))], select=[user_id,name,user_id0,order_id,user_id1,payment_id], outputRowType=[RecordType(VARCHAR(2147483647) user_id, VARCHAR(2147483647) name, VARCHAR(2147483647) user_id0, VARCHAR(2147483647) order_id, VARCHAR(2147483 [...] + "description" : "MultiJoin(commonJoinKey=[user_id], joinTypes=[INNER, INNER], inputUniqueKeys=[noUniqueKey, noUniqueKey, noUniqueKey], joinConditions=[(user_id = user_id0), (user_id = user_id1)], select=[user_id,name,user_id0,order_id,user_id1,payment_id], rowType=[RecordType(VARCHAR(2147483647) user_id, VARCHAR(2147483647) name, VARCHAR(2147483647) user_id0, VARCHAR(2147483647) order_id, VARCHAR(2147483647) user_id1, VARCHAR(2147483647) payment_id)])" }, { "id" : 8, "type" : "stream-exec-calc_1", diff --git a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-inner-join-with-restore/savepoint/_metadata b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-inner-join-with-restore/savepoint/_metadata index 7004ae3c1cb..e2234d5cade 100644 Binary files a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-inner-join-with-restore/savepoint/_metadata and b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-inner-join-with-restore/savepoint/_metadata differ diff --git a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-inner-join-with-ttl-hints-with-restore/plan/three-way-inner-join-with-ttl-hints-with-restore.json b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-inner-join-with-ttl-hints-with-restore/plan/three-way-inner-join-with-ttl-hints-with-restore.json index 4c85b95a98e..f44731007c4 100644 --- a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-inner-join-with-ttl-hints-with-restore/plan/three-way-inner-join-with-ttl-hints-with-restore.json +++ b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-inner-join-with-ttl-hints-with-restore/plan/three-way-inner-join-with-ttl-hints-with-restore.json @@ -236,7 +236,7 @@ "priority" : 2 } ], "outputType" : "ROW<`user_id` VARCHAR(2147483647), `name` VARCHAR(2147483647), `user_id0` VARCHAR(2147483647), `order_id` VARCHAR(2147483647), `user_id1` VARCHAR(2147483647), `payment_id` VARCHAR(2147483647)>", - "description" : "MultiJoin(joinFilter=[AND(=($0, $4), =($0, $2))], joinTypes=[[INNER, INNER, INNER]], joinConditions=[[true, =($0, $2), =($0, $4)]], joinAttributeMap=[{0=[LeftInputId:-1;LeftFieldIndex:-1;RightInputId:0;RightFieldIndex:0;, LeftInputId:-1;LeftFieldIndex:-1;RightInputId:0;RightFieldIndex:0;], 1=[LeftInputId:0;LeftFieldIndex:0;RightInputId:1;RightFieldIndex:0;], 2=[LeftInputId:0;LeftFieldIndex:0;RightInputId:2;RightFieldIndex:0;]}], select=[user_id,name,user_id0,order_id [...] + "description" : "MultiJoin(commonJoinKey=[user_id], joinTypes=[INNER, INNER], inputUniqueKeys=[noUniqueKey, noUniqueKey, noUniqueKey], stateTtlHints=[[[STATE_TTL options:[1d, 0s, 2d]]]], joinConditions=[(user_id = user_id0), (user_id = user_id1)], select=[user_id,name,user_id0,order_id,user_id1,payment_id], rowType=[RecordType(VARCHAR(2147483647) user_id, VARCHAR(2147483647) name, VARCHAR(2147483647) user_id0, VARCHAR(2147483647) order_id, VARCHAR(2147483647) user_id1, VARCHAR(214748 [...] }, { "id" : 66, "type" : "stream-exec-calc_1", diff --git a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-inner-join-with-ttl-hints-with-restore/savepoint/_metadata b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-inner-join-with-ttl-hints-with-restore/savepoint/_metadata index 390abae01b9..a9143ca6973 100644 Binary files a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-inner-join-with-ttl-hints-with-restore/savepoint/_metadata and b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-inner-join-with-ttl-hints-with-restore/savepoint/_metadata differ diff --git a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-join-with-time-attributes-with-restore/plan/three-way-join-with-time-attributes-with-restore.json b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-join-with-time-attributes-with-restore/plan/three-way-join-with-time-attributes-with-restore.json index a7dd1890952..dd64efa2ed9 100644 --- a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-join-with-time-attributes-with-restore/plan/three-way-join-with-time-attributes-with-restore.json +++ b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-join-with-time-attributes-with-restore/plan/three-way-join-with-time-attributes-with-restore.json @@ -307,6 +307,17 @@ "type" : "BOOLEAN" }, "joinAttributeMap" : { + "0" : [ { + "leftInputId" : -1, + "leftFieldIndex" : -1, + "rightInputId" : 0, + "rightFieldIndex" : 0 + }, { + "leftInputId" : -1, + "leftFieldIndex" : -1, + "rightInputId" : 0, + "rightFieldIndex" : 0 + } ], "1" : [ { "leftInputId" : 0, "leftFieldIndex" : 0, @@ -357,7 +368,7 @@ "priority" : 2 } ], "outputType" : "ROW<`user_id_0` VARCHAR(2147483647) NOT NULL, `name` VARCHAR(2147483647), `order_id` VARCHAR(2147483647) NOT NULL, `user_id_1` VARCHAR(2147483647), `rowtime` TIMESTAMP(3), `price` INT, `user_id_2` VARCHAR(2147483647)>", - "description" : "MultiJoin(commonJoinKey=[user_id_0], joinTypes=[INNER, INNER, INNER], inputUniqueKeys=[(user_id_0), (order_id), noUniqueKey], joinConditions=[true, (user_id_0 = user_id_1), (user_id_0 = user_id_2)], joinFilter=[((user_id_0 = user_id_2) AND (user_id_0 = user_id_1))], select=[user_id_0,name,order_id,user_id_1,rowtime,price,user_id_2], outputRowType=[RecordType(VARCHAR(2147483647) user_id_0, VARCHAR(2147483647) name, VARCHAR(2147483647) order_id, VARCHAR(2147483647) use [...] + "description" : "MultiJoin(commonJoinKey=[user_id_0], joinTypes=[INNER, INNER], inputUniqueKeys=[(user_id_0), (order_id), noUniqueKey], joinConditions=[(user_id_0 = user_id_1), (user_id_0 = user_id_2)], select=[user_id_0,name,order_id,user_id_1,rowtime,price,user_id_2], rowType=[RecordType(VARCHAR(2147483647) user_id_0, VARCHAR(2147483647) name, VARCHAR(2147483647) order_id, VARCHAR(2147483647) user_id_1, TIMESTAMP(3) rowtime, INTEGER price, VARCHAR(2147483647) user_id_2)])" }, { "id" : 57, "type" : "stream-exec-calc_1", diff --git a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-join-with-time-attributes-with-restore/savepoint/_metadata b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-join-with-time-attributes-with-restore/savepoint/_metadata index 5faf4cbb499..6f757f0178c 100644 Binary files a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-join-with-time-attributes-with-restore/savepoint/_metadata and b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-join-with-time-attributes-with-restore/savepoint/_metadata differ diff --git a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-left-outer-join-with-restore/plan/three-way-left-outer-join-with-restore.json b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-left-outer-join-with-restore/plan/three-way-left-outer-join-with-restore.json index 258fca068dc..4684d76de04 100644 --- a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-left-outer-join-with-restore/plan/three-way-left-outer-join-with-restore.json +++ b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-left-outer-join-with-restore/plan/three-way-left-outer-join-with-restore.json @@ -175,6 +175,17 @@ "type" : "BOOLEAN" }, "joinAttributeMap" : { + "0" : [ { + "leftInputId" : -1, + "leftFieldIndex" : -1, + "rightInputId" : 0, + "rightFieldIndex" : 0 + }, { + "leftInputId" : -1, + "leftFieldIndex" : -1, + "rightInputId" : 0, + "rightFieldIndex" : 0 + } ], "1" : [ { "leftInputId" : 0, "leftFieldIndex" : 0, @@ -225,7 +236,7 @@ "priority" : 2 } ], "outputType" : "ROW<`user_id` VARCHAR(2147483647), `name` VARCHAR(2147483647), `user_id0` VARCHAR(2147483647), `order_id` VARCHAR(2147483647), `user_id1` VARCHAR(2147483647), `payment_id` VARCHAR(2147483647)>", - "description" : "MultiJoin(commonJoinKey=[user_id], joinTypes=[INNER, LEFT, LEFT], inputUniqueKeys=[noUniqueKey, noUniqueKey, noUniqueKey], joinConditions=[true, (user_id = user_id0), (user_id = user_id1)], joinFilter=[true], select=[user_id,name,user_id0,order_id,user_id1,payment_id], outputRowType=[RecordType(VARCHAR(2147483647) user_id, VARCHAR(2147483647) name, VARCHAR(2147483647) user_id0, VARCHAR(2147483647) order_id, VARCHAR(2147483647) user_id1, VARCHAR(2147483647) payment_id)])" + "description" : "MultiJoin(commonJoinKey=[user_id], joinTypes=[LEFT, LEFT], inputUniqueKeys=[noUniqueKey, noUniqueKey, noUniqueKey], joinConditions=[(user_id = user_id0), (user_id = user_id1)], select=[user_id,name,user_id0,order_id,user_id1,payment_id], rowType=[RecordType(VARCHAR(2147483647) user_id, VARCHAR(2147483647) name, VARCHAR(2147483647) user_id0, VARCHAR(2147483647) order_id, VARCHAR(2147483647) user_id1, VARCHAR(2147483647) payment_id)])" }, { "id" : 17, "type" : "stream-exec-calc_1", diff --git a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-left-outer-join-with-restore/savepoint/_metadata b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-left-outer-join-with-restore/savepoint/_metadata index 585903d8128..ce1481c26cb 100644 Binary files a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-left-outer-join-with-restore/savepoint/_metadata and b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-left-outer-join-with-restore/savepoint/_metadata differ diff --git a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-upsert-preserves-key-with-restore/plan/three-way-upsert-preserves-key-with-restore.json b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-upsert-preserves-key-with-restore/plan/three-way-upsert-preserves-key-with-restore.json index 7d7e110abe6..45bbdbcb0ec 100644 --- a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-upsert-preserves-key-with-restore/plan/three-way-upsert-preserves-key-with-restore.json +++ b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-upsert-preserves-key-with-restore/plan/three-way-upsert-preserves-key-with-restore.json @@ -1,7 +1,7 @@ { "flinkVersion" : "2.2", "nodes" : [ { - "id" : 8, + "id" : 89, "type" : "stream-exec-table-source-scan_1", "scanTableSource" : { "table" : { @@ -39,7 +39,7 @@ "outputType" : "ROW<`user_id` INT NOT NULL, `description` VARCHAR(2147483647)>", "description" : "TableSourceScan(table=[[default_catalog, default_database, Users, project=[user_id, description], metadata=[]]], fields=[user_id, description])" }, { - "id" : 9, + "id" : 90, "type" : "stream-exec-exchange_1", "inputProperties" : [ { "requiredDistribution" : { @@ -52,7 +52,7 @@ "outputType" : "ROW<`user_id` INT NOT NULL, `description` VARCHAR(2147483647)>", "description" : "Exchange(distribution=[hash[user_id]])" }, { - "id" : 10, + "id" : 91, "type" : "stream-exec-table-source-scan_1", "scanTableSource" : { "table" : { @@ -90,7 +90,7 @@ "outputType" : "ROW<`user_id` INT NOT NULL, `order_id` BIGINT NOT NULL>", "description" : "TableSourceScan(table=[[default_catalog, default_database, Orders, project=[user_id, order_id], metadata=[]]], fields=[user_id, order_id])" }, { - "id" : 11, + "id" : 92, "type" : "stream-exec-exchange_1", "inputProperties" : [ { "requiredDistribution" : { @@ -103,7 +103,7 @@ "outputType" : "ROW<`user_id` INT NOT NULL, `order_id` BIGINT NOT NULL>", "description" : "Exchange(distribution=[hash[user_id]])" }, { - "id" : 12, + "id" : 93, "type" : "stream-exec-table-source-scan_1", "scanTableSource" : { "table" : { @@ -141,7 +141,7 @@ "outputType" : "ROW<`user_id` INT NOT NULL, `payment_id` BIGINT NOT NULL>", "description" : "TableSourceScan(table=[[default_catalog, default_database, Payments, project=[user_id, payment_id], metadata=[]]], fields=[user_id, payment_id])" }, { - "id" : 13, + "id" : 94, "type" : "stream-exec-exchange_1", "inputProperties" : [ { "requiredDistribution" : { @@ -154,7 +154,7 @@ "outputType" : "ROW<`user_id` INT NOT NULL, `payment_id` BIGINT NOT NULL>", "description" : "Exchange(distribution=[hash[user_id]])" }, { - "id" : 14, + "id" : 95, "type" : "stream-exec-multi-join_1", "joinTypes" : [ "INNER", "INNER", "INNER" ], "joinConditions" : [ { @@ -282,9 +282,9 @@ "priority" : 2 } ], "outputType" : "ROW<`user_id` INT NOT NULL, `description` VARCHAR(2147483647), `user_id0` INT NOT NULL, `order_id` BIGINT NOT NULL, `user_id1` INT NOT NULL, `payment_id` BIGINT NOT NULL>", - "description" : "MultiJoin(joinFilter=[AND(=($2, $4), =($2, $0))], joinTypes=[[INNER, INNER, INNER]], joinConditions=[[true, =($2, $0), =($2, $4)]], joinAttributeMap=[{0=[LeftInputId:-1;LeftFieldIndex:-1;RightInputId:0;RightFieldIndex:0;], 1=[LeftInputId:0;LeftFieldIndex:0;RightInputId:1;RightFieldIndex:0;], 2=[LeftInputId:1;LeftFieldIndex:0;RightInputId:2;RightFieldIndex:0;]}], select=[user_id,description,user_id0,order_id,user_id1,payment_id], rowType=[RecordType(INTEGER user_id, V [...] + "description" : "MultiJoin(commonJoinKey=[user_id], joinTypes=[INNER, INNER], inputUniqueKeys=[(user_id), (user_id, order_id), (user_id, payment_id)], joinConditions=[(user_id0 = user_id), (user_id0 = user_id1)], select=[user_id,description,user_id0,order_id,user_id1,payment_id], rowType=[RecordType(INTEGER user_id, VARCHAR(2147483647) description, INTEGER user_id0, BIGINT order_id, INTEGER user_id1, BIGINT payment_id)])" }, { - "id" : 15, + "id" : 96, "type" : "stream-exec-calc_1", "projection" : [ { "kind" : "INPUT_REF", @@ -322,7 +322,7 @@ "outputType" : "ROW<`user_id` INT NOT NULL, `order_id` BIGINT NOT NULL, `user_id0` INT NOT NULL, `payment_id` BIGINT NOT NULL, `user_id1` INT NOT NULL, `description` VARCHAR(2147483647)>", "description" : "Calc(select=[user_id0 AS user_id, order_id, user_id1 AS user_id0, payment_id, user_id AS user_id1, description])" }, { - "id" : 16, + "id" : 97, "type" : "stream-exec-sink_1", "configuration" : { "table.exec.sink.keyed-shuffle" : "AUTO", @@ -364,7 +364,7 @@ } } }, - "inputChangelogMode" : [ "INSERT", "UPDATE_AFTER", "DELETE" ], + "inputChangelogMode" : [ "INSERT", "UPDATE_AFTER", "~DELETE" ], "inputUpsertKey" : [ 0, 1, 2, 3 ], "inputProperties" : [ { "requiredDistribution" : { @@ -377,57 +377,57 @@ "description" : "Sink(table=[default_catalog.default_database.sink], fields=[user_id, order_id, user_id0, payment_id, user_id1, description])" } ], "edges" : [ { - "source" : 8, - "target" : 9, + "source" : 89, + "target" : 90, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 10, - "target" : 11, + "source" : 91, + "target" : 92, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 12, - "target" : 13, + "source" : 93, + "target" : 94, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 9, - "target" : 14, + "source" : 90, + "target" : 95, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 11, - "target" : 14, + "source" : 92, + "target" : 95, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 13, - "target" : 14, + "source" : 94, + "target" : 95, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 14, - "target" : 15, + "source" : 95, + "target" : 96, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 15, - "target" : 16, + "source" : 96, + "target" : 97, "shuffle" : { "type" : "FORWARD" }, diff --git a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-upsert-preserves-key-with-restore/savepoint/_metadata b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-upsert-preserves-key-with-restore/savepoint/_metadata index 43c8c803b59..42eb977bb84 100644 Binary files a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-upsert-preserves-key-with-restore/savepoint/_metadata and b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/three-way-upsert-preserves-key-with-restore/savepoint/_metadata differ diff --git a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/two-way-left-join-preserves-upsert-key-with-restore/plan/two-way-left-join-preserves-upsert-key-with-restore.json b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/two-way-left-join-preserves-upsert-key-with-restore/plan/two-way-left-join-preserves-upsert-key-with-restore.json index 1b8b16172e1..ff7446857f8 100644 --- a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/two-way-left-join-preserves-upsert-key-with-restore/plan/two-way-left-join-preserves-upsert-key-with-restore.json +++ b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/two-way-left-join-preserves-upsert-key-with-restore/plan/two-way-left-join-preserves-upsert-key-with-restore.json @@ -1,7 +1,7 @@ { "flinkVersion" : "2.2", "nodes" : [ { - "id" : 1, + "id" : 82, "type" : "stream-exec-table-source-scan_1", "scanTableSource" : { "table" : { @@ -30,7 +30,7 @@ "outputType" : "ROW<`user_id` INT NOT NULL, `order_id` BIGINT NOT NULL, `product` VARCHAR(2147483647)>", "description" : "TableSourceScan(table=[[default_catalog, default_database, Orders]], fields=[user_id, order_id, product])" }, { - "id" : 2, + "id" : 83, "type" : "stream-exec-exchange_1", "inputProperties" : [ { "requiredDistribution" : { @@ -43,7 +43,7 @@ "outputType" : "ROW<`user_id` INT NOT NULL, `order_id` BIGINT NOT NULL, `product` VARCHAR(2147483647)>", "description" : "Exchange(distribution=[hash[user_id]])" }, { - "id" : 3, + "id" : 84, "type" : "stream-exec-table-source-scan_1", "scanTableSource" : { "table" : { @@ -81,7 +81,7 @@ "outputType" : "ROW<`user_id` INT NOT NULL, `shard_id` INT NOT NULL>", "description" : "TableSourceScan(table=[[default_catalog, default_database, Users, project=[user_id, shard_id], metadata=[]]], fields=[user_id, shard_id])" }, { - "id" : 4, + "id" : 85, "type" : "stream-exec-exchange_1", "inputProperties" : [ { "requiredDistribution" : { @@ -94,7 +94,7 @@ "outputType" : "ROW<`user_id` INT NOT NULL, `shard_id` INT NOT NULL>", "description" : "Exchange(distribution=[hash[user_id]])" }, { - "id" : 5, + "id" : 86, "type" : "stream-exec-multi-join_1", "joinTypes" : [ "INNER", "LEFT" ], "joinConditions" : [ { @@ -171,9 +171,9 @@ "priority" : 1 } ], "outputType" : "ROW<`user_id` INT NOT NULL, `order_id` BIGINT NOT NULL, `product` VARCHAR(2147483647), `user_id0` INT, `shard_id` INT>", - "description" : "MultiJoin(joinFilter=[true], joinTypes=[[INNER, LEFT]], joinConditions=[[true, =($3, $0)]], joinAttributeMap=[{0=[LeftInputId:-1;LeftFieldIndex:-1;RightInputId:0;RightFieldIndex:0;], 1=[LeftInputId:0;LeftFieldIndex:0;RightInputId:1;RightFieldIndex:0;]}], select=[user_id,order_id,product,user_id0,shard_id], rowType=[RecordType(INTEGER user_id, BIGINT order_id, VARCHAR(2147483647) product, INTEGER user_id0, INTEGER shard_id)])" + "description" : "MultiJoin(commonJoinKey=[user_id], joinTypes=[LEFT], inputUniqueKeys=[(user_id, order_id), (user_id)], joinConditions=[(user_id0 = user_id)], select=[user_id,order_id,product,user_id0,shard_id], rowType=[RecordType(INTEGER user_id, BIGINT order_id, VARCHAR(2147483647) product, INTEGER user_id0, INTEGER shard_id)])" }, { - "id" : 6, + "id" : 87, "type" : "stream-exec-calc_1", "projection" : [ { "kind" : "INPUT_REF", @@ -203,7 +203,7 @@ "outputType" : "ROW<`user_id` INT NOT NULL, `order_id` BIGINT NOT NULL, `product` VARCHAR(2147483647), `shard_id` INT>", "description" : "Calc(select=[user_id, order_id, product, shard_id])" }, { - "id" : 7, + "id" : 88, "type" : "stream-exec-sink_1", "configuration" : { "table.exec.sink.keyed-shuffle" : "AUTO", @@ -239,7 +239,7 @@ } } }, - "inputChangelogMode" : [ "INSERT", "UPDATE_AFTER", "DELETE" ], + "inputChangelogMode" : [ "INSERT", "UPDATE_AFTER", "~DELETE" ], "inputUpsertKey" : [ 0, 1 ], "inputProperties" : [ { "requiredDistribution" : { @@ -252,43 +252,43 @@ "description" : "Sink(table=[default_catalog.default_database.sink], fields=[user_id, order_id, product, shard_id])" } ], "edges" : [ { - "source" : 1, - "target" : 2, + "source" : 82, + "target" : 83, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 3, - "target" : 4, + "source" : 84, + "target" : 85, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 2, - "target" : 5, + "source" : 83, + "target" : 86, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 4, - "target" : 5, + "source" : 85, + "target" : 86, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 5, - "target" : 6, + "source" : 86, + "target" : 87, "shuffle" : { "type" : "FORWARD" }, "shuffleMode" : "PIPELINED" }, { - "source" : 6, - "target" : 7, + "source" : 87, + "target" : 88, "shuffle" : { "type" : "FORWARD" }, diff --git a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/two-way-left-join-preserves-upsert-key-with-restore/savepoint/_metadata b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/two-way-left-join-preserves-upsert-key-with-restore/savepoint/_metadata index e601e1672c6..0bda1243b2c 100644 Binary files a/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/two-way-left-join-preserves-upsert-key-with-restore/savepoint/_metadata and b/flink-table/flink-table-planner/src/test/resources/restore-tests/stream-exec-multi-join_1/two-way-left-join-preserves-upsert-key-with-restore/savepoint/_metadata differ
