This is an automated email from the ASF dual-hosted git repository. jark pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
commit d5f45c3539835f8c2dda4007eb5f69091a9913d1 Author: yuzhao.cyz <[email protected]> AuthorDate: Tue Mar 17 21:19:41 2020 +0800 [FLINK-14338][table-planner-blink] Plan verify changes from DIGEST to EXPLAIN: change plan for values node * The values node does not print row type anymore --- .../table/planner/plan/batch/sql/CalcTest.xml | 4 +- .../table/planner/plan/batch/sql/LimitTest.xml | 100 ++++++++++----------- .../planner/plan/batch/sql/SetOperatorsTest.xml | 6 +- .../table/planner/plan/batch/sql/SortLimitTest.xml | 8 +- .../table/planner/plan/batch/sql/UnnestTest.xml | 22 ++--- .../table/planner/plan/batch/sql/ValuesTest.xml | 22 ++--- .../plan/batch/sql/join/BroadcastHashJoinTest.xml | 2 +- .../plan/batch/sql/join/NestedLoopJoinTest.xml | 6 +- .../plan/batch/sql/join/SortMergeJoinTest.xml | 2 +- .../logical/CalcPruneAggregateCallRuleTest.xml | 10 +-- .../rules/logical/FlinkLimit0RemoveRuleTest.xml | 18 ++-- .../rules/logical/FlinkPruneEmptyRulesTest.xml | 2 +- .../plan/rules/logical/LogicalUnnestRuleTest.xml | 24 ++--- .../logical/ProjectPruneAggregateCallRuleTest.xml | 4 +- .../logical/subquery/SubQuerySemiJoinTest.xml | 4 +- .../table/planner/plan/stream/sql/LimitTest.xml | 24 ++--- .../planner/plan/stream/sql/SetOperatorsTest.xml | 6 +- .../planner/plan/stream/sql/SortLimitTest.xml | 32 +++---- .../table/planner/plan/stream/sql/UnnestTest.xml | 22 ++--- .../table/planner/plan/stream/sql/ValuesTest.xml | 22 ++--- .../planner/plan/stream/sql/join/JoinTest.xml | 2 +- .../plan/stream/sql/join/WindowJoinTest.xml | 6 +- 22 files changed, 174 insertions(+), 174 deletions(-) diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/CalcTest.xml b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/CalcTest.xml index 9eb1c4d..09e443a 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/CalcTest.xml +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/CalcTest.xml @@ -40,13 +40,13 @@ Calc(select=[ARRAY(_UTF-16LE'Hi', _UTF-16LE'Hello', c) AS EXPR$0]) <Resource name="planBefore"> <![CDATA[ LogicalProject(EXPR$0=[$0], EXPR$1=[CAST($1):VARCHAR(2147483647) CHARACTER SET "UTF-16LE" NOT NULL]) -+- LogicalValues(type=[RecordType(INTEGER a, CHAR(1) b)], tuples=[[{ 3, _UTF-16LE'c' }]]) ++- LogicalValues(tuples=[[{ 3, _UTF-16LE'c' }]]) ]]> </Resource> <Resource name="planAfter"> <![CDATA[ Calc(select=[a AS EXPR$0, CAST(b) AS EXPR$1]) -+- Values(type=[RecordType(INTEGER a, CHAR(1) b)], tuples=[[{ 3, _UTF-16LE'c' }]], values=[a, b]) ++- Values(tuples=[[{ 3, _UTF-16LE'c' }]], values=[a, b]) ]]> </Resource> </TestCase> diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/LimitTest.xml b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/LimitTest.xml index de3fd4b..4456145 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/LimitTest.xml +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/LimitTest.xml @@ -29,7 +29,7 @@ LogicalSort(fetch=[0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a, VARCHAR(2147483647) c)], tuples=[[]], values=[a, c]) +Values(tuples=[[]], values=[a, c]) ]]> </Resource> </TestCase> @@ -130,28 +130,7 @@ LogicalSort(offset=[10], fetch=[0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a, VARCHAR(2147483647) c)], tuples=[[]], values=[a, c]) -]]> - </Resource> - </TestCase> - <TestCase name="testLimitWithOffset"> - <Resource name="sql"> - <![CDATA[SELECT a, c FROM MyTable LIMIT 10 OFFSET 1]]> - </Resource> - <Resource name="planBefore"> - <![CDATA[ -LogicalSort(offset=[1], fetch=[10]) -+- LogicalProject(a=[$0], c=[$2]) - +- LogicalTableScan(table=[[default_catalog, default_database, MyTable, source: [TestTableSource(a, b, c)]]]) -]]> - </Resource> - <Resource name="planAfter"> - <![CDATA[ -Calc(select=[a, c]) -+- Limit(offset=[1], fetch=[10], global=[true]) - +- Exchange(distribution=[single]) - +- Limit(offset=[0], fetch=[11], global=[false]) - +- TableSourceScan(table=[[default_catalog, default_database, MyTable, source: [TestTableSource(a, b, c)]]], fields=[a, b, c]) +Values(tuples=[[]], values=[a, c]) ]]> </Resource> </TestCase> @@ -168,7 +147,7 @@ LogicalSort(offset=[0], fetch=[0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a, VARCHAR(2147483647) c)], tuples=[[]], values=[a, c]) +Values(tuples=[[]], values=[a, c]) ]]> </Resource> </TestCase> @@ -185,7 +164,7 @@ LogicalSort(fetch=[0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a, BIGINT b, VARCHAR(2147483647) c)], tuples=[[]], values=[a, b, c]) +Values(tuples=[[]], values=[a, b, c]) ]]> </Resource> </TestCase> @@ -210,34 +189,34 @@ Calc(select=[a, c]) ]]> </Resource> </TestCase> - <TestCase name="testLimitWithOffset0"> + <TestCase name="testOrderByWithLimitSource"> <Resource name="sql"> - <![CDATA[SELECT a, c FROM MyTable LIMIT 10 OFFSET 0]]> + <![CDATA[SELECT a, c FROM LimitTable ORDER BY c LIMIT 10]]> </Resource> <Resource name="planBefore"> <![CDATA[ -LogicalSort(offset=[0], fetch=[10]) +LogicalSort(sort0=[$1], dir0=[ASC-nulls-first], fetch=[10]) +- LogicalProject(a=[$0], c=[$2]) - +- LogicalTableScan(table=[[default_catalog, default_database, MyTable, source: [TestTableSource(a, b, c)]]]) + +- LogicalTableScan(table=[[default_catalog, default_database, LimitTable]]) ]]> </Resource> <Resource name="planAfter"> <![CDATA[ Calc(select=[a, c]) -+- Limit(offset=[0], fetch=[10], global=[true]) ++- SortLimit(orderBy=[c ASC], offset=[0], fetch=[10], global=[true]) +- Exchange(distribution=[single]) - +- Limit(offset=[0], fetch=[10], global=[false]) - +- TableSourceScan(table=[[default_catalog, default_database, MyTable, source: [TestTableSource(a, b, c)]]], fields=[a, b, c]) + +- SortLimit(orderBy=[c ASC], offset=[0], fetch=[10], global=[false]) + +- TableSourceScan(table=[[default_catalog, default_database, LimitTable]], fields=[a, b, c]) ]]> </Resource> </TestCase> - <TestCase name="testOnlyOffset"> + <TestCase name="testLimitWithOffset"> <Resource name="sql"> - <![CDATA[SELECT a, c FROM MyTable OFFSET 10 ROWS]]> + <![CDATA[SELECT a, c FROM MyTable LIMIT 10 OFFSET 1]]> </Resource> <Resource name="planBefore"> <![CDATA[ -LogicalSort(offset=[10]) +LogicalSort(offset=[1], fetch=[10]) +- LogicalProject(a=[$0], c=[$2]) +- LogicalTableScan(table=[[default_catalog, default_database, MyTable, source: [TestTableSource(a, b, c)]]]) ]]> @@ -245,30 +224,31 @@ LogicalSort(offset=[10]) <Resource name="planAfter"> <![CDATA[ Calc(select=[a, c]) -+- Limit(offset=[10], fetch=[unlimited], global=[true]) ++- Limit(offset=[1], fetch=[10], global=[true]) +- Exchange(distribution=[single]) - +- TableSourceScan(table=[[default_catalog, default_database, MyTable, source: [TestTableSource(a, b, c)]]], fields=[a, b, c]) + +- Limit(offset=[0], fetch=[11], global=[false]) + +- TableSourceScan(table=[[default_catalog, default_database, MyTable, source: [TestTableSource(a, b, c)]]], fields=[a, b, c]) ]]> </Resource> </TestCase> - <TestCase name="testLimitWithOffsetAndLimitSource"> + <TestCase name="testLimitWithOffset0"> <Resource name="sql"> - <![CDATA[SELECT a, c FROM LimitTable LIMIT 10 OFFSET 1]]> + <![CDATA[SELECT a, c FROM MyTable LIMIT 10 OFFSET 0]]> </Resource> <Resource name="planBefore"> <![CDATA[ -LogicalSort(offset=[1], fetch=[10]) +LogicalSort(offset=[0], fetch=[10]) +- LogicalProject(a=[$0], c=[$2]) - +- LogicalTableScan(table=[[default_catalog, default_database, LimitTable]]) + +- LogicalTableScan(table=[[default_catalog, default_database, MyTable, source: [TestTableSource(a, b, c)]]]) ]]> </Resource> <Resource name="planAfter"> <![CDATA[ Calc(select=[a, c]) -+- Limit(offset=[1], fetch=[10], global=[true]) ++- Limit(offset=[0], fetch=[10], global=[true]) +- Exchange(distribution=[single]) - +- Limit(offset=[0], fetch=[11], global=[false]) - +- TableSourceScan(table=[[default_catalog, default_database, LimitTable, source: [limit: 11]]], fields=[a, b, c]) + +- Limit(offset=[0], fetch=[10], global=[false]) + +- TableSourceScan(table=[[default_catalog, default_database, MyTable, source: [TestTableSource(a, b, c)]]], fields=[a, b, c]) ]]> </Resource> </TestCase> @@ -292,13 +272,33 @@ Limit(offset=[0], fetch=[5], global=[true]) ]]> </Resource> </TestCase> - <TestCase name="testOrderByWithLimitSource"> + <TestCase name="testOnlyOffset"> <Resource name="sql"> - <![CDATA[SELECT a, c FROM LimitTable ORDER BY c LIMIT 10]]> + <![CDATA[SELECT a, c FROM MyTable OFFSET 10 ROWS]]> </Resource> <Resource name="planBefore"> <![CDATA[ -LogicalSort(sort0=[$1], dir0=[ASC-nulls-first], fetch=[10]) +LogicalSort(offset=[10]) ++- LogicalProject(a=[$0], c=[$2]) + +- LogicalTableScan(table=[[default_catalog, default_database, MyTable, source: [TestTableSource(a, b, c)]]]) +]]> + </Resource> + <Resource name="planAfter"> + <![CDATA[ +Calc(select=[a, c]) ++- Limit(offset=[10], fetch=[unlimited], global=[true]) + +- Exchange(distribution=[single]) + +- TableSourceScan(table=[[default_catalog, default_database, MyTable, source: [TestTableSource(a, b, c)]]], fields=[a, b, c]) +]]> + </Resource> + </TestCase> + <TestCase name="testLimitWithOffsetAndLimitSource"> + <Resource name="sql"> + <![CDATA[SELECT a, c FROM LimitTable LIMIT 10 OFFSET 1]]> + </Resource> + <Resource name="planBefore"> + <![CDATA[ +LogicalSort(offset=[1], fetch=[10]) +- LogicalProject(a=[$0], c=[$2]) +- LogicalTableScan(table=[[default_catalog, default_database, LimitTable]]) ]]> @@ -306,10 +306,10 @@ LogicalSort(sort0=[$1], dir0=[ASC-nulls-first], fetch=[10]) <Resource name="planAfter"> <![CDATA[ Calc(select=[a, c]) -+- SortLimit(orderBy=[c ASC], offset=[0], fetch=[10], global=[true]) ++- Limit(offset=[1], fetch=[10], global=[true]) +- Exchange(distribution=[single]) - +- SortLimit(orderBy=[c ASC], offset=[0], fetch=[10], global=[false]) - +- TableSourceScan(table=[[default_catalog, default_database, LimitTable]], fields=[a, b, c]) + +- Limit(offset=[0], fetch=[11], global=[false]) + +- TableSourceScan(table=[[default_catalog, default_database, LimitTable, source: [limit: 11]]], fields=[a, b, c]) ]]> </Resource> </TestCase> diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/SetOperatorsTest.xml b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/SetOperatorsTest.xml index 3a062b2..8b3ae12 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/SetOperatorsTest.xml +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/SetOperatorsTest.xml @@ -87,7 +87,7 @@ LogicalIntersect(all=[false]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(VARCHAR(2147483647) c)], tuples=[[]], values=[c]) +Values(tuples=[[]], values=[c]) ]]> </Resource> </TestCase> @@ -107,7 +107,7 @@ LogicalIntersect(all=[false]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(VARCHAR(2147483647) c)], tuples=[[]], values=[c]) +Values(tuples=[[]], values=[c]) ]]> </Resource> </TestCase> @@ -210,7 +210,7 @@ LogicalMinus(all=[false]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(VARCHAR(2147483647) c)], tuples=[[]], values=[c]) +Values(tuples=[[]], values=[c]) ]]> </Resource> </TestCase> diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/SortLimitTest.xml b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/SortLimitTest.xml index fb45f0c..74112af 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/SortLimitTest.xml +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/SortLimitTest.xml @@ -49,7 +49,7 @@ LogicalSort(sort0=[$0], sort1=[$1], dir0=[DESC-nulls-last], dir1=[ASC-nulls-firs </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a, BIGINT b, VARCHAR(2147483647) c)], tuples=[[]], values=[a, b, c]) +Values(tuples=[[]], values=[a, b, c]) ]]> </Resource> </TestCase> @@ -85,7 +85,7 @@ LogicalSort(sort0=[$0], dir0=[DESC-nulls-last], fetch=[0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a, BIGINT b, VARCHAR(2147483647) c)], tuples=[[]], values=[a, b, c]) +Values(tuples=[[]], values=[a, b, c]) ]]> </Resource> </TestCase> @@ -141,7 +141,7 @@ LogicalSort(sort0=[$0], dir0=[DESC-nulls-last], fetch=[0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a, BIGINT b, VARCHAR(2147483647) c)], tuples=[[]], values=[a, b, c]) +Values(tuples=[[]], values=[a, b, c]) ]]> </Resource> </TestCase> @@ -198,7 +198,7 @@ LogicalSort(sort0=[$0], sort1=[$1], dir0=[DESC-nulls-last], dir1=[ASC-nulls-firs </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a, BIGINT b, VARCHAR(2147483647) c)], tuples=[[]], values=[a, b, c]) +Values(tuples=[[]], values=[a, b, c]) ]]> </Resource> </TestCase> diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/UnnestTest.xml b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/UnnestTest.xml index 0074eb9..6da75ba 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/UnnestTest.xml +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/UnnestTest.xml @@ -28,7 +28,7 @@ LogicalProject(a=[$0], s=[$3]) +- LogicalProject(s=[$0]) +- Uncollect +- LogicalProject(c=[$cor0.c]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -56,12 +56,12 @@ LogicalProject(b=[$0], s=[$2]) +- LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{1}]) :- LogicalProject(b=[$0], set=[$2]) : +- LogicalAggregate(group=[{0, 1}], set=[COLLECT($0)]) - : +- LogicalProject(b=[$1], $f1=[TUMBLE($3, 3000:INTERVAL SECOND)]) + : +- LogicalProject(b=[$1], $f1=[$TUMBLE($3, 3000:INTERVAL SECOND)]) : +- LogicalTableScan(table=[[default_catalog, default_database, MyTable]]) +- LogicalProject(s=[$0]) +- Uncollect +- LogicalProject(set=[$cor0.set]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -90,7 +90,7 @@ LogicalProject(a=[$0], b=[$1], v=[$4]) +- LogicalProject(k=[$0], v=[$1]) +- Uncollect +- LogicalProject(c=[$cor0.c]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -121,7 +121,7 @@ LogicalProject(a=[$0], b=[$1], x=[$2], y=[$3]) +- LogicalProject(x=[$0], y=[$1]) +- Uncollect +- LogicalProject(b=[$cor0.b]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -151,7 +151,7 @@ LogicalProject(a=[$0], s=[$2]) +- LogicalProject(s=[$0]) +- Uncollect +- LogicalProject(set=[$cor0.set]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -180,7 +180,7 @@ LogicalProject(a=[$0], s=[$3]) +- LogicalProject(s=[$0]) +- Uncollect +- LogicalProject(c=[$cor0.c]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -209,7 +209,7 @@ LogicalProject(b=[$0], id=[$2], point=[$3]) +- LogicalProject(id=[$0], point=[$1]) +- Uncollect +- LogicalProject(set=[$cor0.set]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -238,7 +238,7 @@ LogicalProject(a=[$0], b=[$1], s=[$3]) +- LogicalProject(s=[$0]) +- Uncollect +- LogicalProject(b=[$cor0.b]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -262,7 +262,7 @@ LogicalProject(a=[$0], b=[$1], s=[$2], t=[$3]) +- LogicalProject(s=[$0], t=[$1]) +- Uncollect +- LogicalProject(b=[$cor0.b]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -284,7 +284,7 @@ LogicalProject(a=[$0], b=[$1], _1=[$2], _2=[$3]) :- LogicalTableScan(table=[[default_catalog, default_database, MyTable, source: [TestTableSource(a, b)]]]) +- Uncollect +- LogicalProject(b=[$cor0.b]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/ValuesTest.xml b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/ValuesTest.xml index fa537d3..c517550 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/ValuesTest.xml +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/ValuesTest.xml @@ -25,16 +25,16 @@ limitations under the License. LogicalProject(a=[$0], b=[$1]), rowType=[RecordType(INTEGER a, DECIMAL(20, 1) b)] +- LogicalUnion(all=[true]), rowType=[RecordType(INTEGER EXPR$0, DECIMAL(20, 1) EXPR$1)] :- LogicalProject(EXPR$0=[1], EXPR$1=[2.0:DECIMAL(2, 1)]), rowType=[RecordType(INTEGER EXPR$0, DECIMAL(2, 1) EXPR$1)] - : +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]), rowType=[RecordType(INTEGER ZERO)] + : +- LogicalValues(tuples=[[{ 0 }]]), rowType=[RecordType(INTEGER ZERO)] +- LogicalProject(EXPR$0=[3], EXPR$1=[4:BIGINT]), rowType=[RecordType(INTEGER EXPR$0, BIGINT EXPR$1)] - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]), rowType=[RecordType(INTEGER ZERO)] + +- LogicalValues(tuples=[[{ 0 }]]), rowType=[RecordType(INTEGER ZERO)] ]]> </Resource> <Resource name="planAfter"> <![CDATA[ Union(all=[true], union=[EXPR$0, EXPR$1]), rowType=[RecordType(INTEGER EXPR$0, DECIMAL(20, 1) EXPR$1)] :- Calc(select=[1 AS EXPR$0, 2.0:DECIMAL(20, 1) AS EXPR$1]), rowType=[RecordType(INTEGER EXPR$0, DECIMAL(20, 1) EXPR$1)] -: +- Values(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]], values=[ZERO], reuse_id=[1]), rowType=[RecordType(INTEGER ZERO)] +: +- Values(tuples=[[{ 0 }]], values=[ZERO], reuse_id=[1]), rowType=[RecordType(INTEGER ZERO)] +- Calc(select=[3 AS EXPR$0, 4.0:DECIMAL(20, 1) AS EXPR$1]), rowType=[RecordType(INTEGER EXPR$0, DECIMAL(20, 1) EXPR$1)] +- Reused(reference_id=[1]), rowType=[RecordType(INTEGER ZERO)] ]]> @@ -47,12 +47,12 @@ Union(all=[true], union=[EXPR$0, EXPR$1]), rowType=[RecordType(INTEGER EXPR$0, D <Resource name="planBefore"> <![CDATA[ LogicalProject(a=[$0], b=[$1], c=[$2]) -+- LogicalValues(type=[RecordType(INTEGER a, INTEGER b, INTEGER c)], tuples=[[{ 1, 2, 3 }]]) ++- LogicalValues(tuples=[[{ 1, 2, 3 }]]) ]]> </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a, INTEGER b, INTEGER c)], tuples=[[{ 1, 2, 3 }]], values=[a, b, c]) +Values(tuples=[[{ 1, 2, 3 }]], values=[a, b, c]) ]]> </Resource> </TestCase> @@ -65,18 +65,18 @@ Values(type=[RecordType(INTEGER a, INTEGER b, INTEGER c)], tuples=[[{ 1, 2, 3 }] LogicalProject(a=[$0], b=[$1]) +- LogicalUnion(all=[true]) :- LogicalProject(EXPR$0=[1], EXPR$1=[2]) - : +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + : +- LogicalValues(tuples=[[{ 0 }]]) :- LogicalProject(EXPR$0=[3], EXPR$1=[null:INTEGER]) - : +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + : +- LogicalValues(tuples=[[{ 0 }]]) +- LogicalProject(EXPR$0=[4], EXPR$1=[5]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> <![CDATA[ Union(all=[true], union=[EXPR$0, EXPR$1]) :- Calc(select=[1 AS EXPR$0, CAST(2) AS EXPR$1]) -: +- Values(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]], values=[ZERO], reuse_id=[1]) +: +- Values(tuples=[[{ 0 }]], values=[ZERO], reuse_id=[1]) :- Calc(select=[3 AS EXPR$0, null:INTEGER AS EXPR$1]) : +- Reused(reference_id=[1]) +- Calc(select=[4 AS EXPR$0, CAST(5) AS EXPR$1]) @@ -91,13 +91,13 @@ Union(all=[true], union=[EXPR$0, EXPR$1]) <Resource name="planBefore"> <![CDATA[ LogicalProject(EXPR$0=[null:INTEGER]) -+- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) ++- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> <![CDATA[ Calc(select=[null:INTEGER AS EXPR$0]) -+- Values(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]], values=[ZERO]) ++- Values(tuples=[[{ 0 }]], values=[ZERO]) ]]> </Resource> </TestCase> diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/join/BroadcastHashJoinTest.xml b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/join/BroadcastHashJoinTest.xml index 9af0bbc..fffdc6f 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/join/BroadcastHashJoinTest.xml +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/join/BroadcastHashJoinTest.xml @@ -350,7 +350,7 @@ HashJoin(joinType=[LeftOuterJoin], where=[=(k, k0)], select=[k, v, k0, v0], isBr :- Calc(select=[CAST(0:BIGINT) AS k, v], where=[=(k, 0:BIGINT)]) : +- TableSourceScan(table=[[default_catalog, default_database, src, source: [TestTableSource(k, v)]]], fields=[k, v]) +- Exchange(distribution=[broadcast]) - +- Values(type=[RecordType(BIGINT k, VARCHAR(2147483647) v)], tuples=[[]], values=[k, v]) + +- Values(tuples=[[]], values=[k, v]) ]]> </Resource> </TestCase> diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/join/NestedLoopJoinTest.xml b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/join/NestedLoopJoinTest.xml index 73dbc0f..a4d534c 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/join/NestedLoopJoinTest.xml +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/join/NestedLoopJoinTest.xml @@ -427,7 +427,7 @@ LogicalProject(d=[$0], e=[$1], f=[$2], g=[$3], h=[$4], a=[$5], b=[$6], c=[$7]) NestedLoopJoin(joinType=[LeftOuterJoin], where=[true], select=[d, e, f, g, h, a, b, c], build=[right]) :- TableSourceScan(table=[[default_catalog, default_database, MyTable2, source: [TestTableSource(d, e, f, g, h)]]], fields=[d, e, f, g, h]) +- Exchange(distribution=[broadcast]) - +- Values(type=[RecordType(INTEGER a, BIGINT b, VARCHAR(2147483647) c)], tuples=[[]], values=[a, b, c]) + +- Values(tuples=[[]], values=[a, b, c]) ]]> </Resource> </TestCase> @@ -541,7 +541,7 @@ LogicalProject(d=[$0], e=[$1], f=[$2], g=[$3], h=[$4], a=[$5], b=[$6], c=[$7]) <![CDATA[ NestedLoopJoin(joinType=[RightOuterJoin], where=[true], select=[d, e, f, g, h, a, b, c], build=[left]) :- Exchange(distribution=[broadcast]) -: +- Values(type=[RecordType(INTEGER d, BIGINT e, INTEGER f, VARCHAR(2147483647) g, BIGINT h)], tuples=[[]], values=[d, e, f, g, h]) +: +- Values(tuples=[[]], values=[d, e, f, g, h]) +- TableSourceScan(table=[[default_catalog, default_database, MyTable1, source: [TestTableSource(a, b, c)]]], fields=[a, b, c]) ]]> </Resource> @@ -685,7 +685,7 @@ NestedLoopJoin(joinType=[LeftOuterJoin], where=[=(k, k0)], select=[k, v, k0, v0] :- Calc(select=[CAST(0:BIGINT) AS k, v], where=[=(k, 0:BIGINT)]) : +- TableSourceScan(table=[[default_catalog, default_database, src, source: [TestTableSource(k, v)]]], fields=[k, v]) +- Exchange(distribution=[broadcast]) - +- Values(type=[RecordType(BIGINT k, VARCHAR(2147483647) v)], tuples=[[]], values=[k, v]) + +- Values(tuples=[[]], values=[k, v]) ]]> </Resource> </TestCase> diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/join/SortMergeJoinTest.xml b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/join/SortMergeJoinTest.xml index f9ac1e6..b9dc2af 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/join/SortMergeJoinTest.xml +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/batch/sql/join/SortMergeJoinTest.xml @@ -463,7 +463,7 @@ SortMergeJoin(joinType=[LeftOuterJoin], where=[=(k, k0)], select=[k, v, k0, v0]) : +- Calc(select=[CAST(0:BIGINT) AS k, v], where=[=(k, 0:BIGINT)]) : +- TableSourceScan(table=[[default_catalog, default_database, src, source: [TestTableSource(k, v)]]], fields=[k, v]) +- Exchange(distribution=[hash[k]]) - +- Values(type=[RecordType(BIGINT k, VARCHAR(2147483647) v)], tuples=[[]], values=[k, v]) + +- Values(tuples=[[]], values=[k, v]) ]]> </Resource> </TestCase> diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/CalcPruneAggregateCallRuleTest.xml b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/CalcPruneAggregateCallRuleTest.xml index 2ca68f6..86fa1c9 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/CalcPruneAggregateCallRuleTest.xml +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/CalcPruneAggregateCallRuleTest.xml @@ -89,7 +89,7 @@ LogicalJoin(condition=[$4], joinType=[semi]) +- LogicalAggregate(group=[{}], m=[MIN($0)]) +- LogicalCalc(expr#0=[{inputs}], expr#1=[true], i=[$t1]) +- LogicalAggregate(group=[{}], EXPR$0=[SUM($0)]) - +- LogicalValues(type=[RecordType(INTEGER a1)], tuples=[[]]) + +- LogicalValues(tuples=[[]]) ]]> </Resource> </TestCase> @@ -166,7 +166,7 @@ LogicalJoin(condition=[$4], joinType=[semi]) +- LogicalAggregate(group=[{}], m=[MIN($0)]) +- LogicalCalc(expr#0=[{inputs}], expr#1=[true], i=[$t1]) +- LogicalAggregate(group=[{}], EXPR$0=[COUNT()]) - +- LogicalValues(type=[RecordType(INTEGER $f0)], tuples=[[]]) + +- LogicalValues(tuples=[[]]) ]]> </Resource> </TestCase> @@ -188,7 +188,7 @@ LogicalProject(a1=[$0], c1=[$2]) </Resource> <Resource name="planAfter"> <![CDATA[ -LogicalCalc(expr#0..1=[{inputs}], expr#2=[10], expr#3=[>($t1, $t2)], a1=[$t0], c1=[$t1], $condition=[$t3]) +LogicalCalc(expr#0..1=[{inputs}], expr#2=[10], expr#3=[>($t1, $t2)], proj#0..1=[{exprs}], $condition=[$t3]) +- LogicalAggregate(group=[{0}], c1=[COUNT($2)]) +- LogicalTableScan(table=[[default_catalog, default_database, T1, source: [TestTableSource(a1, b1, c1, d1)]]]) ]]> @@ -279,7 +279,7 @@ LogicalProject(a2=[$0], b2=[$1], d2=[$3]) </Resource> <Resource name="planAfter"> <![CDATA[ -LogicalCalc(expr#0..2=[{inputs}], expr#3=[0], expr#4=[>($t2, $t3)], a2=[$t0], b2=[$t1], d2=[$t2], $condition=[$t4]) +LogicalCalc(expr#0..2=[{inputs}], expr#3=[0], expr#4=[>($t2, $t3)], proj#0..2=[{exprs}], $condition=[$t4]) +- LogicalAggregate(group=[{0, 1}], d2=[SUM($3)]) +- LogicalTableScan(table=[[default_catalog, default_database, T2, source: [TestTableSource(a2, b2, c2, d2)]]]) ]]> @@ -368,7 +368,7 @@ LogicalProject(a=[$0], b2=[$1], d2=[$3]) </Resource> <Resource name="planAfter"> <![CDATA[ -LogicalCalc(expr#0..2=[{inputs}], a=[$t0], b2=[$t1], d2=[$t2]) +LogicalCalc(expr#0..2=[{inputs}], proj#0..2=[{exprs}]) +- LogicalAggregate(group=[{0, 1}], d2=[SUM($3)]) +- LogicalTableScan(table=[[default_catalog, default_database, T2, source: [TestTableSource(a2, b2, c2, d2)]]]) ]]> diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/FlinkLimit0RemoveRuleTest.xml b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/FlinkLimit0RemoveRuleTest.xml index 1102b0a..649de95 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/FlinkLimit0RemoveRuleTest.xml +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/FlinkLimit0RemoveRuleTest.xml @@ -39,7 +39,7 @@ LogicalProject(a=[$0], b=[$1], c=[$2]) +- LogicalProject($f0=[IS NOT NULL($0)]) +- LogicalAggregate(group=[{}], m=[MIN($0)]) +- LogicalProject(i=[true]) - +- LogicalValues(type=[RecordType(INTEGER a)], tuples=[[]]) + +- LogicalValues(tuples=[[]]) ]]> </Resource> </TestCase> @@ -63,7 +63,7 @@ LogicalSort(fetch=[0]) LogicalProject(a=[$0], b=[$1], c=[$2]) +- LogicalJoin(condition=[OR(=($0, $3), IS NULL($0), IS NULL($3))], joinType=[anti]) :- LogicalTableScan(table=[[default_catalog, default_database, MyTable, source: [TestTableSource(a, b, c)]]]) - +- LogicalValues(type=[RecordType(INTEGER a)], tuples=[[]]) + +- LogicalValues(tuples=[[]]) ]]> </Resource> </TestCase> @@ -87,7 +87,7 @@ LogicalSort(fetch=[0]) LogicalProject(a=[$0], b=[$1], c=[$2]) +- LogicalJoin(condition=[=($0, $3)], joinType=[semi]) :- LogicalTableScan(table=[[default_catalog, default_database, MyTable, source: [TestTableSource(a, b, c)]]]) - +- LogicalValues(type=[RecordType(INTEGER a)], tuples=[[]]) + +- LogicalValues(tuples=[[]]) ]]> </Resource> </TestCase> @@ -110,7 +110,7 @@ LogicalProject(a=[$0], b=[$1], c=[$2], a0=[$3], b0=[$4], c0=[$5]) LogicalProject(a=[$0], b=[$1], c=[$2], a0=[$3], b0=[$4], c0=[$5]) +- LogicalJoin(condition=[true], joinType=[inner]) :- LogicalTableScan(table=[[default_catalog, default_database, MyTable, source: [TestTableSource(a, b, c)]]]) - +- LogicalValues(type=[RecordType(INTEGER a, BIGINT b, VARCHAR(2147483647) c)], tuples=[[]]) + +- LogicalValues(tuples=[[]]) ]]> </Resource> </TestCase> @@ -137,7 +137,7 @@ LogicalProject(a=[$0], b=[$1], c=[$2]) +- LogicalProject($f0=[IS NOT NULL($0)]) +- LogicalAggregate(group=[{}], m=[MIN($0)]) +- LogicalProject(i=[true]) - +- LogicalValues(type=[RecordType(INTEGER a)], tuples=[[]]) + +- LogicalValues(tuples=[[]]) ]]> </Resource> </TestCase> @@ -154,7 +154,7 @@ LogicalSort(fetch=[0]) </Resource> <Resource name="planAfter"> <![CDATA[ -LogicalValues(type=[RecordType(INTEGER a, BIGINT b, VARCHAR(2147483647) c)], tuples=[[]]) +LogicalValues(tuples=[[]]) ]]> </Resource> </TestCase> @@ -171,7 +171,7 @@ LogicalSort(sort0=[$0], dir0=[ASC-nulls-first], offset=[10], fetch=[0]) </Resource> <Resource name="planAfter"> <![CDATA[ -LogicalValues(type=[RecordType(INTEGER a, BIGINT b, VARCHAR(2147483647) c)], tuples=[[]]) +LogicalValues(tuples=[[]]) ]]> </Resource> </TestCase> @@ -190,7 +190,7 @@ LogicalProject(a=[$0]) <Resource name="planAfter"> <![CDATA[ LogicalProject(a=[$0]) -+- LogicalValues(type=[RecordType(INTEGER a)], tuples=[[]]) ++- LogicalValues(tuples=[[]]) ]]> </Resource> </TestCase> @@ -207,7 +207,7 @@ LogicalSort(sort0=[$0], dir0=[ASC-nulls-first], fetch=[0]) </Resource> <Resource name="planAfter"> <![CDATA[ -LogicalValues(type=[RecordType(INTEGER a, BIGINT b, VARCHAR(2147483647) c)], tuples=[[]]) +LogicalValues(tuples=[[]]) ]]> </Resource> </TestCase> diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/FlinkPruneEmptyRulesTest.xml b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/FlinkPruneEmptyRulesTest.xml index cc063dd..d32afbb 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/FlinkPruneEmptyRulesTest.xml +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/FlinkPruneEmptyRulesTest.xml @@ -34,7 +34,7 @@ LogicalProject(d=[$0]) <Resource name="planAfter"> <![CDATA[ LogicalProject(a=[$0], b=[$1], c=[$2]) -+- LogicalValues(type=[RecordType(INTEGER a, BIGINT b, VARCHAR(2147483647) c)], tuples=[[]]) ++- LogicalValues(tuples=[[]]) ]]> </Resource> </TestCase> diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/LogicalUnnestRuleTest.xml b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/LogicalUnnestRuleTest.xml index adb53b9..0a35338 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/LogicalUnnestRuleTest.xml +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/LogicalUnnestRuleTest.xml @@ -28,7 +28,7 @@ LogicalProject(a=[$0], s=[$3]) +- LogicalProject(s=[$0]) +- Uncollect +- LogicalProject(c=[$cor0.c]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -58,12 +58,12 @@ LogicalProject(b=[$0], s=[$2]) +- LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{1}]) :- LogicalProject(b=[$0], set=[$2]) : +- LogicalAggregate(group=[{0, 1}], set=[COLLECT($0)]) - : +- LogicalProject(b=[$1], $f1=[TUMBLE($3, 3000:INTERVAL SECOND)]) + : +- LogicalProject(b=[$1], $f1=[$TUMBLE($3, 3000:INTERVAL SECOND)]) : +- LogicalTableScan(table=[[default_catalog, default_database, MyTable]]) +- LogicalProject(s=[$0]) +- Uncollect +- LogicalProject(set=[$cor0.set]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -73,7 +73,7 @@ LogicalProject(b=[$0], s=[$2]) +- LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{1}]) :- LogicalProject(b=[$0], set=[$2]) : +- LogicalAggregate(group=[{0, 1}], set=[COLLECT($0)]) - : +- LogicalProject(b=[$1], $f1=[TUMBLE($3, 3000:INTERVAL SECOND)]) + : +- LogicalProject(b=[$1], $f1=[$TUMBLE($3, 3000:INTERVAL SECOND)]) : +- LogicalTableScan(table=[[default_catalog, default_database, MyTable]]) +- LogicalProject(s=[$0]) +- LogicalTableFunctionScan(invocation=[explode($cor0.set)], rowType=[RecordType(BIGINT f0)], elementType=[class [Ljava.lang.Object;]) @@ -92,7 +92,7 @@ LogicalProject(a=[$0], b=[$1], v=[$4]) +- LogicalProject(k=[$0], v=[$1]) +- Uncollect +- LogicalProject(c=[$cor0.c]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -125,7 +125,7 @@ LogicalProject(a=[$0], b=[$1], x=[$2], y=[$3]) +- LogicalProject(x=[$0], y=[$1]) +- Uncollect +- LogicalProject(b=[$cor0.b]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -159,7 +159,7 @@ LogicalProject(a=[$0], s=[$2]) +- LogicalProject(s=[$0]) +- Uncollect +- LogicalProject(set=[$cor0.set]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -187,7 +187,7 @@ LogicalProject(a=[$0], s=[$3]) +- LogicalProject(s=[$0]) +- Uncollect +- LogicalProject(c=[$cor0.c]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -218,7 +218,7 @@ LogicalProject(b=[$0], id=[$2], point=[$3]) +- LogicalProject(id=[$0], point=[$1]) +- Uncollect +- LogicalProject(set=[$cor0.set]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -246,7 +246,7 @@ LogicalProject(a=[$0], b=[$1], s=[$3]) +- LogicalProject(s=[$0]) +- Uncollect +- LogicalProject(b=[$cor0.b]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -272,7 +272,7 @@ LogicalProject(a=[$0], b=[$1], s=[$2], t=[$3]) +- LogicalProject(s=[$0], t=[$1]) +- Uncollect +- LogicalProject(b=[$cor0.b]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -298,7 +298,7 @@ LogicalProject(a=[$0], b=[$1], _1=[$2], _2=[$3]) :- LogicalTableScan(table=[[default_catalog, default_database, MyTable, source: [TestTableSource(a, b)]]]) +- Uncollect +- LogicalProject(b=[$cor0.b]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/ProjectPruneAggregateCallRuleTest.xml b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/ProjectPruneAggregateCallRuleTest.xml index 3ded214..3df36eb 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/ProjectPruneAggregateCallRuleTest.xml +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/ProjectPruneAggregateCallRuleTest.xml @@ -89,7 +89,7 @@ LogicalJoin(condition=[$4], joinType=[semi]) +- LogicalAggregate(group=[{}], m=[MIN($0)]) +- LogicalProject(i=[true]) +- LogicalAggregate(group=[{}], EXPR$0=[SUM($0)]) - +- LogicalValues(type=[RecordType(INTEGER a1)], tuples=[[]]) + +- LogicalValues(tuples=[[]]) ]]> </Resource> </TestCase> @@ -166,7 +166,7 @@ LogicalJoin(condition=[$4], joinType=[semi]) +- LogicalAggregate(group=[{}], m=[MIN($0)]) +- LogicalProject(i=[true]) +- LogicalAggregate(group=[{}], EXPR$0=[COUNT()]) - +- LogicalValues(type=[RecordType(INTEGER $f0)], tuples=[[]]) + +- LogicalValues(tuples=[[]]) ]]> </Resource> </TestCase> diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/subquery/SubQuerySemiJoinTest.xml b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/subquery/SubQuerySemiJoinTest.xml index 97b419b..2a96d4d 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/subquery/SubQuerySemiJoinTest.xml +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/rules/logical/subquery/SubQuerySemiJoinTest.xml @@ -586,7 +586,7 @@ LogicalFilter(condition=[=($0, $cor0.a)]) LogicalTableScan(table=[[default_catalog, default_database, y, source: [TestTableSource(c, d)]]]) })], variablesSet=[[$cor0]]) +- LogicalProject(EXPR$0=[$0], EXPR$1=[$1]) - +- LogicalValues(type=[RecordType(INTEGER EXPR$0, INTEGER EXPR$1)], tuples=[[{ 1, 2 }]]) + +- LogicalValues(tuples=[[{ 1, 2 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -594,7 +594,7 @@ LogicalFilter(condition=[=($0, $cor0.a)]) LogicalProject(a=[$0], b=[$1]) +- LogicalJoin(condition=[=($2, $0)], joinType=[semi]) :- LogicalProject(EXPR$0=[$0], EXPR$1=[$1]) - : +- LogicalValues(type=[RecordType(INTEGER EXPR$0, INTEGER EXPR$1)], tuples=[[{ 1, 2 }]]) + : +- LogicalValues(tuples=[[{ 1, 2 }]]) +- LogicalProject(c=[$0]) +- LogicalFilter(condition=[true]) +- LogicalTableScan(table=[[default_catalog, default_database, y, source: [TestTableSource(c, d)]]]) diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/LimitTest.xml b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/LimitTest.xml index d9904a3..607f9f4 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/LimitTest.xml +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/LimitTest.xml @@ -29,7 +29,7 @@ LogicalSort(fetch=[0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a, BIGINT c)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -86,7 +86,7 @@ LogicalSort(offset=[10], fetch=[0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a, BIGINT c)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -103,7 +103,7 @@ LogicalSort(offset=[0], fetch=[0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a, BIGINT c)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -120,7 +120,7 @@ LogicalSort(fetch=[0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a, VARCHAR(2147483647) b, BIGINT c, TIMESTAMP(3) proctime, TIME ATTRIBUTE(ROWTIME) rowtime)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -137,7 +137,7 @@ LogicalSort(fetch=[0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(TIMESTAMP(3) proctime, BIGINT c)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -154,7 +154,7 @@ LogicalSort(fetch=[0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(TIMESTAMP(3) desc, BIGINT c)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -171,7 +171,7 @@ LogicalSort(fetch=[0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(BIGINT c, TIMESTAMP(3) desc)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -188,7 +188,7 @@ LogicalSort(fetch=[0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(BIGINT c, TIMESTAMP(3) proctime)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -205,7 +205,7 @@ LogicalSort(fetch=[0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(TIME ATTRIBUTE(ROWTIME) rowtime, BIGINT c)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -222,7 +222,7 @@ LogicalSort(fetch=[0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(TIME ATTRIBUTE(ROWTIME) desc, BIGINT c)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -239,7 +239,7 @@ LogicalSort(fetch=[0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(BIGINT c, TIME ATTRIBUTE(ROWTIME) desc)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -256,7 +256,7 @@ LogicalSort(fetch=[0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(BIGINT c, TIME ATTRIBUTE(ROWTIME) rowtime)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/SetOperatorsTest.xml b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/SetOperatorsTest.xml index 2249b4a..8c4a2f3 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/SetOperatorsTest.xml +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/SetOperatorsTest.xml @@ -87,7 +87,7 @@ LogicalIntersect(all=[false]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(VARCHAR(2147483647) c)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -107,7 +107,7 @@ LogicalIntersect(all=[false]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(VARCHAR(2147483647) c)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -211,7 +211,7 @@ LogicalMinus(all=[false]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(VARCHAR(2147483647) c)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/SortLimitTest.xml b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/SortLimitTest.xml index b9ce519..03d9b69 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/SortLimitTest.xml +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/SortLimitTest.xml @@ -217,7 +217,7 @@ LogicalProject(a=[$0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -256,7 +256,7 @@ LogicalProject(a=[$0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -295,7 +295,7 @@ LogicalProject(a=[$0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -418,7 +418,7 @@ LogicalProject(a=[$0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -562,7 +562,7 @@ LogicalProject(a=[$0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -601,7 +601,7 @@ LogicalProject(a=[$0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -640,7 +640,7 @@ LogicalProject(a=[$0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -763,7 +763,7 @@ LogicalProject(a=[$0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -802,7 +802,7 @@ LogicalProject(a=[$0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -841,7 +841,7 @@ LogicalProject(a=[$0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -880,7 +880,7 @@ LogicalProject(a=[$0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -919,7 +919,7 @@ LogicalProject(a=[$0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -958,7 +958,7 @@ LogicalProject(a=[$0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -997,7 +997,7 @@ LogicalProject(a=[$0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -1036,7 +1036,7 @@ LogicalProject(a=[$0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -1180,7 +1180,7 @@ LogicalProject(a=[$0]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/UnnestTest.xml b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/UnnestTest.xml index 09ef6c8..b7aba4d 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/UnnestTest.xml +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/UnnestTest.xml @@ -28,7 +28,7 @@ LogicalProject(a=[$0], s=[$3]) +- LogicalProject(s=[$0]) +- Uncollect +- LogicalProject(c=[$cor0.c]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -56,12 +56,12 @@ LogicalProject(b=[$0], s=[$2]) +- LogicalCorrelate(correlation=[$cor0], joinType=[inner], requiredColumns=[{1}]) :- LogicalProject(b=[$0], set=[$2]) : +- LogicalAggregate(group=[{0, 1}], set=[COLLECT($0)]) - : +- LogicalProject(b=[$1], $f1=[TUMBLE($3, 3000:INTERVAL SECOND)]) + : +- LogicalProject(b=[$1], $f1=[$TUMBLE($3, 3000:INTERVAL SECOND)]) : +- LogicalTableScan(table=[[default_catalog, default_database, MyTable]]) +- LogicalProject(s=[$0]) +- Uncollect +- LogicalProject(set=[$cor0.set]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -87,7 +87,7 @@ LogicalProject(a=[$0], b=[$1], v=[$4]) +- LogicalProject(k=[$0], v=[$1]) +- Uncollect +- LogicalProject(c=[$cor0.c]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -118,7 +118,7 @@ LogicalProject(a=[$0], b=[$1], x=[$2], y=[$3]) +- LogicalProject(x=[$0], y=[$1]) +- Uncollect +- LogicalProject(b=[$cor0.b]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -148,7 +148,7 @@ LogicalProject(a=[$0], s=[$2]) +- LogicalProject(s=[$0]) +- Uncollect +- LogicalProject(set=[$cor0.set]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -174,7 +174,7 @@ LogicalProject(a=[$0], s=[$3]) +- LogicalProject(s=[$0]) +- Uncollect +- LogicalProject(c=[$cor0.c]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -203,7 +203,7 @@ LogicalProject(b=[$0], id=[$2], point=[$3]) +- LogicalProject(id=[$0], point=[$1]) +- Uncollect +- LogicalProject(set=[$cor0.set]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -229,7 +229,7 @@ LogicalProject(a=[$0], b=[$1], s=[$3]) +- LogicalProject(s=[$0]) +- Uncollect +- LogicalProject(b=[$cor0.b]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -253,7 +253,7 @@ LogicalProject(a=[$0], b=[$1], s=[$2], t=[$3]) +- LogicalProject(s=[$0], t=[$1]) +- Uncollect +- LogicalProject(b=[$cor0.b]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> @@ -275,7 +275,7 @@ LogicalProject(a=[$0], b=[$1], _1=[$2], _2=[$3]) :- LogicalTableScan(table=[[default_catalog, default_database, MyTable, source: [TestTableSource(a, b)]]]) +- Uncollect +- LogicalProject(b=[$cor0.b]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/ValuesTest.xml b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/ValuesTest.xml index 6f7026f..d2ec0f4 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/ValuesTest.xml +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/ValuesTest.xml @@ -25,16 +25,16 @@ limitations under the License. LogicalProject(a=[$0], b=[$1]), rowType=[RecordType(INTEGER a, DECIMAL(20, 1) b)] +- LogicalUnion(all=[true]), rowType=[RecordType(INTEGER EXPR$0, DECIMAL(20, 1) EXPR$1)] :- LogicalProject(EXPR$0=[1], EXPR$1=[2.0:DECIMAL(2, 1)]), rowType=[RecordType(INTEGER EXPR$0, DECIMAL(2, 1) EXPR$1)] - : +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]), rowType=[RecordType(INTEGER ZERO)] + : +- LogicalValues(tuples=[[{ 0 }]]), rowType=[RecordType(INTEGER ZERO)] +- LogicalProject(EXPR$0=[3], EXPR$1=[4:BIGINT]), rowType=[RecordType(INTEGER EXPR$0, BIGINT EXPR$1)] - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]), rowType=[RecordType(INTEGER ZERO)] + +- LogicalValues(tuples=[[{ 0 }]]), rowType=[RecordType(INTEGER ZERO)] ]]> </Resource> <Resource name="planAfter"> <![CDATA[ Union(all=[true], union=[EXPR$0, EXPR$1]), rowType=[RecordType(INTEGER EXPR$0, DECIMAL(20, 1) EXPR$1)] :- Calc(select=[1 AS EXPR$0, 2.0:DECIMAL(20, 1) AS EXPR$1]), rowType=[RecordType(INTEGER EXPR$0, DECIMAL(20, 1) EXPR$1)] -: +- Values(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]], reuse_id=[1]), rowType=[RecordType(INTEGER ZERO)] +: +- Values(tuples=[[{ 0 }]], reuse_id=[1]), rowType=[RecordType(INTEGER ZERO)] +- Calc(select=[3 AS EXPR$0, 4.0:DECIMAL(20, 1) AS EXPR$1]), rowType=[RecordType(INTEGER EXPR$0, DECIMAL(20, 1) EXPR$1)] +- Reused(reference_id=[1]), rowType=[RecordType(INTEGER ZERO)] ]]> @@ -47,12 +47,12 @@ Union(all=[true], union=[EXPR$0, EXPR$1]), rowType=[RecordType(INTEGER EXPR$0, D <Resource name="planBefore"> <![CDATA[ LogicalProject(a=[$0], b=[$1], c=[$2]) -+- LogicalValues(type=[RecordType(INTEGER a, INTEGER b, INTEGER c)], tuples=[[{ 1, 2, 3 }]]) ++- LogicalValues(tuples=[[{ 1, 2, 3 }]]) ]]> </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a, INTEGER b, INTEGER c)], tuples=[[{ 1, 2, 3 }]]) +Values(tuples=[[{ 1, 2, 3 }]]) ]]> </Resource> </TestCase> @@ -65,18 +65,18 @@ Values(type=[RecordType(INTEGER a, INTEGER b, INTEGER c)], tuples=[[{ 1, 2, 3 }] LogicalProject(a=[$0], b=[$1]) +- LogicalUnion(all=[true]) :- LogicalProject(EXPR$0=[1], EXPR$1=[2]) - : +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + : +- LogicalValues(tuples=[[{ 0 }]]) :- LogicalProject(EXPR$0=[3], EXPR$1=[null:INTEGER]) - : +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + : +- LogicalValues(tuples=[[{ 0 }]]) +- LogicalProject(EXPR$0=[4], EXPR$1=[5]) - +- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) + +- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> <![CDATA[ Union(all=[true], union=[EXPR$0, EXPR$1]) :- Calc(select=[1 AS EXPR$0, CAST(2) AS EXPR$1]) -: +- Values(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]], reuse_id=[1]) +: +- Values(tuples=[[{ 0 }]], reuse_id=[1]) :- Calc(select=[3 AS EXPR$0, null:INTEGER AS EXPR$1]) : +- Reused(reference_id=[1]) +- Calc(select=[4 AS EXPR$0, CAST(5) AS EXPR$1]) @@ -91,13 +91,13 @@ Union(all=[true], union=[EXPR$0, EXPR$1]) <Resource name="planBefore"> <![CDATA[ LogicalProject(EXPR$0=[null:INTEGER]) -+- LogicalValues(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) ++- LogicalValues(tuples=[[{ 0 }]]) ]]> </Resource> <Resource name="planAfter"> <![CDATA[ Calc(select=[null:INTEGER AS EXPR$0]) -+- Values(type=[RecordType(INTEGER ZERO)], tuples=[[{ 0 }]]) ++- Values(tuples=[[{ 0 }]]) ]]> </Resource> </TestCase> diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/join/JoinTest.xml b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/join/JoinTest.xml index 49b6a40..a1d54d3 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/join/JoinTest.xml +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/join/JoinTest.xml @@ -1075,7 +1075,7 @@ Join(joinType=[LeftOuterJoin], where=[=(key, key0)], select=[key, v, key0, v0], : +- Calc(select=[CAST(0:BIGINT) AS key, v], where=[=(key, 0:BIGINT)], updateAsRetraction=[true], accMode=[Acc]) : +- TableSourceScan(table=[[default_catalog, default_database, src, source: [TestTableSource(key, v)]]], fields=[key, v], updateAsRetraction=[true], accMode=[Acc]) +- Exchange(distribution=[hash[key]], updateAsRetraction=[true], accMode=[Acc]) - +- Values(type=[RecordType(BIGINT key, VARCHAR(2147483647) v)], tuples=[[]], updateAsRetraction=[true], accMode=[Acc]) + +- Values(tuples=[[]], updateAsRetraction=[true], accMode=[Acc]) ]]> </Resource> </TestCase> diff --git a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/join/WindowJoinTest.xml b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/join/WindowJoinTest.xml index ba5ea52..334444b 100644 --- a/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/join/WindowJoinTest.xml +++ b/flink-table/flink-table-planner-blink/src/test/resources/org/apache/flink/table/planner/plan/stream/sql/join/WindowJoinTest.xml @@ -99,7 +99,7 @@ LogicalProject(a=[$5], c=[$7], c0=[$2]) </Resource> <Resource name="planAfter"> <![CDATA[ -Values(type=[RecordType(INTEGER a, BIGINT c, BIGINT c0)], tuples=[[]]) +Values(tuples=[[]]) ]]> </Resource> </TestCase> @@ -208,7 +208,7 @@ GROUP BY TUMBLE(t1.rowtime, INTERVAL '6' HOUR), t1.b <![CDATA[ LogicalProject(b=[$1], aSum=[$2], bCnt=[$3]) +- LogicalAggregate(group=[{0, 1}], aSum=[SUM($2)], bCnt=[COUNT($3)]) - +- LogicalProject($f0=[TUMBLE($4, 21600000:INTERVAL HOUR)], b=[$1], a0=[$5], b0=[$6]) + +- LogicalProject($f0=[$TUMBLE($4, 21600000:INTERVAL HOUR)], b=[$1], a0=[$5], b0=[$6]) +- LogicalFilter(condition=[AND(=($0, $5), >=($4, -($9, 600000:INTERVAL MINUTE)), <=($4, +($9, 3600000:INTERVAL HOUR)))]) +- LogicalJoin(condition=[true], joinType=[inner]) :- LogicalTableScan(table=[[default_catalog, default_database, MyTable]]) @@ -394,7 +394,7 @@ GROUP BY TUMBLE(t2.rowtime, INTERVAL '6' HOUR), t2.b <![CDATA[ LogicalProject(b=[$1], aSum=[$2], bCnt=[$3]) +- LogicalAggregate(group=[{0, 1}], aSum=[SUM($2)], bCnt=[COUNT($3)]) - +- LogicalProject($f0=[TUMBLE($9, 21600000:INTERVAL HOUR)], b=[$6], a=[$0], $f3=[$1]) + +- LogicalProject($f0=[$TUMBLE($9, 21600000:INTERVAL HOUR)], b=[$6], a=[$0], $f3=[$1]) +- LogicalFilter(condition=[AND(=($0, $5), >=($4, -($9, 600000:INTERVAL MINUTE)), <=($4, +($9, 3600000:INTERVAL HOUR)))]) +- LogicalJoin(condition=[true], joinType=[inner]) :- LogicalTableScan(table=[[default_catalog, default_database, MyTable]])
