From 1aa279e8e82a4e9771fb1a5068e9a5792a824a54 Mon Sep 17 00:00:00 2001 From: Tomas Vondra Date: Wed, 18 Jan 2023 19:51:38 +0100 Subject: [PATCH 3/5] review comments --- src/backend/optimizer/path/allpaths.c | 5 +++-- src/backend/optimizer/util/clauses.c | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c index 7108501b9a7..357dfaab3e8 100644 --- a/src/backend/optimizer/path/allpaths.c +++ b/src/backend/optimizer/path/allpaths.c @@ -558,8 +558,8 @@ set_rel_pathlist(PlannerInfo *root, RelOptInfo *rel, * the final scan/join targetlist is available (see grouping_planner). */ if (rel->reloptkind == RELOPT_BASEREL && - !bms_equal(rel->relids, root->all_baserels) - && (rel->subplan_params == NIL || rte->rtekind != RTE_SUBQUERY)) + !bms_equal(rel->relids, root->all_baserels) && + (rel->subplan_params == NIL || rte->rtekind != RTE_SUBQUERY)) generate_useful_gather_paths(root, rel, false); /* Now find the cheapest of the paths for this rel */ @@ -3163,6 +3163,7 @@ generate_useful_gather_paths(PlannerInfo *root, RelOptInfo *rel, bool override_r if (rel->partial_pathlist == NIL) return; + /* FIXME ??? */ if (!bms_is_subset(required_outer, rel->relids)) return; diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c index 035471d05d0..9585acf8e69 100644 --- a/src/backend/optimizer/util/clauses.c +++ b/src/backend/optimizer/util/clauses.c @@ -819,6 +819,11 @@ max_parallel_hazard_walker(Node *node, max_parallel_hazard_context *context) if (param->paramkind == PARAM_EXEC) return false; + /* + * XXX The first condition is certainly true, thanks to the preceding + * check. The comment above should be updated to reflect this change, + * probably. + */ if (param->paramkind != PARAM_EXEC || !list_member_int(context->safe_param_ids, param->paramid)) { -- 2.39.0