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 30b887ffdef Fix some answer files
30b887ffdef is described below
commit 30b887ffdef9d9637a61219f1eee20d5ee88af1e
Author: Jinbao Chen <[email protected]>
AuthorDate: Sun Feb 8 12:50:15 2026 +0800
Fix some answer files
---
src/test/regress/expected/createdb.out | 2 +-
src/test/regress/expected/explain.out | 1 -
src/test/regress/expected/freeze_aux_tables.out | 6 ++--
.../regress/expected/gp_tablespace_with_faults.out | 2 +-
src/test/regress/expected/gpsd.out | 20 ++++++++----
src/test/regress/expected/stats.out | 2 +-
src/test/regress/expected/vacuum.out | 36 ++++++++++++----------
src/test/regress/sql/gp_tablespace.sql | 7 ++++-
src/test/regress/sql/gp_tablespace_with_faults.sql | 2 +-
9 files changed, 47 insertions(+), 31 deletions(-)
diff --git a/src/test/regress/expected/createdb.out
b/src/test/regress/expected/createdb.out
index afb76d20ca6..c572782ee22 100644
--- a/src/test/regress/expected/createdb.out
+++ b/src/test/regress/expected/createdb.out
@@ -211,7 +211,7 @@ HINT: Inject an infinite 'skip' into the 'fts_probe' fault
to disable FTS probi
-- should fail
create database db4 STRATEGY = file_copy;
-ERROR: fault triggered, fault name:'end_prepare_two_phase' fault type:'panic'
(seg0 127.0.1.1:7002 pid=3772777)
+ERROR: fault triggered, fault name:'end_prepare_two_phase' fault type:'panic'
(seg0 127.0.1.1:7002 pid=1804307)
select force_mirrors_to_catch_up();
force_mirrors_to_catch_up
---------------------------
diff --git a/src/test/regress/expected/explain.out
b/src/test/regress/expected/explain.out
index eecddd6e407..078bf02c12b 100644
--- a/src/test/regress/expected/explain.out
+++ b/src/test/regress/expected/explain.out
@@ -759,7 +759,6 @@ select jsonb_pretty(
"Settings": { +
"jit": "off", +
"Optimizer": "Postgres query optimizer", +
- "optimizer": "off", +
"enable_parallel": "off", +
"parallel_setup_cost": "0", +
"parallel_tuple_cost": "0", +
diff --git a/src/test/regress/expected/freeze_aux_tables.out
b/src/test/regress/expected/freeze_aux_tables.out
index b5b920003fc..af971fd9dde 100644
--- a/src/test/regress/expected/freeze_aux_tables.out
+++ b/src/test/regress/expected/freeze_aux_tables.out
@@ -167,10 +167,10 @@ select segid = -1 as is_master, relname,
classify_age(age) from aux_rel_ages('te
group by segid = -1, relname, classify_age(age);
is_master | relname | classify_age
-----------+----------------------------+--------------
- t | test_table_heap_with_toast | very young
- f | test_table_heap_with_toast | young
- f | pg_toast_<oid> | young
t | pg_toast_<oid> | very young
+ f | test_table_heap_with_toast | zero
+ f | pg_toast_<oid> | zero
+ t | test_table_heap_with_toast | very young
(4 rows)
select segid = -1 as is_master, relname, classify_age(age) from
aux_rel_ages('test_table_ao')
diff --git a/src/test/regress/expected/gp_tablespace_with_faults.out
b/src/test/regress/expected/gp_tablespace_with_faults.out
index d1573dae7da..4b1957d091a 100644
--- a/src/test/regress/expected/gp_tablespace_with_faults.out
+++ b/src/test/regress/expected/gp_tablespace_with_faults.out
@@ -31,7 +31,7 @@ create or replace function
remove_tablespace_location_directory(tablespace_locat
tablespace_symlink
for tablespace_symlink
in sum(tablespace_symlinks, [])
- if
os.readlink(tablespace_symlink).startswith(tablespace_location_dir)]
+ if os.path.islink(tablespace_symlink) and
os.readlink(tablespace_symlink).startswith(tablespace_location_dir)]
for tablespace_symlink_to_remove in tablespace_symlinks_to_remove:
os.unlink(tablespace_symlink_to_remove);
diff --git a/src/test/regress/expected/gpsd.out
b/src/test/regress/expected/gpsd.out
index 3d3cbe0fa4f..71ee193381e 100644
--- a/src/test/regress/expected/gpsd.out
+++ b/src/test/regress/expected/gpsd.out
@@ -101,9 +101,13 @@ select
stavalues4,
stavalues5
from pg_statistic where starelid IN ('gpsd_foo'::regclass,
'gpsd_foo_1'::regclass);
- staattnum | stainherit | stanullfrac | stawidth | stadistinct | stakind1 |
stakind2 | stakind3 | stakind4 | stakind5 | staop1 | staop2 | staop3 | staop4 |
staop5 | stacoll1 | stacoll2 | stacoll3 | stacoll4 | stacoll5 | stanumbers1 |
stanumbers2 | stanumbers3 | stanumbers4 | stanumbers5 | stavalues1 | stavalues2
| stavalues3 | stavalues4 | stavalues5
------------+------------+-------------+----------+-------------+----------+----------+----------+----------+----------+--------+--------+--------+--------+--------+----------+----------+----------+----------+----------+-------------+-------------+-------------+-------------+-------------+------------+------------+------------+------------+------------
-(0 rows)
+ staattnum | stainherit | stanullfrac | stawidth | stadistinct | stakind1 |
stakind2 | stakind3 | stakind4 | stakind5 | staop1 | staop2 | staop3 | staop4 |
staop5 | stacoll1 | stacoll2 | stacoll3 | stacoll4 | stacoll5 | stanumbers1 |
stanumbers2 | stanumbers3 | stanumbers4 | stanumbers5 |
stavalues1 | stavalues2 | stavalues3 | stavalues4 | stavalues5
+-----------+------------+-------------+----------+-------------+----------+----------+----------+----------+----------+--------+--------+--------+--------+--------+----------+----------+----------+----------+----------+-------------+-------------+-------------+-------------+-------------+------------------------------------------+------------+------------+------------+------------
+ 1 | t | 0 | 4 | -1 | 2 |
0 | 0 | 0 | 0 | 97 | 0 | 0 | 0 |
0 | 0 | 0 | 0 | 0 | 0 | |
| | | | {1,2,3,4,5}
| | | |
+ 2 | t | 0 | 7 | -1 | 2 |
0 | 0 | 0 | 0 | 664 | 0 | 0 | 0 |
0 | 0 | 0 | 0 | 0 | 0 | |
| | | | {"a \\ and a
\"",i,something,z'world',Ϩ} | | | |
+ 1 | f | 0 | 4 | -1 | 2 |
3 | 0 | 0 | 0 | 97 | 97 | 0 | 0 |
0 | 0 | 0 | 0 | 0 | 0 | | {1}
| | | | {1,2,3,4,5}
| | | |
+ 2 | f | 0 | 7 | -1 | 2 |
3 | 0 | 0 | 0 | 664 | 664 | 0 | 0 |
0 | 100 | 100 | 0 | 0 | 0 | | {-1}
| | | | {"a \\ and a
\"",i,something,z'world',Ϩ} | | | |
+(4 rows)
--------------------------------------------------------------------------------
-- Scenario: Table with hll flag
@@ -164,7 +168,11 @@ select
stavalues4,
stavalues5
from pg_statistic where starelid IN ('gpsd_foo'::regclass,
'gpsd_foo_1'::regclass);
- staattnum | stainherit | stanullfrac | stawidth | stadistinct | stakind1 |
stakind2 | stakind3 | stakind4 | stakind5 | staop1 | staop2 | staop3 | staop4 |
staop5 | stacoll1 | stacoll2 | stacoll3 | stacoll4 | stacoll5 | stanumbers1 |
stanumbers2 | stanumbers3 | stanumbers4 | stanumbers5 | stavalues1 | stavalues2
| stavalues3 | stavalues4 | stavalues5
------------+------------+-------------+----------+-------------+----------+----------+----------+----------+----------+--------+--------+--------+--------+--------+----------+----------+----------+----------+----------+-------------+-------------+-------------+-------------+-------------+------------+------------+------------+------------+------------
-(0 rows)
+ staattnum | stainherit | stanullfrac | stawidth | stadistinct | stakind1 |
stakind2 | stakind3 | stakind4 | stakind5 | staop1 | staop2 | staop3 | staop4 |
staop5 | stacoll1 | stacoll2 | stacoll3 | stacoll4 | stacoll5 | stanumbers1 |
stanumbers2 | stanumbers3 | stanumbers4 | stanumbers5 | stavalues1 | stavalues2
| stavalues3 | stavalues4 |
[...]
+-----------+------------+-------------+----------+-------------+----------+----------+----------+----------+----------+--------+--------+--------+--------+--------+----------+----------+----------+----------+----------+-------------+-------------+-------------+-------------+-------------+------------+------------+-----------------+------------+--------------------------------------------------------------------------------------------------------------------------------------------------
[...]
+ 1 | t | 0 | 4 | -1 | 0 |
0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
0 | 0 | 0 | 0 | 0 | 0 | |
| | | | | |
| |
+ 2 | t | 0 | 10 | -1 | 0 |
0 | 0 | 0 | 0 | 0 | 0 | 0 | 0 |
0 | 0 | 0 | 0 | 0 | 0 | |
| | | | | |
{hello,'world'} | |
+ 1 | f | 0 | 4 | -1 | 0 |
0 | 0 | 0 | 99 | 0 | 0 | 0 | 0 |
0 | 0 | 0 | 0 | 0 | 0 | |
| | | | | |
| |
{"\\x0e060200ffffffff0000000001000000010000000000803f0000803f000000000000000000000000000000000000000000000000000000000000000000000000000000000000
[...]
+ 2 | f | 0 | 10 | -1 | 0 |
0 | 0 | 0 | 99 | 0 | 0 | 0 | 0 |
0 | 0 | 0 | 0 | 0 | 0 | |
| | | | | |
| |
{"\\x0e060200ffffffff0000000001000000010000000000803f0000803f000000000000000000000000000000000000000000000000000000000000000000000000000000000000
[...]
+(4 rows)
diff --git a/src/test/regress/expected/stats.out
b/src/test/regress/expected/stats.out
index 33a65be5c47..55b836f029c 100644
--- a/src/test/regress/expected/stats.out
+++ b/src/test/regress/expected/stats.out
@@ -1428,7 +1428,7 @@ SELECT :io_sum_local_after_evictions >
:io_sum_local_before_evictions,
:io_sum_local_after_extends > :io_sum_local_before_extends;
?column? | ?column? | ?column? | ?column?
----------+----------+----------+----------
- f | f | t | t
+ t | f | t | t
(1 row)
-- Change the tablespaces so that the temporary table is rewritten to other
diff --git a/src/test/regress/expected/vacuum.out
b/src/test/regress/expected/vacuum.out
index 93bb198ef79..7e5efcb95bf 100644
--- a/src/test/regress/expected/vacuum.out
+++ b/src/test/regress/expected/vacuum.out
@@ -344,17 +344,19 @@ CREATE VIEW vac_option_tab_counts AS
ORDER BY rel;
VACUUM (PROCESS_TOAST TRUE) vac_option_tab;
SELECT * FROM vac_option_tab_counts;
- rel | vacuum_count
-------+--------------
- main | 1
-(1 row)
+ rel | vacuum_count
+-------+--------------
+ main | 1
+ toast | 1
+(2 rows)
VACUUM (PROCESS_TOAST FALSE) vac_option_tab;
SELECT * FROM vac_option_tab_counts;
- rel | vacuum_count
-------+--------------
- main | 2
-(1 row)
+ rel | vacuum_count
+-------+--------------
+ main | 2
+ toast | 1
+(2 rows)
VACUUM (PROCESS_TOAST FALSE, FULL) vac_option_tab; -- error
ERROR: PROCESS_TOAST required with VACUUM FULL
@@ -362,18 +364,20 @@ ERROR: PROCESS_TOAST required with VACUUM FULL
-- Only the toast table is processed.
VACUUM (PROCESS_MAIN FALSE) vac_option_tab;
SELECT * FROM vac_option_tab_counts;
- rel | vacuum_count
-------+--------------
- main | 2
-(1 row)
+ rel | vacuum_count
+-------+--------------
+ main | 2
+ toast | 2
+(2 rows)
-- Nothing is processed.
VACUUM (PROCESS_MAIN FALSE, PROCESS_TOAST FALSE) vac_option_tab;
SELECT * FROM vac_option_tab_counts;
- rel | vacuum_count
-------+--------------
- main | 2
-(1 row)
+ rel | vacuum_count
+-------+--------------
+ main | 2
+ toast | 2
+(2 rows)
-- Check if the filenodes nodes have been updated as wanted after FULL.
SELECT relfilenode AS main_filenode FROM pg_class
diff --git a/src/test/regress/sql/gp_tablespace.sql
b/src/test/regress/sql/gp_tablespace.sql
index 4c556fbc7f9..30ab9236949 100644
--- a/src/test/regress/sql/gp_tablespace.sql
+++ b/src/test/regress/sql/gp_tablespace.sql
@@ -63,6 +63,9 @@ FROM pg_tablespace WHERE spcname = 'testspace';
-- Ensure mirrors have applied filesystem changes
SELECT force_mirrors_to_catch_up();
+\! ls $PG_ABS_SRCDIR/testtablespace
+
+
-- Test moving AO/AOCO tables from one tablespace to another.
CREATE TABLE ao_ts_table (id int4, t text) with (appendonly=true,
orientation=row) distributed by (id);
CREATE TABLE aoco_ts_table (id int4, t text) with (appendonly=true,
orientation=column) distributed by (id);
@@ -227,8 +230,9 @@ DROP TABLESPACE testspace_existing_version_dir;
-- Ensure mirrors have applied filesystem changes
SELECT force_mirrors_to_catch_up();
--- Test alter tablespace: PG does not seem to test these.
+\! ls $PG_ABS_SRCDIR/testtablespace_existing_version_dir/*
+-- Test alter tablespace: PG does not seem to test these.
-- test SET & OWNER
ALTER TABLESPACE testspace_otherloc SET (random_page_cost=20.0);
SELECT spcoptions FROM pg_tablespace WHERE spcname = 'testspace_otherloc';
@@ -257,6 +261,7 @@ DROP TABLESPACE testspace_otherloc;
CREATE TABLESPACE testspace_dir_empty LOCATION :'testtablespace';
CREATE TABLE t_dir_empty(a int);
+\! rm -rf $PG_ABS_SRCDIR/testtablespace
DROP TABLE IF EXISTS t_dir_empty;
DROP TABLESPACE testspace_dir_empty;
diff --git a/src/test/regress/sql/gp_tablespace_with_faults.sql
b/src/test/regress/sql/gp_tablespace_with_faults.sql
index 240f7526da4..b6329d97874 100644
--- a/src/test/regress/sql/gp_tablespace_with_faults.sql
+++ b/src/test/regress/sql/gp_tablespace_with_faults.sql
@@ -32,7 +32,7 @@ create or replace function
remove_tablespace_location_directory(tablespace_locat
tablespace_symlink
for tablespace_symlink
in sum(tablespace_symlinks, [])
- if
os.readlink(tablespace_symlink).startswith(tablespace_location_dir)]
+ if os.path.islink(tablespace_symlink) and
os.readlink(tablespace_symlink).startswith(tablespace_location_dir)]
for tablespace_symlink_to_remove in tablespace_symlinks_to_remove:
os.unlink(tablespace_symlink_to_remove);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
