=== Applying patches on top of PostgreSQL commit ID b3f1a13f22f9e28842ee5fbd08b7ec805e27aaac === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Fri Apr 4 18:50:27 UTC 2025 On branch cf/5429 nothing to commit, working tree clean === using 'git am' to apply patch ./v2-0001-Use-PRI-64-instead-of-ll-in-format-strings-contin.patch === Applying: Use PRI?64 instead of "ll?" in format strings (continued). Using index info to reconstruct a base tree... M contrib/file_fdw/file_fdw.c M contrib/pageinspect/btreefuncs.c M contrib/pageinspect/hashfuncs.c M contrib/pg_prewarm/pg_prewarm.c M src/backend/access/brin/brin.c M src/backend/access/heap/vacuumlazy.c M src/backend/access/rmgrdesc/clogdesc.c M src/backend/access/rmgrdesc/committsdesc.c M src/backend/access/rmgrdesc/mxactdesc.c M src/backend/access/rmgrdesc/xactdesc.c M src/backend/access/transam/multixact.c M src/backend/access/transam/slru.c M src/backend/access/transam/xloginsert.c M src/backend/access/transam/xlogreader.c M src/backend/backup/basebackup.c M src/backend/backup/basebackup_incremental.c M src/backend/backup/walsummaryfuncs.c M src/backend/catalog/catalog.c M src/backend/commands/analyze.c M src/backend/commands/copy.c M src/backend/commands/copyfrom.c M src/backend/commands/copyfromparse.c M src/backend/commands/explain.c M src/backend/commands/sequence.c M src/backend/commands/vacuum.c M src/backend/replication/logical/logical.c M src/backend/replication/slot.c M src/backend/replication/walreceiver.c M src/backend/storage/ipc/ipc.c M src/backend/storage/ipc/signalfuncs.c M src/backend/utils/activity/pgstat.c M src/backend/utils/activity/pgstat_replslot.c M src/backend/utils/activity/pgstat_shmem.c M src/backend/utils/activity/pgstat_xact.c M src/backend/utils/adt/datetime.c M src/backend/utils/adt/varlena.c M src/backend/utils/adt/xid8funcs.c M src/backend/utils/error/csvlog.c M src/backend/utils/error/elog.c M src/backend/utils/error/jsonlog.c M src/backend/utils/mmgr/mcxt.c M src/backend/utils/sort/logtape.c M src/backend/utils/sort/tuplesort.c M src/bin/pg_basebackup/pg_createsubscriber.c M src/bin/pg_basebackup/pg_receivewal.c M src/bin/pg_combinebackup/load_manifest.c M src/bin/pg_combinebackup/pg_combinebackup.c M src/bin/pg_combinebackup/write_manifest.c M src/bin/pg_controldata/pg_controldata.c M src/bin/pg_resetwal/pg_resetwal.c M src/bin/pg_rewind/libpq_source.c M src/bin/pg_verifybackup/astreamer_verify.c M src/bin/pg_verifybackup/pg_verifybackup.c M src/fe_utils/print.c M src/include/lib/radixtree.h M src/test/modules/libpq_pipeline/libpq_pipeline.c M src/test/modules/test_copy_callbacks/test_copy_callbacks.c M src/test/modules/test_slru/test_slru.c M src/test/modules/xid_wraparound/xid_wraparound.c Falling back to patching base and 3-way merge... Auto-merging src/test/modules/libpq_pipeline/libpq_pipeline.c Auto-merging src/fe_utils/print.c CONFLICT (content): Merge conflict in src/fe_utils/print.c Auto-merging src/bin/pg_verifybackup/pg_verifybackup.c Auto-merging src/bin/pg_verifybackup/astreamer_verify.c CONFLICT (content): Merge conflict in src/bin/pg_verifybackup/astreamer_verify.c Auto-merging src/bin/pg_rewind/libpq_source.c CONFLICT (content): Merge conflict in src/bin/pg_rewind/libpq_source.c Auto-merging src/bin/pg_combinebackup/pg_combinebackup.c Auto-merging src/bin/pg_combinebackup/load_manifest.c Auto-merging src/bin/pg_basebackup/pg_receivewal.c Auto-merging src/bin/pg_basebackup/pg_createsubscriber.c Auto-merging src/backend/utils/sort/logtape.c CONFLICT (content): Merge conflict in src/backend/utils/sort/logtape.c Auto-merging src/backend/utils/mmgr/mcxt.c Auto-merging src/backend/utils/error/elog.c Auto-merging src/backend/utils/adt/varlena.c Auto-merging src/backend/utils/activity/pgstat.c Auto-merging src/backend/storage/ipc/ipc.c CONFLICT (content): Merge conflict in src/backend/storage/ipc/ipc.c Auto-merging src/backend/replication/walreceiver.c Auto-merging src/backend/replication/slot.c Auto-merging src/backend/commands/vacuum.c Auto-merging src/backend/commands/explain.c Auto-merging src/backend/commands/copyfrom.c Auto-merging src/backend/commands/analyze.c Auto-merging src/backend/backup/basebackup_incremental.c Auto-merging src/backend/backup/basebackup.c Auto-merging src/backend/access/transam/xlogreader.c Auto-merging src/backend/access/heap/vacuumlazy.c Auto-merging src/backend/access/brin/brin.c Auto-merging contrib/pg_prewarm/pg_prewarm.c Auto-merging contrib/file_fdw/file_fdw.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 PRI?64 instead of "ll?" in format strings (continued). 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 src/backend/access/transam/twophase.c M src/backend/access/transam/xlogarchive.c M src/backend/access/transam/xlogreader.c M src/backend/backup/basebackup.c M src/backend/replication/walreceiver.c M src/backend/storage/ipc/ipc.c M src/backend/utils/sort/logtape.c M src/bin/pg_basebackup/pg_receivewal.c M src/bin/pg_combinebackup/load_manifest.c M src/bin/pg_combinebackup/pg_combinebackup.c M src/bin/pg_combinebackup/reconstruct.c M src/bin/pg_dump/pg_backup_tar.c M src/bin/pg_rewind/libpq_source.c M src/bin/pg_verifybackup/astreamer_verify.c M src/bin/pg_verifybackup/pg_verifybackup.c M src/fe_utils/archive.c M src/fe_utils/print.c M src/test/modules/libpq_pipeline/libpq_pipeline.c === using patch(1) to apply patch ./v2-0001-Use-PRI-64-instead-of-ll-in-format-strings-contin.patch === patch: unrecognized option `--no-backup-if-mismatch' usage: patch [-bCcEeflNnRstuv] [-B backup-prefix] [-D symbol] [-d directory] [-F max-fuzz] [-i patchfile] [-o out-file] [-p strip-count] [-r rej-name] [-V t | nil | never | none] [-x number] [-z backup-ext] [--posix] [origfile [patchfile]] patch >>>>>> theirs function, arg); } diff --cc src/backend/utils/sort/logtape.c index e529ceb8260,7ee2bdde556..00000000000 --- a/src/backend/utils/sort/logtape.c +++ b/src/backend/utils/sort/logtape.c @@@ -1102,7 -1102,7 +1102,11 @@@ LogicalTapeBackspace(LogicalTape *lt, s if (TapeBlockGetTrailer(lt->buffer)->next != lt->curBlockNumber) elog(ERROR, "broken tape, next of block %" PRId64 " is %" PRId64 ", expected %" PRId64, prev, ++<<<<<<< ours + TapeBlockGetTrailer(lt->buffer)->next, ++======= + (TapeBlockGetTrailer(lt->buffer)->next), ++>>>>>>> theirs lt->curBlockNumber); lt->nbytes = TapeBlockPayloadSize; diff --cc src/bin/pg_rewind/libpq_source.c index 56c2ad55d4a,4a6dfb586d3..00000000000 --- a/src/bin/pg_rewind/libpq_source.c +++ b/src/bin/pg_rewind/libpq_source.c @@@ -576,8 -576,8 +576,13 @@@ process_queued_fetch_requests(libpq_sou filename, rq->path); } if (chunkoff != rq->offset) ++<<<<<<< ours + pg_fatal("received data at offset %" PRId64 " of file \"%s\", when requested for offset %lld", + chunkoff, rq->path, (long long int) rq->offset); ++======= + pg_fatal("received data at offset %" PRId64 " of file \"%s\", when requested for offset %" PRId64, + chunkoff, rq->path, (pgoff_t) rq->offset); ++>>>>>>> theirs /* * We should not receive more data than we requested, or diff --cc src/bin/pg_verifybackup/astreamer_verify.c index 079c3970410,65c6299bd09..00000000000 --- a/src/bin/pg_verifybackup/astreamer_verify.c +++ b/src/bin/pg_verifybackup/astreamer_verify.c @@@ -207,9 -207,9 +207,13 @@@ member_verify_header(astreamer *streame if (m->size != member->size) { report_backup_error(mystreamer->context, ++<<<<<<< ours + "\"%s\" has size %llu in \"%s\" but size %" PRIu64 " in the manifest", ++======= + "\"%s\" has size %" PRId64 " in \"%s\" but size %" PRId64 " in the manifest", ++>>>>>>> theirs member->pathname, - (unsigned long long) member->size, + member->size, mystreamer->archive_name, m->size); m->bad = true; @@@ -296,7 -296,7 +300,11 @@@ member_verify_checksum(astreamer *strea if (mystreamer->checksum_bytes != m->size) { report_backup_error(mystreamer->context, ++<<<<<<< ours + "file \"%s\" in \"%s\" should contain %" PRIu64 " bytes, but read %" PRIu64 " bytes", ++======= + "file \"%s\" in \"%s\" should contain %" PRId64 " bytes, but read %" PRIu64 " bytes", ++>>>>>>> theirs m->pathname, mystreamer->archive_name, m->size, mystreamer->checksum_bytes); diff --cc src/fe_utils/print.c index 28d5bb0bd5d,d66630a1b50..00000000000 --- a/src/fe_utils/print.c +++ b/src/fe_utils/print.c @@@ -3185,7 -3185,7 +3185,11 @@@ printTableInit(printTableContent *cons /* Catch possible overflow. Using >= here allows adding 1 below */ if (total_cells >= SIZE_MAX / sizeof(*content->cells)) { ++<<<<<<< ours + fprintf(stderr, _("Cannot print table contents: number of cells %" PRId64 " is equal to or exceeds maximum %zu.\n"), ++======= + fprintf(stderr, _("Cannot print table contents: number of cells %" PRId64 " is equal to or exceeds maximum %zd.\n"), ++>>>>>>> theirs total_cells, SIZE_MAX / sizeof(*content->cells)); exit(EXIT_FAILURE); @@@ -3269,7 -3269,7 +3273,11 @@@ printTableAddCell(printTableContent *co total_cells = (uint64) content->ncolumns * content->nrows; if (content->cellsadded >= total_cells) { ++<<<<<<< ours + fprintf(stderr, _("Cannot add cell to table content: total cell count of %" PRId64 " exceeded.\n"), ++======= + fprintf(stderr, _("Cannot add cell to table content: total cell count of %" PRIu64 " exceeded.\n"), ++>>>>>>> theirs total_cells); exit(EXIT_FAILURE); }