mirror of
https://github.com/postgres/postgres.git
synced 2025-10-18 04:29:09 +03:00
Prevent integer overflow when forming tuple width estimates.
It's at least theoretically possible to overflow int32 when adding up column width estimates to make a row width estimate. (The bug example isn't terribly convincing as a real use-case, but perhaps wide joins would provide a more plausible route to trouble.) This'd lead to assertion failures or silly planner behavior. To forestall it, make the relevant functions compute their running sums in int64 arithmetic and then clamp to int32 range at the end. We can reasonably assume that MaxAllocSize is a hard limit on actual tuple width, so clamping to that is simply a correction for dubious input values, and there's no need to go as far as widening width variables to int64 everywhere. Per bug #18247 from RekGRpth. There've been no reports of this issue arising in practical cases, so I feel no need to back-patch. Richard Guo and Tom Lane Discussion: https://postgr.es/m/18247-11ac477f02954422@postgresql.org
This commit is contained in:
@@ -22,6 +22,7 @@
|
||||
#include "optimizer/clauses.h"
|
||||
#include "optimizer/cost.h"
|
||||
#include "optimizer/inherit.h"
|
||||
#include "optimizer/optimizer.h"
|
||||
#include "optimizer/pathnode.h"
|
||||
#include "optimizer/paths.h"
|
||||
#include "optimizer/placeholder.h"
|
||||
@@ -1092,6 +1093,7 @@ build_joinrel_tlist(PlannerInfo *root, RelOptInfo *joinrel,
|
||||
bool can_null)
|
||||
{
|
||||
Relids relids = joinrel->relids;
|
||||
int64 tuple_width = joinrel->reltarget->width;
|
||||
ListCell *vars;
|
||||
ListCell *lc;
|
||||
|
||||
@@ -1144,7 +1146,7 @@ build_joinrel_tlist(PlannerInfo *root, RelOptInfo *joinrel,
|
||||
joinrel->reltarget->exprs = lappend(joinrel->reltarget->exprs,
|
||||
phv);
|
||||
/* Bubbling up the precomputed result has cost zero */
|
||||
joinrel->reltarget->width += phinfo->ph_width;
|
||||
tuple_width += phinfo->ph_width;
|
||||
}
|
||||
continue;
|
||||
}
|
||||
@@ -1165,7 +1167,7 @@ build_joinrel_tlist(PlannerInfo *root, RelOptInfo *joinrel,
|
||||
list_nth(root->row_identity_vars, var->varattno - 1);
|
||||
|
||||
/* Update reltarget width estimate from RowIdentityVarInfo */
|
||||
joinrel->reltarget->width += ridinfo->rowidwidth;
|
||||
tuple_width += ridinfo->rowidwidth;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -1181,7 +1183,7 @@ build_joinrel_tlist(PlannerInfo *root, RelOptInfo *joinrel,
|
||||
continue; /* nope, skip it */
|
||||
|
||||
/* Update reltarget width estimate from baserel's attr_widths */
|
||||
joinrel->reltarget->width += baserel->attr_widths[ndx];
|
||||
tuple_width += baserel->attr_widths[ndx];
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -1221,6 +1223,8 @@ build_joinrel_tlist(PlannerInfo *root, RelOptInfo *joinrel,
|
||||
|
||||
/* Vars have cost zero, so no need to adjust reltarget->cost */
|
||||
}
|
||||
|
||||
joinrel->reltarget->width = clamp_width_est(tuple_width);
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user