Skip to content

Commit f86b7d5

Browse files
JennyJennyChenJennyJennyChen
committed
fix compile warnings and regress expected info
1 parent 6d6fe64 commit f86b7d5

File tree

7 files changed

+106
-106
lines changed

7 files changed

+106
-106
lines changed

‎src/backend/optimizer/path/allpaths.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2095,7 +2095,7 @@ check_list_contain_all_const(List *list)
20952095
node = lfirst(lc);
20962096
if (IsA(node, List))
20972097
{
2098-
if (!check_list_contain_all_const(node))
2098+
if (!check_list_contain_all_const((List *)node))
20992099
{
21002100
return false;
21012101
}

‎src/backend/optimizer/util/pgxcship.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1884,7 +1884,7 @@ pgxc_query_contains_only_pg_catalog(List *rtable)
18841884
return true;
18851885
}
18861886

1887-
ExecNodes *
1887+
static ExecNodes *
18881888
make_FQS_single_node()
18891889
{
18901890
ExecNodes *exec_nodes;

‎src/test/regress/expected/create_view.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1719,7 +1719,7 @@ create table test(v int primary key, w int) distribute by shard(v);
17191719
NOTICE: Replica identity is needed for shard table, please add to this table through "alter table" command.
17201720
insert into test values(generate_series(1,50), generate_series(1,50));
17211721
create view test_sort as select * from test where v in (select v from test where w < 20) order by v asc;
1722-
select * from test_sort;
1722+
select * from test_sort order by 1;
17231723
v | w
17241724
----+----
17251725
1 | 1

‎src/test/regress/expected/join_3.out‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -3513,13 +3513,13 @@ left join
35133513
) foo3
35143514
using (join_key);
35153515
QUERY PLAN
3516-
-----------------------------------------------------------------------
3516+
--------------------------------------------------------------------------------
35173517
Remote Subquery Scan on all (datanode_1,datanode_2)
35183518
Output: "*VALUES*".column1, i1.f1, 666
35193519
-> Hash Right Join
35203520
Output: "*VALUES*".column1, i1.f1, (666)
35213521
Hash Cond: (i1.f1 = "*VALUES*".column1)
3522-
-> Hash Right Join
3522+
-> Merge Right Join
35233523
Output: i1.f1, 666
35243524
Merge Cond: (i2.unique2 = i1.f1)
35253525
-> Remote Subquery Scan on all (datanode_1,datanode_2)
@@ -3538,14 +3538,14 @@ using (join_key);
35383538
Sort Key: i1.f1
35393539
-> Seq Scan on public.int4_tbl i1
35403540
Output: i1.f1
3541-
-> Hash
3542-
Output: "*VALUES*".column1
3541+
-> Hash
3542+
Output: "*VALUES*".column1
35433543
-> Remote Subquery Scan on all (datanode_1)
35443544
Output: "*VALUES*".column1
35453545
Distribute results by H: column1
3546-
-> Values Scan on "*VALUES*"
3547-
Output: "*VALUES*".column1
3548-
(27 rows)
3546+
-> Values Scan on "*VALUES*"
3547+
Output: "*VALUES*".column1
3548+
(31 rows)
35493549

35503550
select foo1.join_key as foo1_id, foo3.join_key AS foo3_id, bug_field from
35513551
(values (0),(1)) foo1(join_key)
@@ -5433,28 +5433,28 @@ select * from
54335433
lateral (select f1 from int4_tbl
54345434
where f1 = any (select unique1 from tenk1
54355435
where unique2 = v.x offset 0)) ss;
5436-
QUERY PLAN
5436+
QUERY PLAN
54375437
----------------------------------------------------------------------------------
54385438
Remote Subquery Scan on all
54395439
Output: "*VALUES*".column1, "*VALUES*".column2, int4_tbl.f1
54405440
-> Nested Loop
5441-
Output: "*VALUES*".column1, "*VALUES*".column2, int4_tbl.f1
5442-
-> Values Scan on "*VALUES*"
5443-
Output: "*VALUES*".column1, "*VALUES*".column2
5444-
-> Hash Join
5441+
Output: "*VALUES*".column1, "*VALUES*".column2, int4_tbl.f1
5442+
-> Values Scan on "*VALUES*"
5443+
Output: "*VALUES*".column1, "*VALUES*".column2
5444+
-> Hash Join
5445+
Output: int4_tbl.f1
5446+
Inner Unique: true
5447+
Hash Cond: (int4_tbl.f1 = tenk1.unique1)
5448+
-> Seq Scan on public.int4_tbl
54455449
Output: int4_tbl.f1
5446-
Inner Unique: true
5447-
Hash Cond: (int4_tbl.f1 = tenk1.unique1)
5448-
-> Seq Scan on public.int4_tbl
5449-
Output: int4_tbl.f1
5450-
-> Hash
5450+
-> Hash
5451+
Output: tenk1.unique1
5452+
-> HashAggregate
54515453
Output: tenk1.unique1
5452-
-> HashAggregate
5454+
Group Key: tenk1.unique1
5455+
-> Index Scan using tenk1_unique2 on public.tenk1
54535456
Output: tenk1.unique1
5454-
Group Key: tenk1.unique1
5455-
-> Index Scan using tenk1_unique2 on public.tenk1
5456-
Output: tenk1.unique1
5457-
Index Cond: (tenk1.unique2 = "*VALUES*".column2)
5457+
Index Cond: (tenk1.unique2 = "*VALUES*".column2)
54585458
(20 rows)
54595459

54605460
select * from
@@ -5478,39 +5478,39 @@ lateral (select * from int8_tbl t1,
54785478
where q2 = (select greatest(t1.q1,t2.q2))
54795479
and (select v.id=0)) offset 0) ss2) ss
54805480
where t1.q1 = ss.q2) ss0;
5481-
QUERY PLAN
5481+
QUERY PLAN
54825482
-----------------------------------------------------------------------------
54835483
Remote Subquery Scan on all (datanode_1)
54845484
Output: "*VALUES*".column1, t1.q1, t1.q2, ss2.q1, ss2.q2
5485-
-> Nested Loop
5485+
-> Nested Loop
54865486
Output: "*VALUES*".column1, t1.q1, t1.q2, ss2.q1, ss2.q2
5487-
-> Seq Scan on public.int8_tbl t1
5488-
Output: t1.q1, t1.q2
5487+
-> Seq Scan on public.int8_tbl t1
5488+
Output: t1.q1, t1.q2
54895489
-> Nested Loop
54905490
Output: "*VALUES*".column1, ss2.q1, ss2.q2
54915491
-> Values Scan on "*VALUES*"
54925492
Output: "*VALUES*".column1
5493-
-> Subquery Scan on ss2
5494-
Output: ss2.q1, ss2.q2
5495-
Filter: (t1.q1 = ss2.q2)
5496-
-> Seq Scan on public.int8_tbl t2
5497-
Output: t2.q1, t2.q2
5498-
Filter: (SubPlan 3)
5499-
SubPlan 3
5500-
-> Remote Subquery Scan on all (datanode_1)
5493+
-> Subquery Scan on ss2
5494+
Output: ss2.q1, ss2.q2
5495+
Filter: (t1.q1 = ss2.q2)
5496+
-> Seq Scan on public.int8_tbl t2
5497+
Output: t2.q1, t2.q2
5498+
Filter: (SubPlan 3)
5499+
SubPlan 3
5500+
-> Remote Subquery Scan on all (datanode_1)
5501+
Output: t3.q2
5502+
-> Result
55015503
Output: t3.q2
5502-
-> Result
5503-
Output: t3.q2
5504-
One-Time Filter: $4
5505-
InitPlan 1 (returns $2)
5506-
-> Result
5507-
Output: GREATEST($0, t2.q2)
5508-
InitPlan 2 (returns $4)
5509-
-> Result
5510-
Output: ($3 = 0)
5511-
-> Seq Scan on public.int8_tbl t3
5512-
Output: t3.q1, t3.q2
5513-
Filter: (t3.q2 = $2)
5504+
One-Time Filter: $4
5505+
InitPlan 1 (returns $2)
5506+
-> Result
5507+
Output: GREATEST($0, t2.q2)
5508+
InitPlan 2 (returns $4)
5509+
-> Result
5510+
Output: ($3 = 0)
5511+
-> Seq Scan on public.int8_tbl t3
5512+
Output: t3.q1, t3.q2
5513+
Filter: (t3.q2 = $2)
55145514
(31 rows)
55155515

55165516
select * from (values (0), (1)) v(id),

‎src/test/regress/expected/rules.out‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3198,7 +3198,7 @@ RETURNING *;
31983198
Conflict Filter: ((excluded.hat_color <> 'forbidden'::bpchar) AND (hat_data.* <> excluded.*))
31993199
CTE data
32003200
-> Remote Subquery Scan on all
3201-
-> Values Scan on "*VALUES*"
3201+
-> Values Scan on "*VALUES*"
32023202
-> Remote Subquery Scan on all
32033203
Distribute results by H: hat_name
32043204
-> CTE Scan on data

‎src/test/regress/expected/subselect.out‎

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -776,70 +776,70 @@ where a.thousand = b.thousand
776776
explain (verbose, costs off)
777777
select x, x from
778778
(select (select now()) as x from (values(1),(2)) v(y)) ss;
779-
QUERY PLAN
779+
QUERY PLAN
780780
------------------------------------------
781781
Remote Subquery Scan on all (datanode_1)
782782
Output: $0, $1
783783
-> Values Scan on "*VALUES*"
784-
Output: $0, $1
785-
InitPlan 1 (returns $0)
786-
-> Result
787-
Output: now()
788-
InitPlan 2 (returns $1)
789-
-> Result
790-
Output: now()
784+
Output: $0, $1
785+
InitPlan 1 (returns $0)
786+
-> Result
787+
Output: now()
788+
InitPlan 2 (returns $1)
789+
-> Result
790+
Output: now()
791791
(10 rows)
792792

793793
explain (verbose, costs off)
794794
select x, x from
795795
(select (select random()) as x from (values(1),(2)) v(y)) ss;
796-
QUERY PLAN
796+
QUERY PLAN
797797
------------------------------------------
798798
Remote Subquery Scan on all (datanode_1)
799799
Output: ss.x, ss.x
800800
-> Subquery Scan on ss
801-
Output: ss.x, ss.x
802-
-> Values Scan on "*VALUES*"
803-
Output: $0
804-
InitPlan 1 (returns $0)
805-
-> Result
806-
Output: random()
801+
Output: ss.x, ss.x
802+
-> Values Scan on "*VALUES*"
803+
Output: $0
804+
InitPlan 1 (returns $0)
805+
-> Result
806+
Output: random()
807807
(9 rows)
808808

809809
explain (verbose, costs off)
810810
select x, x from
811811
(select (select now() where y=y) as x from (values(1),(2)) v(y)) ss;
812-
QUERY PLAN
812+
QUERY PLAN
813813
----------------------------------------------------------------------------
814814
Remote Subquery Scan on all (datanode_1)
815815
Output: (SubPlan 1), (SubPlan 2)
816816
-> Values Scan on "*VALUES*"
817-
Output: (SubPlan 1), (SubPlan 2)
818-
SubPlan 1
819-
-> Result
820-
Output: now()
821-
One-Time Filter: ("*VALUES*".column1 = "*VALUES*".column1)
822-
SubPlan 2
823-
-> Result
824-
Output: now()
825-
One-Time Filter: ("*VALUES*".column1 = "*VALUES*".column1)
817+
Output: (SubPlan 1), (SubPlan 2)
818+
SubPlan 1
819+
-> Result
820+
Output: now()
821+
One-Time Filter: ("*VALUES*".column1 = "*VALUES*".column1)
822+
SubPlan 2
823+
-> Result
824+
Output: now()
825+
One-Time Filter: ("*VALUES*".column1 = "*VALUES*".column1)
826826
(12 rows)
827827

828828
explain (verbose, costs off)
829829
select x, x from
830830
(select (select random() where y=y) as x from (values(1),(2)) v(y)) ss;
831-
QUERY PLAN
831+
QUERY PLAN
832832
----------------------------------------------------------------------------------
833833
Remote Subquery Scan on all (datanode_1)
834834
Output: ss.x, ss.x
835835
-> Subquery Scan on ss
836-
Output: ss.x, ss.x
837-
-> Values Scan on "*VALUES*"
838-
Output: (SubPlan 1)
839-
SubPlan 1
840-
-> Result
841-
Output: random()
842-
One-Time Filter: ("*VALUES*".column1 = "*VALUES*".column1)
836+
Output: ss.x, ss.x
837+
-> Values Scan on "*VALUES*"
838+
Output: (SubPlan 1)
839+
SubPlan 1
840+
-> Result
841+
Output: random()
842+
One-Time Filter: ("*VALUES*".column1 = "*VALUES*".column1)
843843
(10 rows)
844844

845845
--
@@ -1962,28 +1962,28 @@ with recursive x(a) as
19621962
select z.a || z1.a as a from z cross join z as z1
19631963
where length(z.a || z1.a) < 5))
19641964
select * from x;
1965-
QUERY PLAN
1965+
QUERY PLAN
19661966
----------------------------------------------------------------
19671967
CTE Scan on x
19681968
Output: x.a
19691969
CTE x
19701970
-> Remote Subquery Scan on all (datanode_1)
19711971
Output: x_1.a
1972-
-> Recursive Union
1973-
-> Values Scan on "*VALUES*"
1974-
Output: "*VALUES*".column1
1975-
-> Nested Loop
1976-
Output: (z.a || z1.a)
1977-
Join Filter: (length((z.a || z1.a)) < 5)
1978-
CTE z
1979-
-> WorkTable Scan on x x_1
1980-
Output: x_1.a
1981-
-> CTE Scan on z
1982-
Output: z.a
1983-
-> Materialize
1984-
Output: z1.a
1985-
-> CTE Scan on z z1
1972+
-> Recursive Union
1973+
-> Values Scan on "*VALUES*"
1974+
Output: "*VALUES*".column1
1975+
-> Nested Loop
1976+
Output: (z.a || z1.a)
1977+
Join Filter: (length((z.a || z1.a)) < 5)
1978+
CTE z
1979+
-> WorkTable Scan on x x_1
1980+
Output: x_1.a
1981+
-> CTE Scan on z
1982+
Output: z.a
1983+
-> Materialize
19861984
Output: z1.a
1985+
-> CTE Scan on z z1
1986+
Output: z1.a
19871987
(20 rows)
19881988

19891989
with recursive x(a) as
@@ -2027,19 +2027,19 @@ with recursive x(a) as
20272027
select z.a || z.a as a from z
20282028
where length(z.a || z.a) < 5))
20292029
select * from x;
2030-
QUERY PLAN
2030+
QUERY PLAN
20312031
--------------------------------------------------------------
20322032
CTE Scan on x
20332033
Output: x.a
20342034
CTE x
20352035
-> Remote Subquery Scan on all (datanode_1)
20362036
Output: x.a
2037-
-> Recursive Union
2038-
-> Values Scan on "*VALUES*"
2039-
Output: "*VALUES*".column1
2040-
-> WorkTable Scan on x x_1
2041-
Output: (x_1.a || x_1.a)
2042-
Filter: (length((x_1.a || x_1.a)) < 5)
2037+
-> Recursive Union
2038+
-> Values Scan on "*VALUES*"
2039+
Output: "*VALUES*".column1
2040+
-> WorkTable Scan on x x_1
2041+
Output: (x_1.a || x_1.a)
2042+
Filter: (length((x_1.a || x_1.a)) < 5)
20432043
(11 rows)
20442044

20452045
with recursive x(a) as

‎src/test/regress/sql/create_view.sql‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,5 +590,5 @@ set enable_seqscan = off;
590590
create table test(v int primary key, w int) distribute by shard(v);
591591
insert into test values(generate_series(1,50), generate_series(1,50));
592592
create view test_sort as select * from test where v in (select v from test where w < 20) order by v asc;
593-
select * from test_sort;
593+
select * from test_sort order by 1;
594594
drop table test cascade;

0 commit comments

Comments
 (0)