=== Applying patches on top of PostgreSQL commit ID 85d5bd308bf5dc3068a4c28aa0f12cc22272f789 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Jan 1 09:15:20 UTC 2026 On branch cf/6352 nothing to commit, working tree clean === using 'git am' to apply patch ./v1-0001-Precalculate-CompactAttribute-s-attcacheoff.patch === Applying: Precalculate CompactAttribute's attcacheoff Using index info to reconstruct a base tree... M src/backend/access/gin/ginutil.c M src/backend/access/spgist/spgutils.c M src/backend/catalog/index.c M src/backend/utils/cache/relcache.c Falling back to patching base and 3-way merge... Auto-merging src/backend/utils/cache/relcache.c Auto-merging src/backend/catalog/index.c CONFLICT (content): Merge conflict in src/backend/catalog/index.c Auto-merging src/backend/access/spgist/spgutils.c Auto-merging src/backend/access/gin/ginutil.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 Precalculate CompactAttribute's attcacheoff 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/dblink/dblink.c M contrib/pg_buffercache/pg_buffercache_pages.c M contrib/pg_visibility/pg_visibility.c M src/backend/access/brin/brin_tuple.c M src/backend/access/common/heaptuple.c M src/backend/access/common/indextuple.c M src/backend/access/common/tupdesc.c M src/backend/access/gin/ginutil.c M src/backend/access/gist/gistscan.c M src/backend/access/spgist/spgutils.c M src/backend/access/transam/twophase.c M src/backend/access/transam/xlogfuncs.c M src/backend/backup/basebackup_copy.c M src/backend/catalog/index.c M src/backend/catalog/pg_publication.c M src/backend/catalog/toasting.c M src/backend/commands/explain.c M src/backend/commands/functioncmds.c M src/backend/commands/sequence.c M src/backend/commands/tablecmds.c M src/backend/executor/execSRF.c M src/backend/executor/execTuples.c M src/backend/executor/nodeFunctionscan.c M src/backend/parser/parse_relation.c M src/backend/parser/parse_target.c M src/backend/replication/libpqwalreceiver/libpqwalreceiver.c M src/backend/replication/walsender.c M src/backend/utils/adt/acl.c M src/backend/utils/adt/genfile.c M src/backend/utils/adt/lockfuncs.c M src/backend/utils/adt/orderedsetaggs.c M src/backend/utils/adt/pgstatfuncs.c M src/backend/utils/adt/tsvector_op.c M src/backend/utils/cache/relcache.c M src/backend/utils/fmgr/funcapi.c M src/backend/utils/init/postinit.c M src/backend/utils/misc/guc_funcs.c M src/include/access/htup_details.h M src/include/access/itup.h M src/include/access/tupdesc.h M src/include/access/tupmacs.h M src/include/executor/tuptable.h M src/pl/plpgsql/src/pl_comp.c M src/test/modules/test_predtest/test_predtest.c === using patch(1) to apply patch ./v1-0001-Precalculate-CompactAttribute-s-attcacheoff.patch === patching file contrib/dblink/dblink.c patching file contrib/pg_buffercache/pg_buffercache_pages.c patching file contrib/pg_visibility/pg_visibility.c patching file src/backend/access/brin/brin_tuple.c patching file src/backend/access/common/heaptuple.c patching file src/backend/access/common/indextuple.c patching file src/backend/access/common/tupdesc.c patching file src/backend/access/gin/ginutil.c Hunk #1 succeeded at 129 (offset 1 line). patching file src/backend/access/gist/gistscan.c patching file src/backend/access/spgist/spgutils.c Hunk #1 succeeded at 335 (offset 1 line). patching file src/backend/access/transam/twophase.c patching file src/backend/access/transam/xlogfuncs.c patching file src/backend/backup/basebackup_copy.c patching file src/backend/catalog/index.c Hunk #1 FAILED at 481. 1 out of 1 hunk FAILED -- saving rejects to file src/backend/catalog/index.c.rej patching file src/backend/catalog/pg_publication.c patching file src/backend/catalog/toasting.c patching file src/backend/commands/explain.c patching file src/backend/commands/functioncmds.c patching file src/backend/commands/sequence.c patching file src/backend/commands/tablecmds.c patching file src/backend/executor/execSRF.c patching file src/backend/executor/execTuples.c patching file src/backend/executor/nodeFunctionscan.c patching file src/backend/parser/parse_relation.c patching file src/backend/parser/parse_target.c patching file src/backend/replication/libpqwalreceiver/libpqwalreceiver.c patching file src/backend/replication/walsender.c patching file src/backend/utils/adt/acl.c patching file src/backend/utils/adt/genfile.c patching file src/backend/utils/adt/lockfuncs.c patching file src/backend/utils/adt/orderedsetaggs.c patching file src/backend/utils/adt/pgstatfuncs.c patching file src/backend/utils/adt/tsvector_op.c patching file src/backend/utils/cache/relcache.c Hunk #3 succeeded at 1977 (offset -5 lines). Hunk #4 succeeded at 3681 (offset -5 lines). Hunk #5 succeeded at 4436 (offset -5 lines). Hunk #6 succeeded at 6262 (offset -5 lines). patching file src/backend/utils/fmgr/funcapi.c patching file src/backend/utils/init/postinit.c patching file src/backend/utils/misc/guc_funcs.c patching file src/include/access/htup_details.h patching file src/include/access/itup.h patching file src/include/access/tupdesc.h patching file src/include/access/tupmacs.h patching file src/include/executor/tuptable.h patching file src/pl/plpgsql/src/pl_comp.c patching file src/test/modules/test_predtest/test_predtest.c Unstaged changes after reset: M contrib/dblink/dblink.c M contrib/pg_buffercache/pg_buffercache_pages.c M contrib/pg_visibility/pg_visibility.c M src/backend/access/brin/brin_tuple.c M src/backend/access/common/heaptuple.c M src/backend/access/common/indextuple.c M src/backend/access/common/tupdesc.c M src/backend/access/gin/ginutil.c M src/backend/access/gist/gistscan.c M src/backend/access/spgist/spgutils.c M src/backend/access/transam/twophase.c M src/backend/access/transam/xlogfuncs.c M src/backend/backup/basebackup_copy.c M src/backend/catalog/pg_publication.c M src/backend/catalog/toasting.c M src/backend/commands/explain.c M src/backend/commands/functioncmds.c M src/backend/commands/sequence.c M src/backend/commands/tablecmds.c M src/backend/executor/execSRF.c M src/backend/executor/execTuples.c M src/backend/executor/nodeFunctionscan.c M src/backend/parser/parse_relation.c M src/backend/parser/parse_target.c M src/backend/replication/libpqwalreceiver/libpqwalreceiver.c M src/backend/replication/walsender.c M src/backend/utils/adt/acl.c M src/backend/utils/adt/genfile.c M src/backend/utils/adt/lockfuncs.c M src/backend/utils/adt/orderedsetaggs.c M src/backend/utils/adt/pgstatfuncs.c M src/backend/utils/adt/tsvector_op.c M src/backend/utils/cache/relcache.c M src/backend/utils/fmgr/funcapi.c M src/backend/utils/init/postinit.c M src/backend/utils/misc/guc_funcs.c M src/include/access/htup_details.h M src/include/access/itup.h M src/include/access/tupdesc.h M src/include/access/tupmacs.h M src/include/executor/tuptable.h M src/pl/plpgsql/src/pl_comp.c M src/test/modules/test_predtest/test_predtest.c Removing src/backend/catalog/index.c.rej === using 'git apply' to apply patch ./v1-0001-Precalculate-CompactAttribute-s-attcacheoff.patch === Applied patch to 'contrib/dblink/dblink.c' cleanly. Applied patch to 'contrib/pg_buffercache/pg_buffercache_pages.c' cleanly. Applied patch to 'contrib/pg_visibility/pg_visibility.c' cleanly. Applied patch to 'src/backend/access/brin/brin_tuple.c' cleanly. Applied patch to 'src/backend/access/common/heaptuple.c' cleanly. Applied patch to 'src/backend/access/common/indextuple.c' cleanly. Applied patch to 'src/backend/access/common/tupdesc.c' cleanly. Applied patch to 'src/backend/access/gin/ginutil.c' cleanly. Applied patch to 'src/backend/access/gist/gistscan.c' cleanly. Applied patch to 'src/backend/access/spgist/spgutils.c' cleanly. Applied patch to 'src/backend/access/transam/twophase.c' cleanly. Applied patch to 'src/backend/access/transam/xlogfuncs.c' cleanly. Applied patch to 'src/backend/backup/basebackup_copy.c' cleanly. Applied patch to 'src/backend/catalog/index.c' with conflicts. Applied patch to 'src/backend/catalog/pg_publication.c' cleanly. Applied patch to 'src/backend/catalog/toasting.c' cleanly. Applied patch to 'src/backend/commands/explain.c' cleanly. Applied patch to 'src/backend/commands/functioncmds.c' cleanly. Applied patch to 'src/backend/commands/sequence.c' cleanly. Applied patch to 'src/backend/commands/tablecmds.c' cleanly. Applied patch to 'src/backend/executor/execSRF.c' cleanly. Applied patch to 'src/backend/executor/execTuples.c' cleanly. Applied patch to 'src/backend/executor/nodeFunctionscan.c' cleanly. Applied patch to 'src/backend/parser/parse_relation.c' cleanly. Applied patch to 'src/backend/parser/parse_target.c' cleanly. Applied patch to 'src/backend/replication/libpqwalreceiver/libpqwalreceiver.c' cleanly. Applied patch to 'src/backend/replication/walsender.c' cleanly. Applied patch to 'src/backend/utils/adt/acl.c' cleanly. Applied patch to 'src/backend/utils/adt/genfile.c' cleanly. Applied patch to 'src/backend/utils/adt/lockfuncs.c' cleanly. Applied patch to 'src/backend/utils/adt/orderedsetaggs.c' cleanly. Applied patch to 'src/backend/utils/adt/pgstatfuncs.c' cleanly. Applied patch to 'src/backend/utils/adt/tsvector_op.c' cleanly. Applied patch to 'src/backend/utils/cache/relcache.c' cleanly. Applied patch to 'src/backend/utils/fmgr/funcapi.c' cleanly. Applied patch to 'src/backend/utils/init/postinit.c' cleanly. Applied patch to 'src/backend/utils/misc/guc_funcs.c' cleanly. Applied patch to 'src/include/access/htup_details.h' cleanly. Applied patch to 'src/include/access/itup.h' cleanly. Applied patch to 'src/include/access/tupdesc.h' cleanly. Applied patch to 'src/include/access/tupmacs.h' cleanly. Applied patch to 'src/include/executor/tuptable.h' cleanly. Applied patch to 'src/pl/plpgsql/src/pl_comp.c' cleanly. Applied patch to 'src/test/modules/test_predtest/test_predtest.c' cleanly. U src/backend/catalog/index.c diff --cc src/backend/catalog/index.c index 86db0541f29,56b46385a0b..00000000000 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@@ -481,6 -481,10 +481,13 @@@ ConstructTupleDescriptor(Relation heapR populate_compact_attribute(indexTupDesc, i); } ++<<<<<<< ours ++======= + TupleDescFinalize(indexTupDesc); + + pfree(amroutine); + ++>>>>>>> theirs return indexTupDesc; }