=== Applying patches on top of PostgreSQL commit ID 2a2e1b470b9b4e9c7d76bc227db02a2efbb57473 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Wed Oct 8 20:56:20 UTC 2025 On branch cf/6083 nothing to commit, working tree clean === using 'git am' to apply patch ./v3-0001-Better-gin-pg_waldump.patch === Applying: Better gin pg_waldump Using index info to reconstruct a base tree... M src/backend/access/rmgrdesc/gindesc.c Falling back to patching base and 3-way merge... Auto-merging src/backend/access/rmgrdesc/gindesc.c CONFLICT (content): Merge conflict in src/backend/access/rmgrdesc/gindesc.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 Better gin pg_waldump 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/rmgrdesc/gindesc.c === using patch(1) to apply patch ./v3-0001-Better-gin-pg_waldump.patch === patching file src/backend/access/rmgrdesc/gindesc.c Hunk #1 FAILED at 150. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/access/rmgrdesc/gindesc.c.rej Removing src/backend/access/rmgrdesc/gindesc.c.rej === using 'git apply' to apply patch ./v3-0001-Better-gin-pg_waldump.patch === Applied patch to 'src/backend/access/rmgrdesc/gindesc.c' with conflicts. U src/backend/access/rmgrdesc/gindesc.c diff --cc src/backend/access/rmgrdesc/gindesc.c index 075c4a0ae93,69994cb4593..00000000000 --- a/src/backend/access/rmgrdesc/gindesc.c +++ b/src/backend/access/rmgrdesc/gindesc.c @@@ -154,26 -151,19 +154,42 @@@ gin_desc(StringInfo buf, XLogReaderStat break; case XLOG_GIN_UPDATE_META_PAGE: { ++<<<<<<< ours + ginxlogUpdateMeta *xlrec = (ginxlogUpdateMeta *) rec; + + appendStringInfo(buf, "ntuples: %d", xlrec->ntuples); + if (xlrec->prevTail != InvalidBlockNumber) + appendStringInfo(buf, " prevTail: %u", + xlrec->prevTail); + if (xlrec->newRightlink != InvalidBlockNumber) + appendStringInfo(buf, " newRightLink: %u", + xlrec->newRightlink); + } + break; + case XLOG_GIN_INSERT_LISTPAGE: + { + ginxlogInsertListPage *xlrec = (ginxlogInsertListPage *) rec; + + appendStringInfo(buf, "ntuples: %d", xlrec->ntuples); + if (xlrec->rightlink != InvalidBlockNumber) + appendStringInfo(buf, " rightlink: %u", + xlrec->rightlink); + } ++======= + int32 ntuples; + ginxlogUpdateMeta *xlrec = (ginxlogUpdateMeta *) rec; + ntuples = xlrec->ntuples; + appendStringInfo(buf, "ntuples: %d", ntuples); + if (ntuples == 0) + appendStringInfo(buf, " prevTail: %u newRightLink: %u", + xlrec->prevTail, + xlrec->newRightlink); + } + break; + case XLOG_GIN_INSERT_LISTPAGE: + appendStringInfo(buf, "ntuples: %d", + ((ginxlogInsertListPage *) rec)->ntuples); ++>>>>>>> theirs break; case XLOG_GIN_DELETE_LISTPAGE: appendStringInfo(buf, "ndeleted: %d",