=== Applying patches on top of PostgreSQL commit ID ef3c3cf6d021ff9884c513afd850a9fe85cad736 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Feb 14 11:22:24 UTC 2026 On branch cf/5621 nothing to commit, working tree clean === using 'git am' to apply patch ./v5-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:785: 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/xloginsert.c M src/backend/access/transam/xlogreader.c M src/backend/utils/misc/guc_parameters.dat M src/backend/utils/misc/postgresql.conf.sample M src/include/access/xlog.h M src/include/access/xlogreader.h Falling back to patching base and 3-way merge... Auto-merging src/include/access/xlogreader.h Auto-merging src/include/access/xlog.h Auto-merging src/backend/utils/misc/postgresql.conf.sample Auto-merging src/backend/utils/misc/guc_parameters.dat Auto-merging src/backend/access/transam/xlogreader.c Auto-merging src/backend/access/transam/xloginsert.c CONFLICT (content): Merge conflict in src/backend/access/transam/xloginsert.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_parameters.dat 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 ./v5-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 #2 succeeded at 717 (offset -1 lines). Hunk #3 succeeded at 1050 (offset -1 lines). patching file src/backend/access/transam/xloginsert.c Hunk #3 FAILED at 91. 1 out of 24 hunks FAILED -- saving rejects to file src/backend/access/transam/xloginsert.c.rej patching file src/backend/access/transam/xlogreader.c patching file src/backend/utils/misc/guc_parameters.dat Hunk #1 succeeded at 3342 (offset 17 lines). patching file src/backend/utils/misc/postgresql.conf.sample Hunk #1 succeeded at 252 (offset 5 lines). 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_parameters.dat 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/xloginsert.c.rej === using 'git apply' to apply patch ./v5-0001-Compress-big-WAL-records.patch === /work/patches/./v5-0001-Compress-big-WAL-records.patch:87: trailing whitespace. /work/patches/./v5-0001-Compress-big-WAL-records.patch:94: trailing whitespace. /work/patches/./v5-0001-Compress-big-WAL-records.patch:319: trailing whitespace. /work/patches/./v5-0001-Compress-big-WAL-records.patch:791: 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' with conflicts. Applied patch to 'src/backend/access/transam/xlogreader.c' cleanly. Applied patch to 'src/backend/utils/misc/guc_parameters.dat' 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/xloginsert.c warning: 4 lines add whitespace errors. diff --cc src/backend/access/transam/xloginsert.c index d3acaa636c3,2e6a55a48b2..00000000000 --- a/src/backend/access/transam/xloginsert.c +++ b/src/backend/access/transam/xloginsert.c @@@ -115,7 -91,17 +91,21 @@@ static uint8 curinsert_flags = 0 static XLogRecData hdr_rdt; static char *hdr_scratch = NULL; ++<<<<<<< ours +#define SizeOfXlogOrigin (sizeof(ReplOriginId) + sizeof(char)) ++======= + /* + * Compression buffers are kept in StringInfo for the prototype. + * compression_buffer_current_size == -1 means we entered critical section + * before we could prepare compression buffers. + */ + static int32 compression_buffer_current_size; + static XLogRecData compressed_rdt_hdr; + static StringInfo data_before_compression = NULL; + static StringInfo compressed_data = NULL; + + #define SizeOfXlogOrigin (sizeof(RepOriginId) + sizeof(char)) ++>>>>>>> theirs #define SizeOfXLogTransactionId (sizeof(TransactionId) + sizeof(char)) #define HEADER_SCRATCH_SIZE \