=== Applying patches on top of PostgreSQL commit ID 6831cd9e3b082d7b830c3196742dd49e3540c49b === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Jan 17 10:42:24 UTC 2026 On branch cf/6301 nothing to commit, working tree clean === using 'git am' to apply patch ./v6-0001-Add-hash_make-macros.patch === Applying: Add hash_make macros === using 'git am' to apply patch ./v6-0002-Add-foreach_hash-macro.patch === Applying: Add foreach_hash macro === using 'git am' to apply patch ./v6-0003-Use-hash_make-macros-throughout-the-codebase.patch === Applying: Use hash_make macros throughout the codebase Using index info to reconstruct a base tree... M src/backend/access/common/heaptuple.c M src/backend/access/heap/rewriteheap.c M src/backend/commands/async.c M src/backend/executor/nodeModifyTable.c M src/backend/postmaster/autovacuum.c M src/backend/replication/logical/relation.c M src/backend/storage/buffer/bufmgr.c M src/backend/storage/buffer/localbuf.c M src/backend/storage/lmgr/lwlock.c M src/backend/storage/smgr/smgr.c M src/backend/utils/cache/typcache.c M src/pl/plpython/plpy_plpymodule.c Falling back to patching base and 3-way merge... Auto-merging src/pl/plpython/plpy_plpymodule.c CONFLICT (content): Merge conflict in src/pl/plpython/plpy_plpymodule.c Auto-merging src/backend/utils/cache/typcache.c Auto-merging src/backend/storage/smgr/smgr.c Auto-merging src/backend/storage/lmgr/lwlock.c Auto-merging src/backend/storage/buffer/localbuf.c Auto-merging src/backend/storage/buffer/bufmgr.c Auto-merging src/backend/replication/logical/relation.c Auto-merging src/backend/postmaster/autovacuum.c Auto-merging src/backend/executor/nodeModifyTable.c Auto-merging src/backend/commands/async.c Auto-merging src/backend/access/heap/rewriteheap.c Auto-merging src/backend/access/common/heaptuple.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 hash_make macros throughout the codebase 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_stat_statements/pg_stat_statements.c M contrib/pg_trgm/trgm_regexp.c M contrib/postgres_fdw/connection.c M contrib/postgres_fdw/shippable.c M contrib/tablefunc/tablefunc.c M src/backend/access/common/heaptuple.c M src/backend/access/gist/gistbuild.c M src/backend/access/gist/gistbuildbuffers.c M src/backend/access/hash/hashpage.c M src/backend/access/heap/rewriteheap.c M src/backend/access/transam/xlogprefetcher.c M src/backend/access/transam/xlogutils.c M src/backend/catalog/pg_enum.c M src/backend/catalog/pg_inherits.c M src/backend/catalog/storage.c M src/backend/commands/async.c M src/backend/commands/prepare.c M src/backend/commands/sequence.c M src/backend/commands/tablecmds.c M src/backend/executor/nodeModifyTable.c M src/backend/nodes/extensible.c M src/backend/optimizer/util/plancat.c M src/backend/optimizer/util/predtest.c M src/backend/optimizer/util/relnode.c M src/backend/parser/parse_oper.c M src/backend/partitioning/partdesc.c M src/backend/postmaster/autovacuum.c M src/backend/postmaster/checkpointer.c M src/backend/replication/logical/applyparallelworker.c M src/backend/replication/logical/relation.c M src/backend/replication/logical/reorderbuffer.c M src/backend/replication/logical/tablesync.c M src/backend/replication/pgoutput/pgoutput.c M src/backend/storage/buffer/buf_table.c M src/backend/storage/buffer/bufmgr.c M src/backend/storage/buffer/localbuf.c M src/backend/storage/file/reinit.c M src/backend/storage/ipc/shmem.c M src/backend/storage/ipc/standby.c M src/backend/storage/lmgr/lock.c M src/backend/storage/lmgr/lwlock.c M src/backend/storage/lmgr/predicate.c M src/backend/storage/smgr/smgr.c M src/backend/storage/sync/sync.c M src/backend/tsearch/ts_typanalyze.c M src/backend/utils/activity/wait_event.c M src/backend/utils/adt/array_typanalyze.c M src/backend/utils/adt/json.c M src/backend/utils/adt/jsonfuncs.c M src/backend/utils/adt/mcxtfuncs.c M src/backend/utils/adt/ri_triggers.c M src/backend/utils/adt/ruleutils.c M src/backend/utils/cache/attoptcache.c M src/backend/utils/cache/evtcache.c M src/backend/utils/cache/funccache.c M src/backend/utils/cache/relcache.c M src/backend/utils/cache/relfilenumbermap.c M src/backend/utils/cache/spccache.c M src/backend/utils/cache/ts_cache.c M src/backend/utils/cache/typcache.c M src/backend/utils/fmgr/dfmgr.c M src/backend/utils/fmgr/fmgr.c M src/backend/utils/misc/guc.c M src/backend/utils/misc/injection_point.c M src/backend/utils/mmgr/portalmem.c M src/backend/utils/time/combocid.c M src/pl/plperl/plperl.c M src/pl/plpgsql/src/pl_exec.c M src/pl/plpython/plpy_plpymodule.c M src/pl/plpython/plpy_procedure.c M src/pl/tcl/pltcl.c M src/timezone/pgtz.c === using patch(1) to apply patch ./v6-0003-Use-hash_make-macros-throughout-the-codebase.patch === patching file contrib/dblink/dblink.c patching file contrib/pg_stat_statements/pg_stat_statements.c patching file contrib/pg_trgm/trgm_regexp.c patching file contrib/postgres_fdw/connection.c patching file contrib/postgres_fdw/shippable.c patching file contrib/tablefunc/tablefunc.c patching file src/backend/access/common/heaptuple.c patching file src/backend/access/gist/gistbuild.c patching file src/backend/access/gist/gistbuildbuffers.c patching file src/backend/access/hash/hashpage.c patching file src/backend/access/heap/rewriteheap.c Hunk #3 succeeded at 754 (offset 3 lines). Hunk #4 succeeded at 784 (offset 3 lines). patching file src/backend/access/transam/xlogprefetcher.c patching file src/backend/access/transam/xlogutils.c patching file src/backend/catalog/pg_enum.c patching file src/backend/catalog/pg_inherits.c patching file src/backend/catalog/storage.c patching file src/backend/commands/async.c Hunk #1 succeeded at 3162 with fuzz 2 (offset 748 lines). patching file src/backend/commands/prepare.c patching file src/backend/commands/sequence.c patching file src/backend/commands/tablecmds.c patching file src/backend/executor/nodeModifyTable.c Hunk #1 succeeded at 5135 (offset 4 lines). patching file src/backend/nodes/extensible.c patching file src/backend/optimizer/util/plancat.c patching file src/backend/optimizer/util/predtest.c patching file src/backend/optimizer/util/relnode.c patching file src/backend/parser/parse_oper.c patching file src/backend/partitioning/partdesc.c patching file src/backend/postmaster/autovacuum.c Hunk #1 succeeded at 904 (offset -3 lines). Hunk #2 succeeded at 933 (offset -3 lines). Hunk #3 succeeded at 1879 (offset -22 lines). Hunk #4 succeeded at 1951 (offset -22 lines). patching file src/backend/postmaster/checkpointer.c patching file src/backend/replication/logical/applyparallelworker.c patching file src/backend/replication/logical/relation.c Hunk #1 succeeded at 105 (offset 1 line). Hunk #2 succeeded at 112 (offset 1 line). Hunk #3 succeeded at 606 (offset 1 line). Hunk #4 succeeded at 613 (offset 1 line). patching file src/backend/replication/logical/reorderbuffer.c patching file src/backend/replication/logical/tablesync.c patching file src/backend/replication/pgoutput/pgoutput.c patching file src/backend/storage/buffer/buf_table.c patching file src/backend/storage/buffer/bufmgr.c Hunk #1 succeeded at 63 (offset 1 line). Hunk #2 succeeded at 4120 (offset 19 lines). Hunk #3 succeeded at 4132 (offset 19 lines). patching file src/backend/storage/buffer/localbuf.c patching file src/backend/storage/file/reinit.c patching file src/backend/storage/ipc/shmem.c patching file src/backend/storage/ipc/standby.c patching file src/backend/storage/lmgr/lock.c patching file src/backend/storage/lmgr/lwlock.c patching file src/backend/storage/lmgr/predicate.c patching file src/backend/storage/smgr/smgr.c patching file src/backend/storage/sync/sync.c patching file src/backend/tsearch/ts_typanalyze.c patching file src/backend/utils/activity/wait_event.c patching file src/backend/utils/adt/array_typanalyze.c patching file src/backend/utils/adt/json.c patching file src/backend/utils/adt/jsonfuncs.c patching file src/backend/utils/adt/mcxtfuncs.c patching file src/backend/utils/adt/ri_triggers.c patching file src/backend/utils/adt/ruleutils.c patching file src/backend/utils/cache/attoptcache.c patching file src/backend/utils/cache/evtcache.c patching file src/backend/utils/cache/funccache.c patching file src/backend/utils/cache/relcache.c patching file src/backend/utils/cache/relfilenumbermap.c patching file src/backend/utils/cache/spccache.c patching file src/backend/utils/cache/ts_cache.c patching file src/backend/utils/cache/typcache.c patching file src/backend/utils/fmgr/dfmgr.c patching file src/backend/utils/fmgr/fmgr.c patching file src/backend/utils/misc/guc.c patching file src/backend/utils/misc/injection_point.c patching file src/backend/utils/mmgr/portalmem.c patching file src/backend/utils/time/combocid.c patching file src/pl/plperl/plperl.c patching file src/pl/plpgsql/src/pl_exec.c patching file src/pl/plpython/plpy_plpymodule.c Hunk #2 succeeded at 146 with fuzz 2 (offset -27 lines). Hunk #3 succeeded at 158 with fuzz 2 (offset -35 lines). patching file src/pl/plpython/plpy_procedure.c patching file src/pl/tcl/pltcl.c patching file src/timezone/pgtz.c [cf/6301 d2b0883c8d9] Use hash_make macros throughout the codebase Author: Jelte Fennema-Nio Date: Thu Dec 4 15:36:19 2025 +0100 73 files changed, 371 insertions(+), 835 deletions(-) === using 'git am' to apply patch ./v6-0004-Use-foreach_hash-macro-throughout-the-codebase.patch === fatal: previous rebase directory .git/rebase-apply still exists but mbox given. === using patch(1) to apply patch ./v6-0004-Use-foreach_hash-macro-throughout-the-codebase.patch === patching file contrib/dblink/dblink.c patching file contrib/pg_stat_statements/pg_stat_statements.c patching file contrib/pg_trgm/trgm_regexp.c patching file contrib/postgres_fdw/connection.c patching file contrib/postgres_fdw/shippable.c patching file src/backend/access/heap/rewriteheap.c Hunk #2 succeeded at 792 (offset 3 lines). Hunk #3 succeeded at 803 (offset 3 lines). Hunk #4 succeeded at 887 (offset 3 lines). Hunk #5 succeeded at 896 (offset 3 lines). patching file src/backend/access/transam/xlogutils.c patching file src/backend/catalog/pg_enum.c patching file src/backend/catalog/storage.c patching file src/backend/commands/prepare.c patching file src/backend/commands/tablecmds.c patching file src/backend/optimizer/util/predtest.c patching file src/backend/parser/parse_oper.c patching file src/backend/partitioning/partdesc.c patching file src/backend/postmaster/autovacuum.c Hunk #1 succeeded at 1018 (offset -3 lines). Hunk #2 succeeded at 1028 (offset -3 lines). Hunk #3 succeeded at 1053 (offset -3 lines). patching file src/backend/replication/logical/relation.c Hunk #1 succeeded at 64 (offset 1 line). Hunk #2 succeeded at 84 (offset 1 line). Hunk #3 succeeded at 521 (offset 1 line). Hunk #4 succeeded at 541 (offset 1 line). Hunk #5 succeeded at 559 (offset 1 line). patching file src/backend/replication/logical/reorderbuffer.c patching file src/backend/replication/pgoutput/pgoutput.c patching file src/backend/storage/buffer/bufmgr.c Hunk #1 succeeded at 4171 (offset 19 lines). Hunk #2 succeeded at 4179 (offset 19 lines). Hunk #3 succeeded at 4192 (offset 19 lines). patching file src/backend/storage/ipc/shmem.c patching file src/backend/storage/ipc/standby.c patching file src/backend/storage/lmgr/lock.c patching file src/backend/storage/lmgr/lwlock.c patching file src/backend/storage/lmgr/predicate.c patching file src/backend/storage/smgr/smgr.c patching file src/backend/storage/sync/sync.c patching file src/backend/tsearch/ts_typanalyze.c patching file src/backend/utils/activity/wait_event.c patching file src/backend/utils/adt/array_typanalyze.c patching file src/backend/utils/cache/relcache.c patching file src/backend/utils/cache/relfilenumbermap.c patching file src/backend/utils/cache/spccache.c patching file src/backend/utils/cache/ts_cache.c patching file src/backend/utils/cache/typcache.c patching file src/backend/utils/misc/guc.c patching file src/backend/utils/mmgr/portalmem.c patching file src/pl/plperl/plperl.c [cf/6301 801081dadb3] Use foreach_hash macro throughout the codebase Author: Jelte Fennema-Nio Date: Thu Dec 4 15:39:09 2025 +0100 37 files changed, 141 insertions(+), 526 deletions(-) === using 'git am' to apply patch ./v6-0005-Inline-functions-that-have-now-become-trivial.patch === fatal: previous rebase directory .git/rebase-apply still exists but mbox given. === using patch(1) to apply patch ./v6-0005-Inline-functions-that-have-now-become-trivial.patch === patching file src/backend/commands/prepare.c patching file src/backend/commands/sequence.c patching file src/backend/utils/cache/funccache.c [cf/6301 7b026b098d9] Inline functions that have now become trivial Author: Jelte Fennema-Nio Date: Wed Dec 3 23:33:18 2025 +0100 3 files changed, 10 insertions(+), 45 deletions(-)