diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2002-12-14 00:17:59 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2002-12-14 00:17:59 +0000 |
| commit | 2d8d66628a8ac49deba8483608135b3c358ae729 (patch) | |
| tree | 95f321c5fc2035b5110317e25b0449e85065c8a5 /src/backend/executor/execProcnode.c | |
| parent | 29cdab3d531b6f612ab53b93dbb34a131e9cdb1c (diff) | |
| download | postgresql-2d8d66628a8ac49deba8483608135b3c358ae729.tar.gz postgresql-2d8d66628a8ac49deba8483608135b3c358ae729.zip | |
Clean up plantree representation of SubPlan-s --- SubLink does not appear
in the planned representation of a subplan at all any more, only SubPlan.
This means subselect.c doesn't scribble on its input anymore, which seems
like a good thing; and there are no longer three different possible
interpretations of a SubLink. Simplify node naming and improve comments
in primnodes.h. No change to stored rules, though.
Diffstat (limited to 'src/backend/executor/execProcnode.c')
| -rw-r--r-- | src/backend/executor/execProcnode.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c index 59c798b267a..dc5a3085ead 100644 --- a/src/backend/executor/execProcnode.c +++ b/src/backend/executor/execProcnode.c @@ -12,7 +12,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.33 2002/12/13 19:45:52 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execProcnode.c,v 1.34 2002/12/14 00:17:50 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -228,10 +228,10 @@ ExecInitNode(Plan *node, EState *estate) subps = NIL; foreach(subp, node->initPlan) { - SubPlanExpr *subplan = (SubPlanExpr *) lfirst(subp); - SubPlanExprState *sstate; + SubPlan *subplan = (SubPlan *) lfirst(subp); + SubPlanState *sstate; - Assert(IsA(subplan, SubPlanExpr)); + Assert(IsA(subplan, SubPlan)); sstate = ExecInitExprInitPlan(subplan, result); ExecInitSubPlan(sstate, estate); subps = lappend(subps, sstate); @@ -247,9 +247,9 @@ ExecInitNode(Plan *node, EState *estate) subps = NIL; foreach(subp, result->subPlan) { - SubPlanExprState *sstate = (SubPlanExprState *) lfirst(subp); + SubPlanState *sstate = (SubPlanState *) lfirst(subp); - Assert(IsA(sstate, SubPlanExprState)); + Assert(IsA(sstate, SubPlanState)); ExecInitSubPlan(sstate, estate); subps = lappend(subps, sstate); } @@ -500,9 +500,9 @@ ExecEndNode(PlanState *node) /* Clean up initPlans and subPlans */ foreach(subp, node->initPlan) - ExecEndSubPlan((SubPlanExprState *) lfirst(subp)); + ExecEndSubPlan((SubPlanState *) lfirst(subp)); foreach(subp, node->subPlan) - ExecEndSubPlan((SubPlanExprState *) lfirst(subp)); + ExecEndSubPlan((SubPlanState *) lfirst(subp)); if (node->chgParam != NIL) { |