database/openGauss-server
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!2070 修复非SMP场景下，full join不能重写为anti full join + left join的问题

Browse Source 
Merge pull request !2070 from pengjiong/drop_ext
This commit is contained in:
opengauss-bot
2022-08-23 12:38:13 +00:00
committed by Gitee
parent 33a27a8ef1 9d9c6ce606
commit 831d1fe85f
4 changed files with 161 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gausskernel/optimizer/plan/planner.cpp
View File

@ -1720,7 +1720,10 @@ Plan* subquery_planner(PlannerGlobal* glob, Query* parse, PlannerInfo* parent_ro
if (hasOuterJoins) {
reduce_outer_joins(root);
DEBUG_QRW("After outer-to-inner conversion");
if (IS_STREAM_PLAN) {
#ifdef ENABLE_MULTIPLE_NODES
if (IS_STREAM_PLAN)
#endif
{
bool support_rewrite = true;
if (!fulljoin_2_left_union_right_anti_support(root->parse))
support_rewrite = false;

3
src/gausskernel/optimizer/prep/prepjointree.cpp
View File

@ -3369,8 +3369,9 @@ void reduce_inequality_fulljoins(PlannerInfo* root)
*/
static Node* reduce_inequality_fulljoins_jointree_recurse(PlannerInfo* root, Node* jtnode)
{
#ifdef ENABLE_MULTIPLE_NODES
Assert(IS_STREAM_PLAN);
#endif
if (jtnode == NULL || IsA(jtnode, RangeTblRef)) {
return jtnode; /* jtnode is returned unmodified */
} else if (IsA(jtnode, FromExpr)) {

105
src/test/regress/expected/join_test_alias.out
View File

@ -53,3 +53,108 @@ on T5.issue_type=T6.is_type
| 首发
(2 rows)
-- full join with non-equal condition
create table fulljointest(c1 int,c2 varchar2(20),c3 varchar2(20),c4 int);
insert into fulljointest values(1,'li','adjani',100);
insert into fulljointest values(2,'li','adjani',2000);
insert into fulljointest values(3,'li','adjani',5000);
set query_dop=1;
explain(costs off) select * from fulljointest t1 full join fulljointest t2 on case t2.c4 when 100 then 'low'
when 5000 then 'high'
when 2000 then 'medium'
end between 'high' and 'high'
join fulljointest t3 on case t3.c4 when 100 then 'low'
when 5000 then 'high'
when 2000 then 'medium'
end between 'high' and 'high'
order by 1,2,3,4;
QUERY PLAN
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Sort
Sort Key: t1.c1, t1.c2, t1.c3, t1.c4
-> Nested Loop
-> Result
-> Append
-> Nested Loop Left Join
-> Seq Scan on fulljointest t1
-> Materialize
-> Seq Scan on fulljointest t2
Filter: ((CASE c4 WHEN 100 THEN 'low'::text WHEN 5000 THEN 'high'::text WHEN 2000 THEN 'medium'::text ELSE NULL::text END >= 'high'::text) AND (CASE c4 WHEN 100 THEN 'low'::text WHEN 5000 THEN 'high'::text WHEN 2000 THEN 'medium'::text ELSE NULL::text END <= 'high'::text))
-> Nested Loop Left Anti Full Join
Join Filter: ((CASE t2.c4 WHEN 100 THEN 'low'::text WHEN 5000 THEN 'high'::text WHEN 2000 THEN 'medium'::text ELSE NULL::text END >= 'high'::text) AND (CASE t2.c4 WHEN 100 THEN 'low'::text WHEN 5000 THEN 'high'::text WHEN 2000 THEN 'medium'::text ELSE NULL::text END <= 'high'::text))
-> Seq Scan on fulljointest t2
-> Materialize
-> Seq Scan on fulljointest t1
-> Materialize
-> Seq Scan on fulljointest t3
Filter: ((CASE c4 WHEN 100 THEN 'low'::text WHEN 5000 THEN 'high'::text WHEN 2000 THEN 'medium'::text ELSE NULL::text END >= 'high'::text) AND (CASE c4 WHEN 100 THEN 'low'::text WHEN 5000 THEN 'high'::text WHEN 2000 THEN 'medium'::text ELSE NULL::text END <= 'high'::text))
(18 rows)
select * from fulljointest t1 full join fulljointest t2 on case t2.c4 when 100 then 'low'
when 5000 then 'high'
when 2000 then 'medium'
end between 'high' and 'high'
join fulljointest t3 on case t3.c4 when 100 then 'low'
when 5000 then 'high'
when 2000 then 'medium'
end between 'high' and 'high'
order by 1,2,3,4;
c1 | c2 | c3 | c4 | c1 | c2 | c3 | c4 | c1 | c2 | c3 | c4
----+----+--------+------+----+----+--------+------+----+----+--------+------
1 | li | adjani | 100 | 3 | li | adjani | 5000 | 3 | li | adjani | 5000
2 | li | adjani | 2000 | 3 | li | adjani | 5000 | 3 | li | adjani | 5000
3 | li | adjani | 5000 | 3 | li | adjani | 5000 | 3 | li | adjani | 5000
| | | | 1 | li | adjani | 100 | 3 | li | adjani | 5000
| | | | 2 | li | adjani | 2000 | 3 | li | adjani | 5000
(5 rows)
set query_dop=4;
explain(costs off) select * from fulljointest t1 full join fulljointest t2 on case t2.c4 when 100 then 'low'
when 5000 then 'high'
when 2000 then 'medium'
end between 'high' and 'high'
join fulljointest t3 on case t3.c4 when 100 then 'low'
when 5000 then 'high'
when 2000 then 'medium'
end between 'high' and 'high'
order by 1,2,3,4;
QUERY PLAN
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Sort
Sort Key: t1.c1, t1.c2, t1.c3, t1.c4
-> Nested Loop
-> Result
-> Append
-> Nested Loop Left Join
-> Seq Scan on fulljointest t1
-> Materialize
-> Seq Scan on fulljointest t2
Filter: ((CASE c4 WHEN 100 THEN 'low'::text WHEN 5000 THEN 'high'::text WHEN 2000 THEN 'medium'::text ELSE NULL::text END >= 'high'::text) AND (CASE c4 WHEN 100 THEN 'low'::text WHEN 5000 THEN 'high'::text WHEN 2000 THEN 'medium'::text ELSE NULL::text END <= 'high'::text))
-> Nested Loop Left Anti Full Join
Join Filter: ((CASE t2.c4 WHEN 100 THEN 'low'::text WHEN 5000 THEN 'high'::text WHEN 2000 THEN 'medium'::text ELSE NULL::text END >= 'high'::text) AND (CASE t2.c4 WHEN 100 THEN 'low'::text WHEN 5000 THEN 'high'::text WHEN 2000 THEN 'medium'::text ELSE NULL::text END <= 'high'::text))
-> Seq Scan on fulljointest t2
-> Materialize
-> Seq Scan on fulljointest t1
-> Materialize
-> Seq Scan on fulljointest t3
Filter: ((CASE c4 WHEN 100 THEN 'low'::text WHEN 5000 THEN 'high'::text WHEN 2000 THEN 'medium'::text ELSE NULL::text END >= 'high'::text) AND (CASE c4 WHEN 100 THEN 'low'::text WHEN 5000 THEN 'high'::text WHEN 2000 THEN 'medium'::text ELSE NULL::text END <= 'high'::text))
(18 rows)
select * from fulljointest t1 full join fulljointest t2 on case t2.c4 when 100 then 'low'
when 5000 then 'high'
when 2000 then 'medium'
end between 'high' and 'high'
join fulljointest t3 on case t3.c4 when 100 then 'low'
when 5000 then 'high'
when 2000 then 'medium'
end between 'high' and 'high'
order by 1,2,3,4;
c1 | c2 | c3 | c4 | c1 | c2 | c3 | c4 | c1 | c2 | c3 | c4
----+----+--------+------+----+----+--------+------+----+----+--------+------
1 | li | adjani | 100 | 3 | li | adjani | 5000 | 3 | li | adjani | 5000
2 | li | adjani | 2000 | 3 | li | adjani | 5000 | 3 | li | adjani | 5000
3 | li | adjani | 5000 | 3 | li | adjani | 5000 | 3 | li | adjani | 5000
| | | | 1 | li | adjani | 100 | 3 | li | adjani | 5000
| | | | 2 | li | adjani | 2000 | 3 | li | adjani | 5000
(5 rows)

51
src/test/regress/sql/join_test_alias.sql
View File

@ -50,4 +50,53 @@ ELSE '增发'::text
END AS is_type from t33
)T6
on T5.issue_type=T6.is_type
;
;
-- full join with non-equal condition
create table fulljointest(c1 int,c2 varchar2(20),c3 varchar2(20),c4 int);
insert into fulljointest values(1,'li','adjani',100);
insert into fulljointest values(2,'li','adjani',2000);
insert into fulljointest values(3,'li','adjani',5000);
set query_dop=1;
explain(costs off) select * from fulljointest t1 full join fulljointest t2 on case t2.c4 when 100 then 'low'
when 5000 then 'high'
when 2000 then 'medium'
end between 'high' and 'high'
join fulljointest t3 on case t3.c4 when 100 then 'low'
when 5000 then 'high'
when 2000 then 'medium'
end between 'high' and 'high'
order by 1,2,3,4;
select * from fulljointest t1 full join fulljointest t2 on case t2.c4 when 100 then 'low'
when 5000 then 'high'
when 2000 then 'medium'
end between 'high' and 'high'
join fulljointest t3 on case t3.c4 when 100 then 'low'
when 5000 then 'high'
when 2000 then 'medium'
end between 'high' and 'high'
order by 1,2,3,4;
set query_dop=4;
explain(costs off) select * from fulljointest t1 full join fulljointest t2 on case t2.c4 when 100 then 'low'
when 5000 then 'high'
when 2000 then 'medium'
end between 'high' and 'high'
join fulljointest t3 on case t3.c4 when 100 then 'low'
when 5000 then 'high'
when 2000 then 'medium'
end between 'high' and 'high'
order by 1,2,3,4;
select * from fulljointest t1 full join fulljointest t2 on case t2.c4 when 100 then 'low'
when 5000 then 'high'
when 2000 then 'medium'
end between 'high' and 'high'
join fulljointest t3 on case t3.c4 when 100 then 'low'
when 5000 then 'high'
when 2000 then 'medium'
end between 'high' and 'high'
order by 1,2,3,4;