diff options
| author | Noah Misch <noah@leadboat.com> | 2025-07-31 06:37:56 -0700 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2025-07-31 06:38:03 -0700 |
| commit | 04bc2c42f765f16e1df4d1504b871d638d6b47e8 (patch) | |
| tree | 99a22f6a0cfffcdf37a421e056ccf5dcd7e5432f /src/test | |
| parent | cc9a62c51a1894a9c838becf558abb056c904fb1 (diff) | |
Sort dump objects independent of OIDs, for the 7 holdout object types.
pg_dump sorts objects by their logical names, e.g. (nspname, relname,
tgname), before dependency-driven reordering. That removes one source
of logically-identical databases differing in their schema-only dumps.
In other words, it helps with schema diffing. The logical name sort
ignored essential sort keys for constraints, operators, PUBLICATION
... FOR TABLE, PUBLICATION ... FOR TABLES IN SCHEMA, operator classes,
and operator families. pg_dump's sort then depended on object OID,
yielding spurious schema diffs. After this change, OIDs affect dump
order only in the event of catalog corruption. While pg_dump also
wrongly ignored pg_collation.collencoding, CREATE COLLATION restrictions
have been keeping that imperceptible in practical use.
Use techniques like we use for object types already having full sort key
coverage. Where the pertinent queries weren't fetching the ignored sort
keys, this adds columns to those queries and stores those keys in memory
for the long term.
The ignorance of sort keys became more problematic when commit
172259afb563d35001410dc6daad78b250924038 added a schema diff test
sensitive to it. Buildfarm member hippopotamus witnessed that.
However, dump order stability isn't a new goal, and this might avoid
other dump comparison failures. Hence, back-patch to v13 (all supported
versions).
Reviewed-by: Robert Haas <robertmhaas@gmail.com>
Discussion: https://postgr.es/m/20250707192654.9e.nmisch@google.com
Backpatch-through: 13
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/regress/expected/publication.out | 8 | ||||
| -rw-r--r-- | src/test/regress/sql/publication.sql | 9 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/test/regress/expected/publication.out b/src/test/regress/expected/publication.out index b7ce080424f..35595fb1427 100644 --- a/src/test/regress/expected/publication.out +++ b/src/test/regress/expected/publication.out @@ -344,3 +344,11 @@ NOTICE: drop cascades to table pub_test.testpub_nopk RESET SESSION AUTHORIZATION; DROP ROLE regress_publication_user, regress_publication_user2; DROP ROLE regress_publication_user_dummy; +-- stage objects for pg_dump tests +CREATE SCHEMA pubme CREATE TABLE t0 (c int, d int) CREATE TABLE t1 (c int); +SET client_min_messages = 'ERROR'; +CREATE PUBLICATION dump_pub_1ct FOR TABLE ONLY pubme.t0; +CREATE PUBLICATION dump_pub_2ct FOR TABLE ONLY pubme.t0, pubme.t1; +CREATE PUBLICATION dump_pub_all FOR TABLE ONLY pubme.t0, pubme.t1 + WITH (publish_via_partition_root = true); +RESET client_min_messages; diff --git a/src/test/regress/sql/publication.sql b/src/test/regress/sql/publication.sql index 7d5c9373845..021d4e2cb24 100644 --- a/src/test/regress/sql/publication.sql +++ b/src/test/regress/sql/publication.sql @@ -218,3 +218,12 @@ DROP SCHEMA pub_test CASCADE; RESET SESSION AUTHORIZATION; DROP ROLE regress_publication_user, regress_publication_user2; DROP ROLE regress_publication_user_dummy; + +-- stage objects for pg_dump tests +CREATE SCHEMA pubme CREATE TABLE t0 (c int, d int) CREATE TABLE t1 (c int); +SET client_min_messages = 'ERROR'; +CREATE PUBLICATION dump_pub_1ct FOR TABLE ONLY pubme.t0; +CREATE PUBLICATION dump_pub_2ct FOR TABLE ONLY pubme.t0, pubme.t1; +CREATE PUBLICATION dump_pub_all FOR TABLE ONLY pubme.t0, pubme.t1 + WITH (publish_via_partition_root = true); +RESET client_min_messages; |