=== Applying patches on top of PostgreSQL commit ID 12efa48978c6dba5eca1b95758127181783fb217 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sun Aug 3 08:00:26 UTC 2025 On branch cf/5795 nothing to commit, working tree clean === using 'git am' to apply patch ./v5-0001-Pathify-RHS-unique-ification-for-semijoin-plannin.patch === Applying: Pathify RHS unique-ification for semijoin planning Using index info to reconstruct a base tree... M src/backend/optimizer/path/costsize.c M src/backend/optimizer/plan/createplan.c M src/backend/optimizer/plan/planner.c M src/backend/optimizer/util/pathnode.c M src/include/nodes/pathnodes.h M src/include/optimizer/pathnode.h M src/test/regress/expected/join.out M src/tools/pgindent/typedefs.list Falling back to patching base and 3-way merge... Auto-merging src/tools/pgindent/typedefs.list Auto-merging src/test/regress/expected/join.out Auto-merging src/include/optimizer/pathnode.h CONFLICT (content): Merge conflict in src/include/optimizer/pathnode.h Auto-merging src/include/nodes/pathnodes.h Auto-merging src/backend/optimizer/util/pathnode.c Auto-merging src/backend/optimizer/plan/planner.c Auto-merging src/backend/optimizer/plan/createplan.c Auto-merging src/backend/optimizer/path/costsize.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 Pathify RHS unique-ification for semijoin planning 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/optimizer/README M src/backend/optimizer/path/costsize.c M src/backend/optimizer/path/joinpath.c M src/backend/optimizer/path/joinrels.c M src/backend/optimizer/plan/createplan.c M src/backend/optimizer/plan/planner.c M src/backend/optimizer/prep/prepunion.c M src/backend/optimizer/util/pathnode.c M src/backend/optimizer/util/relnode.c M src/include/nodes/nodes.h M src/include/nodes/pathnodes.h M src/include/optimizer/pathnode.h M src/include/optimizer/planner.h M src/test/regress/expected/join.out M src/test/regress/expected/partition_join.out M src/test/regress/expected/subselect.out M src/test/regress/sql/subselect.sql M src/tools/pgindent/typedefs.list === using patch(1) to apply patch ./v5-0001-Pathify-RHS-unique-ification-for-semijoin-plannin.patch === patching file src/backend/optimizer/README patching file src/backend/optimizer/path/costsize.c Hunk #1 succeeded at 3969 (offset 6 lines). Hunk #2 succeeded at 4366 (offset 6 lines). patching file src/backend/optimizer/path/joinpath.c patching file src/backend/optimizer/path/joinrels.c patching file src/backend/optimizer/plan/createplan.c Hunk #3 succeeded at 293 (offset 3 lines). Hunk #4 succeeded at 467 (offset 3 lines). Hunk #5 succeeded at 1751 (offset 4 lines). Hunk #6 succeeded at 2108 (offset 4 lines). Hunk #7 succeeded at 2128 (offset 4 lines). Hunk #8 succeeded at 6667 (offset 9 lines). Hunk #9 succeeded at 6735 (offset 9 lines). patching file src/backend/optimizer/plan/planner.c Hunk #2 succeeded at 4912 (offset -11 lines). Hunk #3 succeeded at 5106 (offset -11 lines). Hunk #4 succeeded at 8243 (offset -11 lines). patching file src/backend/optimizer/prep/prepunion.c patching file src/backend/optimizer/util/pathnode.c Hunk #3 succeeded at 1738 (offset 5 lines). Hunk #4 succeeded at 1789 (offset 5 lines). Hunk #5 succeeded at 2546 (offset 5 lines). Hunk #6 succeeded at 2801 (offset 5 lines). Hunk #7 succeeded at 2848 (offset 5 lines). Hunk #8 succeeded at 2924 (offset 5 lines). Hunk #9 succeeded at 2936 (offset 5 lines). Hunk #10 succeeded at 3005 (offset 5 lines). patching file src/backend/optimizer/util/relnode.c patching file src/include/nodes/nodes.h patching file src/include/nodes/pathnodes.h Hunk #1 succeeded at 703 (offset 3 lines). Hunk #2 succeeded at 768 (offset 6 lines). Hunk #3 succeeded at 943 (offset 6 lines). Hunk #4 succeeded at 1016 (offset 2 lines). Hunk #5 succeeded at 1763 (offset 2 lines). Hunk #6 succeeded at 2163 with fuzz 1 (offset 4 lines). Hunk #7 succeeded at 2369 (offset 4 lines). patching file src/include/optimizer/pathnode.h Hunk #1 FAILED at 91. 1 out of 2 hunks FAILED -- saving rejects to file src/include/optimizer/pathnode.h.rej patching file src/include/optimizer/planner.h patching file src/test/regress/expected/join.out patching file src/test/regress/expected/partition_join.out patching file src/test/regress/expected/subselect.out patching file src/test/regress/sql/subselect.sql patching file src/tools/pgindent/typedefs.list Hunk #1 succeeded at 3159 (offset 4 lines). Hunk #2 succeeded at 3174 (offset 4 lines). Unstaged changes after reset: M src/backend/optimizer/README M src/backend/optimizer/path/costsize.c M src/backend/optimizer/path/joinpath.c M src/backend/optimizer/path/joinrels.c M src/backend/optimizer/plan/createplan.c M src/backend/optimizer/plan/planner.c M src/backend/optimizer/prep/prepunion.c M src/backend/optimizer/util/pathnode.c M src/backend/optimizer/util/relnode.c M src/include/nodes/nodes.h M src/include/nodes/pathnodes.h M src/include/optimizer/pathnode.h M src/include/optimizer/planner.h M src/test/regress/expected/join.out M src/test/regress/expected/partition_join.out M src/test/regress/expected/subselect.out M src/test/regress/sql/subselect.sql M src/tools/pgindent/typedefs.list Removing src/include/optimizer/pathnode.h.rej === using 'git apply' to apply patch ./v5-0001-Pathify-RHS-unique-ification-for-semijoin-plannin.patch === Applied patch to 'src/backend/optimizer/README' cleanly. Applied patch to 'src/backend/optimizer/path/costsize.c' cleanly. Applied patch to 'src/backend/optimizer/path/joinpath.c' cleanly. Applied patch to 'src/backend/optimizer/path/joinrels.c' cleanly. Applied patch to 'src/backend/optimizer/plan/createplan.c' cleanly. Applied patch to 'src/backend/optimizer/plan/planner.c' cleanly. Applied patch to 'src/backend/optimizer/prep/prepunion.c' cleanly. Applied patch to 'src/backend/optimizer/util/pathnode.c' cleanly. Applied patch to 'src/backend/optimizer/util/relnode.c' cleanly. Applied patch to 'src/include/nodes/nodes.h' cleanly. Applied patch to 'src/include/nodes/pathnodes.h' cleanly. Applied patch to 'src/include/optimizer/pathnode.h' with conflicts. Applied patch to 'src/include/optimizer/planner.h' cleanly. Applied patch to 'src/test/regress/expected/join.out' cleanly. Applied patch to 'src/test/regress/expected/partition_join.out' cleanly. Applied patch to 'src/test/regress/expected/subselect.out' cleanly. Applied patch to 'src/test/regress/sql/subselect.sql' cleanly. Applied patch to 'src/tools/pgindent/typedefs.list' cleanly. U src/include/optimizer/pathnode.h diff --cc src/include/optimizer/pathnode.h index 58936e963cb,71d2945b175..00000000000 --- a/src/include/optimizer/pathnode.h +++ b/src/include/optimizer/pathnode.h @@@ -90,9 -90,7 +90,13 @@@ extern MemoizePath *create_memoize_path List *hash_operators, bool singlerow, bool binary_mode, ++<<<<<<< ours + Cardinality est_calls); +extern UniquePath *create_unique_path(PlannerInfo *root, RelOptInfo *rel, + Path *subpath, SpecialJoinInfo *sjinfo); ++======= + double calls); ++>>>>>>> theirs extern GatherPath *create_gather_path(PlannerInfo *root, RelOptInfo *rel, Path *subpath, PathTarget *target, Relids required_outer, double *rows);