You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by zh...@apache.org on 2024/05/27 04:07:26 UTC
(flink) branch master updated: [FLINK-35426][table-planner] Change the distribution of DynamicFilteringDataCollector to Broadcast
This is an automated email from the ASF dual-hosted git repository.
zhuzh 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 4b342da6d14 [FLINK-35426][table-planner] Change the distribution of DynamicFilteringDataCollector to Broadcast
4b342da6d14 is described below
commit 4b342da6d149113dde821b370a136beef3430fff
Author: sunxia <xi...@gmail.com>
AuthorDate: Thu May 23 11:28:33 2024 +0800
[FLINK-35426][table-planner] Change the distribution of DynamicFilteringDataCollector to Broadcast
---
.../DynamicFilteringDependencyProcessor.java | 2 +-
.../plan/batch/sql/DynamicFilteringTest.xml | 96 +++++++++++-----------
.../plan/optimize/ShuffleModePlanOptimizeTest.xml | 24 +++---
.../program/DynamicPartitionPruningProgramTest.xml | 10 +--
.../program/FlinkRuntimeFilterProgramTest.xml | 4 +-
5 files changed, 68 insertions(+), 68 deletions(-)
diff --git a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/processor/DynamicFilteringDependencyProcessor.java b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/processor/DynamicFilteringDependencyProcessor.java
index 8570532a21b..147f0cd7a4b 100644
--- a/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/processor/DynamicFilteringDependencyProcessor.java
+++ b/flink-table/flink-table-planner/src/main/java/org/apache/flink/table/planner/plan/nodes/exec/processor/DynamicFilteringDependencyProcessor.java
@@ -102,7 +102,7 @@ public class DynamicFilteringDependencyProcessor implements ExecNodeGraphProcess
new BatchExecExchange(
context.getPlanner().getTableConfig(),
InputProperty.builder()
- .requiredDistribution(InputProperty.ANY_DISTRIBUTION)
+ .requiredDistribution(InputProperty.BROADCAST_DISTRIBUTION)
.damBehavior(InputProperty.DamBehavior.BLOCKING)
.build(),
(RowType) dynamicFilteringDataCollector.getOutputType(),
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/DynamicFilteringTest.xml b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/DynamicFilteringTest.xml
index 539954a475e..59a3625d547 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/DynamicFilteringTest.xml
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/DynamicFilteringTest.xml
@@ -39,8 +39,8 @@ HashJoin(joinType=[InnerJoin], where=[=(p1, p)], select=[a1, b1, c1, p1, x, y, z
== Optimized Execution Plan ==
HashJoin(joinType=[InnerJoin], where=[(p1 = p)], select=[a1, b1, c1, p1, x, y, z, p], build=[right])
:- Exchange(distribution=[hash[p1]])
-: +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1, partitions=[{p1=2}, {p1=3}]]], fields=[a1, b1, c1, p1])\n])
-: :- Exchange(distribution=[any], shuffle_mode=[BATCH])
+: +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1, partitions=[{p1=2}, {p1=3}]]], fields=[a1, b1, c1, p1])\n])
+: :- Exchange(distribution=[broadcast], shuffle_mode=[BATCH])
: : +- DynamicFilteringDataCollector(fields=[p])
: : +- Calc(select=[x, y, z, p], where=[((x > 10) AND (CAST(p AS BIGINT) > 1))])(reuse_id=[1])
: : +- TableSourceScan(table=[[default_catalog, default_database, dim, filter=[]]], fields=[x, y, z, p])
@@ -88,11 +88,11 @@ HashJoin(joinType=[InnerJoin], where=[(p1 = p)], select=[a1, b1, c1, p1, x, y, z
"id" : ,
"type" : "MultipleInput[]",
"pact" : "Operator",
- "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1, partitions=[{p1=2}, {p1=3}]]], fields=[a1, b1, c1, p1])\\n])",
+ "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1, partitions=[{p1=2}, {p1=3}]]], fields=[a1, b1, c1, p1])\\n])",
"parallelism" : 10,
"predecessors" : [ {
"id" : ,
- "ship_strategy" : "REBALANCE",
+ "ship_strategy" : "BROADCAST",
"side" : "second"
}, {
"id" : ,
@@ -155,8 +155,8 @@ Calc(select=[a1, b1, c1, p1, x, y, z, p, a10, b10, c10, p10])
:- Exchange(distribution=[hash[y]])
: +- HashJoin(joinType=[InnerJoin], where=[(p1 = p)], select=[a1, b1, c1, p1, x, y, z, p], build=[right])
: :- Exchange(distribution=[hash[p1]])
- : : +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\n])
- : : :- Exchange(distribution=[any], shuffle_mode=[BATCH])
+ : : +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\n])
+ : : :- Exchange(distribution=[broadcast], shuffle_mode=[BATCH])
: : : +- DynamicFilteringDataCollector(fields=[p])
: : : +- Calc(select=[x, y, z, p], where=[(x > 10)])(reuse_id=[1])
: : : +- TableSourceScan(table=[[default_catalog, default_database, dim, filter=[]]], fields=[x, y, z, p])
@@ -207,11 +207,11 @@ Calc(select=[a1, b1, c1, p1, x, y, z, p, a10, b10, c10, p10])
"id" : ,
"type" : "MultipleInput[]",
"pact" : "Operator",
- "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\\n])",
+ "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\\n])",
"parallelism" : 10,
"predecessors" : [ {
"id" : ,
- "ship_strategy" : "REBALANCE",
+ "ship_strategy" : "BROADCAST",
"side" : "second"
}, {
"id" : ,
@@ -317,8 +317,8 @@ Calc(select=[a1, b1, c1, p1, x, y, z, p, a10, b10, c10, p10])
:- Exchange(distribution=[hash[y]])
: +- HashJoin(joinType=[InnerJoin], where=[(p1 = p)], select=[a1, b1, c1, p1, x, y, z, p], build=[right])
: :- Exchange(distribution=[hash[p1]])
- : : +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\n])
- : : :- Exchange(distribution=[any], shuffle_mode=[BATCH])
+ : : +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\n])
+ : : :- Exchange(distribution=[broadcast], shuffle_mode=[BATCH])
: : : +- DynamicFilteringDataCollector(fields=[p])
: : : +- Calc(select=[x, y, z, p], where=[(x > 10)])(reuse_id=[1])
: : : +- TableSourceScan(table=[[default_catalog, default_database, dim, filter=[]]], fields=[x, y, z, p])
@@ -369,11 +369,11 @@ Calc(select=[a1, b1, c1, p1, x, y, z, p, a10, b10, c10, p10])
"id" : ,
"type" : "MultipleInput[]",
"pact" : "Operator",
- "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\\n])",
+ "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\\n])",
"parallelism" : 10,
"predecessors" : [ {
"id" : ,
- "ship_strategy" : "REBALANCE",
+ "ship_strategy" : "BROADCAST",
"side" : "second"
}, {
"id" : ,
@@ -472,8 +472,8 @@ MultipleInput(readOrder=[2,1,0], members=[\nHashJoin(joinType=[InnerJoin], where
:- Exchange(distribution=[hash[p2]])
: +- TableSourceScan(table=[[default_catalog, default_database, fact2]], fields=[a2, b2, c2, p2])
:- Exchange(distribution=[hash[p1]])
-: +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\n])
-: :- Exchange(distribution=[any], shuffle_mode=[BATCH])
+: +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\n])
+: :- Exchange(distribution=[broadcast], shuffle_mode=[BATCH])
: : +- DynamicFilteringDataCollector(fields=[p])
: : +- Calc(select=[x, y, z, p], where=[(x > 10)])(reuse_id=[1])
: : +- TableSourceScan(table=[[default_catalog, default_database, dim, filter=[]]], fields=[x, y, z, p])
@@ -527,11 +527,11 @@ MultipleInput(readOrder=[2,1,0], members=[\nHashJoin(joinType=[InnerJoin], where
"id" : ,
"type" : "MultipleInput[]",
"pact" : "Operator",
- "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\\n])",
+ "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\\n])",
"parallelism" : 10,
"predecessors" : [ {
"id" : ,
- "ship_strategy" : "REBALANCE",
+ "ship_strategy" : "BROADCAST",
"side" : "second"
}, {
"id" : ,
@@ -591,8 +591,8 @@ MultipleInput(readOrder=[2,1,0], members=[\nHashJoin(joinType=[InnerJoin], where
:- Exchange(distribution=[hash[p2]])
: +- TableSourceScan(table=[[default_catalog, default_database, fact2]], fields=[a2, b2, c2, p2])
:- Exchange(distribution=[hash[p1]])
-: +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\n])
-: :- Exchange(distribution=[any], shuffle_mode=[BATCH])
+: +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\n])
+: :- Exchange(distribution=[broadcast], shuffle_mode=[BATCH])
: : +- DynamicFilteringDataCollector(fields=[p])
: : +- Calc(select=[x, y, z, p], where=[(x > 10)])(reuse_id=[1])
: : +- TableSourceScan(table=[[default_catalog, default_database, dim, filter=[]]], fields=[x, y, z, p])
@@ -646,11 +646,11 @@ MultipleInput(readOrder=[2,1,0], members=[\nHashJoin(joinType=[InnerJoin], where
"id" : ,
"type" : "MultipleInput[]",
"pact" : "Operator",
- "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\\n])",
+ "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\\n])",
"parallelism" : 10,
"predecessors" : [ {
"id" : ,
- "ship_strategy" : "REBALANCE",
+ "ship_strategy" : "BROADCAST",
"side" : "second"
}, {
"id" : ,
@@ -703,8 +703,8 @@ HashJoin(joinType=[InnerJoin], where=[=(p1, p)], select=[a1, b1, c1, p1, x, y, z
== Optimized Execution Plan ==
HashJoin(joinType=[InnerJoin], where=[(p1 = p)], select=[a1, b1, c1, p1, x, y, z, p], build=[right])
:- Exchange(distribution=[hash[p1]])
-: +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1, partitions=[{p1=2}, {p1=3}]]], fields=[a1, b1, c1, p1])\n])
-: :- Exchange(distribution=[any], shuffle_mode=[BATCH])
+: +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1, partitions=[{p1=2}, {p1=3}]]], fields=[a1, b1, c1, p1])\n])
+: :- Exchange(distribution=[broadcast], shuffle_mode=[BATCH])
: : +- DynamicFilteringDataCollector(fields=[p])
: : +- Calc(select=[x, y, z, p], where=[((x > 10) AND (CAST(p AS BIGINT) > 1))])(reuse_id=[1])
: : +- TableSourceScan(table=[[default_catalog, default_database, dim, filter=[]]], fields=[x, y, z, p])
@@ -752,11 +752,11 @@ HashJoin(joinType=[InnerJoin], where=[(p1 = p)], select=[a1, b1, c1, p1, x, y, z
"id" : ,
"type" : "MultipleInput[]",
"pact" : "Operator",
- "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1, partitions=[{p1=2}, {p1=3}]]], fields=[a1, b1, c1, p1])\\n])",
+ "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1, partitions=[{p1=2}, {p1=3}]]], fields=[a1, b1, c1, p1])\\n])",
"parallelism" : 10,
"predecessors" : [ {
"id" : ,
- "ship_strategy" : "REBALANCE",
+ "ship_strategy" : "BROADCAST",
"side" : "second"
}, {
"id" : ,
@@ -943,8 +943,8 @@ HashJoin(joinType=[InnerJoin], where=[=(p1, p)], select=[a1, b1, c1, p1, x, y, z
== Optimized Execution Plan ==
HashJoin(joinType=[InnerJoin], where=[(p1 = p)], select=[a1, b1, c1, p1, x, y, z, p], build=[right])
:- Exchange(distribution=[hash[p1]])
-: +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\n])
-: :- Exchange(distribution=[any], shuffle_mode=[BATCH])
+: +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\n])
+: :- Exchange(distribution=[broadcast], shuffle_mode=[BATCH])
: : +- DynamicFilteringDataCollector(fields=[p])
: : +- Calc(select=[x, y, z, p], where=[(x > 10)])(reuse_id=[1])
: : +- TableSourceScan(table=[[default_catalog, default_database, dim, filter=[]]], fields=[x, y, z, p])
@@ -992,11 +992,11 @@ HashJoin(joinType=[InnerJoin], where=[(p1 = p)], select=[a1, b1, c1, p1, x, y, z
"id" : ,
"type" : "MultipleInput[]",
"pact" : "Operator",
- "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\\n])",
+ "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\\n])",
"parallelism" : 10,
"predecessors" : [ {
"id" : ,
- "ship_strategy" : "REBALANCE",
+ "ship_strategy" : "BROADCAST",
"side" : "second"
}, {
"id" : ,
@@ -1061,8 +1061,8 @@ Union(all=[true], union=[a1, b1, c1, p1, x, y, z, p])
== Optimized Execution Plan ==
MultipleInput(readOrder=[1,0,1,0], members=[\nUnion(all=[true], union=[a1, b1, c1, p1, x, y, z, p])\n:- HashJoin(joinType=[InnerJoin], where=[(p1 = p)], select=[a1, b1, c1, p1, x, y, z, p], build=[right])\n: :- [#1] Exchange(distribution=[hash[p1]])\n: +- [#2] Exchange(distribution=[hash[p]])\n+- HashJoin(joinType=[InnerJoin], where=[(p2 = p)], select=[a2, b2, c2, p2, x, y, z, p], build=[right])\n :- [#3] Exchange(distribution=[hash[p2]])\n +- [#2] Exchange(distribution=[hash[p]])\n])
:- Exchange(distribution=[hash[p1]])
-: +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\n])
-: :- Exchange(distribution=[any], shuffle_mode=[BATCH])
+: +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\n])
+: :- Exchange(distribution=[broadcast], shuffle_mode=[BATCH])
: : +- DynamicFilteringDataCollector(fields=[p])(reuse_id=[2])
: : +- Calc(select=[x, y, z, p], where=[(x > 10)])(reuse_id=[1])
: : +- TableSourceScan(table=[[default_catalog, default_database, dim, filter=[]]], fields=[x, y, z, p])
@@ -1070,8 +1070,8 @@ MultipleInput(readOrder=[1,0,1,0], members=[\nUnion(all=[true], union=[a1, b1, c
:- Exchange(distribution=[hash[p]])(reuse_id=[3])
: +- Reused(reference_id=[1])
:- Exchange(distribution=[hash[p2]])
-: +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact2]], fields=[a2, b2, c2, p2])\n])
-: :- Exchange(distribution=[any], shuffle_mode=[BATCH])
+: +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact2]], fields=[a2, b2, c2, p2])\n])
+: :- Exchange(distribution=[broadcast], shuffle_mode=[BATCH])
: : +- Reused(reference_id=[2])
: +- DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact2]], fields=[a2, b2, c2, p2])
+- Reused(reference_id=[3])
@@ -1122,11 +1122,11 @@ MultipleInput(readOrder=[1,0,1,0], members=[\nUnion(all=[true], union=[a1, b1, c
"id" : ,
"type" : "MultipleInput[]",
"pact" : "Operator",
- "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\\n])",
+ "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\\n])",
"parallelism" : 10,
"predecessors" : [ {
"id" : ,
- "ship_strategy" : "REBALANCE",
+ "ship_strategy" : "BROADCAST",
"side" : "second"
}, {
"id" : ,
@@ -1137,11 +1137,11 @@ MultipleInput(readOrder=[1,0,1,0], members=[\nUnion(all=[true], union=[a1, b1, c
"id" : ,
"type" : "MultipleInput[]",
"pact" : "Operator",
- "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact2]], fields=[a2, b2, c2, p2])\\n])",
+ "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact2]], fields=[a2, b2, c2, p2])\\n])",
"parallelism" : 10,
"predecessors" : [ {
"id" : ,
- "ship_strategy" : "REBALANCE",
+ "ship_strategy" : "BROADCAST",
"side" : "second"
}, {
"id" : ,
@@ -1198,8 +1198,8 @@ HashJoin(joinType=[InnerJoin], where=[=(p1, p)], select=[a1, b1, c1, p1, x, y, z
== Optimized Execution Plan ==
HashJoin(joinType=[InnerJoin], where=[(p1 = p)], select=[a1, b1, c1, p1, x, y, z, p], build=[right])
:- Exchange(distribution=[hash[p1]])
-: +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\n])
-: :- Exchange(distribution=[any], shuffle_mode=[BATCH])
+: +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\n])
+: :- Exchange(distribution=[broadcast], shuffle_mode=[BATCH])
: : +- DynamicFilteringDataCollector(fields=[p])
: : +- Calc(select=[x, y, z, p], where=[(x > 10)])(reuse_id=[1])
: : +- TableSourceScan(table=[[default_catalog, default_database, dim, filter=[]]], fields=[x, y, z, p])
@@ -1247,11 +1247,11 @@ HashJoin(joinType=[InnerJoin], where=[(p1 = p)], select=[a1, b1, c1, p1, x, y, z
"id" : ,
"type" : "MultipleInput[]",
"pact" : "Operator",
- "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\\n])",
+ "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\\n])",
"parallelism" : 10,
"predecessors" : [ {
"id" : ,
- "ship_strategy" : "REBALANCE",
+ "ship_strategy" : "BROADCAST",
"side" : "second"
}, {
"id" : ,
@@ -1316,8 +1316,8 @@ Union(all=[true], union=[a1, b1, c1, p1, x, y, z, p])
== Optimized Execution Plan ==
MultipleInput(readOrder=[1,0,1,0], members=[\nUnion(all=[true], union=[a1, b1, c1, p1, x, y, z, p])\n:- HashJoin(joinType=[InnerJoin], where=[(p1 = p)], select=[a1, b1, c1, p1, x, y, z, p], build=[right])\n: :- [#1] Exchange(distribution=[hash[p1]])\n: +- [#2] Exchange(distribution=[hash[p]], shuffle_mode=[BATCH])\n+- HashJoin(joinType=[InnerJoin], where=[(p2 = p)], select=[a2, b2, c2, p2, x, y, z, p], build=[right])\n :- [#3] Exchange(distribution=[hash[p2]])\n +- [#2] Exchange(di [...]
:- Exchange(distribution=[hash[p1]])
-: +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\n])
-: :- Exchange(distribution=[any], shuffle_mode=[BATCH])
+: +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\n])
+: :- Exchange(distribution=[broadcast], shuffle_mode=[BATCH])
: : +- DynamicFilteringDataCollector(fields=[p])(reuse_id=[2])
: : +- Calc(select=[x, y, z, p], where=[(x > 10)])(reuse_id=[1])
: : +- TableSourceScan(table=[[default_catalog, default_database, dim, filter=[]]], fields=[x, y, z, p])
@@ -1325,8 +1325,8 @@ MultipleInput(readOrder=[1,0,1,0], members=[\nUnion(all=[true], union=[a1, b1, c
:- Exchange(distribution=[hash[p]], shuffle_mode=[BATCH])(reuse_id=[3])
: +- Reused(reference_id=[1])
:- Exchange(distribution=[hash[p2]])
-: +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact2]], fields=[a2, b2, c2, p2])\n])
-: :- Exchange(distribution=[any], shuffle_mode=[BATCH])
+: +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact2]], fields=[a2, b2, c2, p2])\n])
+: :- Exchange(distribution=[broadcast], shuffle_mode=[BATCH])
: : +- Reused(reference_id=[2])
: +- DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact2]], fields=[a2, b2, c2, p2])
+- Reused(reference_id=[3])
@@ -1377,11 +1377,11 @@ MultipleInput(readOrder=[1,0,1,0], members=[\nUnion(all=[true], union=[a1, b1, c
"id" : ,
"type" : "MultipleInput[]",
"pact" : "Operator",
- "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\\n])",
+ "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact1]], fields=[a1, b1, c1, p1])\\n])",
"parallelism" : 10,
"predecessors" : [ {
"id" : ,
- "ship_strategy" : "REBALANCE",
+ "ship_strategy" : "BROADCAST",
"side" : "second"
}, {
"id" : ,
@@ -1392,11 +1392,11 @@ MultipleInput(readOrder=[1,0,1,0], members=[\nUnion(all=[true], union=[a1, b1, c
"id" : ,
"type" : "MultipleInput[]",
"pact" : "Operator",
- "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact2]], fields=[a2, b2, c2, p2])\\n])",
+ "contents" : "[]:MultipleInput(members=[\\nOrderEnforcer\\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\\n+- [#2] DynamicFilteringTableSourceScan(table=[[default_catalog, default_database, fact2]], fields=[a2, b2, c2, p2])\\n])",
"parallelism" : 10,
"predecessors" : [ {
"id" : ,
- "ship_strategy" : "REBALANCE",
+ "ship_strategy" : "BROADCAST",
"side" : "second"
}, {
"id" : ,
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/optimize/ShuffleModePlanOptimizeTest.xml b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/optimize/ShuffleModePlanOptimizeTest.xml
index 65382e2f600..07e91f7ca7b 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/optimize/ShuffleModePlanOptimizeTest.xml
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/optimize/ShuffleModePlanOptimizeTest.xml
@@ -56,8 +56,8 @@ MultipleInput(readOrder=[0,0,1], members=[\nNestedLoopJoin(joinType=[InnerJoin],
: +- Calc(select=[0 AS $f0])
: +- HashJoin(joinType=[InnerJoin], where=[(fact_date_sk = dim_date_sk)], select=[fact_date_sk, dim_date_sk], build=[right])
: :- Exchange(distribution=[hash[fact_date_sk]])
-: : +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[testCatalog, test_database, fact_part, project=[fact_date_sk], metadata=[]]], fields=[fact_date_sk])\n])
-: : :- Exchange(distribution=[any], shuffle_mode=[BATCH])
+: : +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[testCatalog, test_database, fact_part, project=[fact_date_sk], metadata=[]]], fields=[fact_date_sk])\n])
+: : :- Exchange(distribution=[broadcast], shuffle_mode=[BATCH])
: : : +- DynamicFilteringDataCollector(fields=[dim_date_sk])
: : : +- Calc(select=[dim_date_sk], where=[(price < 400)])(reuse_id=[1])
: : : +- TableSourceScan(table=[[testCatalog, test_database, dim, project=[price, dim_date_sk], metadata=[]]], fields=[price, dim_date_sk])(reuse_id=[2])
@@ -82,8 +82,8 @@ MultipleInput(readOrder=[0,0,1], members=[\nNestedLoopJoin(joinType=[InnerJoin],
+- Calc(select=[0 AS $f0])
+- HashJoin(joinType=[InnerJoin], where=[(fact_date_sk = dim_date_sk)], select=[fact_date_sk, dim_date_sk], build=[right])
:- Exchange(distribution=[hash[fact_date_sk]])
- : +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[testCatalog, test_database, fact_part, project=[fact_date_sk], metadata=[]]], fields=[fact_date_sk])\n])
- : :- Exchange(distribution=[any], shuffle_mode=[BATCH])
+ : +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[testCatalog, test_database, fact_part, project=[fact_date_sk], metadata=[]]], fields=[fact_date_sk])\n])
+ : :- Exchange(distribution=[broadcast], shuffle_mode=[BATCH])
: : +- DynamicFilteringDataCollector(fields=[dim_date_sk])
: : +- Calc(select=[dim_date_sk], where=[(price < 200)])(reuse_id=[3])
: : +- Reused(reference_id=[2])
@@ -132,8 +132,8 @@ MultipleInput(readOrder=[0,0,1], members=[\nNestedLoopJoin(joinType=[InnerJoin],
: +- Calc(select=[0 AS $f0])
: +- HashJoin(joinType=[InnerJoin], where=[(fact_date_sk = dim_date_sk)], select=[fact_date_sk, dim_date_sk], build=[right])
: :- Exchange(distribution=[hash[fact_date_sk]])
-: : +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[testCatalog, test_database, fact_part, project=[fact_date_sk], metadata=[]]], fields=[fact_date_sk])\n])
-: : :- Exchange(distribution=[any], shuffle_mode=[BATCH])
+: : +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[testCatalog, test_database, fact_part, project=[fact_date_sk], metadata=[]]], fields=[fact_date_sk])\n])
+: : :- Exchange(distribution=[broadcast], shuffle_mode=[BATCH])
: : : +- DynamicFilteringDataCollector(fields=[dim_date_sk])
: : : +- Calc(select=[dim_date_sk], where=[(price < 400)])(reuse_id=[1])
: : : +- TableSourceScan(table=[[testCatalog, test_database, dim, project=[price, dim_date_sk], metadata=[]]], fields=[price, dim_date_sk])(reuse_id=[2])
@@ -159,8 +159,8 @@ MultipleInput(readOrder=[0,0,1], members=[\nNestedLoopJoin(joinType=[InnerJoin],
+- Calc(select=[0 AS $f0])
+- HashJoin(joinType=[InnerJoin], where=[(fact_date_sk = dim_date_sk)], select=[fact_date_sk, dim_date_sk], build=[right])
:- Exchange(distribution=[hash[fact_date_sk]])
- : +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[testCatalog, test_database, fact_part, project=[fact_date_sk], metadata=[]]], fields=[fact_date_sk])\n])
- : :- Exchange(distribution=[any], shuffle_mode=[BATCH])
+ : +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[testCatalog, test_database, fact_part, project=[fact_date_sk], metadata=[]]], fields=[fact_date_sk])\n])
+ : :- Exchange(distribution=[broadcast], shuffle_mode=[BATCH])
: : +- DynamicFilteringDataCollector(fields=[dim_date_sk])
: : +- Calc(select=[dim_date_sk], where=[(price < 200)])(reuse_id=[3])
: : +- Reused(reference_id=[2])
@@ -209,8 +209,8 @@ MultipleInput(readOrder=[0,0,1], members=[\nNestedLoopJoin(joinType=[InnerJoin],
: +- Calc(select=[0 AS $f0])
: +- HashJoin(joinType=[InnerJoin], where=[(fact_date_sk = dim_date_sk)], select=[fact_date_sk, dim_date_sk], build=[right])
: :- Exchange(distribution=[hash[fact_date_sk]])
-: : +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[testCatalog, test_database, fact_part, project=[fact_date_sk], metadata=[]]], fields=[fact_date_sk])\n])
-: : :- Exchange(distribution=[any], shuffle_mode=[BATCH])
+: : +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[testCatalog, test_database, fact_part, project=[fact_date_sk], metadata=[]]], fields=[fact_date_sk])\n])
+: : :- Exchange(distribution=[broadcast], shuffle_mode=[BATCH])
: : : +- DynamicFilteringDataCollector(fields=[dim_date_sk])
: : : +- Calc(select=[dim_date_sk], where=[(price < 400)])(reuse_id=[1])
: : : +- TableSourceScan(table=[[testCatalog, test_database, dim, project=[price, dim_date_sk], metadata=[]]], fields=[price, dim_date_sk])(reuse_id=[2])
@@ -236,8 +236,8 @@ MultipleInput(readOrder=[0,0,1], members=[\nNestedLoopJoin(joinType=[InnerJoin],
+- Calc(select=[0 AS $f0])
+- HashJoin(joinType=[InnerJoin], where=[(fact_date_sk = dim_date_sk)], select=[fact_date_sk, dim_date_sk], build=[right])
:- Exchange(distribution=[hash[fact_date_sk]])
- : +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[testCatalog, test_database, fact_part, project=[fact_date_sk], metadata=[]]], fields=[fact_date_sk])\n])
- : :- Exchange(distribution=[any], shuffle_mode=[BATCH])
+ : +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[testCatalog, test_database, fact_part, project=[fact_date_sk], metadata=[]]], fields=[fact_date_sk])\n])
+ : :- Exchange(distribution=[broadcast], shuffle_mode=[BATCH])
: : +- DynamicFilteringDataCollector(fields=[dim_date_sk])
: : +- Calc(select=[dim_date_sk], where=[(price < 200)])(reuse_id=[3])
: : +- Reused(reference_id=[2])
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/optimize/program/DynamicPartitionPruningProgramTest.xml b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/optimize/program/DynamicPartitionPruningProgramTest.xml
index 1b5cccf5b9c..11f83540c17 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/optimize/program/DynamicPartitionPruningProgramTest.xml
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/optimize/program/DynamicPartitionPruningProgramTest.xml
@@ -888,18 +888,18 @@ LogicalProject(id=[$0], price=[$1], amount=[$2])
<Resource name="optimized exec plan">
<![CDATA[
Calc(select=[id, price, amount])
-+- MultipleInput(readOrder=[0,0,0,1,0,1], members=[\nHashJoin(joinType=[InnerJoin], where=[(amount = id0)], select=[id, price, amount, id0], isBroadcast=[true], build=[right])\n:- Calc(select=[id, price, amount])\n: +- HashJoin(joinType=[InnerJoin], where=[(fact_date_sk = dim_date_sk)], select=[id, price, amount, fact_date_sk, dim_date_sk], isBroadcast=[true], build=[right])\n: :- Union(all=[true], union=[id, price, amount, fact_date_sk])\n: : :- OrderEnforcer\n: : : :- [ [...]
++- MultipleInput(readOrder=[0,0,0,1,0,1], members=[\nHashJoin(joinType=[InnerJoin], where=[(amount = id0)], select=[id, price, amount, id0], isBroadcast=[true], build=[right])\n:- Calc(select=[id, price, amount])\n: +- HashJoin(joinType=[InnerJoin], where=[(fact_date_sk = dim_date_sk)], select=[id, price, amount, fact_date_sk, dim_date_sk], isBroadcast=[true], build=[right])\n: :- Union(all=[true], union=[id, price, amount, fact_date_sk])\n: : :- OrderEnforcer\n: : : :- [ [...]
:- Exchange(distribution=[broadcast])
: +- Calc(select=[id], where=[(amount < 10)])(reuse_id=[2])
: +- TableSourceScan(table=[[testCatalog, test_database, dim, filter=[], project=[id, amount, price, dim_date_sk], metadata=[]]], fields=[id, amount, price, dim_date_sk])(reuse_id=[1])
:- Exchange(distribution=[broadcast])
: +- Calc(select=[dim_date_sk], where=[SEARCH(price, Sarg[(300..500)])])
: +- Reused(reference_id=[1])
- :- Exchange(distribution=[any], shuffle_mode=[BATCH])
+ :- Exchange(distribution=[broadcast], shuffle_mode=[BATCH])
: +- DynamicFilteringDataCollector(fields=[id])(reuse_id=[3])
: +- Reused(reference_id=[2])
:- DynamicFilteringTableSourceScan(table=[[testCatalog, test_database, fact_part, project=[id, price, amount, fact_date_sk], metadata=[]]], fields=[id, price, amount, fact_date_sk])
- :- Exchange(distribution=[any], shuffle_mode=[BATCH])
+ :- Exchange(distribution=[broadcast], shuffle_mode=[BATCH])
: +- Reused(reference_id=[3])
+- DynamicFilteringTableSourceScan(table=[[testCatalog, test_database, fact_part2, project=[id, price, amount, fact_date_sk], metadata=[]]], fields=[id, price, amount, fact_date_sk])
]]>
@@ -1031,8 +1031,8 @@ Union(all=[true], union=[id, price, amount])
:- Calc(select=[id, price, amount])
: +- HashJoin(joinType=[InnerJoin], where=[(fact_date_sk = dim_date_sk)], select=[id, amount, price, fact_date_sk, dim_date_sk], build=[right])
: :- Exchange(distribution=[hash[fact_date_sk]])
-: : +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[testCatalog, test_database, fact_part, project=[id, amount, price, fact_date_sk], metadata=[]]], fields=[id, amount, price, fact_date_sk])\n])
-: : :- Exchange(distribution=[any], shuffle_mode=[BATCH])
+: : +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[testCatalog, test_database, fact_part, project=[id, amount, price, fact_date_sk], metadata=[]]], fields=[id, amount, price, fact_date_sk])\n])
+: : :- Exchange(distribution=[broadcast], shuffle_mode=[BATCH])
: : : +- DynamicFilteringDataCollector(fields=[dim_date_sk])
: : : +- Calc(select=[dim_date_sk], where=[(price < 500)])(reuse_id=[1])
: : : +- TableSourceScan(table=[[testCatalog, test_database, dim, filter=[], project=[price, dim_date_sk], metadata=[]]], fields=[price, dim_date_sk])
diff --git a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/optimize/program/FlinkRuntimeFilterProgramTest.xml b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/optimize/program/FlinkRuntimeFilterProgramTest.xml
index 6fe08aa83d4..8df49b0e10b 100644
--- a/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/optimize/program/FlinkRuntimeFilterProgramTest.xml
+++ b/flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/optimize/program/FlinkRuntimeFilterProgramTest.xml
@@ -1146,8 +1146,8 @@ HashJoin(joinType=[InnerJoin], where=[(fact_date_sk = dim_date_sk)], select=[id,
: +- Calc(select=[id, male, amount, price, dim_date_sk], where=[(price < 500)])(reuse_id=[1])
: +- TableSourceScan(table=[[testCatalog, test_database, dim, filter=[]]], fields=[id, male, amount, price, dim_date_sk])
+- Exchange(distribution=[hash[fact_date_sk]])
- +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[any], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[testCatalog, test_database, fact_part]], fields=[id, name, amount, price, fact_date_sk])\n])
- :- Exchange(distribution=[any], shuffle_mode=[BATCH])
+ +- MultipleInput(members=[\nOrderEnforcer\n:- [#1] Exchange(distribution=[broadcast], shuffle_mode=[BATCH])\n+- [#2] DynamicFilteringTableSourceScan(table=[[testCatalog, test_database, fact_part]], fields=[id, name, amount, price, fact_date_sk])\n])
+ :- Exchange(distribution=[broadcast], shuffle_mode=[BATCH])
: +- DynamicFilteringDataCollector(fields=[dim_date_sk])
: +- Reused(reference_id=[1])
+- DynamicFilteringTableSourceScan(table=[[testCatalog, test_database, fact_part]], fields=[id, name, amount, price, fact_date_sk])