=== Applying patches on top of PostgreSQL commit ID 53a49365052026907afff7613929710d1e7f0da0 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Feb 1 06:06:26 UTC 2025 On branch cf/5117 nothing to commit, working tree clean === applying patch ./v07-0002-Move-progress-related-fields-from-PgBackendStatus-to.patch Applied patch to 'src/backend/utils/activity/backend_progress.c' cleanly. Applied patch to 'src/backend/utils/activity/backend_status.c' cleanly. Applied patch to 'src/backend/utils/adt/pgstatfuncs.c' cleanly. Applied patch to 'src/include/utils/backend_progress.h' cleanly. Applied patch to 'src/include/utils/backend_status.h' cleanly. [cf/5117 263fd349c0] Move progress related fields from PgBackendStatus to PgBackendProgress. Author: Antonin Houska Date: Mon Jan 13 14:29:54 2025 +0100 5 files changed, 30 insertions(+), 26 deletions(-) === applying patch ./v07-0003-Move-conversion-of-a-historic-to-MVCC-snapshot-to-a-.patch Applied patch to 'src/backend/replication/logical/snapbuild.c' cleanly. Applied patch to 'src/backend/utils/time/snapmgr.c' cleanly. Applied patch to 'src/include/replication/snapbuild.h' cleanly. Applied patch to 'src/include/utils/snapmgr.h' cleanly. [cf/5117 8c5f9b109e] Move conversion of a "historic" to MVCC snapshot to a separate function. Author: Antonin Houska Date: Mon Jan 13 14:29:54 2025 +0100 4 files changed, 45 insertions(+), 11 deletions(-) === applying patch ./v07-0004-Add-CONCURRENTLY-option-to-both-VACUUM-FULL-and-CLUS.patch Applied patch to 'doc/src/sgml/monitoring.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/cluster.sgml' cleanly. Applied patch to 'doc/src/sgml/ref/vacuum.sgml' cleanly. Applied patch to 'src/Makefile' cleanly. Applied patch to 'src/backend/access/heap/heapam.c' cleanly. Applied patch to 'src/backend/access/heap/heapam_handler.c' cleanly. Applied patch to 'src/backend/access/heap/heapam_visibility.c' cleanly. Applied patch to 'src/backend/catalog/index.c' cleanly. Applied patch to 'src/backend/catalog/system_views.sql' cleanly. Applied patch to 'src/backend/commands/cluster.c' cleanly. Applied patch to 'src/backend/commands/matview.c' cleanly. Applied patch to 'src/backend/commands/tablecmds.c' cleanly. Applied patch to 'src/backend/commands/vacuum.c' cleanly. Applied patch to 'src/backend/meson.build' cleanly. Applied patch to 'src/backend/replication/logical/decode.c' cleanly. Applied patch to 'src/backend/replication/logical/snapbuild.c' cleanly. Falling back to direct application... Falling back to direct application... Falling back to direct application... /work/patches/./v07-0004-Add-CONCURRENTLY-option-to-both-VACUUM-FULL-and-CLUS.patch:4436: new blank line at EOF. + Applied patch to 'src/backend/storage/ipc/ipci.c' cleanly. Applied patch to 'src/backend/tcop/utility.c' cleanly. Applied patch to 'src/backend/utils/activity/backend_progress.c' cleanly. Applied patch to 'src/backend/utils/activity/wait_event_names.txt' cleanly. Applied patch to 'src/backend/utils/cache/inval.c' cleanly. Applied patch to 'src/backend/utils/cache/relcache.c' cleanly. Applied patch to 'src/backend/utils/time/snapmgr.c' cleanly. Applied patch to 'src/bin/psql/tab-complete.in.c' cleanly. Applied patch to 'src/include/access/heapam.h' cleanly. Applied patch to 'src/include/access/tableam.h' cleanly. Applied patch to 'src/include/catalog/index.h' cleanly. Applied patch to 'src/include/commands/cluster.h' cleanly. Applied patch to 'src/include/commands/progress.h' cleanly. Applied patch to 'src/include/commands/vacuum.h' cleanly. Applied patch to 'src/include/replication/snapbuild.h' cleanly. Applied patch to 'src/include/storage/lockdefs.h' cleanly. Applied patch to 'src/include/storage/lwlocklist.h' cleanly. Applied patch to 'src/include/utils/backend_progress.h' cleanly. Applied patch to 'src/include/utils/inval.h' cleanly. Applied patch to 'src/include/utils/rel.h' cleanly. Applied patch to 'src/include/utils/snapmgr.h' cleanly. Applied patch to 'src/test/regress/expected/rules.out' cleanly. warning: 1 line adds whitespace errors. [cf/5117 e18d3ab422] Add CONCURRENTLY option to both VACUUM FULL and CLUSTER commands. Author: Antonin Houska Date: Mon Jan 13 14:29:54 2025 +0100 41 files changed, 3572 insertions(+), 202 deletions(-) create mode 100644 src/backend/replication/pgoutput_cluster/Makefile create mode 100644 src/backend/replication/pgoutput_cluster/meson.build create mode 100644 src/backend/replication/pgoutput_cluster/pgoutput_cluster.c === applying patch ./v07-0005-Preserve-visibility-information-of-the-concurrent-da.patch Applied patch to 'src/backend/access/common/toast_internals.c' cleanly. Applied patch to 'src/backend/access/heap/heapam.c' cleanly. Applied patch to 'src/backend/access/heap/heapam_handler.c' cleanly. Applied patch to 'src/backend/access/transam/xact.c' cleanly. Applied patch to 'src/backend/commands/cluster.c' cleanly. Applied patch to 'src/backend/replication/logical/decode.c' cleanly. Applied patch to 'src/backend/replication/logical/snapbuild.c' cleanly. Applied patch to 'src/backend/replication/pgoutput_cluster/pgoutput_cluster.c' cleanly. Applied patch to 'src/include/access/heapam.h' cleanly. Applied patch to 'src/include/access/heapam_xlog.h' cleanly. Applied patch to 'src/include/access/xact.h' cleanly. Applied patch to 'src/include/commands/cluster.h' cleanly. Applied patch to 'src/include/utils/snapshot.h' cleanly. [cf/5117 875a6980a8] Preserve visibility information of the concurrent data changes. Author: Antonin Houska Date: Mon Jan 13 14:29:54 2025 +0100 13 files changed, 389 insertions(+), 70 deletions(-) === applying patch ./v07-0006-Add-regression-tests.patch Applied patch to 'src/backend/commands/cluster.c' cleanly. Applied patch to 'src/test/modules/injection_points/Makefile' with conflicts. Falling back to direct application... Falling back to direct application... Applied patch to 'src/test/modules/injection_points/meson.build' with conflicts. Falling back to direct application... U src/test/modules/injection_points/Makefile U src/test/modules/injection_points/meson.build diff --cc src/test/modules/injection_points/Makefile index 4f0161fd33,e40ebec1bb..0000000000 --- a/src/test/modules/injection_points/Makefile +++ b/src/test/modules/injection_points/Makefile @@@ -14,7 -13,8 +14,12 @@@ PGFILEDESC = "injection_points - facili REGRESS = injection_points reindex_conc REGRESS_OPTS = --dlpath=$(top_builddir)/src/test/regress ++<<<<<<< ours +ISOLATION = basic inplace syscache-update-pruned ++======= + ISOLATION = basic inplace cluster + ISOLATION_OPTS = --temp-config $(top_srcdir)/src/test/modules/injection_points/logical.conf ++>>>>>>> theirs TAP_TESTS = 1 diff --cc src/test/modules/injection_points/meson.build index 259045e5c2,8c404ddd61..0000000000 --- a/src/test/modules/injection_points/meson.build +++ b/src/test/modules/injection_points/meson.build @@@ -45,9 -44,10 +45,16 @@@ tests += 'specs': [ 'basic', 'inplace', ++<<<<<<< ours + 'syscache-update-pruned', + ], + 'runningcheck': false, # see syscache-update-pruned ++======= + 'cluster', + ], + # 'cluster' requires wal_level = 'logical'. + 'regress_args': ['--temp-config', files('logical.conf')], ++>>>>>>> theirs }, 'tap': { 'env': {