=== Applying patches on top of PostgreSQL commit ID 630a93799d538c35c94187e07ef64d566a573a4e === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Dec 13 10:30:23 UTC 2025 On branch cf/6221 nothing to commit, working tree clean === using 'git am' to apply patch ./v2-0001-Refactor-how-we-form-HeapTuples-for-CatalogTuple-.patch === Applying: Refactor how we form HeapTuples for CatalogTuple(Insert|Update) === using 'git am' to apply patch ./v2-0002-Update-the-remainder-of-catalog-updates-using-the.patch === Applying: Update the remainder of catalog updates using the new APIs error: sha1 information is lacking or useless (src/backend/catalog/pg_constraint.c). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Update the remainder of catalog updates using the new APIs 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". === using patch(1) to apply patch ./v2-0002-Update-the-remainder-of-catalog-updates-using-the.patch === patching file src/backend/catalog/aclchk.c Hunk #2 succeeded at 1316 (offset 2 lines). Hunk #3 succeeded at 1643 (offset 2 lines). Hunk #4 succeeded at 1735 (offset 2 lines). Hunk #5 succeeded at 1947 (offset 2 lines). Hunk #6 succeeded at 1998 (offset 2 lines). Hunk #7 succeeded at 2122 (offset 2 lines). Hunk #8 succeeded at 2196 (offset 2 lines). Hunk #9 succeeded at 2222 (offset 2 lines). Hunk #10 succeeded at 2272 (offset 2 lines). Hunk #11 succeeded at 2280 (offset 2 lines). Hunk #12 succeeded at 2351 (offset 2 lines). Hunk #13 succeeded at 2502 (offset 2 lines). Hunk #14 succeeded at 4601 (offset 2 lines). Hunk #15 succeeded at 4635 (offset 2 lines). Hunk #16 succeeded at 4653 (offset 2 lines). Hunk #17 succeeded at 4666 (offset 2 lines). Hunk #18 succeeded at 4677 (offset 2 lines). Hunk #19 succeeded at 4722 (offset 2 lines). Hunk #20 succeeded at 4782 (offset 2 lines). Hunk #21 succeeded at 4826 (offset 2 lines). Hunk #22 succeeded at 4911 (offset 2 lines). patching file src/backend/catalog/heap.c Hunk #4 FAILED at 733. 1 out of 29 hunks FAILED -- saving rejects to file src/backend/catalog/heap.c.rej patching file src/backend/catalog/index.c patching file src/backend/catalog/partition.c patching file src/backend/catalog/pg_attrdef.c patching file src/backend/catalog/pg_cast.c patching file src/backend/catalog/pg_collation.c patching file src/backend/catalog/pg_constraint.c patching file src/backend/catalog/pg_conversion.c patching file src/backend/catalog/pg_db_role_setting.c patching file src/backend/catalog/pg_depend.c Hunk #2 FAILED at 88. 1 out of 10 hunks FAILED -- saving rejects to file src/backend/catalog/pg_depend.c.rej patching file src/backend/catalog/pg_enum.c patching file src/backend/catalog/pg_inherits.c patching file src/backend/catalog/pg_largeobject.c patching file src/backend/catalog/pg_namespace.c patching file src/backend/catalog/pg_operator.c patching file src/backend/catalog/pg_parameter_acl.c patching file src/backend/catalog/pg_proc.c patching file src/backend/catalog/pg_publication.c patching file src/backend/catalog/pg_range.c patching file src/backend/catalog/pg_shdepend.c patching file src/backend/catalog/pg_subscription.c patching file src/backend/catalog/pg_type.c patching file src/backend/catalog/toasting.c patching file src/backend/commands/amcmds.c patching file src/backend/commands/cluster.c patching file src/backend/commands/collationcmds.c patching file src/backend/commands/comment.c patching file src/backend/commands/dbcommands.c Hunk #9 succeeded at 2383 (offset 1 line). Hunk #10 succeeded at 2504 (offset 1 line). Hunk #11 succeeded at 2522 (offset 1 line). Hunk #12 succeeded at 2591 (offset 1 line). Hunk #13 succeeded at 2692 (offset 1 line). Hunk #14 succeeded at 2724 (offset 1 line). Hunk #15 succeeded at 2738 (offset 1 line). patching file src/backend/commands/event_trigger.c patching file src/backend/commands/extension.c patching file src/backend/commands/foreigncmds.c patching file src/backend/commands/functioncmds.c patching file src/backend/commands/indexcmds.c patching file src/backend/commands/matview.c patching file src/backend/commands/opclasscmds.c patching file src/backend/commands/operatorcmds.c patching file src/backend/commands/policy.c patching file src/backend/commands/proclang.c patching file src/backend/commands/publicationcmds.c patching file src/backend/commands/schemacmds.c patching file src/backend/commands/seclabel.c patching file src/backend/commands/sequence.c patching file src/backend/commands/statscmds.c patching file src/backend/commands/subscriptioncmds.c patching file src/backend/commands/tablecmds.c patching file src/backend/commands/tablespace.c patching file src/backend/commands/trigger.c patching file src/backend/commands/tsearchcmds.c patching file src/backend/commands/typecmds.c patching file src/backend/commands/user.c patching file src/backend/replication/logical/origin.c patching file src/backend/replication/logical/tablesync.c patching file src/backend/replication/logical/worker.c patching file src/backend/rewrite/rewriteDefine.c patching file src/backend/rewrite/rewriteSupport.c patching file src/backend/statistics/extended_stats.c Hunk #4 succeeded at 2299 (offset -1 lines). Hunk #5 succeeded at 2321 (offset -1 lines). patching file src/backend/statistics/relation_stats.c patching file src/backend/storage/large_object/inv_api.c patching file src/backend/utils/cache/relcache.c Unstaged changes after reset: M src/backend/catalog/aclchk.c M src/backend/catalog/heap.c M src/backend/catalog/index.c M src/backend/catalog/partition.c M src/backend/catalog/pg_attrdef.c M src/backend/catalog/pg_cast.c M src/backend/catalog/pg_collation.c M src/backend/catalog/pg_constraint.c M src/backend/catalog/pg_conversion.c M src/backend/catalog/pg_db_role_setting.c M src/backend/catalog/pg_depend.c M src/backend/catalog/pg_enum.c M src/backend/catalog/pg_inherits.c M src/backend/catalog/pg_largeobject.c M src/backend/catalog/pg_namespace.c M src/backend/catalog/pg_operator.c M src/backend/catalog/pg_parameter_acl.c M src/backend/catalog/pg_proc.c M src/backend/catalog/pg_publication.c M src/backend/catalog/pg_range.c M src/backend/catalog/pg_shdepend.c M src/backend/catalog/pg_subscription.c M src/backend/catalog/pg_type.c M src/backend/catalog/toasting.c M src/backend/commands/amcmds.c M src/backend/commands/cluster.c M src/backend/commands/collationcmds.c M src/backend/commands/comment.c M src/backend/commands/dbcommands.c M src/backend/commands/event_trigger.c M src/backend/commands/extension.c M src/backend/commands/foreigncmds.c M src/backend/commands/functioncmds.c M src/backend/commands/indexcmds.c M src/backend/commands/matview.c M src/backend/commands/opclasscmds.c M src/backend/commands/operatorcmds.c M src/backend/commands/policy.c M src/backend/commands/proclang.c M src/backend/commands/publicationcmds.c M src/backend/commands/schemacmds.c M src/backend/commands/seclabel.c M src/backend/commands/sequence.c M src/backend/commands/statscmds.c M src/backend/commands/subscriptioncmds.c M src/backend/commands/tablecmds.c M src/backend/commands/tablespace.c M src/backend/commands/trigger.c M src/backend/commands/tsearchcmds.c M src/backend/commands/typecmds.c M src/backend/commands/user.c M src/backend/replication/logical/origin.c M src/backend/replication/logical/tablesync.c M src/backend/replication/logical/worker.c M src/backend/rewrite/rewriteDefine.c M src/backend/rewrite/rewriteSupport.c M src/backend/statistics/extended_stats.c M src/backend/statistics/relation_stats.c M src/backend/storage/large_object/inv_api.c M src/backend/utils/cache/relcache.c Removing src/backend/catalog/heap.c.rej Removing src/backend/catalog/pg_depend.c.rej === using 'git apply' to apply patch ./v2-0002-Update-the-remainder-of-catalog-updates-using-the.patch === Applied patch to 'src/backend/catalog/aclchk.c' cleanly. Applied patch to 'src/backend/catalog/heap.c' with conflicts. Applied patch to 'src/backend/catalog/index.c' cleanly. Applied patch to 'src/backend/catalog/partition.c' cleanly. Applied patch to 'src/backend/catalog/pg_attrdef.c' cleanly. Applied patch to 'src/backend/catalog/pg_cast.c' cleanly. Applied patch to 'src/backend/catalog/pg_collation.c' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/backend/catalog/pg_conversion.c' cleanly. Applied patch to 'src/backend/catalog/pg_db_role_setting.c' cleanly. Applied patch to 'src/backend/catalog/pg_depend.c' with conflicts. Applied patch to 'src/backend/catalog/pg_enum.c' cleanly. Applied patch to 'src/backend/catalog/pg_inherits.c' cleanly. Applied patch to 'src/backend/catalog/pg_largeobject.c' cleanly. Applied patch to 'src/backend/catalog/pg_namespace.c' cleanly. Applied patch to 'src/backend/catalog/pg_operator.c' cleanly. Applied patch to 'src/backend/catalog/pg_parameter_acl.c' cleanly. Applied patch to 'src/backend/catalog/pg_proc.c' cleanly. Applied patch to 'src/backend/catalog/pg_publication.c' cleanly. Applied patch to 'src/backend/catalog/pg_range.c' cleanly. Applied patch to 'src/backend/catalog/pg_shdepend.c' cleanly. Applied patch to 'src/backend/catalog/pg_subscription.c' cleanly. Applied patch to 'src/backend/catalog/pg_type.c' cleanly. Applied patch to 'src/backend/catalog/toasting.c' cleanly. Applied patch to 'src/backend/commands/amcmds.c' cleanly. Applied patch to 'src/backend/commands/cluster.c' cleanly. Applied patch to 'src/backend/commands/collationcmds.c' cleanly. Applied patch to 'src/backend/commands/comment.c' cleanly. Applied patch to 'src/backend/commands/dbcommands.c' cleanly. Applied patch to 'src/backend/commands/event_trigger.c' cleanly. Applied patch to 'src/backend/commands/extension.c' cleanly. Applied patch to 'src/backend/commands/foreigncmds.c' cleanly. Applied patch to 'src/backend/commands/functioncmds.c' cleanly. Applied patch to 'src/backend/commands/indexcmds.c' cleanly. Applied patch to 'src/backend/commands/matview.c' cleanly. Applied patch to 'src/backend/commands/opclasscmds.c' cleanly. Applied patch to 'src/backend/commands/operatorcmds.c' cleanly. Applied patch to 'src/backend/commands/policy.c' cleanly. Applied patch to 'src/backend/commands/proclang.c' cleanly. Applied patch to 'src/backend/commands/publicationcmds.c' cleanly. Applied patch to 'src/backend/commands/schemacmds.c' cleanly. Applied patch to 'src/backend/commands/seclabel.c' cleanly. Applied patch to 'src/backend/commands/sequence.c' cleanly. Applied patch to 'src/backend/commands/statscmds.c' cleanly. Applied patch to 'src/backend/commands/subscriptioncmds.c' cleanly. Applied patch to 'src/backend/commands/tablecmds.c' cleanly. Applied patch to 'src/backend/commands/tablespace.c' cleanly. Applied patch to 'src/backend/commands/trigger.c' cleanly. Applied patch to 'src/backend/commands/tsearchcmds.c' cleanly. Applied patch to 'src/backend/commands/typecmds.c' cleanly. Applied patch to 'src/backend/commands/user.c' cleanly. Applied patch to 'src/backend/replication/logical/origin.c' cleanly. Applied patch to 'src/backend/replication/logical/tablesync.c' cleanly. Applied patch to 'src/backend/replication/logical/worker.c' cleanly. Applied patch to 'src/backend/rewrite/rewriteDefine.c' cleanly. Applied patch to 'src/backend/rewrite/rewriteSupport.c' cleanly. Applied patch to 'src/backend/statistics/extended_stats.c' cleanly. Applied patch to 'src/backend/statistics/relation_stats.c' cleanly. Applied patch to 'src/backend/storage/large_object/inv_api.c' cleanly. Applied patch to 'src/backend/utils/cache/relcache.c' cleanly. U src/backend/catalog/heap.c U src/backend/catalog/pg_depend.c diff --cc src/backend/catalog/heap.c index 265cc3e5fbf,24a815c9784..00000000000 --- a/src/backend/catalog/heap.c +++ b/src/backend/catalog/heap.c @@@ -732,9 -733,9 +733,13 @@@ InsertPgAttributeTuples(Relation pg_att /* Initialize the number of slots to use */ nslots = Min(tupdesc->natts, (MAX_CATALOG_MULTI_INSERT_BYTES / sizeof(FormData_pg_attribute))); ++<<<<<<< ours + slot = palloc_array(TupleTableSlot *, nslots); ++======= + slots = palloc(sizeof(TupleTableSlot *) * nslots); ++>>>>>>> theirs for (int i = 0; i < nslots; i++) - slot[i] = MakeSingleTupleTableSlot(td, &TTSOpsHeapTuple); + slots[i] = MakeSingleTupleTableSlot(td, &TTSOpsHeapTuple); while (natts < tupdesc->natts) { diff --cc src/backend/catalog/pg_depend.c index a6f63e107bb,88deac7f3bd..00000000000 --- a/src/backend/catalog/pg_depend.c +++ b/src/backend/catalog/pg_depend.c @@@ -88,7 -88,7 +88,11 @@@ recordMultipleDependencies(const Object */ max_slots = Min(nreferenced, MAX_CATALOG_MULTI_INSERT_BYTES / sizeof(FormData_pg_depend)); ++<<<<<<< ours + slot = palloc_array(TupleTableSlot *, max_slots); ++======= + slots = palloc(sizeof(TupleTableSlot *) * max_slots); ++>>>>>>> theirs /* Don't open indexes unless we need to make an update */ indstate = NULL;