diff options
author | Robert Haas <rhaas@postgresql.org> | 2015-06-26 09:40:47 -0400 |
---|---|---|
committer | Robert Haas <rhaas@postgresql.org> | 2015-06-26 09:40:47 -0400 |
commit | 5ca611841bcd37c7ee8448c46c8398ef8d8edcc4 (patch) | |
tree | 492d1f96b9f0b3a25e321f6d58cba98b0a95bfd2 /src/backend/optimizer/plan/setrefs.c | |
parent | 4b8e24b9ad308c30dbe2184e06848e638e018114 (diff) | |
download | postgresql-5ca611841bcd37c7ee8448c46c8398ef8d8edcc4.tar.gz postgresql-5ca611841bcd37c7ee8448c46c8398ef8d8edcc4.zip |
Improve handling of CustomPath/CustomPlan(State) children.
Allow CustomPath to have a list of paths, CustomPlan a list of plans,
and CustomPlanState a list of planstates known to the core system, so
that custom path/plan providers can more reasonably use this
infrastructure for nodes with multiple children.
KaiGai Kohei, per a design suggestion from Tom Lane, with some
further kibitzing by me.
Diffstat (limited to 'src/backend/optimizer/plan/setrefs.c')
-rw-r--r-- | src/backend/optimizer/plan/setrefs.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c index a7f65dd529f..c0641a7cfb0 100644 --- a/src/backend/optimizer/plan/setrefs.c +++ b/src/backend/optimizer/plan/setrefs.c @@ -1151,6 +1151,8 @@ set_customscan_references(PlannerInfo *root, CustomScan *cscan, int rtoffset) { + ListCell *lc; + /* Adjust scanrelid if it's valid */ if (cscan->scan.scanrelid > 0) cscan->scan.scanrelid += rtoffset; @@ -1194,6 +1196,12 @@ set_customscan_references(PlannerInfo *root, fix_scan_list(root, cscan->custom_exprs, rtoffset); } + /* Adjust child plan-nodes recursively, if needed */ + foreach (lc, cscan->custom_plans) + { + lfirst(lc) = set_plan_refs(root, (Plan *) lfirst(lc), rtoffset); + } + /* Adjust custom_relids if needed */ if (rtoffset > 0) { |