=== Applying patches on top of PostgreSQL commit ID b4e0d0c53fabe7d19b6a081d6c2b98aa4df55295 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Feb 21 09:58:29 UTC 2025 On branch cf/5111 nothing to commit, working tree clean === applying patch ./v20250203-0001-Introduce-pg_sequence_state-function-for-e.patch Applied patch to 'doc/src/sgml/func.sgml' cleanly. Applied patch to 'src/backend/commands/sequence.c' cleanly. Applied patch to 'src/include/catalog/pg_proc.dat' cleanly. Applied patch to 'src/test/regress/expected/sequence.out' cleanly. Applied patch to 'src/test/regress/sql/sequence.sql' cleanly. [cf/5111 4ea0910bdc] Introduce pg_sequence_state function for enhanced sequence management Author: Vignesh C Date: Fri Sep 20 08:45:21 2024 +0530 5 files changed, 118 insertions(+) === applying patch ./v20250203-0002-Introduce-ALL-SEQUENCES-support-for-Postgr.patch Applied patch to 'doc/src/sgml/ref/create_publication.sgml' cleanly. Applied patch to 'src/backend/catalog/pg_publication.c' cleanly. Applied patch to 'src/backend/commands/publicationcmds.c' cleanly. Applied patch to 'src/backend/parser/gram.y' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump.h' cleanly. Applied patch to 'src/bin/pg_dump/t/002_pg_dump.pl' cleanly. Applied patch to 'src/bin/psql/describe.c' cleanly. Applied patch to 'src/bin/psql/tab-complete.in.c' cleanly. Applied patch to 'src/include/catalog/pg_publication.h' cleanly. Applied patch to 'src/include/nodes/parsenodes.h' cleanly. Applied patch to 'src/test/regress/expected/psql.out' cleanly. Applied patch to 'src/test/regress/expected/publication.out' cleanly. Applied patch to 'src/test/regress/sql/publication.sql' cleanly. Applied patch to 'src/tools/pgindent/typedefs.list' cleanly. [cf/5111 f3e610c83d] Introduce "ALL SEQUENCES" support for PostgreSQL logical replication Author: Vignesh Date: Mon Feb 3 09:53:31 2025 +0530 15 files changed, 766 insertions(+), 353 deletions(-) === applying patch ./v20250203-0003-Reorganize-tablesync-Code-and-Introduce-sy.patch Applied patch to 'src/backend/catalog/pg_subscription.c' cleanly. Applied patch to 'src/backend/replication/logical/Makefile' cleanly. Applied patch to 'src/backend/replication/logical/applyparallelworker.c' cleanly. Applied patch to 'src/backend/replication/logical/meson.build' cleanly. Falling back to direct application... Applied patch to 'src/backend/replication/logical/tablesync.c' cleanly. Applied patch to 'src/backend/replication/logical/worker.c' cleanly. Applied patch to 'src/include/catalog/pg_subscription_rel.h' cleanly. Applied patch to 'src/include/replication/worker_internal.h' cleanly. Applied patch to 'src/tools/pgindent/typedefs.list' cleanly. [cf/5111 080ea83def] Reorganize tablesync Code and Introduce syncutils Author: Vignesh C Date: Mon Aug 12 14:43:11 2024 +0530 10 files changed, 234 insertions(+), 189 deletions(-) create mode 100644 src/backend/replication/logical/syncutils.c === applying patch ./v20250203-0004-Enhance-sequence-synchronization-during-su.patch Applied patch to 'src/backend/catalog/pg_publication.c' cleanly. Applied patch to 'src/backend/catalog/pg_subscription.c' cleanly. Applied patch to 'src/backend/catalog/system_views.sql' cleanly. Applied patch to 'src/backend/commands/sequence.c' cleanly. Applied patch to 'src/backend/commands/subscriptioncmds.c' with conflicts. Applied patch to 'src/backend/executor/execReplication.c' cleanly. Applied patch to 'src/backend/parser/gram.y' cleanly. Applied patch to 'src/backend/postmaster/bgworker.c' cleanly. Applied patch to 'src/backend/replication/logical/Makefile' cleanly. Applied patch to 'src/backend/replication/logical/launcher.c' cleanly. Applied patch to 'src/backend/replication/logical/meson.build' cleanly. Falling back to direct application... Applied patch to 'src/backend/replication/logical/syncutils.c' cleanly. Applied patch to 'src/backend/replication/logical/tablesync.c' cleanly. Applied patch to 'src/backend/replication/logical/worker.c' cleanly. Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly. Applied patch to 'src/bin/pg_dump/common.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump.h' cleanly. Applied patch to 'src/bin/psql/tab-complete.in.c' cleanly. Applied patch to 'src/include/catalog/pg_proc.dat' cleanly. Applied patch to 'src/include/catalog/pg_subscription_rel.h' cleanly. Applied patch to 'src/include/commands/sequence.h' cleanly. Applied patch to 'src/include/nodes/parsenodes.h' cleanly. Applied patch to 'src/include/replication/logicalworker.h' cleanly. Applied patch to 'src/include/replication/worker_internal.h' cleanly. Applied patch to 'src/test/regress/expected/rules.out' cleanly. Applied patch to 'src/test/regress/expected/subscription.out' cleanly. Applied patch to 'src/test/subscription/meson.build' cleanly. Falling back to direct application... U src/backend/commands/subscriptioncmds.c diff --cc src/backend/commands/subscriptioncmds.c index 4aec73bcc6,18bbdec143..0000000000 --- a/src/backend/commands/subscriptioncmds.c +++ b/src/backend/commands/subscriptioncmds.c @@@ -2083,12 -2204,11 +2204,20 @@@ AlterSubscriptionOwner_oid(Oid subid, O } /* ++<<<<<<< ours + * Check and log a warning if the publisher has subscribed to the same table, + * its partition ancestors (if it's a partition), or its partition children (if + * it's a partitioned table), from some other publishers. This check is + * required only if "copy_data = true" and "origin = none" for CREATE + * SUBSCRIPTION and ALTER SUBSCRIPTION ... REFRESH statements to notify the + * user that data having origin might have been copied. ++======= + * Check and log a warning if the publisher has subscribed to the same table + * from some other publisher. This check is required only if "copy_data = true" + * and "origin = none" for CREATE SUBSCRIPTION and + * ALTER SUBSCRIPTION ... REFRESH PUBLICATION statements to notify the user + * that data having origin might have been copied. ++>>>>>>> theirs * * This check need not be performed on the tables that are already added * because incremental sync for those tables will happen through WAL and the