mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid compiler warning in non-assert builds.

Browse Source 
After 3c90dcd03, try_partitionwise_join's child_joinrelids
variable is read only in an Assert, provoking a compiler
warning in non-assert builds.  Rearrange code to avoid the
warning and eliminate unnecessary work in the non-assert case.

Per CI testing (via Jeff Davis and Bharath Rupireddy)

Discussion: https://postgr.es/m/ef0de9713e605451f1b60b30648c5ee900b2394c.camel@j-davis.com
This commit is contained in:
Tom Lane 2023-07-22 10:32:52 -04:00
parent 702d003269
commit bda97e47af
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/backend/optimizer/path/joinrels.c
View File

@ -1543,7 +1543,6 @@ try_partitionwise_join(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2,
SpecialJoinInfo *child_sjinfo; SpecialJoinInfo *child_sjinfo;
List *child_restrictlist; List *child_restrictlist;
RelOptInfo *child_joinrel; RelOptInfo *child_joinrel;
Relids child_joinrelids;
AppendRelInfo **appinfos; AppendRelInfo **appinfos;
int nappinfos; int nappinfos;
@ -1646,10 +1645,6 @@ try_partitionwise_join(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2,
child_rel2->relids), child_rel2->relids),
&nappinfos); &nappinfos);
/* Build correct join relids for child join */
child_joinrelids = adjust_child_relids(joinrel->relids,
nappinfos, appinfos);
/* /*
* Construct restrictions applicable to the child join from those * Construct restrictions applicable to the child join from those
* applicable to the parent join. * applicable to the parent join.
@ -1658,8 +1653,8 @@ try_partitionwise_join(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2,
(List *) adjust_appendrel_attrs(root, (List *) adjust_appendrel_attrs(root,
(Node *) parent_restrictlist, (Node *) parent_restrictlist,
nappinfos, appinfos); nappinfos, appinfos);
pfree(appinfos);
/* Find or construct the child join's RelOptInfo */
child_joinrel = joinrel->part_rels[cnt_parts]; child_joinrel = joinrel->part_rels[cnt_parts];
if (!child_joinrel) if (!child_joinrel)
{ {
@ -1672,11 +1667,17 @@ try_partitionwise_join(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2,
child_joinrel->relids); child_joinrel->relids);
} }
Assert(bms_equal(child_joinrel->relids, child_joinrelids)); /* Assert we got the right one */
Assert(bms_equal(child_joinrel->relids,
adjust_child_relids(joinrel->relids,
nappinfos, appinfos)));
/* And make paths for the child join */
populate_joinrel_with_paths(root, child_rel1, child_rel2, populate_joinrel_with_paths(root, child_rel1, child_rel2,
child_joinrel, child_sjinfo, child_joinrel, child_sjinfo,
child_restrictlist); child_restrictlist);
pfree(appinfos);
} }
} }