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

!4349 [bugfix] ClearGenericRootCache时重置index->rel指针

Browse Source 
Merge pull request !4349 from Lamaric/issue-I8B3PF
This commit is contained in:
opengauss_bot
2023-11-06 07:12:12 +00:00
committed by Gitee
parent b76df2a020 37e6a66a95
commit 98369962cc
3 changed files with 190 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gausskernel/optimizer/gplanmgr/gplanmgr.cpp
View File

@ -1792,6 +1792,9 @@ ClearGenericRootCache(PlannerInfo *pinfo, bool onlyPossionCache)
foreach (lc, rel->indexlist) {
IndexOptInfo *idxinfo = (IndexOptInfo *)lfirst(lc);
idxinfo->predOK = false;
if (idxinfo->rel != NULL && idxinfo->rel != rel) {
idxinfo->rel = rel;
}
}
foreach (lc, rel->baserestrictinfo) {

110
src/test/regress/expected/hw_pbe.out
View File

@ -4250,3 +4250,113 @@ execute pbe_cagp(10,10);
deallocate pbe_cagp;
drop table tab_1103983;
drop table if exists tab_1109433;
NOTICE: table "tab_1109433" does not exist, skipping
create table tab_1109433(c1 int,c2 varchar,c3 text,c4 date) ;
insert into tab_1109433 values(generate_series(0, 60),generate_series(1, 30),generate_series(1, 10),date'1999-01-01'+generate_series(1, 60));
insert into tab_1109433 values(generate_series(1, 50),generate_series(0, 30),generate_series(2, 10),date'2000-01-01'+generate_series(1, 50));
insert into tab_1109433 values(generate_series(2, 30),generate_series(2, 30),generate_series(0, 10),date'2001-01-01'+generate_series(1, 50));
insert into tab_1109433 values(generate_series(2, 30),generate_series(2, 30),generate_series(1, 10),date'2002-01-01'+generate_series(1, 50));
insert into tab_1109433 values(generate_series(1, 60),null,null,null);
create index on tab_1109433(c2,c3);
analyze tab_1109433;
drop table if exists tab_1109433_1;
NOTICE: table "tab_1109433_1" does not exist, skipping
create table tab_1109433_1(c1 int,c2 varchar2(20),c3 varchar2(20),c4 int,c5 date);
insert into tab_1109433_1 values(generate_series(1, 50),'li','adjani',10,'2001-02-02');
insert into tab_1109433_1 values(generate_series(2, 50),'li','adjani',20,'2001-01-12');
insert into tab_1109433_1 values(generate_series(3, 50),'li','adjani',50,'2000-01-01');
drop table if exists tab_1109433_2;
NOTICE: table "tab_1109433_2" does not exist, skipping
create table tab_1109433_2(c1 int,c2 varchar2(20),c3 varchar2(20),c4 int,c5 date);
insert into tab_1109433_2 values(1,'li','adjani',10,'2001-02-02');
insert into tab_1109433_2 values(2,'li','adjani',20,'2001-01-12');
insert into tab_1109433_2 values(3,'li','adjani',50,'2000-01-01');
insert into tab_1109433_2 values(10,'li','adj',10,'2001-02-02');
insert into tab_1109433_2 values(20,'li','adj',20,'2001-01-12');
insert into tab_1109433_2 values(30,'li','adj',50,'2000-01-01');
drop table if exists tab_1109433_3;
NOTICE: table "tab_1109433_3" does not exist, skipping
create table tab_1109433_3(c1 int,c2 varchar2(20),c3 varchar2(20),c4 int,c5 date);
insert into tab_1109433_3 values(1,'li','adjani',10,'2001-02-02');
insert into tab_1109433_3 values(2,'li','adjani',20,'2001-01-12');
insert into tab_1109433_3 values(3,'li','adjani',50,'2000-01-01');
insert into tab_1109433_3 values(11,'li','ani',11,'2001-01-02');
insert into tab_1109433_3 values(12,'li','ani',12,'2001-01-12');
insert into tab_1109433_3 values(13,'li','ani',15,'2000-01-01');
prepare tab_1109433_pbe as SELECT /*+ choose_adaptive_gplan */ T.c2
,count(case when POSITION(T.c3 IN '1,2') > 0 and T.c2 = $1 then 1 end) AS LG_PERSON_NUM
,count(case when POSITION(T.c3 IN '1,2') > 0 and T.c2 = $2 then 1 end) AS LG_ORG_NUM
,count(case when POSITION(T.c3 IN '1,2') > 0 then 1 end) AS LG_NUM
,count(case when T.c3 = '4' and T.c2 = $1 then 1 end) AS VTM_PERSON_NUM
,count(case when T.c3 = '4' and T.c2 = $2 then 1 end) AS VTM_ORG_NUM
,count(case when T.c3 = '4' then 1 end) AS VTM_NUM
,count(case when T.c3 = $1 and T.c2 = $1 then 1 end) AS REMOTE_PERSON_NUM
,count(case when T.c3 = $1 and T.c2 = $2 then 1 end) AS REMOTE_ORG_NUM
,count(case when T.c3 = $1 then 1 end) AS REMOTE_NUM
,count(case when POSITION(T.c3 IN '1,2') > 0 and T.c2 = $1 and B.c1 = $1 then 1 end) AS LG_REJECT_PERSON_NUM
,count(case when POSITION(T.c3 IN '1,2') > 0 and T.c2 = $2 and B.c1 = $1 then 1 end) AS LG_REJECT_ORG_NUM
,count(case when POSITION(T.c3 IN '1,2') > 0 and B.c1 = $1 then 1 end) AS LG_REJECT_NUM
,count(case when T.c3 = $1 and B.c1 = $1 then 1 end) AS REMOTE_REJECT_NUM
,count(case when T.c3 = '4' and B.c1 = $1 then 1 end) AS VTM_REJECT_NUM
FROM tab_1109433 T left JOIN tab_1109433_1 B
ON T.c1 = B.c1
WHERE 1 = 1
AND T.c2 = $4
AND T.c4 >= TO_DATE($3)
AND T.c4 < TO_DATE('20220922') + 1
GROUP BY T.c2
order by 1,2,3,4,5,6,7,8;
execute tab_1109433_pbe(0,1,'19900401',13);
c2 | lg_person_num | lg_org_num | lg_num | vtm_person_num | vtm_org_num | vtm_num | remote_person_num | remote_org_num | remote_num | lg_reject_person_num | lg_reject_org_num | lg_reject_num | remote_reject_num | vtm_reject_num
----+---------------+------------+--------+----------------+-------------+---------+-------------------+----------------+------------+----------------------+-------------------+---------------+-------------------+----------------
13 | 0 | 0 | 477 | 0 | 0 | 312 | 0 | 0 | 150 | 0 | 0 | 0 | 0 | 0
(1 row)
execute tab_1109433_pbe(1,1,'19910401',14);
c2 | lg_person_num | lg_org_num | lg_num | vtm_person_num | vtm_org_num | vtm_num | remote_person_num | remote_org_num | remote_num | lg_reject_person_num | lg_reject_org_num | lg_reject_num | remote_reject_num | vtm_reject_num
----+---------------+------------+--------+----------------+-------------+---------+-------------------+----------------+------------+----------------------+-------------------+---------------+-------------------+----------------
14 | 0 | 0 | 477 | 0 | 0 | 628 | 0 | 0 | 165 | 0 | 0 | 1 | 0 | 3
(1 row)
explain (costs off) execute tab_1109433_pbe(0,1,'19900401',13);
QUERY PLAN
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Sort
Sort Key: (count(CASE WHEN (("position"('1,2'::text, t.c3) > 0) AND ((t.c2)::text = $1)) THEN 1 ELSE NULL::integer END)), (count(CASE WHEN (("position"('1,2'::text, t.c3) > 0) AND ((t.c2)::text = $2)) THEN 1 ELSE NULL::integer END)), (count(CASE WHEN ("position"('1,2'::text, t.c3) > 0) THEN 1 ELSE NULL::integer END)), (count(CASE WHEN ((t.c3 = '4'::text) AND ((t.c2)::text = $1)) THEN 1 ELSE NULL::integer END)), (count(CASE WHEN ((t.c3 = '4'::text) AND ((t.c2)::text = $2)) THEN 1 ELSE NULL::integer END)), (count(CASE WHEN (t.c3 = '4'::text) THEN 1 ELSE NULL::integer END)), (count(CASE WHEN ((t.c3 = $1) AND ((t.c2)::text = $1)) THEN 1 ELSE NULL::integer END))
-> GroupAggregate
Group By Key: t.c2
-> Hash Left Join
Hash Cond: (t.c1 = b.c1)
-> Bitmap Heap Scan on tab_1109433 t
Recheck Cond: ((c2)::text = $4)
Filter: ((c4 >= to_date($3)) AND (c4 < (to_date('20220922'::text) + '@ 1 day'::interval)))
-> Bitmap Index Scan on tab_1109433_c2_c3_idx
Index Cond: ((c2)::text = $4)
-> Hash
-> Seq Scan on tab_1109433_1 b
(13 rows)
explain (costs off) execute tab_1109433_pbe(1,1,'19910401',14);
QUERY PLAN
---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Sort
Sort Key: (count(CASE WHEN (("position"('1,2'::text, t.c3) > 0) AND ((t.c2)::text = $1)) THEN 1 ELSE NULL::integer END)), (count(CASE WHEN (("position"('1,2'::text, t.c3) > 0) AND ((t.c2)::text = $2)) THEN 1 ELSE NULL::integer END)), (count(CASE WHEN ("position"('1,2'::text, t.c3) > 0) THEN 1 ELSE NULL::integer END)), (count(CASE WHEN ((t.c3 = '4'::text) AND ((t.c2)::text = $1)) THEN 1 ELSE NULL::integer END)), (count(CASE WHEN ((t.c3 = '4'::text) AND ((t.c2)::text = $2)) THEN 1 ELSE NULL::integer END)), (count(CASE WHEN (t.c3 = '4'::text) THEN 1 ELSE NULL::integer END)), (count(CASE WHEN ((t.c3 = $1) AND ((t.c2)::text = $1)) THEN 1 ELSE NULL::integer END))
-> GroupAggregate
Group By Key: t.c2
-> Hash Left Join
Hash Cond: (t.c1 = b.c1)
-> Bitmap Heap Scan on tab_1109433 t
Recheck Cond: ((c2)::text = $4)
Filter: ((c4 >= to_date($3)) AND (c4 < (to_date('20220922'::text) + '@ 1 day'::interval)))
-> Bitmap Index Scan on tab_1109433_c2_c3_idx
Index Cond: ((c2)::text = $4)
-> Hash
-> Seq Scan on tab_1109433_1 b
(13 rows)
deallocate tab_1109433_pbe;
drop table tab_1109433;
drop table tab_1109433_1;
drop table tab_1109433_2;
drop table tab_1109433_3;

77
src/test/regress/sql/hw_pbe.sql
View File

@ -850,3 +850,80 @@ execute pbe_cagp(10,10);
deallocate pbe_cagp;
drop table tab_1103983;
drop table if exists tab_1109433;
create table tab_1109433(c1 int,c2 varchar,c3 text,c4 date) ;
insert into tab_1109433 values(generate_series(0, 60),generate_series(1, 30),generate_series(1, 10),date'1999-01-01'+generate_series(1, 60));
insert into tab_1109433 values(generate_series(1, 50),generate_series(0, 30),generate_series(2, 10),date'2000-01-01'+generate_series(1, 50));
insert into tab_1109433 values(generate_series(2, 30),generate_series(2, 30),generate_series(0, 10),date'2001-01-01'+generate_series(1, 50));
insert into tab_1109433 values(generate_series(2, 30),generate_series(2, 30),generate_series(1, 10),date'2002-01-01'+generate_series(1, 50));
insert into tab_1109433 values(generate_series(1, 60),null,null,null);
create index on tab_1109433(c2,c3);
analyze tab_1109433;
drop table if exists tab_1109433_1;
create table tab_1109433_1(c1 int,c2 varchar2(20),c3 varchar2(20),c4 int,c5 date);
insert into tab_1109433_1 values(generate_series(1, 50),'li','adjani',10,'2001-02-02');
insert into tab_1109433_1 values(generate_series(2, 50),'li','adjani',20,'2001-01-12');
insert into tab_1109433_1 values(generate_series(3, 50),'li','adjani',50,'2000-01-01');
drop table if exists tab_1109433_2;
create table tab_1109433_2(c1 int,c2 varchar2(20),c3 varchar2(20),c4 int,c5 date);
insert into tab_1109433_2 values(1,'li','adjani',10,'2001-02-02');
insert into tab_1109433_2 values(2,'li','adjani',20,'2001-01-12');
insert into tab_1109433_2 values(3,'li','adjani',50,'2000-01-01');
insert into tab_1109433_2 values(10,'li','adj',10,'2001-02-02');
insert into tab_1109433_2 values(20,'li','adj',20,'2001-01-12');
insert into tab_1109433_2 values(30,'li','adj',50,'2000-01-01');
drop table if exists tab_1109433_3;
create table tab_1109433_3(c1 int,c2 varchar2(20),c3 varchar2(20),c4 int,c5 date);
insert into tab_1109433_3 values(1,'li','adjani',10,'2001-02-02');
insert into tab_1109433_3 values(2,'li','adjani',20,'2001-01-12');
insert into tab_1109433_3 values(3,'li','adjani',50,'2000-01-01');
insert into tab_1109433_3 values(11,'li','ani',11,'2001-01-02');
insert into tab_1109433_3 values(12,'li','ani',12,'2001-01-12');
insert into tab_1109433_3 values(13,'li','ani',15,'2000-01-01');
prepare tab_1109433_pbe as SELECT /*+ choose_adaptive_gplan */ T.c2
,count(case when POSITION(T.c3 IN '1,2') > 0 and T.c2 = $1 then 1 end) AS LG_PERSON_NUM
,count(case when POSITION(T.c3 IN '1,2') > 0 and T.c2 = $2 then 1 end) AS LG_ORG_NUM
,count(case when POSITION(T.c3 IN '1,2') > 0 then 1 end) AS LG_NUM
,count(case when T.c3 = '4' and T.c2 = $1 then 1 end) AS VTM_PERSON_NUM
,count(case when T.c3 = '4' and T.c2 = $2 then 1 end) AS VTM_ORG_NUM
,count(case when T.c3 = '4' then 1 end) AS VTM_NUM
,count(case when T.c3 = $1 and T.c2 = $1 then 1 end) AS REMOTE_PERSON_NUM
,count(case when T.c3 = $1 and T.c2 = $2 then 1 end) AS REMOTE_ORG_NUM
,count(case when T.c3 = $1 then 1 end) AS REMOTE_NUM
,count(case when POSITION(T.c3 IN '1,2') > 0 and T.c2 = $1 and B.c1 = $1 then 1 end) AS LG_REJECT_PERSON_NUM
,count(case when POSITION(T.c3 IN '1,2') > 0 and T.c2 = $2 and B.c1 = $1 then 1 end) AS LG_REJECT_ORG_NUM
,count(case when POSITION(T.c3 IN '1,2') > 0 and B.c1 = $1 then 1 end) AS LG_REJECT_NUM
,count(case when T.c3 = $1 and B.c1 = $1 then 1 end) AS REMOTE_REJECT_NUM
,count(case when T.c3 = '4' and B.c1 = $1 then 1 end) AS VTM_REJECT_NUM
FROM tab_1109433 T left JOIN tab_1109433_1 B
ON T.c1 = B.c1
WHERE 1 = 1
AND T.c2 = $4
AND T.c4 >= TO_DATE($3)
AND T.c4 < TO_DATE('20220922') + 1
GROUP BY T.c2
order by 1,2,3,4,5,6,7,8;
execute tab_1109433_pbe(0,1,'19900401',13);
execute tab_1109433_pbe(1,1,'19910401',14);
explain (costs off) execute tab_1109433_pbe(0,1,'19900401',13);
explain (costs off) execute tab_1109433_pbe(1,1,'19910401',14);
deallocate tab_1109433_pbe;
drop table tab_1109433;
drop table tab_1109433_1;
drop table tab_1109433_2;
drop table tab_1109433_3;