=== Applying patches on top of PostgreSQL commit ID 2ae459b08523ab110d1e2d60b46eb6bcd253bbdc === /etc/rc.d/jail: WARNING: Per-jail configuration via jail_* variables is obsolete. Please consider migrating to /etc/jail.conf. Thu Aug 13 14:23:32 UTC 2026 On branch cf/5129 nothing to commit, working tree clean === using 'git am' to apply patch ./v21-0001-mark_async_capable-subpath-should-match-subplan.patch === Applying: mark_async_capable(): subpath should match subplan === using 'git am' to apply patch ./v21-0002-Introduce-AppendBase-AppendBaseState-base-types-.patch === Applying: Introduce AppendBase/AppendBaseState base types for Append/MergeAppend error: sha1 information is lacking or useless (src/backend/optimizer/plan/createplan.c). error: could not build fake ancestor hint: Use 'git am --show-current-patch=diff' to see the failed patch Patch failed at 0001 Introduce AppendBase/AppendBaseState base types for Append/MergeAppend 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 ./v21-0002-Introduce-AppendBase-AppendBaseState-base-types-.patch === patching file contrib/pg_overexplain/pg_overexplain.c patching file contrib/pg_plan_advice/pgpa_scan.c patching file contrib/pg_plan_advice/pgpa_walker.c patching file contrib/postgres_fdw/postgres_fdw.c Hunk #1 succeeded at 2501 (offset -5 lines). Hunk #2 succeeded at 2510 (offset -5 lines). Hunk #3 succeeded at 8089 (offset -5 lines). Hunk #4 succeeded at 8131 (offset -5 lines). patching file src/backend/commands/explain.c patching file src/backend/executor/execAmi.c patching file src/backend/executor/execCurrent.c patching file src/backend/executor/execProcnode.c patching file src/backend/executor/nodeAppend.c Hunk #1 succeeded at 129 (offset 1 line). Hunk #2 succeeded at 139 (offset 1 line). Hunk #3 succeeded at 148 (offset 1 line). Hunk #4 succeeded at 163 (offset 1 line). Hunk #5 succeeded at 198 (offset 1 line). Hunk #6 succeeded at 221 (offset 1 line). Hunk #7 succeeded at 236 (offset 1 line). Hunk #8 succeeded at 275 (offset 1 line). Hunk #9 succeeded at 289 (offset 1 line). Hunk #10 succeeded at 319 (offset 1 line). Hunk #11 succeeded at 331 (offset 1 line). Hunk #12 succeeded at 350 (offset 1 line). Hunk #13 succeeded at 389 (offset 1 line). Hunk #14 succeeded at 411 (offset 1 line). Hunk #15 succeeded at 424 with fuzz 1 (offset 1 line). Hunk #16 succeeded at 436 (offset 5 lines). Hunk #17 succeeded at 1158 with fuzz 2 (offset 693 lines). Hunk #18 FAILED at 476. Hunk #19 FAILED at 504. Hunk #20 FAILED at 526. Hunk #21 FAILED at 544. Hunk #22 FAILED at 557. Hunk #23 FAILED at 575. Hunk #24 FAILED at 590. Hunk #25 FAILED at 640. Hunk #26 FAILED at 655. Hunk #27 FAILED at 722. Hunk #28 FAILED at 738. Hunk #29 FAILED at 762. Hunk #30 FAILED at 775. Hunk #31 FAILED at 800. Hunk #32 FAILED at 809. Hunk #33 FAILED at 851. Hunk #34 FAILED at 882. Hunk #35 FAILED at 910. Hunk #36 FAILED at 964. Hunk #37 FAILED at 984. Hunk #38 FAILED at 997. Hunk #39 FAILED at 1018. Hunk #40 FAILED at 1034. Hunk #41 FAILED at 1043. Hunk #42 FAILED at 1062. Hunk #43 FAILED at 1081. Hunk #44 FAILED at 1092. Hunk #45 succeeded at 1227 (offset 59 lines). Hunk #46 succeeded at 1251 (offset 59 lines). Hunk #47 succeeded at 1263 (offset 59 lines). 27 out of 47 hunks FAILED -- saving rejects to file src/backend/executor/nodeAppend.c.rej patching file src/backend/executor/nodeMergeAppend.c patching file src/backend/nodes/nodeFuncs.c patching file src/backend/optimizer/plan/createplan.c patching file src/backend/optimizer/plan/setrefs.c patching file src/backend/optimizer/plan/subselect.c patching file src/backend/utils/adt/ruleutils.c patching file src/include/nodes/execnodes.h patching file src/include/nodes/plannodes.h patching file src/tools/pgindent/typedefs.list Unstaged changes after reset: M contrib/pg_overexplain/pg_overexplain.c M contrib/pg_plan_advice/pgpa_scan.c M contrib/pg_plan_advice/pgpa_walker.c M contrib/postgres_fdw/postgres_fdw.c M src/backend/commands/explain.c M src/backend/executor/execAmi.c M src/backend/executor/execCurrent.c M src/backend/executor/execProcnode.c M src/backend/executor/nodeAppend.c M src/backend/executor/nodeMergeAppend.c M src/backend/nodes/nodeFuncs.c M src/backend/optimizer/plan/createplan.c M src/backend/optimizer/plan/setrefs.c M src/backend/optimizer/plan/subselect.c M src/backend/utils/adt/ruleutils.c M src/include/nodes/execnodes.h M src/include/nodes/plannodes.h M src/tools/pgindent/typedefs.list Removing src/backend/executor/nodeAppend.c.rej === using 'git apply' to apply patch ./v21-0002-Introduce-AppendBase-AppendBaseState-base-types-.patch === Applied patch to 'contrib/pg_overexplain/pg_overexplain.c' cleanly. Applied patch to 'contrib/pg_plan_advice/pgpa_scan.c' cleanly. Applied patch to 'contrib/pg_plan_advice/pgpa_walker.c' cleanly. Applied patch to 'contrib/postgres_fdw/postgres_fdw.c' cleanly. Applied patch to 'src/backend/commands/explain.c' cleanly. Applied patch to 'src/backend/executor/execAmi.c' cleanly. Applied patch to 'src/backend/executor/execCurrent.c' cleanly. Applied patch to 'src/backend/executor/execProcnode.c' cleanly. Applied patch to 'src/backend/executor/nodeAppend.c' with conflicts. Applied patch to 'src/backend/executor/nodeMergeAppend.c' cleanly. Applied patch to 'src/backend/nodes/nodeFuncs.c' cleanly. error: repository lacks the necessary blob to perform 3-way merge. Falling back to direct application... Applied patch to 'src/backend/optimizer/plan/setrefs.c' cleanly. Applied patch to 'src/backend/optimizer/plan/subselect.c' cleanly. Applied patch to 'src/backend/utils/adt/ruleutils.c' cleanly. Applied patch to 'src/include/nodes/execnodes.h' cleanly. Applied patch to 'src/include/nodes/plannodes.h' cleanly. Applied patch to 'src/tools/pgindent/typedefs.list' cleanly. U src/backend/executor/nodeAppend.c diff --cc src/backend/executor/nodeAppend.c index 51654b31ad1,40201998fc7..00000000000 --- a/src/backend/executor/nodeAppend.c +++ b/src/backend/executor/nodeAppend.c @@@ -424,13 -423,9 +424,13 @@@ ExecEndAppend(AppendState *node void ExecReScanAppend(AppendState *node) { - int nasyncplans = node->as_nasyncplans; + int nasyncplans = node->as.nasyncplans; int i; + /* If there are any async subplans, reset async requests made for them. */ + if (nasyncplans > 0) + ExecAppendAsyncReset(node); + /* * If any PARAM_EXEC Params used in pruning expressions have changed, then * we'd better unset the valid subplans so that they are reselected for @@@ -466,6 -461,25 +466,28 @@@ ExecReScan(subnode); } ++<<<<<<< ours ++======= + /* Reset async state */ + if (nasyncplans > 0) + { + i = -1; + while ((i = bms_next_member(node->as.asyncplans, i)) >= 0) + { + AsyncRequest *areq = node->as.asyncrequests[i]; + + areq->callback_pending = false; + areq->request_complete = false; + areq->result = NULL; + } + + node->as_nasyncresults = 0; + node->as_nasyncremain = 0; + bms_free(node->as.needrequest); + node->as.needrequest = NULL; + } + ++>>>>>>> theirs /* Let choose_next_subplan_* function handle setting the first subplan */ node->as_whichplan = INVALID_SUBPLAN_INDEX; node->as_syncdone = false;