mirror of
https://github.com/postgres/postgres.git
synced 2025-09-03 15:22:11 +03:00
Rename shadowed local variables
In a similar effort to f01592f91
, here we mostly rename shadowed local
variables to remove the warnings produced when compiling with
-Wshadow=compatible-local.
This fixes 63 warnings and leaves just 5.
Author: Justin Pryzby, David Rowley
Reviewed-by: Justin Pryzby
Discussion https://postgr.es/m/20220817145434.GC26426%40telsasoft.com
This commit is contained in:
@@ -2217,13 +2217,13 @@ cost_append(AppendPath *apath)
|
||||
|
||||
if (pathkeys == NIL)
|
||||
{
|
||||
Path *subpath = (Path *) linitial(apath->subpaths);
|
||||
Path *firstsubpath = (Path *) linitial(apath->subpaths);
|
||||
|
||||
/*
|
||||
* For an unordered, non-parallel-aware Append we take the startup
|
||||
* cost as the startup cost of the first subpath.
|
||||
*/
|
||||
apath->path.startup_cost = subpath->startup_cost;
|
||||
apath->path.startup_cost = firstsubpath->startup_cost;
|
||||
|
||||
/* Compute rows and costs as sums of subplan rows and costs. */
|
||||
foreach(l, apath->subpaths)
|
||||
|
@@ -1303,11 +1303,11 @@ generate_bitmap_or_paths(PlannerInfo *root, RelOptInfo *rel,
|
||||
}
|
||||
else
|
||||
{
|
||||
RestrictInfo *rinfo = castNode(RestrictInfo, orarg);
|
||||
RestrictInfo *ri = castNode(RestrictInfo, orarg);
|
||||
List *orargs;
|
||||
|
||||
Assert(!restriction_is_or_clause(rinfo));
|
||||
orargs = list_make1(rinfo);
|
||||
Assert(!restriction_is_or_clause(ri));
|
||||
orargs = list_make1(ri);
|
||||
|
||||
indlist = build_paths_for_OR(root, rel,
|
||||
orargs,
|
||||
|
@@ -305,10 +305,10 @@ TidQualFromRestrictInfoList(PlannerInfo *root, List *rlist, RelOptInfo *rel)
|
||||
}
|
||||
else
|
||||
{
|
||||
RestrictInfo *rinfo = castNode(RestrictInfo, orarg);
|
||||
RestrictInfo *ri = castNode(RestrictInfo, orarg);
|
||||
|
||||
Assert(!restriction_is_or_clause(rinfo));
|
||||
sublist = TidQualFromRestrictInfo(root, rinfo, rel);
|
||||
Assert(!restriction_is_or_clause(ri));
|
||||
sublist = TidQualFromRestrictInfo(root, ri, rel);
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user