This is an automated email from the ASF dual-hosted git repository.
twalthr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push:
new 5d4a191c172 [FLINK-38251][table-planner] Enable restore tests again
5d4a191c172 is described below
commit 5d4a191c172f094760cd299634036b9adce38f16
Author: Gustavo de Morais <gdemor...@confluent.io>
AuthorDate: Fri Aug 15 10:36:50 2025 +0100
[FLINK-38251][table-planner] Enable restore tests again
This closes #26905.
---
.../nodes/exec/stream/MultiJoinTestPrograms.java | 7 +--
...our-way-complex-updating-join-with-restore.json | 28 ++++++++++++
.../savepoint/_metadata | Bin 35375 -> 35513 bytes
...r-way-join-no-common-join-key-with-restore.json | 49 ++++++++++++++++++---
.../savepoint/_metadata | Bin 38180 -> 38180 bytes
.../plan/three-way-inner-join-with-restore.json | 4 +-
.../savepoint/_metadata | Bin 21331 -> 21331 bytes
...way-join-with-time-attributes-with-restore.json | 4 +-
.../savepoint/_metadata | Bin 23917 -> 23917 bytes
.../three-way-left-outer-join-with-restore.json | 35 +++++++++++++++
.../savepoint/_metadata | Bin 21588 -> 21583 bytes
11 files changed, 113 insertions(+), 14 deletions(-)
diff --git
a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/MultiJoinTestPrograms.java
b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/MultiJoinTestPrograms.java
index 4429324f070..71e0458c4f3 100644
---
a/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/MultiJoinTestPrograms.java
+++
b/flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/nodes/exec/stream/MultiJoinTestPrograms.java
@@ -19,7 +19,6 @@
package org.apache.flink.table.planner.plan.nodes.exec.stream;
import org.apache.flink.table.api.config.OptimizerConfigOptions;
-import org.apache.flink.table.api.config.TableConfigOptions;
import org.apache.flink.table.test.program.SinkTestStep;
import org.apache.flink.table.test.program.SourceTestStep;
import org.apache.flink.table.test.program.TableTestProgram;
@@ -276,6 +275,7 @@ public class MultiJoinTestPrograms {
TableTestProgram.of(
"three-way-left-outer-join-with-restore",
"three way left outer join with restore")
+
.setupConfig(OptimizerConfigOptions.TABLE_OPTIMIZER_MULTI_JOIN_ENABLED, true)
.setupTableSource(
SourceTestStep.newBuilder("Users")
.addSchema("user_id STRING", "name STRING")
@@ -329,6 +329,7 @@ public class MultiJoinTestPrograms {
TableTestProgram.of(
"three-way-inner-join-with-restore",
"three way inner join with restore")
+
.setupConfig(OptimizerConfigOptions.TABLE_OPTIMIZER_MULTI_JOIN_ENABLED, true)
.setupTableSource(
SourceTestStep.newBuilder("Users")
.addSchema("user_id STRING", "name STRING")
@@ -454,7 +455,7 @@ public class MultiJoinTestPrograms {
TableTestProgram.of(
"four-way-join-no-common-join-key-with-restore",
"four way join no common join key with restore")
- .setupConfig(TableConfigOptions.PLAN_FORCE_RECOMPILE, true)
+
.setupConfig(OptimizerConfigOptions.TABLE_OPTIMIZER_MULTI_JOIN_ENABLED, true)
.setupTableSource(
SourceTestStep.newBuilder("Users")
.addSchema(
@@ -665,7 +666,7 @@ public class MultiJoinTestPrograms {
TableTestProgram.of(
"four-way-complex-updating-join-with-restore",
"four way complex updating join with restore")
- .setupConfig(TableConfigOptions.PLAN_FORCE_RECOMPILE, true)
+
.setupConfig(OptimizerConfigOptions.TABLE_OPTIMIZER_MULTI_JOIN_ENABLED, true)
.setupTableSource(
SourceTestStep.newBuilder("Users")
.addSchema(
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 47c36634cfe..1976c12bf92 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
@@ -301,6 +301,20 @@
"syntax" : "BINARY",
"internalName" : "$AND$1",
"operands" : [ {
+ "kind" : "CALL",
+ "syntax" : "BINARY",
+ "internalName" : "$=$1",
+ "operands" : [ {
+ "kind" : "INPUT_REF",
+ "inputIndex" : 1,
+ "type" : "VARCHAR(2147483647) NOT NULL"
+ }, {
+ "kind" : "INPUT_REF",
+ "inputIndex" : 4,
+ "type" : "VARCHAR(2147483647)"
+ } ],
+ "type" : "BOOLEAN"
+ }, {
"kind" : "CALL",
"syntax" : "BINARY",
"internalName" : "$=$1",
@@ -348,6 +362,20 @@
"type" : "BOOLEAN"
} ],
"type" : "BOOLEAN"
+ }, {
+ "kind" : "CALL",
+ "syntax" : "BINARY",
+ "internalName" : "$=$1",
+ "operands" : [ {
+ "kind" : "INPUT_REF",
+ "inputIndex" : 5,
+ "type" : "VARCHAR(2147483647)"
+ }, {
+ "kind" : "INPUT_REF",
+ "inputIndex" : 9,
+ "type" : "VARCHAR(2147483647)"
+ } ],
+ "type" : "BOOLEAN"
} ],
"type" : "BOOLEAN"
},
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 061d0b08163..d7a9f9d0137 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 0614a6c49f5..596942d5eea 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
@@ -229,15 +229,35 @@
"multiJoinCondition" : {
"kind" : "CALL",
"syntax" : "BINARY",
- "internalName" : "$=$1",
+ "internalName" : "$AND$1",
"operands" : [ {
- "kind" : "INPUT_REF",
- "inputIndex" : 1,
- "type" : "VARCHAR(2147483647) NOT NULL"
+ "kind" : "CALL",
+ "syntax" : "BINARY",
+ "internalName" : "$=$1",
+ "operands" : [ {
+ "kind" : "INPUT_REF",
+ "inputIndex" : 1,
+ "type" : "VARCHAR(2147483647) NOT NULL"
+ }, {
+ "kind" : "INPUT_REF",
+ "inputIndex" : 3,
+ "type" : "VARCHAR(2147483647)"
+ } ],
+ "type" : "BOOLEAN"
}, {
- "kind" : "INPUT_REF",
- "inputIndex" : 4,
- "type" : "VARCHAR(2147483647)"
+ "kind" : "CALL",
+ "syntax" : "BINARY",
+ "internalName" : "$=$1",
+ "operands" : [ {
+ "kind" : "INPUT_REF",
+ "inputIndex" : 1,
+ "type" : "VARCHAR(2147483647) NOT NULL"
+ }, {
+ "kind" : "INPUT_REF",
+ "inputIndex" : 4,
+ "type" : "VARCHAR(2147483647)"
+ } ],
+ "type" : "BOOLEAN"
} ],
"type" : "BOOLEAN"
},
@@ -393,6 +413,21 @@
} ],
"type" : "BOOLEAN"
} ],
+ "multiJoinCondition" : {
+ "kind" : "CALL",
+ "syntax" : "BINARY",
+ "internalName" : "$=$1",
+ "operands" : [ {
+ "kind" : "INPUT_REF",
+ "inputIndex" : 3,
+ "type" : "VARCHAR(2147483647) NOT NULL"
+ }, {
+ "kind" : "INPUT_REF",
+ "inputIndex" : 5,
+ "type" : "VARCHAR(2147483647)"
+ } ],
+ "type" : "BOOLEAN"
+ },
"joinAttributeMap" : {
"1" : [ {
"leftInputId" : 0,
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 f53211043d6..60cec499366 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 1d63921f3c6..8c6259fcd1e 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
@@ -153,7 +153,7 @@
"type" : "VARCHAR(2147483647)"
}, {
"kind" : "INPUT_REF",
- "inputIndex" : 4,
+ "inputIndex" : 2,
"type" : "VARCHAR(2147483647)"
} ],
"type" : "BOOLEAN"
@@ -167,7 +167,7 @@
"type" : "VARCHAR(2147483647)"
}, {
"kind" : "INPUT_REF",
- "inputIndex" : 2,
+ "inputIndex" : 4,
"type" : "VARCHAR(2147483647)"
} ],
"type" : "BOOLEAN"
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 377ec1862c7..7004ae3c1cb 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-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 ff3c0a554f5..fd59b796425 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
@@ -285,7 +285,7 @@
"type" : "VARCHAR(2147483647) NOT NULL"
}, {
"kind" : "INPUT_REF",
- "inputIndex" : 6,
+ "inputIndex" : 3,
"type" : "VARCHAR(2147483647)"
} ],
"type" : "BOOLEAN"
@@ -299,7 +299,7 @@
"type" : "VARCHAR(2147483647) NOT NULL"
}, {
"kind" : "INPUT_REF",
- "inputIndex" : 3,
+ "inputIndex" : 6,
"type" : "VARCHAR(2147483647)"
} ],
"type" : "BOOLEAN"
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 f11caa837fe..5faf4cbb499 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 d8c280fb337..4c43ee089d5 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
@@ -139,6 +139,41 @@
} ],
"type" : "BOOLEAN"
} ],
+ "multiJoinCondition" : {
+ "kind" : "CALL",
+ "syntax" : "BINARY",
+ "internalName" : "$AND$1",
+ "operands" : [ {
+ "kind" : "CALL",
+ "syntax" : "BINARY",
+ "internalName" : "$=$1",
+ "operands" : [ {
+ "kind" : "INPUT_REF",
+ "inputIndex" : 0,
+ "type" : "VARCHAR(2147483647)"
+ }, {
+ "kind" : "INPUT_REF",
+ "inputIndex" : 2,
+ "type" : "VARCHAR(2147483647)"
+ } ],
+ "type" : "BOOLEAN"
+ }, {
+ "kind" : "CALL",
+ "syntax" : "BINARY",
+ "internalName" : "$=$1",
+ "operands" : [ {
+ "kind" : "INPUT_REF",
+ "inputIndex" : 0,
+ "type" : "VARCHAR(2147483647)"
+ }, {
+ "kind" : "INPUT_REF",
+ "inputIndex" : 4,
+ "type" : "VARCHAR(2147483647)"
+ } ],
+ "type" : "BOOLEAN"
+ } ],
+ "type" : "BOOLEAN"
+ },
"joinAttributeMap" : {
"1" : [ {
"leftInputId" : 0,
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 f0288325eee..585903d8128 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
