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

fix create table as error when deparse in debug5 mode

Browse Source
This commit is contained in:
Zongtian Hou
2022-11-01 16:44:54 +08:00
parent abc267120c
commit a846d7418a
3 changed files with 60 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1486,6 +1486,13 @@ static Node* pull_up_simple_union_all(PlannerInfo* root, Node* jtnode, RangeTblE
rtoffset = list_length(root->parse->rtable);
rtable = (List*)copyObject(subquery->rtable);
IncrementVarSublevelsUp_rtable(rtable, -1, 1);
ListCell *lc= NULL;
foreach (lc, rtable){
RangeTblEntry* rte = (RangeTblEntry*)lfirst(lc);
if (rte->rtekind == RTE_SUBQUERY) {
rte->pulled_from_subquery = true;
}
}
root->parse->rtable = list_concat(root->parse->rtable, rtable);
/* Subquery can be pull, so set flag to true. */

27
src/test/regress/input/test_debug5.source
View File

@ -1,7 +1,10 @@
DROP TABLE IF EXISTS brinindex_t1;
DROP TABLE IF EXISTS test_expression_13_01;
DROP TABLE IF EXISTS test_expression_13_02;
DROP TABLE IF EXISTS ct_tbl_as;
DROP TABLE IF EXISTS ct_as;
SET log_min_messages TO debug5;
SET logging_module TO 'on(all)';
-- test deparse of subquery pull up in cte
CREATE TABLE brinindex_t1(c1 numrange,c2 int,c3 text);
@ -25,8 +28,32 @@ CREATE TABLE test_expression_13_02
INSERT INTO test_expression_13_02 VALUES(2, NULL, 201, 'English');
SELECT c_name,c_class FROM test_expression_13_01 WHERE NULL IN (SELECT c_id FROM test_expression_13_02 WHERE c_grade > 200);
-- test ceate table as with union all
CREATE TABLE ct_tbl_as
(
c_id int, c_int int, c_integer integer,
c_real real, c_decimal decimal(38), c_numeric numeric(38),
c_char char(50) not null,
c_varchar varchar(20),
c_varchar2 varchar2(4000)
)
PARTITION BY RANGE (c_integer)
(
partition P_20180121 values less than (0),
partition P_20190122 values less than (10),
partition P_20200123 values less than (20)
);
INSERT INTO ct_tbl_as VALUES(1,12,-2,123.63,563.893,852.33,'qwe','ugfd','weewvbgfyui');
INSERT INTO ct_tbl_as VALUES(2,22,8,123.63,563.893,852.33,'qedc','kjjhbn','rtygftyui');
INSERT INTO ct_tbl_as VALUES(3,32,12,123.63,563.893,852.33,'qhfs','ihgd','wertrtgui');
CREATE TABLE ct_as AS (select c_char c1,c_varchar2 c2 from ct_tbl_as) UNION ALL (SELECT c_char c3,c_varchar2 c4 FROM ct_tbl_as);
-- clean up
DROP TABLE brinindex_t1;
DROP TABLE test_expression_13_01;
DROP TABLE test_expression_13_02;
DROP TABLE ct_tbl_as;
DROP TABLE ct_as;
RESET log_min_messages;

26
src/test/regress/output/test_debug5.source
View File

@ -4,7 +4,12 @@ DROP TABLE IF EXISTS test_expression_13_01;
NOTICE: table "test_expression_13_01" does not exist, skipping
DROP TABLE IF EXISTS test_expression_13_02;
NOTICE: table "test_expression_13_02" does not exist, skipping
DROP TABLE IF EXISTS ct_tbl_as;
NOTICE: table "ct_tbl_as" does not exist, skipping
DROP TABLE IF EXISTS ct_as;
NOTICE: table "ct_as" does not exist, skipping
SET log_min_messages TO debug5;
SET logging_module TO 'on(all)';
-- test deparse of subquery pull up in cte
CREATE TABLE brinindex_t1(c1 numrange,c2 int,c3 text);
INSERT INTO brinindex_t1 SELECT format('[%s,%s]',b*1000,b*1000+3.1415926)::numrange,a,a || 'brinindextest' FROM (SELECT a,random() as b FROM generate_series(1,10000) as a);
@ -29,8 +34,29 @@ SELECT c_name,c_class FROM test_expression_13_01 WHERE NULL IN (SELECT c_id FROM
--------+---------
(0 rows)
-- test ceate table as with union all
CREATE TABLE ct_tbl_as
(
c_id int, c_int int, c_integer integer,
c_real real, c_decimal decimal(38), c_numeric numeric(38),
c_char char(50) not null,
c_varchar varchar(20),
c_varchar2 varchar2(4000)
)
PARTITION BY RANGE (c_integer)
(
partition P_20180121 values less than (0),
partition P_20190122 values less than (10),
partition P_20200123 values less than (20)
);
INSERT INTO ct_tbl_as VALUES(1,12,-2,123.63,563.893,852.33,'qwe','ugfd','weewvbgfyui');
INSERT INTO ct_tbl_as VALUES(2,22,8,123.63,563.893,852.33,'qedc','kjjhbn','rtygftyui');
INSERT INTO ct_tbl_as VALUES(3,32,12,123.63,563.893,852.33,'qhfs','ihgd','wertrtgui');
CREATE TABLE ct_as AS (select c_char c1,c_varchar2 c2 from ct_tbl_as) UNION ALL (SELECT c_char c3,c_varchar2 c4 FROM ct_tbl_as);
-- clean up
DROP TABLE brinindex_t1;
DROP TABLE test_expression_13_01;
DROP TABLE test_expression_13_02;
DROP TABLE ct_tbl_as;
DROP TABLE ct_as;
RESET log_min_messages;