Skip to content

Commit e40a885

Browse files
committed
[FLINK-38609][table] Make generation of xml plans deterministic
1 parent 072162a commit e40a885

File tree

206 files changed

+20417
-19277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+20417
-19277
lines changed

flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/plan/common/DynamicFunctionPlanTestBase.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ void testAggregateReduceConstants3() {
9191
@Test
9292
void testCalcMerge() {
9393
util.verifyExecPlan(
94-
"SELECT * FROM ( \n"
94+
"SELECT * FROM (\n"
9595
+ " SELECT *, SUBSTR(CAST(LOCALTIME AS VARCHAR), 1, 2) hh\n"
9696
+ " FROM src\n"
9797
+ " ) t1 WHERE hh > 12 AND cat LIKE 'fruit%'\n");

flink-table/flink-table-planner/src/test/java/org/apache/flink/table/planner/utils/DiffRepository.java

Lines changed: 206 additions & 71 deletions
Large diffs are not rendered by default.

flink-table/flink-table-planner/src/test/resources/org/apache/flink/table/api/batch/ExplainTest.xml

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ MultipleInput(readOrder=[0,1], members=[\nHashJoin(joinType=[InnerJoin], where=[
9494
]]>
9595
</Resource>
9696
</TestCase>
97-
<TestCase name="testExplainWithAgg[extended=true]">
97+
<TestCase name="testExplainWithAgg[extended=false]">
9898
<Resource name="explain">
9999
<![CDATA[== Abstract Syntax Tree ==
100100
LogicalProject(EXPR$0=[$1])
@@ -103,12 +103,12 @@ LogicalProject(EXPR$0=[$1])
103103
+- LogicalTableScan(table=[[default_catalog, default_database, MyTable1]])
104104
105105
== Optimized Physical Plan ==
106-
Calc(select=[EXPR$0]): rowcount = , cumulative cost = {rows, cpu, io, network, memory}
107-
+- HashAggregate(isMerge=[true], groupBy=[a], select=[a, Final_COUNT(count1$0) AS EXPR$0]): rowcount = , cumulative cost = {rows, cpu, io, network, memory}
108-
+- Exchange(distribution=[hash[a]]): rowcount = , cumulative cost = {rows, cpu, io, network, memory}
109-
+- LocalHashAggregate(groupBy=[a], select=[a, Partial_COUNT(*) AS count1$0]): rowcount = , cumulative cost = {rows, cpu, io, network, memory}
110-
+- Calc(select=[a]): rowcount = , cumulative cost = {rows, cpu, io, network, memory}
111-
+- BoundedStreamScan(table=[[default_catalog, default_database, MyTable1]], fields=[a, b, c]): rowcount = , cumulative cost = {rows, cpu, io, network, memory}
106+
Calc(select=[EXPR$0])
107+
+- HashAggregate(isMerge=[true], groupBy=[a], select=[a, Final_COUNT(count1$0) AS EXPR$0])
108+
+- Exchange(distribution=[hash[a]])
109+
+- LocalHashAggregate(groupBy=[a], select=[a, Partial_COUNT(*) AS count1$0])
110+
+- Calc(select=[a])
111+
+- BoundedStreamScan(table=[[default_catalog, default_database, MyTable1]], fields=[a, b, c])
112112
113113
== Optimized Execution Plan ==
114114
Calc(select=[EXPR$0])
@@ -120,7 +120,7 @@ Calc(select=[EXPR$0])
120120
]]>
121121
</Resource>
122122
</TestCase>
123-
<TestCase name="testExplainWithAgg[extended=false]">
123+
<TestCase name="testExplainWithAgg[extended=true]">
124124
<Resource name="explain">
125125
<![CDATA[== Abstract Syntax Tree ==
126126
LogicalProject(EXPR$0=[$1])
@@ -129,12 +129,12 @@ LogicalProject(EXPR$0=[$1])
129129
+- LogicalTableScan(table=[[default_catalog, default_database, MyTable1]])
130130
131131
== Optimized Physical Plan ==
132-
Calc(select=[EXPR$0])
133-
+- HashAggregate(isMerge=[true], groupBy=[a], select=[a, Final_COUNT(count1$0) AS EXPR$0])
134-
+- Exchange(distribution=[hash[a]])
135-
+- LocalHashAggregate(groupBy=[a], select=[a, Partial_COUNT(*) AS count1$0])
136-
+- Calc(select=[a])
137-
+- BoundedStreamScan(table=[[default_catalog, default_database, MyTable1]], fields=[a, b, c])
132+
Calc(select=[EXPR$0]): rowcount = , cumulative cost = {rows, cpu, io, network, memory}
133+
+- HashAggregate(isMerge=[true], groupBy=[a], select=[a, Final_COUNT(count1$0) AS EXPR$0]): rowcount = , cumulative cost = {rows, cpu, io, network, memory}
134+
+- Exchange(distribution=[hash[a]]): rowcount = , cumulative cost = {rows, cpu, io, network, memory}
135+
+- LocalHashAggregate(groupBy=[a], select=[a, Partial_COUNT(*) AS count1$0]): rowcount = , cumulative cost = {rows, cpu, io, network, memory}
136+
+- Calc(select=[a]): rowcount = , cumulative cost = {rows, cpu, io, network, memory}
137+
+- BoundedStreamScan(table=[[default_catalog, default_database, MyTable1]], fields=[a, b, c]): rowcount = , cumulative cost = {rows, cpu, io, network, memory}
138138
139139
== Optimized Execution Plan ==
140140
Calc(select=[EXPR$0])
@@ -446,35 +446,35 @@ SortLimit(orderBy=[a ASC], offset=[0], fetch=[5], global=[true])
446446
]]>
447447
</Resource>
448448
</TestCase>
449-
<TestCase name="testExplainWithTableSourceScan[extended=true]">
449+
<TestCase name="testExplainWithTableSourceScan[extended=false]">
450450
<Resource name="explain">
451451
<![CDATA[== Abstract Syntax Tree ==
452452
LogicalProject(a=[$0], b=[$1], c=[$2])
453453
+- LogicalTableScan(table=[[default_catalog, default_database, MyTable]])
454454
455455
== Optimized Physical Plan ==
456-
TableSourceScan(table=[[default_catalog, default_database, MyTable]], fields=[a, b, c]): rowcount = , cumulative cost = {rows, cpu, io, network, memory}
456+
TableSourceScan(table=[[default_catalog, default_database, MyTable]], fields=[a, b, c])
457457
458458
== Optimized Execution Plan ==
459459
TableSourceScan(table=[[default_catalog, default_database, MyTable]], fields=[a, b, c])
460460
]]>
461461
</Resource>
462462
</TestCase>
463-
<TestCase name="testExplainWithTableSourceScan[extended=false]">
463+
<TestCase name="testExplainWithTableSourceScan[extended=true]">
464464
<Resource name="explain">
465465
<![CDATA[== Abstract Syntax Tree ==
466466
LogicalProject(a=[$0], b=[$1], c=[$2])
467467
+- LogicalTableScan(table=[[default_catalog, default_database, MyTable]])
468468
469469
== Optimized Physical Plan ==
470-
TableSourceScan(table=[[default_catalog, default_database, MyTable]], fields=[a, b, c])
470+
TableSourceScan(table=[[default_catalog, default_database, MyTable]], fields=[a, b, c]): rowcount = , cumulative cost = {rows, cpu, io, network, memory}
471471
472472
== Optimized Execution Plan ==
473473
TableSourceScan(table=[[default_catalog, default_database, MyTable]], fields=[a, b, c])
474474
]]>
475475
</Resource>
476476
</TestCase>
477-
<TestCase name="testExplainWithUnion[extended=true]">
477+
<TestCase name="testExplainWithUnion[extended=false]">
478478
<Resource name="explain">
479479
<![CDATA[== Abstract Syntax Tree ==
480480
LogicalUnion(all=[true])
@@ -484,9 +484,9 @@ LogicalUnion(all=[true])
484484
+- LogicalTableScan(table=[[default_catalog, default_database, MyTable2]])
485485
486486
== Optimized Physical Plan ==
487-
Union(all=[true], union=[a, b, c]): rowcount = , cumulative cost = {rows, cpu, io, network, memory}
488-
:- BoundedStreamScan(table=[[default_catalog, default_database, MyTable1]], fields=[a, b, c]): rowcount = , cumulative cost = {rows, cpu, io, network, memory}
489-
+- BoundedStreamScan(table=[[default_catalog, default_database, MyTable2]], fields=[d, e, f]): rowcount = , cumulative cost = {rows, cpu, io, network, memory}
487+
Union(all=[true], union=[a, b, c])
488+
:- BoundedStreamScan(table=[[default_catalog, default_database, MyTable1]], fields=[a, b, c])
489+
+- BoundedStreamScan(table=[[default_catalog, default_database, MyTable2]], fields=[d, e, f])
490490
491491
== Optimized Execution Plan ==
492492
Union(all=[true], union=[a, b, c])
@@ -495,7 +495,7 @@ Union(all=[true], union=[a, b, c])
495495
]]>
496496
</Resource>
497497
</TestCase>
498-
<TestCase name="testExplainWithUnion[extended=false]">
498+
<TestCase name="testExplainWithUnion[extended=true]">
499499
<Resource name="explain">
500500
<![CDATA[== Abstract Syntax Tree ==
501501
LogicalUnion(all=[true])
@@ -505,9 +505,9 @@ LogicalUnion(all=[true])
505505
+- LogicalTableScan(table=[[default_catalog, default_database, MyTable2]])
506506
507507
== Optimized Physical Plan ==
508-
Union(all=[true], union=[a, b, c])
509-
:- BoundedStreamScan(table=[[default_catalog, default_database, MyTable1]], fields=[a, b, c])
510-
+- BoundedStreamScan(table=[[default_catalog, default_database, MyTable2]], fields=[d, e, f])
508+
Union(all=[true], union=[a, b, c]): rowcount = , cumulative cost = {rows, cpu, io, network, memory}
509+
:- BoundedStreamScan(table=[[default_catalog, default_database, MyTable1]], fields=[a, b, c]): rowcount = , cumulative cost = {rows, cpu, io, network, memory}
510+
+- BoundedStreamScan(table=[[default_catalog, default_database, MyTable2]], fields=[d, e, f]): rowcount = , cumulative cost = {rows, cpu, io, network, memory}
511511
512512
== Optimized Execution Plan ==
513513
Union(all=[true], union=[a, b, c])

0 commit comments

Comments
 (0)