From 1c39902456e715902e0e24b7cfdaf7135c472ae8 Mon Sep 17 00:00:00 2001 From: Ashutosh Bapat Date: Mon, 7 Aug 2023 11:00:53 +0530 Subject: [PATCH 3/3] Do not translate dummy SpecialJoinInfos Plain inner joins do not have SpecialJoinInfos associated with them. They are crafted on the fly for parent joins. Do the same for child joins. Ashutosh Bapat --- src/backend/optimizer/path/costsize.c | 37 ++------------ src/backend/optimizer/path/joinrels.c | 72 ++++++++++++++++++--------- src/include/optimizer/paths.h | 2 + 3 files changed, 54 insertions(+), 57 deletions(-) diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c index d6ceafd51c..43e0c9621c 100644 --- a/src/backend/optimizer/path/costsize.c +++ b/src/backend/optimizer/path/costsize.c @@ -5021,23 +5021,7 @@ compute_semi_anti_join_factors(PlannerInfo *root, /* * Also get the normal inner-join selectivity of the join clauses. */ - norm_sjinfo.type = T_SpecialJoinInfo; - norm_sjinfo.min_lefthand = outerrel->relids; - norm_sjinfo.min_righthand = innerrel->relids; - norm_sjinfo.syn_lefthand = outerrel->relids; - norm_sjinfo.syn_righthand = innerrel->relids; - norm_sjinfo.jointype = JOIN_INNER; - norm_sjinfo.ojrelid = 0; - norm_sjinfo.commute_above_l = NULL; - norm_sjinfo.commute_above_r = NULL; - norm_sjinfo.commute_below_l = NULL; - norm_sjinfo.commute_below_r = NULL; - /* we don't bother trying to make the remaining fields valid */ - norm_sjinfo.lhs_strict = false; - norm_sjinfo.semi_can_btree = false; - norm_sjinfo.semi_can_hash = false; - norm_sjinfo.semi_operators = NIL; - norm_sjinfo.semi_rhs_exprs = NIL; + make_dummy_sjinfo(&norm_sjinfo, outerrel, innerrel); nselec = clauselist_selectivity(root, joinquals, @@ -5190,23 +5174,8 @@ approx_tuple_count(PlannerInfo *root, JoinPath *path, List *quals) /* * Make up a SpecialJoinInfo for JOIN_INNER semantics. */ - sjinfo.type = T_SpecialJoinInfo; - sjinfo.min_lefthand = path->outerjoinpath->parent->relids; - sjinfo.min_righthand = path->innerjoinpath->parent->relids; - sjinfo.syn_lefthand = path->outerjoinpath->parent->relids; - sjinfo.syn_righthand = path->innerjoinpath->parent->relids; - sjinfo.jointype = JOIN_INNER; - sjinfo.ojrelid = 0; - sjinfo.commute_above_l = NULL; - sjinfo.commute_above_r = NULL; - sjinfo.commute_below_l = NULL; - sjinfo.commute_below_r = NULL; - /* we don't bother trying to make the remaining fields valid */ - sjinfo.lhs_strict = false; - sjinfo.semi_can_btree = false; - sjinfo.semi_can_hash = false; - sjinfo.semi_operators = NIL; - sjinfo.semi_rhs_exprs = NIL; + make_dummy_sjinfo(&sjinfo, path->outerjoinpath->parent, + path->innerjoinpath->parent); /* Get the approximate selectivity */ foreach(l, quals) diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.c index 1a341c9b73..540eda612f 100644 --- a/src/backend/optimizer/path/joinrels.c +++ b/src/backend/optimizer/path/joinrels.c @@ -44,7 +44,8 @@ static void try_partitionwise_join(PlannerInfo *root, RelOptInfo *rel1, List *parent_restrictlist); static void build_child_join_sjinfo(PlannerInfo *root, SpecialJoinInfo *parent_sjinfo, - Relids left_relids, Relids right_relids, + RelOptInfo *left_child, + RelOptInfo *right_child, SpecialJoinInfo *child_sjinfo); static void free_child_sjinfo_members(SpecialJoinInfo *child_sjinfo); static void compute_partition_bounds(PlannerInfo *root, RelOptInfo *rel1, @@ -655,6 +656,32 @@ join_is_legal(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2, return true; } +/* + * make_dummy_sjinfo + * Populate the given SpecialJoinInfo for a plain inner join, between rel1 + * and rel2, which does not have a SpecialJoinInfo associated with it. + */ +void +make_dummy_sjinfo(SpecialJoinInfo *sjinfo, RelOptInfo *rel1, RelOptInfo *rel2) +{ + sjinfo->type = T_SpecialJoinInfo; + sjinfo->min_lefthand = rel1->relids; + sjinfo->min_righthand = rel2->relids; + sjinfo->syn_lefthand = rel1->relids; + sjinfo->syn_righthand = rel2->relids; + sjinfo->jointype = JOIN_INNER; + sjinfo->ojrelid = 0; + sjinfo->commute_above_l = NULL; + sjinfo->commute_above_r = NULL; + sjinfo->commute_below_l = NULL; + sjinfo->commute_below_r = NULL; + /* we don't bother trying to make the remaining fields valid */ + sjinfo->lhs_strict = false; + sjinfo->semi_can_btree = false; + sjinfo->semi_can_hash = false; + sjinfo->semi_operators = NIL; + sjinfo->semi_rhs_exprs = NIL; +} /* * make_join_rel @@ -718,23 +745,7 @@ make_join_rel(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2) if (sjinfo == NULL) { sjinfo = &sjinfo_data; - sjinfo->type = T_SpecialJoinInfo; - sjinfo->min_lefthand = rel1->relids; - sjinfo->min_righthand = rel2->relids; - sjinfo->syn_lefthand = rel1->relids; - sjinfo->syn_righthand = rel2->relids; - sjinfo->jointype = JOIN_INNER; - sjinfo->ojrelid = 0; - sjinfo->commute_above_l = NULL; - sjinfo->commute_above_r = NULL; - sjinfo->commute_below_l = NULL; - sjinfo->commute_below_r = NULL; - /* we don't bother trying to make the remaining fields valid */ - sjinfo->lhs_strict = false; - sjinfo->semi_can_btree = false; - sjinfo->semi_can_hash = false; - sjinfo->semi_operators = NIL; - sjinfo->semi_rhs_exprs = NIL; + make_dummy_sjinfo(sjinfo, rel1, rel2); } /* @@ -1618,8 +1629,8 @@ try_partitionwise_join(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2, * Construct SpecialJoinInfo from parent join relations's * SpecialJoinInfo. */ - build_child_join_sjinfo(root, parent_sjinfo, child_rel1->relids, - child_rel2->relids, &child_sjinfo); + build_child_join_sjinfo(root, parent_sjinfo, child_rel1, + child_rel2, &child_sjinfo); /* Find the AppendRelInfo structures */ appinfos = find_appinfos_by_relids(root, @@ -1674,7 +1685,7 @@ try_partitionwise_join(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2, */ static void build_child_join_sjinfo(PlannerInfo *root, SpecialJoinInfo *parent_sjinfo, - Relids left_relids, Relids right_relids, + RelOptInfo *left_child, RelOptInfo *right_child, SpecialJoinInfo *child_sjinfo) { AppendRelInfo **left_appinfos; @@ -1682,10 +1693,18 @@ build_child_join_sjinfo(PlannerInfo *root, SpecialJoinInfo *parent_sjinfo, AppendRelInfo **right_appinfos; int right_nappinfos; + /* Dummy SpecialJoinInfos can be created without any translation. */ + if (parent_sjinfo->jointype == JOIN_INNER) + { + Assert(parent_sjinfo->ojrelid == 0); + make_dummy_sjinfo(child_sjinfo, left_child, right_child); + return; + } + memcpy(child_sjinfo, parent_sjinfo, sizeof(SpecialJoinInfo)); - left_appinfos = find_appinfos_by_relids(root, left_relids, + left_appinfos = find_appinfos_by_relids(root, left_child->relids, &left_nappinfos); - right_appinfos = find_appinfos_by_relids(root, right_relids, + right_appinfos = find_appinfos_by_relids(root, right_child->relids, &right_nappinfos); child_sjinfo->min_lefthand = @@ -1720,6 +1739,13 @@ build_child_join_sjinfo(PlannerInfo *root, SpecialJoinInfo *parent_sjinfo, static void free_child_sjinfo_members(SpecialJoinInfo *child_sjinfo) { + /* + * Dummy SpecialJoinInfos do not have any translated fields and hence have + * nothing to free. + */ + if (child_sjinfo->jointype == JOIN_INNER) + return; + /* * The relids are used only for comparison and their references are not * stored anywhere. Free those. diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h index 50bc3b503a..090ae00d6d 100644 --- a/src/include/optimizer/paths.h +++ b/src/include/optimizer/paths.h @@ -112,6 +112,8 @@ extern bool have_join_order_restriction(PlannerInfo *root, extern bool have_dangerous_phv(PlannerInfo *root, Relids outer_relids, Relids inner_params); extern void mark_dummy_rel(RelOptInfo *rel); +extern void make_dummy_sjinfo(SpecialJoinInfo *sjinfo, RelOptInfo *rel1, + RelOptInfo *rel2); /* * equivclass.c -- 2.25.1