=== Applying patches on top of PostgreSQL commit ID 12efa48978c6dba5eca1b95758127181783fb217 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun Aug 3 11:18:23 UTC 2025 On branch cf/5621 nothing to commit, working tree clean === using 'git am' to apply patch ./v4-0001-Compress-big-WAL-records.patch === Applying: Compress big WAL records .git/rebase-apply/patch:81: trailing whitespace. .git/rebase-apply/patch:88: trailing whitespace. .git/rebase-apply/patch:313: trailing whitespace. .git/rebase-apply/patch:780: trailing whitespace. else warning: 4 lines add whitespace errors. Using index info to reconstruct a base tree... M src/backend/access/transam/xlog.c M src/backend/access/transam/xlogreader.c Falling back to patching base and 3-way merge... Auto-merging src/backend/access/transam/xlogreader.c CONFLICT (content): Merge conflict in src/backend/access/transam/xlogreader.c Auto-merging src/backend/access/transam/xlog.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/test/recovery/t/026_overwrite_contrecord.pl === using patch(1) to apply patch ./v4-0001-Compress-big-WAL-records.patch === patching file contrib/pg_walinspect/pg_walinspect.c patching file src/backend/access/rmgrdesc/xlogdesc.c patching file src/backend/access/transam/xlog.c Hunk #1 succeeded at 136 (offset 1 line). Hunk #2 succeeded at 727 (offset 1 line). Hunk #3 succeeded at 1059 (offset 1 line). patching file src/backend/access/transam/xloginsert.c patching file src/backend/access/transam/xlogreader.c Hunk #9 succeeded at 808 with fuzz 2 (offset 54 lines). Hunk #10 FAILED at 795. Hunk #11 succeeded at 853 (offset 10 lines). Hunk #12 succeeded at 864 (offset 10 lines). Hunk #13 succeeded at 883 (offset 10 lines). Hunk #14 succeeded at 895 (offset 10 lines). Hunk #15 succeeded at 918 (offset 10 lines). Hunk #16 succeeded at 1707 (offset 10 lines). Hunk #17 succeeded at 1823 (offset 10 lines). Hunk #18 succeeded at 1938 (offset 10 lines). Hunk #19 succeeded at 1974 (offset 10 lines). Hunk #20 succeeded at 2181 (offset 10 lines). Hunk #21 succeeded at 2202 (offset 10 lines). 1 out of 21 hunks FAILED -- saving rejects to file src/backend/access/transam/xlogreader.c.rej patching file src/backend/utils/misc/guc_tables.c patching file src/backend/utils/misc/postgresql.conf.sample patching file src/include/access/xlog.h patching file src/include/access/xloginsert.h patching file src/include/access/xlogreader.h patching file src/include/access/xlogrecord.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/xloginsert.h M src/include/access/xlogreader.h M src/include/access/xlogrecord.h M src/test/recovery/t/026_overwrite_contrecord.pl Removing src/backend/access/transam/xlogreader.c.rej === using 'git apply' to apply patch ./v4-0001-Compress-big-WAL-records.patch === /work/patches/./v4-0001-Compress-big-WAL-records.patch:87: trailing whitespace. /work/patches/./v4-0001-Compress-big-WAL-records.patch:94: trailing whitespace. /work/patches/./v4-0001-Compress-big-WAL-records.patch:319: trailing whitespace. /work/patches/./v4-0001-Compress-big-WAL-records.patch:786: 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' with conflicts. 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' cleanly. Applied patch to 'src/include/access/xlogreader.h' cleanly. Applied patch to 'src/include/access/xlogrecord.h' cleanly. Applied patch to 'src/test/recovery/t/026_overwrite_contrecord.pl' cleanly. U src/backend/access/transam/xlogreader.c warning: 4 lines add whitespace errors. diff --cc src/backend/access/transam/xlogreader.c index dcc8d4f9c1b,b5e9f8ae1bb..00000000000 --- a/src/backend/access/transam/xlogreader.c +++ b/src/backend/access/transam/xlogreader.c @@@ -723,12 -752,11 +752,20 @@@ restart /* Calculate pointer to beginning of next page */ targetPagePtr += XLOG_BLCKSZ; ++<<<<<<< ours + /* + * Read the page header before processing the record data, so we + * can handle the case where the previous record ended as being a + * partial one. + */ + readOff = ReadPageInternal(state, targetPagePtr, SizeOfXLogShortPHD); ++======= + /* Wait for the next page to become available */ + readOff = ReadPageInternal(state, targetPagePtr, + Min(total_len_phisical - gotlen + SizeOfXLogShortPHD, + XLOG_BLCKSZ)); + ++>>>>>>> theirs if (readOff == XLREAD_WOULDBLOCK) return XLREAD_WOULDBLOCK; else if (readOff < 0)