=== Applying patches on top of PostgreSQL commit ID fc39b286ad7262a4aac8ff9a34f244763bed7a53 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Tue Jun 24 04:29:22 UTC 2025 On branch cf/5621 nothing to commit, working tree clean === using 'git am' to apply patch ./v3-0001-Compress-big-WAL-records.patch === Applying: Compress big WAL records .git/rebase-apply/patch:82: trailing whitespace. .git/rebase-apply/patch:89: trailing whitespace. .git/rebase-apply/patch:314: trailing whitespace. .git/rebase-apply/patch:781: trailing whitespace. else warning: 4 lines add whitespace errors. Using index info to reconstruct a base tree... M contrib/pg_walinspect/pg_walinspect.c M src/backend/access/transam/xlog.c M src/backend/access/transam/xloginsert.c M src/backend/access/transam/xlogreader.c M src/backend/utils/misc/guc_tables.c M src/backend/utils/misc/postgresql.conf.sample M src/include/access/xlog.h M src/include/access/xloginsert.h M src/include/pg_config_manual.h Falling back to patching base and 3-way merge... Auto-merging src/include/pg_config_manual.h Auto-merging src/include/access/xloginsert.h CONFLICT (content): Merge conflict in src/include/access/xloginsert.h Auto-merging src/include/access/xlog.h Auto-merging src/backend/utils/misc/postgresql.conf.sample Auto-merging src/backend/utils/misc/guc_tables.c Auto-merging src/backend/access/transam/xlogreader.c Auto-merging src/backend/access/transam/xloginsert.c Auto-merging src/backend/access/transam/xlog.c Auto-merging contrib/pg_walinspect/pg_walinspect.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 Compress big WAL 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". Unstaged changes after reset: M contrib/pg_walinspect/pg_walinspect.c M src/backend/access/rmgrdesc/xlogdesc.c M src/backend/access/transam/xlog.c M src/backend/access/transam/xloginsert.c M src/backend/access/transam/xlogreader.c M src/backend/utils/misc/guc_tables.c M src/backend/utils/misc/postgresql.conf.sample M src/include/access/xlog.h M src/include/access/xloginsert.h M src/include/access/xlogreader.h M src/include/access/xlogrecord.h M src/include/pg_config_manual.h M src/test/recovery/t/026_overwrite_contrecord.pl === using patch(1) to apply patch ./v3-0001-Compress-big-WAL-records.patch === patching file contrib/pg_walinspect/pg_walinspect.c Hunk #1 succeeded at 314 (offset 3 lines). patching file src/backend/access/rmgrdesc/xlogdesc.c patching file src/backend/access/transam/xlog.c Hunk #2 succeeded at 727 (offset 11 lines). Hunk #3 succeeded at 1059 (offset 11 lines). patching file src/backend/access/transam/xloginsert.c patching file src/backend/access/transam/xlogreader.c Hunk #2 succeeded at 55 (offset 1 line). Hunk #3 succeeded at 173 (offset 1 line). Hunk #4 succeeded at 538 (offset 1 line). Hunk #5 succeeded at 650 (offset 1 line). Hunk #6 succeeded at 685 (offset 1 line). Hunk #7 succeeded at 708 (offset 1 line). Hunk #8 succeeded at 724 (offset 1 line). Hunk #9 succeeded at 754 (offset 1 line). Hunk #10 succeeded at 795 (offset 1 line). Hunk #11 succeeded at 843 (offset 1 line). Hunk #12 succeeded at 854 (offset 1 line). Hunk #13 succeeded at 873 (offset 1 line). Hunk #14 succeeded at 885 (offset 1 line). Hunk #15 succeeded at 908 (offset 1 line). Hunk #16 succeeded at 1697 (offset 10 lines). Hunk #17 succeeded at 1813 (offset 10 lines). Hunk #18 succeeded at 1928 (offset 10 lines). Hunk #19 succeeded at 1964 (offset 10 lines). Hunk #20 succeeded at 2171 (offset 10 lines). Hunk #21 succeeded at 2192 (offset 10 lines). patching file src/backend/utils/misc/guc_tables.c Hunk #1 succeeded at 3028 (offset 47 lines). patching file src/backend/utils/misc/postgresql.conf.sample Hunk #1 succeeded at 247 (offset 16 lines). patching file src/include/access/xlog.h patching file src/include/access/xloginsert.h Hunk #1 FAILED at 45. 1 out of 1 hunk FAILED -- saving rejects to file src/include/access/xloginsert.h.rej patching file src/include/access/xlogreader.h patching file src/include/access/xlogrecord.h patching file src/include/pg_config_manual.h patching file src/test/recovery/t/026_overwrite_contrecord.pl Unstaged changes after reset: M contrib/pg_walinspect/pg_walinspect.c M src/backend/access/rmgrdesc/xlogdesc.c M src/backend/access/transam/xlog.c M src/backend/access/transam/xloginsert.c M src/backend/access/transam/xlogreader.c M src/backend/utils/misc/guc_tables.c M src/backend/utils/misc/postgresql.conf.sample M src/include/access/xlog.h M src/include/access/xlogreader.h M src/include/access/xlogrecord.h M src/include/pg_config_manual.h M src/test/recovery/t/026_overwrite_contrecord.pl Removing src/include/access/xloginsert.h.rej === using 'git apply' to apply patch ./v3-0001-Compress-big-WAL-records.patch === /work/patches/./v3-0001-Compress-big-WAL-records.patch:88: trailing whitespace. /work/patches/./v3-0001-Compress-big-WAL-records.patch:95: trailing whitespace. /work/patches/./v3-0001-Compress-big-WAL-records.patch:320: trailing whitespace. /work/patches/./v3-0001-Compress-big-WAL-records.patch:787: trailing whitespace. else Applied patch to 'contrib/pg_walinspect/pg_walinspect.c' cleanly. Applied patch to 'src/backend/access/rmgrdesc/xlogdesc.c' cleanly. Applied patch to 'src/backend/access/transam/xlog.c' cleanly. Applied patch to 'src/backend/access/transam/xloginsert.c' cleanly. Applied patch to 'src/backend/access/transam/xlogreader.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/include/access/xlog.h' cleanly. Applied patch to 'src/include/access/xloginsert.h' with conflicts. Applied patch to 'src/include/access/xlogreader.h' cleanly. Applied patch to 'src/include/access/xlogrecord.h' cleanly. Applied patch to 'src/include/pg_config_manual.h' cleanly. Applied patch to 'src/test/recovery/t/026_overwrite_contrecord.pl' cleanly. U src/include/access/xloginsert.h warning: 4 lines add whitespace errors. diff --cc src/include/access/xloginsert.h index cf057f033a2,497bd89b91c..00000000000 --- a/src/include/access/xloginsert.h +++ b/src/include/access/xloginsert.h @@@ -45,7 -45,8 +45,12 @@@ extern void XLogBeginInsert(void) extern void XLogSetRecordFlags(uint8 flags); extern XLogRecPtr XLogInsert(RmgrId rmid, uint8 info); extern void XLogEnsureRecordSpace(int max_block_id, int ndatas); ++<<<<<<< ours +extern void XLogRegisterData(const void *data, uint32 len); ++======= + extern void XLogEnsureCompressionBuffer(uint32 extraLen); + extern void XLogRegisterData(const char *data, uint32 len); ++>>>>>>> theirs extern void XLogRegisterBuffer(uint8 block_id, Buffer buffer, uint8 flags); extern void XLogRegisterBlock(uint8 block_id, RelFileLocator *rlocator, ForkNumber forknum, BlockNumber blknum, const PageData *page,