From 10d872ce10bc8c7f6a430fe70367714b526fab4d Mon Sep 17 00:00:00 2001 From: Alexander Pyhalov Date: Sat, 15 Nov 2025 10:16:25 +0300 Subject: [PATCH 1/2] mark_async_capable(): subpath should match subplan mark_async_capable() believes that path corresponds to plan. This is not true when create_[merge_]append_plan() inserts sort node. In this case mark_async_capable() can treat Sort plan node as some other and crash. Fix this by handling the Sort node separately. This is needed to make MergeAppend node async-capable that will be implemented in a next commit. --- src/backend/optimizer/plan/createplan.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c index 8af091ba647..5cd7fa7b897 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -1139,10 +1139,12 @@ mark_async_capable_plan(Plan *plan, Path *path) SubqueryScan *scan_plan = (SubqueryScan *) plan; /* - * If the generated plan node includes a gating Result node, - * we can't execute it asynchronously. + * Check that plan is really a SubqueryScan before using it. + * It can be not true, if the generated plan node includes a + * gating Result node or a Sort node. In such case we can't + * execute it asynchronously. */ - if (IsA(plan, Result)) + if (!IsA(scan_plan, SubqueryScan)) return false; /* @@ -1160,10 +1162,10 @@ mark_async_capable_plan(Plan *plan, Path *path) FdwRoutine *fdwroutine = path->parent->fdwroutine; /* - * If the generated plan node includes a gating Result node, - * we can't execute it asynchronously. + * If the generated plan node includes a gating Result node or + * a Sort node, we can't execute it asynchronously. */ - if (IsA(plan, Result)) + if (IsA(plan, Result) || IsA(plan, Sort)) return false; Assert(fdwroutine != NULL); @@ -1176,9 +1178,9 @@ mark_async_capable_plan(Plan *plan, Path *path) /* * If the generated plan node includes a Result node for the - * projection, we can't execute it asynchronously. + * projection or a Sort node, we can't execute it asynchronously. */ - if (IsA(plan, Result)) + if (IsA(plan, Result) || IsA(plan, Sort)) return false; /* -- 2.43.0