=== Applying patches on top of PostgreSQL commit ID c55df7c6eae5a5c6f91cd029fb91913db7f2089c === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Mon Apr 14 15:04:20 UTC 2025 On branch cf/4942 nothing to commit, working tree clean === using 'git am' to apply patch ./v19-0001-Avoid-orphaned-objects-dependencies.patch === Applying: Avoid orphaned objects dependencies Using index info to reconstruct a base tree... M src/backend/catalog/aclchk.c M src/backend/catalog/heap.c M src/backend/catalog/index.c M src/backend/catalog/objectaddress.c M src/backend/catalog/pg_aggregate.c M src/backend/catalog/pg_attrdef.c M src/backend/catalog/pg_constraint.c M src/backend/catalog/pg_proc.c M src/backend/catalog/pg_publication.c M src/backend/commands/alter.c M src/backend/commands/cluster.c M src/backend/commands/extension.c M src/backend/commands/functioncmds.c M src/backend/commands/indexcmds.c M src/backend/commands/opclasscmds.c M src/backend/commands/sequence.c M src/backend/commands/statscmds.c M src/backend/commands/tablecmds.c M src/backend/commands/trigger.c M src/backend/commands/typecmds.c M src/test/isolation/isolation_schedule M src/test/regress/expected/alter_table.out Falling back to patching base and 3-way merge... Auto-merging src/test/regress/expected/alter_table.out Auto-merging src/test/isolation/isolation_schedule Auto-merging src/backend/commands/typecmds.c Auto-merging src/backend/commands/trigger.c Auto-merging src/backend/commands/tablecmds.c Auto-merging src/backend/commands/statscmds.c Auto-merging src/backend/commands/sequence.c Auto-merging src/backend/commands/opclasscmds.c Auto-merging src/backend/commands/indexcmds.c Auto-merging src/backend/commands/functioncmds.c Auto-merging src/backend/commands/extension.c Auto-merging src/backend/commands/cluster.c Auto-merging src/backend/commands/alter.c Auto-merging src/backend/catalog/pg_publication.c Auto-merging src/backend/catalog/pg_proc.c CONFLICT (content): Merge conflict in src/backend/catalog/pg_proc.c Auto-merging src/backend/catalog/pg_constraint.c Auto-merging src/backend/catalog/pg_attrdef.c Auto-merging src/backend/catalog/pg_aggregate.c Auto-merging src/backend/catalog/objectaddress.c Auto-merging src/backend/catalog/index.c Auto-merging src/backend/catalog/heap.c Auto-merging src/backend/catalog/aclchk.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 Avoid orphaned objects dependencies 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/catalog/aclchk.c M src/backend/catalog/dependency.c M src/backend/catalog/heap.c M src/backend/catalog/index.c M src/backend/catalog/objectaddress.c M src/backend/catalog/pg_aggregate.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_depend.c M src/backend/catalog/pg_operator.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_type.c M src/backend/catalog/toasting.c M src/backend/commands/alter.c M src/backend/commands/amcmds.c M src/backend/commands/cluster.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/opclasscmds.c M src/backend/commands/operatorcmds.c M src/backend/commands/policy.c M src/backend/commands/proclang.c M src/backend/commands/sequence.c M src/backend/commands/statscmds.c M src/backend/commands/tablecmds.c M src/backend/commands/trigger.c M src/backend/commands/tsearchcmds.c M src/backend/commands/typecmds.c M src/backend/rewrite/rewriteDefine.c M src/backend/utils/errcodes.txt M src/include/catalog/dependency.h M src/include/catalog/objectaddress.h M src/test/isolation/isolation_schedule M src/test/regress/expected/alter_table.out Removing src/test/isolation/expected/test_dependencies_locks.out Removing src/test/isolation/specs/test_dependencies_locks.spec === using patch(1) to apply patch ./v19-0001-Avoid-orphaned-objects-dependencies.patch === patching file src/backend/catalog/aclchk.c Hunk #1 succeeded at 1355 (offset 14 lines). patching file src/backend/catalog/dependency.c patching file src/backend/catalog/heap.c Hunk #1 succeeded at 849 (offset 12 lines). Hunk #2 succeeded at 858 (offset 12 lines). Hunk #3 succeeded at 1468 (offset 14 lines). Hunk #4 succeeded at 1490 (offset 14 lines). Hunk #5 succeeded at 3871 (offset 67 lines). Hunk #6 succeeded at 3879 (offset 67 lines). patching file src/backend/catalog/index.c Hunk #1 succeeded at 1118 (offset 1 line). Hunk #2 succeeded at 1131 (offset 1 line). Hunk #3 succeeded at 1152 (offset 1 line). Hunk #4 succeeded at 1169 (offset 1 line). Hunk #5 succeeded at 1191 (offset 1 line). Hunk #6 succeeded at 1200 (offset 1 line). Hunk #7 succeeded at 2011 (offset 1 line). Hunk #8 succeeded at 2030 (offset 1 line). patching file src/backend/catalog/objectaddress.c Hunk #1 succeeded at 2599 (offset 4 lines). patching file src/backend/catalog/pg_aggregate.c Hunk #1 succeeded at 749 (offset 1 line). Hunk #2 succeeded at 764 (offset 1 line). Hunk #3 succeeded at 772 (offset 1 line). Hunk #4 succeeded at 780 (offset 1 line). Hunk #5 succeeded at 788 (offset 1 line). Hunk #6 succeeded at 796 (offset 1 line). Hunk #7 succeeded at 804 (offset 1 line). Hunk #8 succeeded at 812 (offset 1 line). patching file src/backend/catalog/pg_attrdef.c Hunk #1 succeeded at 117 (offset -61 lines). patching file src/backend/catalog/pg_cast.c patching file src/backend/catalog/pg_collation.c patching file src/backend/catalog/pg_constraint.c Hunk #1 succeeded at 266 (offset 2 lines). Hunk #2 succeeded at 298 (offset 2 lines). Hunk #3 succeeded at 318 (offset 2 lines). Hunk #4 succeeded at 353 (offset 2 lines). Hunk #5 succeeded at 373 (offset 2 lines). Hunk #6 succeeded at 1158 (offset 16 lines). patching file src/backend/catalog/pg_conversion.c patching file src/backend/catalog/pg_depend.c patching file src/backend/catalog/pg_operator.c patching file src/backend/catalog/pg_proc.c Hunk #1 succeeded at 621 (offset 28 lines). Hunk #2 FAILED at 607. Hunk #3 FAILED at 628. Hunk #4 succeeded at 663 (offset 21 lines). Hunk #5 succeeded at 703 (offset 21 lines). 2 out of 5 hunks FAILED -- saving rejects to file src/backend/catalog/pg_proc.c.rej patching file src/backend/catalog/pg_publication.c Hunk #4 succeeded at 734 (offset 8 lines). patching file src/backend/catalog/pg_range.c patching file src/backend/catalog/pg_type.c patching file src/backend/catalog/toasting.c patching file src/backend/commands/alter.c Hunk #1 succeeded at 515 (offset 16 lines). Hunk #2 succeeded at 822 (offset 16 lines). patching file src/backend/commands/amcmds.c patching file src/backend/commands/cluster.c Hunk #1 succeeded at 1279 (offset 5 lines). Hunk #2 succeeded at 1288 (offset 5 lines). Hunk #3 succeeded at 1391 (offset 5 lines). Hunk #4 succeeded at 1401 (offset 5 lines). patching file src/backend/commands/event_trigger.c patching file src/backend/commands/extension.c Hunk #1 succeeded at 2121 (offset 86 lines). Hunk #2 succeeded at 2130 (offset 86 lines). Hunk #3 succeeded at 3238 (offset 157 lines). Hunk #4 succeeded at 3529 (offset 157 lines). Hunk #5 succeeded at 3686 (offset 157 lines). patching file src/backend/commands/foreigncmds.c patching file src/backend/commands/functioncmds.c Hunk #1 succeeded at 1464 (offset 3 lines). Hunk #2 succeeded at 1478 (offset 3 lines). Hunk #3 succeeded at 1995 (offset 3 lines). patching file src/backend/commands/indexcmds.c Hunk #1 succeeded at 4513 (offset 25 lines). patching file src/backend/commands/opclasscmds.c Hunk #4 succeeded at 1518 (offset 25 lines). Hunk #5 succeeded at 1535 (offset 25 lines). Hunk #6 succeeded at 1544 (offset 25 lines). Hunk #7 succeeded at 1578 (offset 25 lines). Hunk #8 succeeded at 1662 (offset 25 lines). Hunk #9 succeeded at 1671 (offset 25 lines). 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/sequence.c patching file src/backend/commands/statscmds.c Hunk #2 succeeded at 555 (offset 18 lines). Hunk #3 succeeded at 578 (offset 18 lines). Hunk #4 succeeded at 600 (offset 18 lines). patching file src/backend/commands/tablecmds.c Hunk #1 succeeded at 3571 (offset 44 lines). Hunk #2 succeeded at 7572 (offset 137 lines). Hunk #3 succeeded at 10784 (offset 290 lines). Hunk #4 succeeded at 14897 (offset 920 lines). Hunk #5 succeeded at 16477 (offset 920 lines). Hunk #6 succeeded at 16497 (offset 920 lines). Hunk #7 succeeded at 18232 (offset 932 lines). Hunk #8 succeeded at 19005 (offset 932 lines). patching file src/backend/commands/trigger.c Hunk #1 succeeded at 1023 (offset 3 lines). Hunk #2 succeeded at 1030 (offset 3 lines). Hunk #3 succeeded at 1055 (offset 3 lines). Hunk #4 succeeded at 1069 (offset 3 lines). Hunk #5 succeeded at 1082 (offset 3 lines). Hunk #6 succeeded at 1091 (offset 3 lines). Hunk #7 succeeded at 1107 (offset 3 lines). Hunk #8 succeeded at 1117 (offset 3 lines). Hunk #9 succeeded at 1130 (offset 3 lines). Hunk #10 succeeded at 1282 (offset 3 lines). patching file src/backend/commands/tsearchcmds.c patching file src/backend/commands/typecmds.c Hunk #1 succeeded at 1821 (offset 1 line). Hunk #2 succeeded at 1888 (offset 2 lines). Hunk #3 succeeded at 2704 (offset 4 lines). Hunk #4 succeeded at 4308 (offset 4 lines). Hunk #5 succeeded at 4606 (offset 4 lines). Hunk #6 succeeded at 4655 (offset 4 lines). patching file src/backend/rewrite/rewriteDefine.c patching file src/backend/utils/errcodes.txt patching file src/include/catalog/dependency.h patching file src/include/catalog/objectaddress.h patching file src/test/isolation/expected/test_dependencies_locks.out patching file src/test/isolation/isolation_schedule Hunk #1 succeeded at 116 (offset 1 line). patching file src/test/isolation/specs/test_dependencies_locks.spec patching file src/test/regress/expected/alter_table.out Hunk #1 succeeded at 2933 (offset 71 lines). Unstaged changes after reset: M src/backend/catalog/aclchk.c M src/backend/catalog/dependency.c M src/backend/catalog/heap.c M src/backend/catalog/index.c M src/backend/catalog/objectaddress.c M src/backend/catalog/pg_aggregate.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_depend.c M src/backend/catalog/pg_operator.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_type.c M src/backend/catalog/toasting.c M src/backend/commands/alter.c M src/backend/commands/amcmds.c M src/backend/commands/cluster.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/opclasscmds.c M src/backend/commands/operatorcmds.c M src/backend/commands/policy.c M src/backend/commands/proclang.c M src/backend/commands/sequence.c M src/backend/commands/statscmds.c M src/backend/commands/tablecmds.c M src/backend/commands/trigger.c M src/backend/commands/tsearchcmds.c M src/backend/commands/typecmds.c M src/backend/rewrite/rewriteDefine.c M src/backend/utils/errcodes.txt M src/include/catalog/dependency.h M src/include/catalog/objectaddress.h M src/test/isolation/isolation_schedule M src/test/regress/expected/alter_table.out Removing src/backend/catalog/pg_proc.c.rej Removing src/test/isolation/expected/test_dependencies_locks.out Removing src/test/isolation/specs/test_dependencies_locks.spec === using 'git apply' to apply patch ./v19-0001-Avoid-orphaned-objects-dependencies.patch === Applied patch to 'src/backend/catalog/aclchk.c' cleanly. Applied patch to 'src/backend/catalog/dependency.c' cleanly. Applied patch to 'src/backend/catalog/heap.c' cleanly. Applied patch to 'src/backend/catalog/index.c' cleanly. Applied patch to 'src/backend/catalog/objectaddress.c' cleanly. Applied patch to 'src/backend/catalog/pg_aggregate.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. Applied patch to 'src/backend/catalog/pg_constraint.c' cleanly. Applied patch to 'src/backend/catalog/pg_conversion.c' cleanly. Applied patch to 'src/backend/catalog/pg_depend.c' cleanly. Applied patch to 'src/backend/catalog/pg_operator.c' cleanly. Applied patch to 'src/backend/catalog/pg_proc.c' with conflicts. 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_type.c' cleanly. Applied patch to 'src/backend/catalog/toasting.c' cleanly. Applied patch to 'src/backend/commands/alter.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/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/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/sequence.c' cleanly. Applied patch to 'src/backend/commands/statscmds.c' cleanly. Applied patch to 'src/backend/commands/tablecmds.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/rewrite/rewriteDefine.c' cleanly. Applied patch to 'src/backend/utils/errcodes.txt' cleanly. Applied patch to 'src/include/catalog/dependency.h' cleanly. Applied patch to 'src/include/catalog/objectaddress.h' cleanly. Falling back to direct application... Applied patch to 'src/test/isolation/isolation_schedule' cleanly. Falling back to direct application... Applied patch to 'src/test/regress/expected/alter_table.out' cleanly. U src/backend/catalog/pg_proc.c diff --cc src/backend/catalog/pg_proc.c index 5fdcf24d5f8,c3999bdce87..00000000000 --- a/src/backend/catalog/pg_proc.c +++ b/src/backend/catalog/pg_proc.c @@@ -636,19 -617,30 +645,43 @@@ ProcedureCreate(const char *procedureNa /* dependency on return type */ ObjectAddressSet(referenced, TypeRelationId, returnType); add_exact_object_address(&referenced, addrs); + LockNotPinnedObject(TypeRelationId, returnType); ++<<<<<<< ours ++======= + /* dependency on transform used by return type, if any */ + if ((trfid = get_transform_oid(returnType, languageObjectId, true))) + { + ObjectAddressSet(referenced, TransformRelationId, trfid); + add_exact_object_address(&referenced, addrs); + LockNotPinnedObject(TransformRelationId, trfid); + } + ++>>>>>>> theirs /* dependency on parameter types */ for (i = 0; i < allParamCount; i++) { ObjectAddressSet(referenced, TypeRelationId, allParams[i]); add_exact_object_address(&referenced, addrs); ++<<<<<<< ours + } + + /* dependency on transforms, if any */ + foreach_oid(transformid, trfoids) + { + ObjectAddressSet(referenced, TransformRelationId, transformid); + add_exact_object_address(&referenced, addrs); ++======= + LockNotPinnedObject(TypeRelationId, allParams[i]); + + /* dependency on transform used by parameter type, if any */ + if ((trfid = get_transform_oid(allParams[i], languageObjectId, true))) + { + ObjectAddressSet(referenced, TransformRelationId, trfid); + add_exact_object_address(&referenced, addrs); + LockNotPinnedObject(TransformRelationId, trfid); + } ++>>>>>>> theirs } /* dependency on support function, if any */