Skip to content

Commit f08e5ec

Browse files
snuyanzinxuyangzhong
snuyanzin
and
xuyangzhong
committed
[FLINK-36007][table] Apply changes from FLINK-36277 to AdaptiveJoin
This closes #25895 -------------------- Co-authored-by: xuyang <[email protected]>
1 parent ec169a8 commit f08e5ec

File tree

1 file changed

+35
-35
lines changed

1 file changed

+35
-35
lines changed

‎flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/adaptive/AdaptiveJoinTest.xml‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ LogicalProject(EXPR$0=[$1])
3333
+- LogicalFilter(condition=[AND(=($0, $4), =($0, $8))])
3434
+- LogicalJoin(condition=[true], joinType=[inner])
3535
:- LogicalJoin(condition=[true], joinType=[inner])
36-
: :- LogicalTableScan(table=[[default_catalog, default_database, T1, source: [TestTableSource(a1, b1, c1, d1)]]])
37-
: +- LogicalTableScan(table=[[default_catalog, default_database, T2, source: [TestTableSource(a2, b2, c2, d2)]]])
38-
+- LogicalTableScan(table=[[default_catalog, default_database, T3, source: [TestTableSource(a3, b3, c3, d3)]]])
36+
: :- LogicalTableScan(table=[[default_catalog, default_database, T1]])
37+
: +- LogicalTableScan(table=[[default_catalog, default_database, T2]])
38+
+- LogicalTableScan(table=[[default_catalog, default_database, T3]])
3939
]]>
4040
</Resource>
4141
<Resource name="optimized exec plan">
@@ -52,13 +52,13 @@ Calc(select=[EXPR$0])
5252
: +- HashJoin(joinType=[InnerJoin], where=[(a1 = a2)], select=[a1, b1, a2], build=[right])
5353
: :- Exchange(distribution=[hash[a1]])
5454
: : +- Calc(select=[a1, b1])
55-
: : +- LegacyTableSourceScan(table=[[default_catalog, default_database, T1, source: [TestTableSource(a1, b1, c1, d1)]]], fields=[a1, b1, c1, d1])
55+
: : +- TableSourceScan(table=[[default_catalog, default_database, T1]], fields=[a1, b1, c1, d1])
5656
: +- Exchange(distribution=[hash[a2]])
5757
: +- Calc(select=[a2])
58-
: +- LegacyTableSourceScan(table=[[default_catalog, default_database, T2, source: [TestTableSource(a2, b2, c2, d2)]]], fields=[a2, b2, c2, d2])
58+
: +- TableSourceScan(table=[[default_catalog, default_database, T2]], fields=[a2, b2, c2, d2])
5959
+- Exchange(distribution=[hash[a3]])
6060
+- Calc(select=[a3])
61-
+- LegacyTableSourceScan(table=[[default_catalog, default_database, T3, source: [TestTableSource(a3, b3, c3, d3)]]], fields=[a3, b3, c3, d3])
61+
+- TableSourceScan(table=[[default_catalog, default_database, T3]], fields=[a3, b3, c3, d3])
6262
]]>
6363
</Resource>
6464
</TestCase>
@@ -71,17 +71,17 @@ Calc(select=[EXPR$0])
7171
LogicalProject(a1=[$0], b1=[$1], c1=[$2], d1=[$3], a2=[$4], b2=[$5], c2=[$6], d2=[$7])
7272
+- LogicalFilter(condition=[=($0, $4)])
7373
+- LogicalJoin(condition=[true], joinType=[inner])
74-
:- LogicalTableScan(table=[[default_catalog, default_database, T1, source: [TestTableSource(a1, b1, c1, d1)]]])
75-
+- LogicalTableScan(table=[[default_catalog, default_database, T2, source: [TestTableSource(a2, b2, c2, d2)]]])
74+
:- LogicalTableScan(table=[[default_catalog, default_database, T1]])
75+
+- LogicalTableScan(table=[[default_catalog, default_database, T2]])
7676
]]>
7777
</Resource>
7878
<Resource name="optimized exec plan">
7979
<![CDATA[
8080
AdaptiveJoin(originalJoin=[SortMergeJoin], joinType=[InnerJoin], where=[(a1 = a2)], select=[a1, b1, c1, d1, a2, b2, c2, d2])
8181
:- Exchange(distribution=[hash[a1]])
82-
: +- LegacyTableSourceScan(table=[[default_catalog, default_database, T1, source: [TestTableSource(a1, b1, c1, d1)]]], fields=[a1, b1, c1, d1])
82+
: +- TableSourceScan(table=[[default_catalog, default_database, T1]], fields=[a1, b1, c1, d1])
8383
+- Exchange(distribution=[hash[a2]])
84-
+- LegacyTableSourceScan(table=[[default_catalog, default_database, T2, source: [TestTableSource(a2, b2, c2, d2)]]], fields=[a2, b2, c2, d2])
84+
+- TableSourceScan(table=[[default_catalog, default_database, T2]], fields=[a2, b2, c2, d2])
8585
]]>
8686
</Resource>
8787
</TestCase>
@@ -94,17 +94,17 @@ AdaptiveJoin(originalJoin=[SortMergeJoin], joinType=[InnerJoin], where=[(a1 = a2
9494
LogicalProject(a1=[$0], b1=[$1], c1=[$2], d1=[$3], a2=[$4], b2=[$5], c2=[$6], d2=[$7])
9595
+- LogicalFilter(condition=[=($0, $4)])
9696
+- LogicalJoin(condition=[true], joinType=[inner])
97-
:- LogicalTableScan(table=[[default_catalog, default_database, T1, source: [TestTableSource(a1, b1, c1, d1)]]])
98-
+- LogicalTableScan(table=[[default_catalog, default_database, T2, source: [TestTableSource(a2, b2, c2, d2)]]])
97+
:- LogicalTableScan(table=[[default_catalog, default_database, T1]])
98+
+- LogicalTableScan(table=[[default_catalog, default_database, T2]])
9999
]]>
100100
</Resource>
101101
<Resource name="optimized exec plan">
102102
<![CDATA[
103103
AdaptiveJoin(originalJoin=[ShuffleHashJoin], joinType=[InnerJoin], where=[(a1 = a2)], select=[a1, b1, c1, d1, a2, b2, c2, d2], build=[left])
104104
:- Exchange(distribution=[hash[a1]])
105-
: +- LegacyTableSourceScan(table=[[default_catalog, default_database, T1, source: [TestTableSource(a1, b1, c1, d1)]]], fields=[a1, b1, c1, d1])
105+
: +- TableSourceScan(table=[[default_catalog, default_database, T1]], fields=[a1, b1, c1, d1])
106106
+- Exchange(distribution=[hash[a2]])
107-
+- LegacyTableSourceScan(table=[[default_catalog, default_database, T2, source: [TestTableSource(a2, b2, c2, d2)]]], fields=[a2, b2, c2, d2])
107+
+- TableSourceScan(table=[[default_catalog, default_database, T2]], fields=[a2, b2, c2, d2])
108108
]]>
109109
</Resource>
110110
</TestCase>
@@ -117,17 +117,17 @@ AdaptiveJoin(originalJoin=[ShuffleHashJoin], joinType=[InnerJoin], where=[(a1 =
117117
LogicalProject(a1=[$0], b1=[$1], c1=[$2], d1=[$3], a2=[$4], b2=[$5], c2=[$6], d2=[$7])
118118
+- LogicalFilter(condition=[=($0, $4)])
119119
+- LogicalJoin(condition=[true], joinType=[inner])
120-
:- LogicalTableScan(table=[[default_catalog, default_database, T1, source: [TestTableSource(a1, b1, c1, d1)]]])
121-
+- LogicalTableScan(table=[[default_catalog, default_database, T2, source: [TestTableSource(a2, b2, c2, d2)]]])
120+
:- LogicalTableScan(table=[[default_catalog, default_database, T1]])
121+
+- LogicalTableScan(table=[[default_catalog, default_database, T2]])
122122
]]>
123123
</Resource>
124124
<Resource name="optimized exec plan">
125125
<![CDATA[
126126
AdaptiveJoin(originalJoin=[ShuffleHashJoin], joinType=[InnerJoin], where=[(a1 = a2)], select=[a1, b1, c1, d1, a2, b2, c2, d2], build=[left])
127127
:- Exchange(distribution=[hash[a1]])
128-
: +- LegacyTableSourceScan(table=[[default_catalog, default_database, T1, source: [TestTableSource(a1, b1, c1, d1)]]], fields=[a1, b1, c1, d1])
128+
: +- TableSourceScan(table=[[default_catalog, default_database, T1]], fields=[a1, b1, c1, d1])
129129
+- Exchange(distribution=[hash[a2]])
130-
+- LegacyTableSourceScan(table=[[default_catalog, default_database, T2, source: [TestTableSource(a2, b2, c2, d2)]]], fields=[a2, b2, c2, d2])
130+
+- TableSourceScan(table=[[default_catalog, default_database, T2]], fields=[a2, b2, c2, d2])
131131
]]>
132132
</Resource>
133133
</TestCase>
@@ -140,16 +140,16 @@ AdaptiveJoin(originalJoin=[ShuffleHashJoin], joinType=[InnerJoin], where=[(a1 =
140140
LogicalProject(a1=[$0], b1=[$1], c1=[$2], d1=[$3], a2=[$4], b2=[$5], c2=[$6], d2=[$7])
141141
+- LogicalFilter(condition=[=($0, $4)])
142142
+- LogicalJoin(condition=[true], joinType=[inner])
143-
:- LogicalTableScan(table=[[default_catalog, default_database, T1, source: [TestTableSource(a1, b1, c1, d1)]]])
144-
+- LogicalTableScan(table=[[default_catalog, default_database, T2, source: [TestTableSource(a2, b2, c2, d2)]]])
143+
:- LogicalTableScan(table=[[default_catalog, default_database, T1]])
144+
+- LogicalTableScan(table=[[default_catalog, default_database, T2]])
145145
]]>
146146
</Resource>
147147
<Resource name="optimized exec plan">
148148
<![CDATA[
149149
HashJoin(joinType=[InnerJoin], where=[(a1 = a2)], select=[a1, b1, c1, d1, a2, b2, c2, d2], isBroadcast=[true], build=[right])
150-
:- LegacyTableSourceScan(table=[[default_catalog, default_database, T1, source: [TestTableSource(a1, b1, c1, d1)]]], fields=[a1, b1, c1, d1])
150+
:- TableSourceScan(table=[[default_catalog, default_database, T1]], fields=[a1, b1, c1, d1])
151151
+- Exchange(distribution=[broadcast])
152-
+- LegacyTableSourceScan(table=[[default_catalog, default_database, T2, source: [TestTableSource(a2, b2, c2, d2)]]], fields=[a2, b2, c2, d2])
152+
+- TableSourceScan(table=[[default_catalog, default_database, T2]], fields=[a2, b2, c2, d2])
153153
]]>
154154
</Resource>
155155
</TestCase>
@@ -168,10 +168,10 @@ LogicalProject(a=[$0], a0=[$1], b=[$2], c=[$3], d=[$4])
168168
:- LogicalUnion(all=[true])
169169
: :- LogicalProject(a=[$0])
170170
: : +- LogicalProject(a=[$0])
171-
: : +- LogicalTableScan(table=[[default_catalog, default_database, T1, source: [TestTableSource(a1, b1, c1, d1)]]])
171+
: : +- LogicalTableScan(table=[[default_catalog, default_database, T1]])
172172
: +- LogicalProject(a=[$0])
173-
: +- LogicalTableScan(table=[[default_catalog, default_database, T2, source: [TestTableSource(a2, b2, c2, d2)]]])
174-
+- LogicalTableScan(table=[[default_catalog, default_database, T, source: [TestTableSource(a, b, c, d)]]])
173+
: +- LogicalTableScan(table=[[default_catalog, default_database, T2]])
174+
+- LogicalTableScan(table=[[default_catalog, default_database, T]])
175175
]]>
176176
</Resource>
177177
<Resource name="optimized exec plan">
@@ -180,11 +180,11 @@ AdaptiveJoin(originalJoin=[ShuffleHashJoin], joinType=[LeftOuterJoin], where=[(a
180180
:- Exchange(distribution=[hash[a]])
181181
: +- Union(all=[true], union=[a])
182182
: :- Calc(select=[a1 AS a])
183-
: : +- LegacyTableSourceScan(table=[[default_catalog, default_database, T1, source: [TestTableSource(a1, b1, c1, d1)]]], fields=[a1, b1, c1, d1])
183+
: : +- TableSourceScan(table=[[default_catalog, default_database, T1]], fields=[a1, b1, c1, d1])
184184
: +- Calc(select=[a2 AS a])
185-
: +- LegacyTableSourceScan(table=[[default_catalog, default_database, T2, source: [TestTableSource(a2, b2, c2, d2)]]], fields=[a2, b2, c2, d2])
185+
: +- TableSourceScan(table=[[default_catalog, default_database, T2]], fields=[a2, b2, c2, d2])
186186
+- Exchange(distribution=[hash[a]])
187-
+- LegacyTableSourceScan(table=[[default_catalog, default_database, T, source: [TestTableSource(a, b, c, d)]]], fields=[a, b, c, d])
187+
+- TableSourceScan(table=[[default_catalog, default_database, T]], fields=[a, b, c, d])
188188
]]>
189189
</Resource>
190190
</TestCase>
@@ -204,27 +204,27 @@ LogicalProject(a=[$0], d2=[$1])
204204
+- LogicalJoin(condition=[=($0, $1)], joinType=[inner])
205205
:- LogicalProject(a=[$4])
206206
: +- LogicalJoin(condition=[=($4, $0)], joinType=[inner])
207-
: :- LogicalTableScan(table=[[default_catalog, default_database, T1, source: [TestTableSource(a1, b1, c1, d1)]]])
208-
: +- LogicalTableScan(table=[[default_catalog, default_database, T, source: [TestTableSource(a, b, c, d)]]])
207+
: :- LogicalTableScan(table=[[default_catalog, default_database, T1]])
208+
: +- LogicalTableScan(table=[[default_catalog, default_database, T]])
209209
+- LogicalProject(d2=[$7])
210210
+- LogicalJoin(condition=[=($7, $0)], joinType=[inner])
211-
:- LogicalTableScan(table=[[default_catalog, default_database, T, source: [TestTableSource(a, b, c, d)]]])
212-
+- LogicalTableScan(table=[[default_catalog, default_database, T2, source: [TestTableSource(a2, b2, c2, d2)]]])
211+
:- LogicalTableScan(table=[[default_catalog, default_database, T]])
212+
+- LogicalTableScan(table=[[default_catalog, default_database, T2]])
213213
]]>
214214
</Resource>
215215
<Resource name="optimized exec plan">
216216
<![CDATA[
217217
MultipleInput(readOrder=[0,1,1,2], members=[\nHashJoin(joinType=[InnerJoin], where=[(a = d2)], select=[a, d2], build=[left])\n:- Calc(select=[a])\n: +- HashJoin(joinType=[InnerJoin], where=[(a = a1)], select=[a1, a], build=[left])\n: :- [#1] Exchange(distribution=[hash[a1]])\n: +- [#2] Exchange(distribution=[hash[a]])\n+- Calc(select=[d2])\n +- HashJoin(joinType=[InnerJoin], where=[(d2 = a)], select=[a, d2], build=[left])\n :- [#2] Exchange(distribution=[hash[a]])\n +- [#4] Exchange(distribution=[hash[d2]])\n])
218218
:- Exchange(distribution=[hash[a1]])
219219
: +- Calc(select=[a1])
220-
: +- LegacyTableSourceScan(table=[[default_catalog, default_database, T1, source: [TestTableSource(a1, b1, c1, d1)]]], fields=[a1, b1, c1, d1])
220+
: +- TableSourceScan(table=[[default_catalog, default_database, T1]], fields=[a1, b1, c1, d1])
221221
:- Exchange(distribution=[hash[a]])(reuse_id=[1])
222222
: +- Calc(select=[a])
223-
: +- LegacyTableSourceScan(table=[[default_catalog, default_database, T, source: [TestTableSource(a, b, c, d)]]], fields=[a, b, c, d])
223+
: +- TableSourceScan(table=[[default_catalog, default_database, T]], fields=[a, b, c, d])
224224
:- Reused(reference_id=[1])
225225
+- Exchange(distribution=[hash[d2]])
226226
+- Calc(select=[d2])
227-
+- LegacyTableSourceScan(table=[[default_catalog, default_database, T2, source: [TestTableSource(a2, b2, c2, d2)]]], fields=[a2, b2, c2, d2])
227+
+- TableSourceScan(table=[[default_catalog, default_database, T2]], fields=[a2, b2, c2, d2])
228228
]]>
229229
</Resource>
230230
</TestCase>

0 commit comments

Comments
 (0)