v15-0001-mark_async_capable-subpath-should-match-subplan.patch
text/x-diff
Filename: v15-0001-mark_async_capable-subpath-should-match-subplan.patch
Type: text/x-diff
Part: 0
Message:
Re: Asynchronous MergeAppend
Patch
Same data as JSON:
GET /api/v1/attachments/:id/patch
the parsed metadata as JSON — format, series position, per-file stats; never the diff bytes.
API reference →
Format: format-patch
Series: patch v15-0001
Subject: mark_async_capable(): subpath should match subplan
| File | + | − |
|---|---|---|
| src/backend/optimizer/plan/createplan.c | 10 | 8 |
From d1f50696c83075def009a2870a765e4778c84b1d Mon Sep 17 00:00:00 2001 From: Alexander Pyhalov <a.pyhalov@postgrespro.ru> Date: Thu, 12 Feb 2026 09:17:38 +0300 Subject: [PATCH 1/3] 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 50b0e10308b..5d704e38f37 100644 --- a/src/backend/optimizer/plan/createplan.c +++ b/src/backend/optimizer/plan/createplan.c @@ -1138,10 +1138,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(plan, SubqueryScan)) return false; /* @@ -1159,10 +1161,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); @@ -1175,9 +1177,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