This is an automated email from the ASF dual-hosted git repository. tuhaihe pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit 2f682fe7cbeda969b796ba04d368afd5f1909121 Author: liushengsong <[email protected]> AuthorDate: Tue Jun 16 10:03:11 2026 +0800 Fix PAX alter_distribution_policy test: use matchsubs to mask cluster.c line number --- .../src/test/regress/expected/alter_distribution_policy.out | 8 ++++++-- .../test/regress/expected/alter_distribution_policy_optimizer.out | 8 ++++++-- .../src/test/regress/sql/alter_distribution_policy.sql | 4 ++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/contrib/pax_storage/src/test/regress/expected/alter_distribution_policy.out b/contrib/pax_storage/src/test/regress/expected/alter_distribution_policy.out index be070815b61..1f4d55e0b8a 100644 --- a/contrib/pax_storage/src/test/regress/expected/alter_distribution_policy.out +++ b/contrib/pax_storage/src/test/regress/expected/alter_distribution_policy.out @@ -1,3 +1,7 @@ +-- start_matchsubs +-- m/\(cluster.c:\d+\)/ +-- s/\(cluster.c:\d+\)/\(cluster.c:###\)/ +-- end_matchsubs -- ALTER TABLE ... SET DISTRIBUTED BY -- This is the main interface for system expansion \set DATA values(1, 2), (2, 3), (3, 4) @@ -171,7 +175,7 @@ ERROR: permission denied: "pg_class" is a system catalog create table atsdb (i int, j text) distributed by (j); insert into atsdb select i, i::text from generate_series(1, 10) i; alter table atsdb set with(appendonly = true); -ERROR: PAX not allow swap relation files for different AM (cluster.c:1535) +ERROR: PAX not allow swap relation files for different AM (cluster.c:###) select relname, segrelid != 0, reloptions from pg_class, pg_appendonly where pg_class.oid = 'atsdb'::regclass and relid = pg_class.oid; relname | ?column? | reloptions @@ -316,7 +320,7 @@ select * from distcheck where rel = 'atsdb'; alter table atsdb drop column n; alter table atsdb set with(appendonly = true, compresslevel = 3); -ERROR: PAX not allow swap relation files for different AM (cluster.c:1535) +ERROR: PAX not allow swap relation files for different AM (cluster.c:###) select relname, segrelid != 0, reloptions from pg_class, pg_appendonly where pg_class.oid = 'atsdb'::regclass and relid = pg_class.oid; relname | ?column? | reloptions diff --git a/contrib/pax_storage/src/test/regress/expected/alter_distribution_policy_optimizer.out b/contrib/pax_storage/src/test/regress/expected/alter_distribution_policy_optimizer.out index df30a5d8f05..0eafd5f8854 100644 --- a/contrib/pax_storage/src/test/regress/expected/alter_distribution_policy_optimizer.out +++ b/contrib/pax_storage/src/test/regress/expected/alter_distribution_policy_optimizer.out @@ -1,3 +1,7 @@ +-- start_matchsubs +-- m/\(cluster.c:\d+\)/ +-- s/\(cluster.c:\d+\)/\(cluster.c:###\)/ +-- end_matchsubs -- ALTER TABLE ... SET DISTRIBUTED BY -- This is the main interface for system expansion \set DATA values(1, 2), (2, 3), (3, 4) @@ -171,7 +175,7 @@ ERROR: permission denied: "pg_class" is a system catalog create table atsdb (i int, j text) distributed by (j); insert into atsdb select i, i::text from generate_series(1, 10) i; alter table atsdb set with(appendonly = true); -ERROR: PAX not allow swap relation files for different AM (cluster.c:1535) +ERROR: PAX not allow swap relation files for different AM (cluster.c:###) select relname, segrelid != 0, reloptions from pg_class, pg_appendonly where pg_class.oid = 'atsdb'::regclass and relid = pg_class.oid; relname | ?column? | reloptions @@ -316,7 +320,7 @@ select * from distcheck where rel = 'atsdb'; alter table atsdb drop column n; alter table atsdb set with(appendonly = true, compresslevel = 3); -ERROR: PAX not allow swap relation files for different AM (cluster.c:1535) +ERROR: PAX not allow swap relation files for different AM (cluster.c:###) select relname, segrelid != 0, reloptions from pg_class, pg_appendonly where pg_class.oid = 'atsdb'::regclass and relid = pg_class.oid; relname | ?column? | reloptions diff --git a/contrib/pax_storage/src/test/regress/sql/alter_distribution_policy.sql b/contrib/pax_storage/src/test/regress/sql/alter_distribution_policy.sql index feade3ed93d..6345ae987ec 100644 --- a/contrib/pax_storage/src/test/regress/sql/alter_distribution_policy.sql +++ b/contrib/pax_storage/src/test/regress/sql/alter_distribution_policy.sql @@ -1,3 +1,7 @@ +-- start_matchsubs +-- m/\(cluster.c:\d+\)/ +-- s/\(cluster.c:\d+\)/\(cluster.c:###\)/ +-- end_matchsubs -- ALTER TABLE ... SET DISTRIBUTED BY -- This is the main interface for system expansion \set DATA values(1, 2), (2, 3), (3, 4) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
