=== Applying patches on top of PostgreSQL commit ID aecc558666ad62fbecb08ff7af1394656811a581 === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Sat Feb 28 22:42:29 UTC 2026 On branch cf/5128 nothing to commit, working tree clean === using 'git am' to apply patch ./0001-Allow-partition-wise-join-when-reltarget-contains-wh.patch === Applying: Allow partition-wise join when reltarget contains whole row vars Using index info to reconstruct a base tree... M src/backend/optimizer/path/allpaths.c M src/backend/optimizer/plan/setrefs.c Falling back to patching base and 3-way merge... Auto-merging src/backend/optimizer/plan/setrefs.c CONFLICT (content): Merge conflict in src/backend/optimizer/plan/setrefs.c Auto-merging src/backend/optimizer/path/allpaths.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 Allow partition-wise join when reltarget contains whole row vars 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/path/allpaths.c M src/backend/optimizer/plan/setrefs.c === using patch(1) to apply patch ./0001-Allow-partition-wise-join-when-reltarget-contains-wh.patch === patching file src/backend/optimizer/path/allpaths.c Hunk #1 succeeded at 1033 (offset 57 lines). patching file src/backend/optimizer/plan/setrefs.c Hunk #2 succeeded at 217 with fuzz 2 (offset 3 lines). Hunk #3 succeeded at 2846 (offset 135 lines). Hunk #4 succeeded at 2866 (offset 135 lines). Hunk #5 succeeded at 2883 (offset 135 lines). Hunk #6 succeeded at 2903 (offset 135 lines). Hunk #7 succeeded at 3209 (offset 135 lines). Hunk #8 succeeded at 3298 (offset 150 lines). Hunk #9 succeeded at 3307 (offset 150 lines). Hunk #10 succeeded at 3418 (offset 150 lines). Hunk #11 succeeded at 3836 with fuzz 2 (offset 168 lines). [cf/5128 98efcbbcc15] Allow partition-wise join when reltarget contains whole row vars Author: Alexander Pyhalov Date: Mon Dec 25 15:51:28 2023 +0300 2 files changed, 48 insertions(+), 6 deletions(-) === using 'git am' to apply patch ./0002-Handle-ConvertRowtypeExprs-in-pull_vars_clause.patch === fatal: previous rebase directory .git/rebase-apply still exists but mbox given. === using patch(1) to apply patch ./0002-Handle-ConvertRowtypeExprs-in-pull_vars_clause.patch === patching file src/backend/nodes/nodeFuncs.c Hunk #1 succeeded at 4837 (offset 31 lines). patching file src/backend/optimizer/plan/setrefs.c Hunk #1 succeeded at 217 with fuzz 2 (offset 3 lines). Hunk #2 succeeded at 3834 with fuzz 2 (offset 168 lines). patching file src/backend/optimizer/util/var.c Hunk #1 succeeded at 635 (offset 44 lines). Hunk #2 succeeded at 753 (offset 44 lines). patching file src/include/nodes/nodeFuncs.h patching file src/include/optimizer/optimizer.h Hunk #1 succeeded at 193 (offset 1 line). [cf/5128 902c4ddef81] Handle ConvertRowtypeExprs in pull_vars_clause(). Author: Ashutosh Bapat Date: Mon Dec 25 16:08:15 2023 +0300 5 files changed, 53 insertions(+), 32 deletions(-) === using 'git am' to apply patch ./0003-Handle-child-relation-s-ConvertRowtypeExpr-in-find_c.patch === fatal: previous rebase directory .git/rebase-apply still exists but mbox given. === using patch(1) to apply patch ./0003-Handle-child-relation-s-ConvertRowtypeExpr-in-find_c.patch === patching file src/backend/optimizer/path/equivclass.c Hunk #1 succeeded at 1007 with fuzz 2 (offset 155 lines). Hunk #2 succeeded at 1036 (offset 155 lines). [cf/5128 e29d3037f23] Handle child relation's ConvertRowtypeExpr in find_computable_ec_member() Author: Ashutosh Bapat Date: Mon Dec 25 17:40:20 2023 +0300 1 file changed, 4 insertions(+), 2 deletions(-) === using 'git am' to apply patch ./0004-Compare-converted-whole-row-vars-in-search_indexed_t.patch === fatal: previous rebase directory .git/rebase-apply still exists but mbox given. === using patch(1) to apply patch ./0004-Compare-converted-whole-row-vars-in-search_indexed_t.patch === patching file src/backend/nodes/nodeFuncs.c Hunk #1 succeeded at 4869 (offset 31 lines). patching file src/backend/optimizer/plan/setrefs.c Hunk #1 succeeded at 3079 (offset 135 lines). patching file src/backend/optimizer/util/tlist.c Hunk #1 succeeded at 128 (offset 9 lines). patching file src/include/nodes/nodeFuncs.h patching file src/include/optimizer/tlist.h patching file src/test/regress/expected/partition_aggregate.out Hunk #1 succeeded at 488 (offset 35 lines). patching file src/test/regress/expected/partition_join.out Hunk #1 FAILED at 147. Hunk #2 succeeded at 1420 (offset 34 lines). 1 out of 2 hunks FAILED -- saving rejects to file src/test/regress/expected/partition_join.out.rej patching file src/test/regress/sql/partition_aggregate.sql Hunk #1 succeeded at 123 (offset 7 lines). patching file src/test/regress/sql/partition_join.sql Hunk #1 succeeded at 53 (offset 5 lines). Hunk #2 succeeded at 244 (offset 10 lines). Unstaged changes after reset: M src/backend/nodes/nodeFuncs.c M src/backend/optimizer/plan/setrefs.c M src/backend/optimizer/util/tlist.c M src/include/nodes/nodeFuncs.h M src/include/optimizer/tlist.h M src/test/regress/expected/partition_aggregate.out M src/test/regress/expected/partition_join.out M src/test/regress/sql/partition_aggregate.sql M src/test/regress/sql/partition_join.sql Removing src/test/regress/expected/partition_join.out.rej === using 'git apply' to apply patch ./0004-Compare-converted-whole-row-vars-in-search_indexed_t.patch === error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/backend/optimizer/util/tlist.c' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/include/optimizer/tlist.h' cleanly. Applied patch to 'src/test/regress/expected/partition_aggregate.out' cleanly. Applied patch to 'src/test/regress/expected/partition_join.out' with conflicts. Applied patch to 'src/test/regress/sql/partition_aggregate.sql' cleanly. Applied patch to 'src/test/regress/sql/partition_join.sql' cleanly. U src/test/regress/expected/partition_join.out diff --cc src/test/regress/expected/partition_join.out index f6d3ade368a,22c4279931f..00000000000 --- a/src/test/regress/expected/partition_join.out +++ b/src/test/regress/expected/partition_join.out @@@ -158,21 -154,26 +158,44 @@@ SELECT t1, t2 FROM prt1 t1 LEFT JOIN pr -------------------------------------------------- Sort Sort Key: t1.a, t2.b ++<<<<<<< ours + -> Hash Left Join + Hash Cond: (t1.a = t2.b) + -> Append + -> Seq Scan on prt1_p1 t1_1 + Filter: (b = 0) + -> Seq Scan on prt1_p2 t1_2 + Filter: (b = 0) + -> Seq Scan on prt1_p3 t1_3 + Filter: (b = 0) + -> Hash + -> Append + -> Seq Scan on prt2_p1 t2_1 + -> Seq Scan on prt2_p2 t2_2 + -> Seq Scan on prt2_p3 t2_3 +(16 rows) ++======= + -> Append + -> Hash Right Join + Hash Cond: (t2_1.b = t1_1.a) + -> Seq Scan on prt2_p1 t2_1 + -> Hash + -> Seq Scan on prt1_p1 t1_1 + Filter: (b = 0) + -> Hash Right Join + Hash Cond: (t2_2.b = t1_2.a) + -> Seq Scan on prt2_p2 t2_2 + -> Hash + -> Seq Scan on prt1_p2 t1_2 + Filter: (b = 0) + -> Hash Right Join + Hash Cond: (t2_3.b = t1_3.a) + -> Seq Scan on prt2_p3 t2_3 + -> Hash + -> Seq Scan on prt1_p3 t1_3 + Filter: (b = 0) + (21 rows) ++>>>>>>> theirs SELECT t1, t2 FROM prt1 t1 LEFT JOIN prt2 t2 ON t1.a = t2.b WHERE t1.b = 0 ORDER BY t1.a, t2.b; t1 | t2