=== Applying patches on top of PostgreSQL commit ID 984410b923263cac901fa81e0efbe523e9c36df3 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Feb 21 08:37:53 UTC 2025 On branch cf/4677 nothing to commit, working tree clean === applying patch ./v11-0001-Remove-FormData_pg_sequence_data-from-init_param.patch Applied patch to 'src/backend/commands/sequence.c' cleanly. [cf/4677 2d4c71a21e] Remove FormData_pg_sequence_data from init_params()/sequence.c Author: Michael Paquier Date: Fri Dec 1 12:00:45 2023 +0900 1 file changed, 49 insertions(+), 32 deletions(-) === applying patch ./v11-0002-Integrate-addition-of-attributes-for-sequences-w.patch Applied patch to 'src/include/nodes/parsenodes.h' cleanly. Applied patch to 'src/backend/commands/sequence.c' cleanly. Applied patch to 'src/backend/commands/tablecmds.c' cleanly. Applied patch to 'src/backend/tcop/utility.c' cleanly. Applied patch to 'src/test/modules/test_ddl_deparse/expected/alter_table.out' cleanly. Applied patch to 'src/test/modules/test_ddl_deparse/expected/create_sequence_1.out' cleanly. Applied patch to 'src/test/modules/test_ddl_deparse/expected/create_table.out' cleanly. Applied patch to 'src/test/modules/test_ddl_deparse/test_ddl_deparse.c' cleanly. [cf/4677 ebd2aa728c] Integrate addition of attributes for sequences with ALTER TABLE Author: Michael Paquier Date: Fri Jan 19 15:00:14 2024 +0900 8 files changed, 69 insertions(+), 8 deletions(-) === applying patch ./v11-0003-Refactor-code-for-in-core-local-sequences.patch Applied patch to 'src/include/access/rmgrlist.h' cleanly. Falling back to direct application... Applied patch to 'src/backend/access/rmgrdesc/Makefile' cleanly. Applied patch to 'src/backend/access/rmgrdesc/meson.build' cleanly. Applied patch to 'src/backend/access/rmgrdesc/seqlocaldesc.c' cleanly. Applied patch to 'src/backend/access/sequence/Makefile' cleanly. Applied patch to 'src/backend/access/sequence/meson.build' cleanly. Falling back to direct application... Falling back to direct application... Applied patch to 'src/backend/access/transam/rmgr.c' cleanly. Applied patch to 'src/backend/commands/sequence.c' cleanly. Applied patch to 'src/bin/pg_waldump/.gitignore' cleanly. Applied patch to 'src/bin/pg_waldump/rmgrdesc.c' cleanly. Applied patch to 'src/bin/pg_waldump/t/001_basic.pl' cleanly. [cf/4677 5a6d47f5ee] Refactor code for in-core "local" sequences Author: Michael Paquier Date: Thu Apr 25 16:49:47 2024 +0900 14 files changed, 822 insertions(+), 622 deletions(-) rename src/backend/access/rmgrdesc/{seqdesc.c => seqlocaldesc.c} (64%) create mode 100644 src/backend/access/sequence/seqlocalam.c create mode 100644 src/backend/access/sequence/seqlocalxlog.c create mode 100644 src/include/access/seqlocalam.h === applying patch ./v11-0004-Sequence-access-methods-backend-support.patch Applied patch to 'src/include/access/seqlocalam.h' cleanly. Falling back to direct application... Applied patch to 'src/include/catalog/pg_am.dat' cleanly. Applied patch to 'src/include/catalog/pg_am.h' cleanly. Applied patch to 'src/include/catalog/pg_class.h' cleanly. Applied patch to 'src/include/catalog/pg_proc.dat' cleanly. Applied patch to 'src/include/catalog/pg_type.dat' cleanly. Applied patch to 'src/include/commands/defrem.h' cleanly. Applied patch to 'src/include/commands/sequence.h' cleanly. Applied patch to 'src/include/nodes/meson.build' cleanly. Applied patch to 'src/include/nodes/parsenodes.h' cleanly. Applied patch to 'src/include/utils/guc_hooks.h' cleanly. Applied patch to 'src/include/utils/rel.h' cleanly. Applied patch to 'src/backend/access/sequence/Makefile' cleanly. Applied patch to 'src/backend/access/sequence/meson.build' cleanly. Applied patch to 'src/backend/access/sequence/seqlocalam.c' cleanly. Applied patch to 'src/backend/access/sequence/sequence.c' cleanly. Falling back to direct application... Applied patch to 'src/backend/catalog/heap.c' cleanly. Applied patch to 'src/backend/commands/amcmds.c' cleanly. Applied patch to 'src/backend/commands/sequence.c' cleanly. Applied patch to 'src/backend/commands/tablecmds.c' cleanly. Applied patch to 'src/backend/nodes/Makefile' cleanly. Applied patch to 'src/backend/nodes/gen_node_support.pl' cleanly. Applied patch to 'src/backend/parser/gram.y' cleanly. Applied patch to 'src/backend/parser/parse_utilcmd.c' cleanly. Applied patch to 'src/backend/utils/adt/pseudotypes.c' cleanly. Applied patch to 'src/backend/utils/cache/relcache.c' cleanly. Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly. Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' 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/test/regress/expected/create_am.out' cleanly. Applied patch to 'src/test/regress/expected/opr_sanity.out' cleanly. Applied patch to 'src/test/regress/expected/psql.out' cleanly. Applied patch to 'src/test/regress/expected/type_sanity.out' cleanly. Applied patch to 'src/test/regress/sql/create_am.sql' cleanly. Applied patch to 'src/test/regress/sql/opr_sanity.sql' cleanly. Applied patch to 'src/test/regress/sql/type_sanity.sql' cleanly. Applied patch to 'src/tools/pgindent/typedefs.list' cleanly. [cf/4677 309680b9c9] Sequence access methods - backend support Author: Michael Paquier Date: Wed Dec 4 08:09:46 2024 +0900 40 files changed, 695 insertions(+), 182 deletions(-) create mode 100644 src/backend/access/sequence/sequenceamapi.c create mode 100644 src/include/access/sequenceam.h === applying patch ./v11-0005-Sequence-access-methods-dump-restore-support.patch Applied patch to 'src/bin/pg_dump/pg_backup.h' cleanly. Applied patch to 'src/bin/pg_dump/pg_backup_archiver.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_backup_archiver.h' cleanly. Applied patch to 'src/bin/pg_dump/pg_dump.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_dumpall.c' cleanly. Applied patch to 'src/bin/pg_dump/pg_restore.c' cleanly. Applied patch to 'src/bin/pg_dump/t/002_pg_dump.pl' with conflicts. Applied patch to 'doc/src/sgml/ref/pg_dump.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/pg_dumpall.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/pg_restore.sgml' cleanly. U src/bin/pg_dump/t/002_pg_dump.pl diff --cc src/bin/pg_dump/t/002_pg_dump.pl index 3945e4f0e2,888ac6d0f1..0000000000 --- a/src/bin/pg_dump/t/002_pg_dump.pl +++ b/src/bin/pg_dump/t/002_pg_dump.pl @@@ -804,7 -783,7 +811,11 @@@ my %full_runs = no_large_objects => 1, no_owner => 1, no_privs => 1, ++<<<<<<< ours + no_statistics => 1, ++======= + no_sequence_access_method => 1, ++>>>>>>> theirs no_table_access_method => 1, pg_dumpall_dbprivs => 1, pg_dumpall_exclude => 1,