=== Applying patches on top of PostgreSQL commit ID e994f956e4864f424320f5243b9af11e173ad398 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Jul 6 08:36:27 UTC 2026 On branch cf/6574 nothing to commit, working tree clean === using 'git am' to apply patch ./v13-0001-Implement-vect-and-uniqsortvect-containers-and-b.patch === Applying: Implement vect and uniqsortvect containers and bitpack algorithms. === using 'git am' to apply patch ./v13-0002-Tests-of-vect-and-uniqsortvect-containers-and-of.patch === Applying: Tests of vect and uniqsortvect containers and of bitpack algorithms. === using 'git am' to apply patch ./v13-0003-Implement-Delta-Frame-of-Reference-compression.patch === Applying: Implement Delta Frame of Reference compression. === using 'git am' to apply patch ./v13-0004-Tests-for-Delta-Frame-of-Reference-unit.patch === Applying: Tests for Delta Frame of Reference unit. === using 'git am' to apply patch ./v13-0005-Use-Delta-Frame-of-Reference-DFoR-to-compress-pr.patch === Applying: Use Delta Frame of Reference (DFoR) to compress prune/freeze records. .git/rebase-apply/patch:1168: space before tab in indent. wal_keep_size = '1GB' warning: 1 line adds whitespace errors. Using index info to reconstruct a base tree... M src/backend/access/heap/pruneheap.c M src/backend/utils/misc/guc_parameters.dat M src/backend/utils/misc/guc_tables.c M src/backend/utils/misc/postgresql.conf.sample Falling back to patching base and 3-way merge... Auto-merging src/backend/utils/misc/postgresql.conf.sample CONFLICT (content): Merge conflict in src/backend/utils/misc/postgresql.conf.sample Auto-merging src/backend/utils/misc/guc_tables.c Auto-merging src/backend/utils/misc/guc_parameters.dat Auto-merging src/backend/access/heap/pruneheap.c error: Failed to merge in the changes. hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Use Delta Frame of Reference (DFoR) to compress prune/freeze records. When you have resolved this problem, run "git am --continue". If you prefer to skip this patch, run "git am --skip" instead. To restore the original branch and stop patching, run "git am --abort". === using patch(1) to apply patch ./v13-0005-Use-Delta-Frame-of-Reference-DFoR-to-compress-pr.patch === patching file src/backend/access/heap/heapam_xlog.c patching file src/backend/access/heap/pruneheap.c patching file src/backend/access/rmgrdesc/Makefile patching file src/backend/access/rmgrdesc/heapam_xlog_dfor.c patching file src/backend/access/rmgrdesc/heapdesc.c patching file src/backend/access/rmgrdesc/meson.build patching file src/backend/utils/misc/guc_parameters.dat Hunk #1 succeeded at 3516 (offset 9 lines). patching file src/backend/utils/misc/guc_tables.c patching file src/backend/utils/misc/postgresql.conf.sample Hunk #1 FAILED at 263. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/utils/misc/postgresql.conf.sample.rej patching file src/bin/pg_waldump/.gitignore patching file src/bin/pg_waldump/Makefile patching file src/bin/pg_waldump/meson.build patching file src/include/access/heapam_xlog.h patching file src/include/access/heapam_xlog_dfor.h patching file src/test/dfor/Makefile patching file src/test/recovery/t/052_prune_dfor_compression.pl Unstaged changes after reset: M src/backend/access/heap/heapam_xlog.c M src/backend/access/heap/pruneheap.c M src/backend/access/rmgrdesc/Makefile M src/backend/access/rmgrdesc/heapdesc.c M src/backend/access/rmgrdesc/meson.build M src/backend/utils/misc/guc_parameters.dat M src/backend/utils/misc/guc_tables.c M src/bin/pg_waldump/.gitignore M src/bin/pg_waldump/Makefile M src/bin/pg_waldump/meson.build M src/include/access/heapam_xlog.h M src/test/dfor/Makefile Removing src/backend/access/rmgrdesc/heapam_xlog_dfor.c Removing src/backend/utils/misc/postgresql.conf.sample.rej Removing src/include/access/heapam_xlog_dfor.h Removing src/test/recovery/t/052_prune_dfor_compression.pl === using 'git apply' to apply patch ./v13-0005-Use-Delta-Frame-of-Reference-DFoR-to-compress-pr.patch === /work/patches/./v13-0005-Use-Delta-Frame-of-Reference-DFoR-to-compress-pr.patch:1191: space before tab in indent. wal_keep_size = '1GB' Applied patch to 'src/backend/access/heap/heapam_xlog.c' cleanly. Applied patch to 'src/backend/access/heap/pruneheap.c' cleanly. Applied patch to 'src/backend/access/rmgrdesc/Makefile' cleanly. Falling back to direct application... Applied patch to 'src/backend/access/rmgrdesc/heapdesc.c' cleanly. Applied patch to 'src/backend/access/rmgrdesc/meson.build' cleanly. Applied patch to 'src/backend/utils/misc/guc_parameters.dat' cleanly. Applied patch to 'src/backend/utils/misc/guc_tables.c' cleanly. Applied patch to 'src/backend/utils/misc/postgresql.conf.sample' with conflicts. Applied patch to 'src/bin/pg_waldump/.gitignore' cleanly. Applied patch to 'src/bin/pg_waldump/Makefile' cleanly. Applied patch to 'src/bin/pg_waldump/meson.build' cleanly. Applied patch to 'src/include/access/heapam_xlog.h' cleanly. Falling back to direct application... Applied patch to 'src/test/dfor/Makefile' cleanly. Falling back to direct application... U src/backend/utils/misc/postgresql.conf.sample warning: 1 line adds whitespace errors. diff --cc src/backend/utils/misc/postgresql.conf.sample index d7942f50a70,4152e789ee1..00000000000 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@@ -262,7 -262,9 +262,13 @@@ #wal_log_hints = off # also do full page writes of non-critical updates # (change requires restart) #wal_compression = off # enables compression of full-page writes; ++<<<<<<< ours + # off, pglz (or "on"), lz4, or zstd ++======= + # off, pglz, lz4, zstd, or on + #wal_prune_dfor_compression = true # Compress dead and unused offset arrays + # at PRUNE/FREEZE WAL records using DFOR. ++>>>>>>> theirs #wal_init_zero = on # zero-fill new WAL files #wal_recycle = on # recycle WAL files #wal_buffers = -1 # min 32kB, -1 sets based on shared_buffers