This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new 84e9c2472af Fix some errors
84e9c2472af is described below
commit 84e9c2472af5d4a84349e11849fdfd5d735e3209
Author: Jinbao Chen <[email protected]>
AuthorDate: Sun Nov 30 01:09:56 2025 +0800
Fix some errors
---
src/backend/utils/init/miscinit.c | 5 +-
src/test/regress/expected/indexing.out | 50 ++++++------
src/test/regress/expected/partition_aggregate.out | 74 +++--------------
src/test/regress/expected/psql.out | 12 +--
src/test/regress/expected/sequence.out | 18 +----
src/test/regress/expected/tuplesort.out | 96 +++++++----------------
src/test/regress/expected/xml.out | 2 +-
src/test/regress/serial_schedule | 26 +++---
src/test/regress/sql/psql.sql | 2 +-
9 files changed, 96 insertions(+), 189 deletions(-)
diff --git a/src/backend/utils/init/miscinit.c
b/src/backend/utils/init/miscinit.c
index 81b65631ea2..ee5e1cacdea 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -1025,9 +1025,8 @@ SetSessionAuthorization(Oid userid, bool is_superuser)
SetResQueueId();
}
- SetConfigOption("is_superuser",
- is_superuser ? "on" : "off",
- PGC_INTERNAL, PGC_S_OVERRIDE);
+ if (!SetRoleIsActive)
+ SetOuterUserId(userid, is_superuser);
}
/*
diff --git a/src/test/regress/expected/indexing.out
b/src/test/regress/expected/indexing.out
index 250a6ea708c..9719ce12527 100644
--- a/src/test/regress/expected/indexing.out
+++ b/src/test/regress/expected/indexing.out
@@ -1310,35 +1310,41 @@ create table idxpart1 partition of idxpart for values
from (0) to (100000);
set enable_seqscan to off;
create index idxpart_brin on idxpart using brin(b);
explain (costs off) select * from idxpart where b = 'abcd';
- QUERY PLAN
--------------------------------------------
- Bitmap Heap Scan on idxpart1 idxpart
- Recheck Cond: (b = 'abcd'::text)
- -> Bitmap Index Scan on idxpart1_b_idx
- Index Cond: (b = 'abcd'::text)
-(4 rows)
+ QUERY PLAN
+-------------------------------------------------
+ Gather Motion 3:1 (slice1; segments: 3)
+ -> Bitmap Heap Scan on idxpart1 idxpart
+ Recheck Cond: (b = 'abcd'::text)
+ -> Bitmap Index Scan on idxpart1_b_idx
+ Index Cond: (b = 'abcd'::text)
+ Optimizer: Postgres query optimizer
+(6 rows)
drop index idxpart_brin;
create index idxpart_spgist on idxpart using spgist(b);
explain (costs off) select * from idxpart where b = 'abcd';
- QUERY PLAN
--------------------------------------------
- Bitmap Heap Scan on idxpart1 idxpart
- Recheck Cond: (b = 'abcd'::text)
- -> Bitmap Index Scan on idxpart1_b_idx
- Index Cond: (b = 'abcd'::text)
-(4 rows)
+ QUERY PLAN
+-------------------------------------------------
+ Gather Motion 3:1 (slice1; segments: 3)
+ -> Bitmap Heap Scan on idxpart1 idxpart
+ Recheck Cond: (b = 'abcd'::text)
+ -> Bitmap Index Scan on idxpart1_b_idx
+ Index Cond: (b = 'abcd'::text)
+ Optimizer: Postgres query optimizer
+(6 rows)
drop index idxpart_spgist;
create index idxpart_gin on idxpart using gin(c);
explain (costs off) select * from idxpart where c @> array[42];
- QUERY PLAN
-----------------------------------------------
- Bitmap Heap Scan on idxpart1 idxpart
- Recheck Cond: (c @> '{42}'::integer[])
- -> Bitmap Index Scan on idxpart1_c_idx
- Index Cond: (c @> '{42}'::integer[])
-(4 rows)
+ QUERY PLAN
+----------------------------------------------------
+ Gather Motion 3:1 (slice1; segments: 3)
+ -> Bitmap Heap Scan on idxpart1 idxpart
+ Recheck Cond: (c @> '{42}'::integer[])
+ -> Bitmap Index Scan on idxpart1_c_idx
+ Index Cond: (c @> '{42}'::integer[])
+ Optimizer: Postgres query optimizer
+(6 rows)
drop index idxpart_gin;
reset enable_seqscan;
@@ -1550,7 +1556,7 @@ select indexrelid::regclass, indisvalid,
order by indexrelid::regclass::text collate "C";
indexrelid | indisvalid | indrelid |
inhparent
--------------------------------+------------+-----------------------+-------------------------------
- parted_isvalid_idx | f | parted_isvalid_tab |
+ parted_isvalid_idx | t | parted_isvalid_tab |
parted_isvalid_idx_11 | f | parted_isvalid_tab_11 |
parted_isvalid_tab_1_expr_idx
parted_isvalid_tab_12_expr_idx | t | parted_isvalid_tab_12 |
parted_isvalid_tab_1_expr_idx
parted_isvalid_tab_1_expr_idx | f | parted_isvalid_tab_1 |
parted_isvalid_idx
diff --git a/src/test/regress/expected/partition_aggregate.out
b/src/test/regress/expected/partition_aggregate.out
index 97eb23f75db..18ae4b847c8 100644
--- a/src/test/regress/expected/partition_aggregate.out
+++ b/src/test/regress/expected/partition_aggregate.out
@@ -425,9 +425,8 @@ SELECT c, sum(a) FROM pagg_tab GROUP BY rollup(c) ORDER BY
1, 2;
-- make any difference.
EXPLAIN (COSTS OFF)
SELECT c, sum(b order by a) FROM pagg_tab GROUP BY c ORDER BY 1, 2;
-<<<<<<< HEAD
- QUERY PLAN
-------------------------------------------------------------------------------
+ QUERY PLAN
+---------------------------------------------------------------------
Gather Motion 3:1 (slice1; segments: 3)
Merge Key: pagg_tab.c, (sum(pagg_tab.b ORDER BY pagg_tab.a))
-> Sort
@@ -436,49 +435,20 @@ SELECT c, sum(b order by a) FROM pagg_tab GROUP BY c
ORDER BY 1, 2;
-> GroupAggregate
Group Key: pagg_tab.c
-> Sort
- Sort Key: pagg_tab.c
- -> Redistribute Motion 3:3 (slice2; segments: 3)
- Hash Key: pagg_tab.c
- -> Seq Scan on pagg_tab_p1 pagg_tab
+ Sort Key: pagg_tab.c, pagg_tab.a
+ -> Seq Scan on pagg_tab_p1 pagg_tab
-> GroupAggregate
Group Key: pagg_tab_1.c
-> Sort
- Sort Key: pagg_tab_1.c
- -> Redistribute Motion 3:3 (slice3; segments: 3)
- Hash Key: pagg_tab_1.c
- -> Seq Scan on pagg_tab_p2 pagg_tab_1
+ Sort Key: pagg_tab_1.c, pagg_tab_1.a
+ -> Seq Scan on pagg_tab_p2 pagg_tab_1
-> GroupAggregate
Group Key: pagg_tab_2.c
-> Sort
- Sort Key: pagg_tab_2.c
- -> Redistribute Motion 3:3 (slice4; segments: 3)
- Hash Key: pagg_tab_2.c
- -> Seq Scan on pagg_tab_p3 pagg_tab_2
+ Sort Key: pagg_tab_2.c, pagg_tab_2.a
+ -> Seq Scan on pagg_tab_p3 pagg_tab_2
Optimizer: Postgres query optimizer
-(27 rows)
-=======
- QUERY PLAN
----------------------------------------------------------------
- Sort
- Sort Key: pagg_tab.c, (sum(pagg_tab.b ORDER BY pagg_tab.a))
- -> Append
- -> GroupAggregate
- Group Key: pagg_tab.c
- -> Sort
- Sort Key: pagg_tab.c, pagg_tab.a
- -> Seq Scan on pagg_tab_p1 pagg_tab
- -> GroupAggregate
- Group Key: pagg_tab_1.c
- -> Sort
- Sort Key: pagg_tab_1.c, pagg_tab_1.a
- -> Seq Scan on pagg_tab_p2 pagg_tab_1
- -> GroupAggregate
- Group Key: pagg_tab_2.c
- -> Sort
- Sort Key: pagg_tab_2.c, pagg_tab_2.a
- -> Seq Scan on pagg_tab_p3 pagg_tab_2
-(18 rows)
->>>>>>> REL_16_9
+(21 rows)
-- Since GROUP BY clause does not match with PARTITION KEY; we need to do
-- partial aggregation. However, ORDERED SET are not partial safe and thus
@@ -1154,17 +1124,6 @@ SELECT a, sum(b), array_agg(distinct c), count(*) FROM
pagg_tab_ml GROUP BY a HA
Sort Key: pagg_tab_ml.a, pagg_tab_ml.c
-> Seq Scan on pagg_tab_ml_p1 pagg_tab_ml
-> GroupAggregate
-<<<<<<< HEAD
-=======
- Group Key: pagg_tab_ml_5.a
- Filter: (avg(pagg_tab_ml_5.b) < '3'::numeric)
- -> Sort
- Sort Key: pagg_tab_ml_5.a, pagg_tab_ml_5.c
- -> Append
- -> Seq Scan on pagg_tab_ml_p3_s1
pagg_tab_ml_5
- -> Seq Scan on pagg_tab_ml_p3_s2
pagg_tab_ml_6
- -> GroupAggregate
->>>>>>> REL_16_9
Group Key: pagg_tab_ml_2.a
Filter: (avg(pagg_tab_ml_2.b) < '3'::numeric)
-> Sort
@@ -1176,7 +1135,7 @@ SELECT a, sum(b), array_agg(distinct c), count(*) FROM
pagg_tab_ml GROUP BY a HA
Group Key: pagg_tab_ml_5.a
Filter: (avg(pagg_tab_ml_5.b) < '3'::numeric)
-> Sort
- Sort Key: pagg_tab_ml_5.a
+ Sort Key: pagg_tab_ml_5.a, pagg_tab_ml_5.c
-> Append
-> Seq Scan on pagg_tab_ml_p3_s1
pagg_tab_ml_5
-> Seq Scan on pagg_tab_ml_p3_s2
pagg_tab_ml_6
@@ -1211,17 +1170,6 @@ SELECT a, sum(b), array_agg(distinct c), count(*) FROM
pagg_tab_ml GROUP BY a HA
Sort Key: pagg_tab_ml.a, pagg_tab_ml.c
-> Seq Scan on pagg_tab_ml_p1 pagg_tab_ml
-> GroupAggregate
-<<<<<<< HEAD
-=======
- Group Key: pagg_tab_ml_5.a
- Filter: (avg(pagg_tab_ml_5.b) < '3'::numeric)
- -> Sort
- Sort Key: pagg_tab_ml_5.a, pagg_tab_ml_5.c
- -> Append
- -> Seq Scan on pagg_tab_ml_p3_s1 pagg_tab_ml_5
- -> Seq Scan on pagg_tab_ml_p3_s2 pagg_tab_ml_6
- -> GroupAggregate
->>>>>>> REL_16_9
Group Key: pagg_tab_ml_2.a
Filter: (avg(pagg_tab_ml_2.b) < '3'::numeric)
-> Sort
@@ -1233,7 +1181,7 @@ SELECT a, sum(b), array_agg(distinct c), count(*) FROM
pagg_tab_ml GROUP BY a HA
Group Key: pagg_tab_ml_5.a
Filter: (avg(pagg_tab_ml_5.b) < '3'::numeric)
-> Sort
- Sort Key: pagg_tab_ml_5.a
+ Sort Key: pagg_tab_ml_5.a, pagg_tab_ml_5.c
-> Append
-> Seq Scan on pagg_tab_ml_p3_s1 pagg_tab_ml_5
-> Seq Scan on pagg_tab_ml_p3_s2 pagg_tab_ml_6
diff --git a/src/test/regress/expected/psql.out
b/src/test/regress/expected/psql.out
index b2bd51da6d1..548c54454ee 100644
--- a/src/test/regress/expected/psql.out
+++ b/src/test/regress/expected/psql.out
@@ -5671,9 +5671,9 @@ SELECT 'ok' AS "done" ;
ok
(1 row)
+Hobbes
Calvin
Susie
-Hobbes
done
------
ok
@@ -6794,12 +6794,12 @@ GRANT regress_du_role0 TO regress_du_role2 WITH ADMIN
FALSE, INHERIT FALSE, SET
Role name | Member of | Options | Grantor
------------------+------------------+---------------------+------------------
regress_du_role1 | regress_du_role0 | ADMIN, INHERIT, SET | regress_du_admin
- regress_du_role1 | regress_du_role0 | INHERIT, SET | regress_du_role1
- regress_du_role1 | regress_du_role0 | INHERIT, SET | regress_du_role2
- regress_du_role2 | regress_du_role0 | ADMIN, INHERIT, SET | regress_du_admin
+ regress_du_role1 | regress_du_role0 | INHERIT | regress_du_role1
+ regress_du_role1 | regress_du_role0 | SET | regress_du_role2
+ regress_du_role2 | regress_du_role0 | ADMIN | regress_du_admin
regress_du_role2 | regress_du_role0 | INHERIT, SET | regress_du_role1
- regress_du_role2 | regress_du_role0 | INHERIT, SET | regress_du_role2
- regress_du_role2 | regress_du_role1 | ADMIN, INHERIT, SET | regress_du_admin
+ regress_du_role2 | regress_du_role0 | | regress_du_role2
+ regress_du_role2 | regress_du_role1 | ADMIN, SET | regress_du_admin
(7 rows)
\du regress_du_role*
diff --git a/src/test/regress/expected/sequence.out
b/src/test/regress/expected/sequence.out
index 4ae356f3a87..dd747c3175f 100644
--- a/src/test/regress/expected/sequence.out
+++ b/src/test/regress/expected/sequence.out
@@ -574,29 +574,19 @@ SELECT nextval('seq2');
DROP SEQUENCE seq2;
-- should fail
SELECT lastval();
-<<<<<<< HEAD
ERROR: lastval() not supported
-=======
-ERROR: lastval is not yet defined in this session
-- unlogged sequences
-- (more tests in src/test/recovery/)
CREATE UNLOGGED SEQUENCE sequence_test_unlogged;
+ERROR: unlogged sequences are not supported
ALTER SEQUENCE sequence_test_unlogged SET LOGGED;
+ERROR: relation "sequence_test_unlogged" does not exist
\d sequence_test_unlogged
- Sequence "public.sequence_test_unlogged"
- Type | Start | Minimum | Maximum | Increment | Cycles? | Cache
---------+-------+---------+---------------------+-----------+---------+-------
- bigint | 1 | 1 | 9223372036854775807 | 1 | no | 1
-
ALTER SEQUENCE sequence_test_unlogged SET UNLOGGED;
+ERROR: relation "sequence_test_unlogged" does not exist
\d sequence_test_unlogged
- Unlogged sequence "public.sequence_test_unlogged"
- Type | Start | Minimum | Maximum | Increment | Cycles? | Cache
---------+-------+---------+---------------------+-----------+---------+-------
- bigint | 1 | 1 | 9223372036854775807 | 1 | no | 1
-
DROP SEQUENCE sequence_test_unlogged;
->>>>>>> REL_16_9
+ERROR: sequence "sequence_test_unlogged" does not exist
-- Test sequences in read-only transactions
CREATE TEMPORARY SEQUENCE sequence_test_temp1;
START TRANSACTION READ ONLY;
diff --git a/src/test/regress/expected/tuplesort.out
b/src/test/regress/expected/tuplesort.out
index d1654de5102..63fcb8be3d5 100644
--- a/src/test/regress/expected/tuplesort.out
+++ b/src/test/regress/expected/tuplesort.out
@@ -538,7 +538,6 @@ EXPLAIN (COSTS OFF) :qry;
QUERY PLAN
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Limit
-<<<<<<< HEAD
-> Gather Motion 3:1 (slice1; segments: 3)
Merge Key: (count(DISTINCT a.col1)), a.col12, (count(DISTINCT
a.col2)), (count(DISTINCT b.col1)), (count(DISTINCT b.col2)), (count(*))
-> Limit
@@ -547,39 +546,22 @@ EXPLAIN (COSTS OFF) :qry;
-> GroupAggregate
Group Key: a.col12
Filter: (count(*) > 1)
- -> Merge Join
- Merge Cond: (a.col12 = b.col12)
- -> Sort
- Sort Key: a.col12 DESC
- -> Redistribute Motion 3:3 (slice2;
segments: 3)
- Hash Key: a.col12
- -> Seq Scan on test_mark_restore
a
- -> Sort
- Sort Key: b.col12 DESC
- -> Redistribute Motion 3:3 (slice3;
segments: 3)
- Hash Key: b.col12
- -> Seq Scan on test_mark_restore
b
- Optimizer: Postgres query optimizer
-(22 rows)
-=======
- -> Sort
- Sort Key: (count(DISTINCT a.col1)) DESC, a.col12 DESC,
(count(DISTINCT a.col2)) DESC, (count(DISTINCT b.col1)) DESC, (count(DISTINCT
b.col2)) DESC, (count(*)) DESC
- -> GroupAggregate
- Group Key: a.col12
- Filter: (count(*) > 1)
- -> Incremental Sort
- Sort Key: a.col12 DESC, a.col1
- Presorted Key: a.col12
- -> Merge Join
- Merge Cond: (a.col12 = b.col12)
-> Sort
- Sort Key: a.col12 DESC
- -> Seq Scan on test_mark_restore a
- -> Sort
- Sort Key: b.col12 DESC
- -> Seq Scan on test_mark_restore b
-(17 rows)
->>>>>>> REL_16_9
+ Sort Key: a.col12 DESC, a.col1
+ -> Merge Join
+ Merge Cond: (a.col12 = b.col12)
+ -> Sort
+ Sort Key: a.col12 DESC
+ -> Redistribute Motion 3:3
(slice2; segments: 3)
+ Hash Key: a.col12
+ -> Seq Scan on
test_mark_restore a
+ -> Sort
+ Sort Key: b.col12 DESC
+ -> Redistribute Motion 3:3
(slice3; segments: 3)
+ Hash Key: b.col12
+ -> Seq Scan on
test_mark_restore b
+ Optimizer: Postgres query optimizer
+(24 rows)
:qry;
col12 | count | count | count | count | count
@@ -602,7 +584,6 @@ EXPLAIN (COSTS OFF) :qry;
QUERY PLAN
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Limit
-<<<<<<< HEAD
-> Gather Motion 3:1 (slice1; segments: 3)
Merge Key: (count(DISTINCT a.col1)), a.col12, (count(DISTINCT
a.col2)), (count(DISTINCT b.col1)), (count(DISTINCT b.col2)), (count(*))
-> Limit
@@ -611,39 +592,22 @@ EXPLAIN (COSTS OFF) :qry;
-> GroupAggregate
Group Key: a.col12
Filter: (count(*) > 1)
- -> Merge Join
- Merge Cond: (a.col12 = b.col12)
- -> Sort
- Sort Key: a.col12 DESC
- -> Redistribute Motion 3:3 (slice2;
segments: 3)
- Hash Key: a.col12
- -> Seq Scan on test_mark_restore
a
- -> Sort
- Sort Key: b.col12 DESC
- -> Redistribute Motion 3:3 (slice3;
segments: 3)
- Hash Key: b.col12
- -> Seq Scan on test_mark_restore
b
- Optimizer: Postgres query optimizer
-(22 rows)
-=======
- -> Sort
- Sort Key: (count(DISTINCT a.col1)) DESC, a.col12 DESC,
(count(DISTINCT a.col2)) DESC, (count(DISTINCT b.col1)) DESC, (count(DISTINCT
b.col2)) DESC, (count(*)) DESC
- -> GroupAggregate
- Group Key: a.col12
- Filter: (count(*) > 1)
- -> Incremental Sort
- Sort Key: a.col12 DESC, a.col1
- Presorted Key: a.col12
- -> Merge Join
- Merge Cond: (a.col12 = b.col12)
-> Sort
- Sort Key: a.col12 DESC
- -> Seq Scan on test_mark_restore a
- -> Sort
- Sort Key: b.col12 DESC
- -> Seq Scan on test_mark_restore b
-(17 rows)
->>>>>>> REL_16_9
+ Sort Key: a.col12 DESC, a.col1
+ -> Merge Join
+ Merge Cond: (a.col12 = b.col12)
+ -> Sort
+ Sort Key: a.col12 DESC
+ -> Redistribute Motion 3:3
(slice2; segments: 3)
+ Hash Key: a.col12
+ -> Seq Scan on
test_mark_restore a
+ -> Sort
+ Sort Key: b.col12 DESC
+ -> Redistribute Motion 3:3
(slice3; segments: 3)
+ Hash Key: b.col12
+ -> Seq Scan on
test_mark_restore b
+ Optimizer: Postgres query optimizer
+(24 rows)
:qry;
col12 | count | count | count | count | count
diff --git a/src/test/regress/expected/xml.out
b/src/test/regress/expected/xml.out
index 8eb4294d264..658b8fcbf24 100644
--- a/src/test/regress/expected/xml.out
+++ b/src/test/regress/expected/xml.out
@@ -829,7 +829,7 @@ SELECT table_name, view_definition FROM
information_schema.views
table_name |
view_definition
------------+---------------------------------------------------------------------------------------------------------------------------------------
xmlview1 | SELECT xmlcomment('test'::text) AS xmlcomment;
- xmlview10 | SELECT XMLSERIALIZE(DOCUMENT '<foo><bar>42</bar></foo>'::xml AS
text INDENT) AS "xmlserialize";
+ xmlview10 | SELECT XMLSERIALIZE(DOCUMENT '<foo><bar>42</bar></foo>'::xml AS
text NO INDENT) AS "xmlserialize";
xmlview11 | SELECT (XMLSERIALIZE(DOCUMENT '<foo><bar>42</bar></foo>'::xml
AS character varying NO INDENT))::character varying AS "xmlserialize";
xmlview2 | SELECT XMLCONCAT('hello'::xml, 'you'::xml) AS "xmlconcat";
xmlview3 | SELECT XMLELEMENT(NAME element, XMLATTRIBUTES(1 AS ":one:",
'deuce' AS two), 'content&') AS "xmlelement";
diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
index 7d232fa776b..d68daabc6f4 100644
--- a/src/test/regress/serial_schedule
+++ b/src/test/regress/serial_schedule
@@ -190,17 +190,17 @@ test: returning
# # GPDB_83_MERGE_FIXME: the largeobject test is temporarily disabled due to
test errors
# ignore: largeobject
#test: with
-#test: xml
-# test: partition_join
-# test: partition_prune
-# test: reloptions
-# test: hash_part
-# test: indexing
-# test: partition_aggregate
-# test: partition_info
-# test: tuplesort
+test: xml
+test: partition_join
+test: partition_prune
+test: reloptions
+test: hash_part
+test: indexing
+test: partition_aggregate
+test: partition_info
+test: tuplesort
# test: explain
-# test: event_trigger
-# test: fast_default
-# test: stats
-# test: createdb
+test: event_trigger
+test: fast_default
+#test: stats
+#test: createdb
diff --git a/src/test/regress/sql/psql.sql b/src/test/regress/sql/psql.sql
index 7202a6c50e8..926361593e3 100644
--- a/src/test/regress/sql/psql.sql
+++ b/src/test/regress/sql/psql.sql
@@ -1316,7 +1316,7 @@ create function psql_df_plpgsql ()
comment on function psql_df_plpgsql () is 'some comment';
\df+ psql_df_*
-rollback;
+ rollback;
drop role regress_psql_user;
-- check \sf
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
