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 13d26932e25 Fix some answer files
13d26932e25 is described below
commit 13d26932e25aa49c861fa3e5f8fa6de338d11245
Author: Jinbao Chen <[email protected]>
AuthorDate: Sun Jan 4 21:21:27 2026 +0800
Fix some answer files
---
src/test/regress/expected/bfv_dd.out | 3 +-
src/test/regress/expected/bfv_dml.out | 12 +-
src/test/regress/expected/expand_table.out | 6 +-
src/test/regress/expected/partition_locking.out | 144 +++++++++++++++---------
src/test/regress/expected/shrink_table.out | 10 +-
5 files changed, 109 insertions(+), 66 deletions(-)
diff --git a/src/test/regress/expected/bfv_dd.out
b/src/test/regress/expected/bfv_dd.out
index 46b9f092f5e..839a0a9f9bb 100644
--- a/src/test/regress/expected/bfv_dd.out
+++ b/src/test/regress/expected/bfv_dd.out
@@ -888,8 +888,9 @@ INFO: (slice 2) Dispatch command to SINGLE content
-- subqueries
select * from dd_singlecol_1 t1 where a=1 and b < (select count(*) from
dd_singlecol_2 t2 where t2.a=t1.a);
-INFO: (slice 2) Dispatch command to ALL contents: 0 1 2
+INFO: (slice 3) Dispatch command to ALL contents: 0 1 2
INFO: (slice 1) Dispatch command to ALL contents: 0 1 2
+INFO: (slice 2) Dispatch command to SINGLE content
a | b
---+---
(0 rows)
diff --git a/src/test/regress/expected/bfv_dml.out
b/src/test/regress/expected/bfv_dml.out
index 3fdefb0b0b6..d70e712852e 100644
--- a/src/test/regress/expected/bfv_dml.out
+++ b/src/test/regress/expected/bfv_dml.out
@@ -199,12 +199,12 @@ select * from update_pk_test order by 1,2;
(1 row)
explain update update_pk_test set a = 5;
- QUERY PLAN
---------------------------------------------------------------------------------------------------
- Update on update_pk_test (cost=0.00..1.05 rows=1 width=22)
- -> Explicit Redistribute Motion 3:3 (slice1; segments: 3)
(cost=0.00..1.05 rows=1 width=22)
- -> Split (cost=0.00..1.01 rows=1 width=22)
- -> Seq Scan on update_pk_test (cost=0.00..1.01 rows=1
width=22)
+ QUERY PLAN
+---------------------------------------------------------------------------------------------------------
+ Update on update_pk_test (cost=0.00..1469.00 rows=0 width=0)
+ -> Explicit Redistribute Motion 3:3 (slice1; segments: 3)
(cost=0.00..1469.00 rows=57400 width=18)
+ -> Split Update (cost=0.00..321.00 rows=57400 width=18)
+ -> Seq Scan on update_pk_test (cost=0.00..321.00 rows=28700
width=18)
Optimizer: Postgres query optimizer
(5 rows)
diff --git a/src/test/regress/expected/expand_table.out
b/src/test/regress/expected/expand_table.out
index bd30b4d5391..4580b261c4c 100644
--- a/src/test/regress/expected/expand_table.out
+++ b/src/test/regress/expected/expand_table.out
@@ -913,10 +913,12 @@ CREATE TABLE expand_table2(a int) distributed by (a);
CREATE VIEW expand_view AS select * from expand_table1;
CREATE rule "_RETURN" AS ON SELECT TO expand_table2
DO INSTEAD SELECT * FROM expand_table1;
+ERROR: relation "expand_table2" cannot have ON SELECT rules
+DETAIL: This operation is not supported for tables.
ALTER TABLE expand_table2 EXPAND TABLE;
-ERROR: "expand_table2" is not a table, materialized view, or foreign table
ALTER TABLE expand_view EXPAND TABLE;
-ERROR: "expand_view" is not a table, materialized view, or foreign table
+ERROR: ALTER action ALTER COLUMN ... EXPAND TABLE cannot be performed on
relation "expand_view"
+DETAIL: This operation is not supported for views.
ALTER TABLE expand_table1 EXPAND TABLE;
--
-- Test expanding a table with a domain type as distribution key.
diff --git a/src/test/regress/expected/partition_locking.out
b/src/test/regress/expected/partition_locking.out
index 4b65e54bf81..15b0784d117 100644
--- a/src/test/regress/expected/partition_locking.out
+++ b/src/test/regress/expected/partition_locking.out
@@ -91,6 +91,15 @@ select * from locktest_master where coalesce not like 'gp_%'
and coalesce not li
toast index | AccessExclusiveLock | relation | master
toast index | AccessExclusiveLock | relation | master
toast index | AccessExclusiveLock | relation | master
+ toast table | AccessExclusiveLock | relation | master
+ toast table | AccessExclusiveLock | relation | master
+ toast table | AccessExclusiveLock | relation | master
+ toast table | AccessExclusiveLock | relation | master
+ toast table | AccessExclusiveLock | relation | master
+ toast table | AccessExclusiveLock | relation | master
+ toast table | AccessExclusiveLock | relation | master
+ toast table | AccessExclusiveLock | relation | master
+ toast table | AccessExclusiveLock | relation | master
toast table | ShareLock | relation | master
toast table | ShareLock | relation | master
toast table | ShareLock | relation | master
@@ -100,7 +109,7 @@ select * from locktest_master where coalesce not like
'gp_%' and coalesce not li
toast table | ShareLock | relation | master
toast table | ShareLock | relation | master
toast table | ShareLock | relation | master
-(28 rows)
+(37 rows)
select * from locktest_segments where coalesce not like 'gp_%' and coalesce
not like 'pg_%';
coalesce | mode | locktype | node
@@ -115,25 +124,34 @@ select * from locktest_segments where coalesce not like
'gp_%' and coalesce not
partlockt_1_prt_7 | AccessExclusiveLock | relation | n segments
partlockt_1_prt_8 | AccessExclusiveLock | relation | n segments
partlockt_1_prt_9 | AccessExclusiveLock | relation | n segments
+ toast table | AccessExclusiveLock | relation | n segments
toast table | ShareLock | relation | n segments
toast index | AccessExclusiveLock | relation | n segments
+ toast table | AccessExclusiveLock | relation | n segments
toast table | ShareLock | relation | n segments
toast index | AccessExclusiveLock | relation | n segments
+ toast table | AccessExclusiveLock | relation | n segments
toast table | ShareLock | relation | n segments
toast index | AccessExclusiveLock | relation | n segments
+ toast table | AccessExclusiveLock | relation | n segments
toast table | ShareLock | relation | n segments
toast index | AccessExclusiveLock | relation | n segments
+ toast table | AccessExclusiveLock | relation | n segments
toast table | ShareLock | relation | n segments
toast index | AccessExclusiveLock | relation | n segments
+ toast table | AccessExclusiveLock | relation | n segments
toast table | ShareLock | relation | n segments
toast index | AccessExclusiveLock | relation | n segments
+ toast table | AccessExclusiveLock | relation | n segments
toast table | ShareLock | relation | n segments
toast index | AccessExclusiveLock | relation | n segments
+ toast table | AccessExclusiveLock | relation | n segments
toast table | ShareLock | relation | n segments
toast index | AccessExclusiveLock | relation | n segments
+ toast table | AccessExclusiveLock | relation | n segments
toast table | ShareLock | relation | n segments
toast index | AccessExclusiveLock | relation | n segments
-(28 rows)
+(37 rows)
commit;
-- select
@@ -245,6 +263,12 @@ HINT: The 'DISTRIBUTED BY' clause determines the
distribution of data. Make sur
select * from locktest_master where coalesce not like 'gp_%' and coalesce not
like 'pg_%';
coalesce | mode | locktype | node
-------------------+---------------------+----------+--------
+ aoseg table | AccessExclusiveLock | relation | master
+ aoseg table | AccessExclusiveLock | relation | master
+ aoseg table | AccessExclusiveLock | relation | master
+ aovisimap table | AccessExclusiveLock | relation | master
+ aovisimap table | AccessExclusiveLock | relation | master
+ aovisimap table | AccessExclusiveLock | relation | master
partlockt | AccessExclusiveLock | relation | master
partlockt_1_prt_1 | AccessExclusiveLock | relation | master
partlockt_1_prt_2 | AccessExclusiveLock | relation | master
@@ -252,10 +276,13 @@ select * from locktest_master where coalesce not like
'gp_%' and coalesce not li
toast index | AccessExclusiveLock | relation | master
toast index | AccessExclusiveLock | relation | master
toast index | AccessExclusiveLock | relation | master
+ toast table | AccessExclusiveLock | relation | master
+ toast table | AccessExclusiveLock | relation | master
+ toast table | AccessExclusiveLock | relation | master
toast table | ShareLock | relation | master
toast table | ShareLock | relation | master
toast table | ShareLock | relation | master
-(10 rows)
+(19 rows)
select * from locktest_segments where coalesce not like 'gp_%' and coalesce
not like 'pg_%';
coalesce | mode | locktype | node
@@ -264,13 +291,22 @@ select * from locktest_segments where coalesce not like
'gp_%' and coalesce not
partlockt_1_prt_1 | AccessExclusiveLock | relation | n segments
partlockt_1_prt_2 | AccessExclusiveLock | relation | n segments
partlockt_1_prt_3 | AccessExclusiveLock | relation | n segments
+ aoseg table | AccessExclusiveLock | relation | n segments
+ aoseg table | AccessExclusiveLock | relation | n segments
+ aoseg table | AccessExclusiveLock | relation | n segments
+ aovisimap table | AccessExclusiveLock | relation | n segments
+ aovisimap table | AccessExclusiveLock | relation | n segments
+ aovisimap table | AccessExclusiveLock | relation | n segments
+ toast table | AccessExclusiveLock | relation | n segments
toast table | ShareLock | relation | n segments
toast index | AccessExclusiveLock | relation | n segments
+ toast table | AccessExclusiveLock | relation | n segments
toast table | ShareLock | relation | n segments
toast index | AccessExclusiveLock | relation | n segments
+ toast table | AccessExclusiveLock | relation | n segments
toast table | ShareLock | relation | n segments
toast index | AccessExclusiveLock | relation | n segments
-(10 rows)
+(19 rows)
commit;
begin;
@@ -361,54 +397,56 @@ HINT: The 'DISTRIBUTED BY' clause determines the
distribution of data. Make sur
begin;
create index partlockt_idx on partlockt(i);
select * from locktest_master where coalesce not like 'gp_%' and coalesce not
like 'pg_%';
- coalesce | mode | locktype | node
--------------------------+---------------------+----------+--------
- partlockt | ShareLock | relation | master
- partlockt_1_prt_1 | ShareLock | relation | master
- partlockt_1_prt_1_i_idx | AccessExclusiveLock | relation | master
- partlockt_1_prt_2 | ShareLock | relation | master
- partlockt_1_prt_2_i_idx | AccessExclusiveLock | relation | master
- partlockt_1_prt_3 | ShareLock | relation | master
- partlockt_1_prt_3_i_idx | AccessExclusiveLock | relation | master
- partlockt_1_prt_4 | ShareLock | relation | master
- partlockt_1_prt_4_i_idx | AccessExclusiveLock | relation | master
- partlockt_1_prt_5 | ShareLock | relation | master
- partlockt_1_prt_5_i_idx | AccessExclusiveLock | relation | master
- partlockt_1_prt_6 | ShareLock | relation | master
- partlockt_1_prt_6_i_idx | AccessExclusiveLock | relation | master
- partlockt_1_prt_7 | ShareLock | relation | master
- partlockt_1_prt_7_i_idx | AccessExclusiveLock | relation | master
- partlockt_1_prt_8 | ShareLock | relation | master
- partlockt_1_prt_8_i_idx | AccessExclusiveLock | relation | master
- partlockt_1_prt_9 | ShareLock | relation | master
- partlockt_1_prt_9_i_idx | AccessExclusiveLock | relation | master
- partlockt_idx | AccessExclusiveLock | relation | master
-(20 rows)
+ coalesce | mode | locktype | node
+-------------------------+--------------------------+----------+--------
+ partlockt | ShareLock | relation | master
+ partlockt_1_prt_1 | ShareLock | relation | master
+ partlockt_1_prt_1_i_idx | AccessExclusiveLock | relation | master
+ partlockt_1_prt_2 | ShareLock | relation | master
+ partlockt_1_prt_2_i_idx | AccessExclusiveLock | relation | master
+ partlockt_1_prt_3 | ShareLock | relation | master
+ partlockt_1_prt_3_i_idx | AccessExclusiveLock | relation | master
+ partlockt_1_prt_4 | ShareLock | relation | master
+ partlockt_1_prt_4_i_idx | AccessExclusiveLock | relation | master
+ partlockt_1_prt_5 | ShareLock | relation | master
+ partlockt_1_prt_5_i_idx | AccessExclusiveLock | relation | master
+ partlockt_1_prt_6 | ShareLock | relation | master
+ partlockt_1_prt_6_i_idx | AccessExclusiveLock | relation | master
+ partlockt_1_prt_7 | ShareLock | relation | master
+ partlockt_1_prt_7_i_idx | AccessExclusiveLock | relation | master
+ partlockt_1_prt_8 | ShareLock | relation | master
+ partlockt_1_prt_8_i_idx | AccessExclusiveLock | relation | master
+ partlockt_1_prt_9 | ShareLock | relation | master
+ partlockt_1_prt_9_i_idx | AccessExclusiveLock | relation | master
+ partlockt_idx | AccessExclusiveLock | relation | master
+ partlockt_idx | ShareUpdateExclusiveLock | relation | master
+(21 rows)
select * from locktest_segments where coalesce not like 'gp_%' and coalesce
not like 'pg_%';
- coalesce | mode | locktype | node
--------------------------+---------------------+----------+------------
- partlockt | ShareLock | relation | n segments
- partlockt_1_prt_1 | ShareLock | relation | n segments
- partlockt_1_prt_1_i_idx | AccessExclusiveLock | relation | n segments
- partlockt_1_prt_2 | ShareLock | relation | n segments
- partlockt_1_prt_2_i_idx | AccessExclusiveLock | relation | n segments
- partlockt_1_prt_3 | ShareLock | relation | n segments
- partlockt_1_prt_3_i_idx | AccessExclusiveLock | relation | n segments
- partlockt_1_prt_4 | ShareLock | relation | n segments
- partlockt_1_prt_4_i_idx | AccessExclusiveLock | relation | n segments
- partlockt_1_prt_5 | ShareLock | relation | n segments
- partlockt_1_prt_5_i_idx | AccessExclusiveLock | relation | n segments
- partlockt_1_prt_6 | ShareLock | relation | n segments
- partlockt_1_prt_6_i_idx | AccessExclusiveLock | relation | n segments
- partlockt_1_prt_7 | ShareLock | relation | n segments
- partlockt_1_prt_7_i_idx | AccessExclusiveLock | relation | n segments
- partlockt_1_prt_8 | ShareLock | relation | n segments
- partlockt_1_prt_8_i_idx | AccessExclusiveLock | relation | n segments
- partlockt_1_prt_9 | ShareLock | relation | n segments
- partlockt_1_prt_9_i_idx | AccessExclusiveLock | relation | n segments
- partlockt_idx | AccessExclusiveLock | relation | n segments
-(20 rows)
+ coalesce | mode | locktype | node
+-------------------------+--------------------------+----------+------------
+ partlockt | ShareLock | relation | n segments
+ partlockt_1_prt_1 | ShareLock | relation | n segments
+ partlockt_1_prt_1_i_idx | AccessExclusiveLock | relation | n segments
+ partlockt_1_prt_2 | ShareLock | relation | n segments
+ partlockt_1_prt_2_i_idx | AccessExclusiveLock | relation | n segments
+ partlockt_1_prt_3 | ShareLock | relation | n segments
+ partlockt_1_prt_3_i_idx | AccessExclusiveLock | relation | n segments
+ partlockt_1_prt_4 | ShareLock | relation | n segments
+ partlockt_1_prt_4_i_idx | AccessExclusiveLock | relation | n segments
+ partlockt_1_prt_5 | ShareLock | relation | n segments
+ partlockt_1_prt_5_i_idx | AccessExclusiveLock | relation | n segments
+ partlockt_1_prt_6 | ShareLock | relation | n segments
+ partlockt_1_prt_6_i_idx | AccessExclusiveLock | relation | n segments
+ partlockt_1_prt_7 | ShareLock | relation | n segments
+ partlockt_1_prt_7_i_idx | AccessExclusiveLock | relation | n segments
+ partlockt_1_prt_8 | ShareLock | relation | n segments
+ partlockt_1_prt_8_i_idx | AccessExclusiveLock | relation | n segments
+ partlockt_1_prt_9 | ShareLock | relation | n segments
+ partlockt_1_prt_9_i_idx | AccessExclusiveLock | relation | n segments
+ partlockt_idx | AccessExclusiveLock | relation | n segments
+ partlockt_idx | ShareUpdateExclusiveLock | relation | n segments
+(21 rows)
commit;
-- Force use of the index in the select and delete below. We're not interested
@@ -429,7 +467,8 @@ select * from locktest_master where coalesce not like
'gp_%' and coalesce not li
partlockt | AccessShareLock | relation | master
partlockt_1_prt_1 | AccessShareLock | relation | master
partlockt_1_prt_1_i_idx | AccessShareLock | relation | master
-(3 rows)
+ partlockt_idx | AccessShareLock | relation | master
+(4 rows)
select * from locktest_segments where coalesce not like 'gp_%' and coalesce
not like 'pg_%';
coalesce | mode | locktype | node
@@ -481,7 +520,8 @@ select * from locktest_master where coalesce not like
'gp_%' and coalesce not li
partlockt | ExclusiveLock | relation | master
partlockt_1_prt_4 | ExclusiveLock | relation | master
partlockt_1_prt_4_i_idx | ExclusiveLock | relation | master
-(3 rows)
+ partlockt_idx | ExclusiveLock | relation | master
+(4 rows)
select * from locktest_segments where coalesce not like 'gp_%' and coalesce
not like 'pg_%';
coalesce | mode | locktype | node
diff --git a/src/test/regress/expected/shrink_table.out
b/src/test/regress/expected/shrink_table.out
index 78a8d32fa40..d19fe98724f 100644
--- a/src/test/regress/expected/shrink_table.out
+++ b/src/test/regress/expected/shrink_table.out
@@ -807,15 +807,15 @@ CREATE TABLE shrink_table2(a int) distributed by (a);
CREATE VIEW shrink_view AS select * from shrink_table1;
CREATE rule "_RETURN" AS ON SELECT TO shrink_table2
DO INSTEAD SELECT * FROM shrink_table1;
+ERROR: relation "shrink_table2" cannot have ON SELECT rules
+DETAIL: This operation is not supported for tables.
ALTER TABLE shrink_table2 shrink TABLE to 2;
-ERROR: "shrink_table2" is not a table, materialized view, or foreign table
ALTER TABLE shrink_view shrink TABLE to 2;
-ERROR: "shrink_view" is not a table, materialized view, or foreign table
+ERROR: ALTER action ALTER COLUMN ... SHRINK TABLE cannot be performed on
relation "shrink_view"
+DETAIL: This operation is not supported for views.
ALTER TABLE shrink_table1 shrink TABLE to 2;
drop table shrink_table1 cascade;
-NOTICE: drop cascades to 2 other objects
-DETAIL: drop cascades to view shrink_view
-drop cascades to view shrink_table2
+NOTICE: drop cascades to view shrink_view
--
-- Test shrinking a table with a domain type as distribution key.
--
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
