diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2002-12-12 15:49:42 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2002-12-12 15:49:42 +0000 |
| commit | a0bf885f9eaccadd23b766ecbc064f17f06ae883 (patch) | |
| tree | 62b65e5cf1a8ec02ece3a98c15457ddff018bb94 /src/backend/executor/nodeSubplan.c | |
| parent | debb072886efcb15e7f0825e35b168afe316d37d (diff) | |
| download | postgresql-a0bf885f9eaccadd23b766ecbc064f17f06ae883.tar.gz postgresql-a0bf885f9eaccadd23b766ecbc064f17f06ae883.zip | |
Phase 2 of read-only-plans project: restructure expression-tree nodes
so that all executable expression nodes inherit from a common supertype
Expr. This is somewhat of an exercise in code purity rather than any
real functional advance, but getting rid of the extra Oper or Func node
formerly used in each operator or function call should provide at least
a little space and speed improvement.
initdb forced by changes in stored-rules representation.
Diffstat (limited to 'src/backend/executor/nodeSubplan.c')
| -rw-r--r-- | src/backend/executor/nodeSubplan.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c index 195634c1289..880a6233db2 100644 --- a/src/backend/executor/nodeSubplan.c +++ b/src/backend/executor/nodeSubplan.c @@ -7,7 +7,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeSubplan.c,v 1.35 2002/12/05 15:50:33 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeSubplan.c,v 1.36 2002/12/12 15:49:27 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -34,7 +34,7 @@ ExecSubPlan(SubPlanState *node, List *pvar, ExprContext *econtext, bool *isNull) { PlanState *planstate = node->planstate; - SubPlan *subplan = (SubPlan *) node->ps.plan; + SubPlanExpr *subplan = (SubPlanExpr *) node->ps.plan; SubLink *sublink = subplan->sublink; SubLinkType subLinkType = sublink->subLinkType; bool useor = sublink->useor; @@ -151,7 +151,7 @@ ExecSubPlan(SubPlanState *node, List *pvar, */ foreach(lst, sublink->oper) { - Expr *expr = (Expr *) lfirst(lst); + OpExpr *expr = (OpExpr *) lfirst(lst); Param *prm = lsecond(expr->args); ParamExecData *prmdata; Datum expresult; @@ -172,8 +172,8 @@ ExecSubPlan(SubPlanState *node, List *pvar, { switch (nodeTag(prm)) { - case T_Expr: - prm = lfirst(((Expr *) prm)->args); + case T_FuncExpr: + prm = lfirst(((FuncExpr *) prm)->args); break; case T_RelabelType: prm = (Param *) (((RelabelType *) prm)->arg); @@ -288,7 +288,7 @@ ExecSubPlan(SubPlanState *node, List *pvar, * ---------------------------------------------------------------- */ SubPlanState * -ExecInitSubPlan(SubPlan *node, EState *estate) +ExecInitSubPlan(SubPlanExpr *node, EState *estate) { SubPlanState *subplanstate; EState *sp_estate; @@ -374,7 +374,7 @@ void ExecSetParamPlan(SubPlanState *node, ExprContext *econtext) { PlanState *planstate = node->planstate; - SubPlan *subplan = (SubPlan *) node->ps.plan; + SubPlanExpr *subplan = (SubPlanExpr *) node->ps.plan; SubLink *sublink = subplan->sublink; EState *estate = node->ps.state; MemoryContext oldcontext; @@ -497,7 +497,7 @@ void ExecReScanSetParamPlan(SubPlanState *node, PlanState *parent) { PlanState *planstate = node->planstate; - SubPlan *subplan = (SubPlan *) node->ps.plan; + SubPlanExpr *subplan = (SubPlanExpr *) node->ps.plan; EState *estate = node->ps.state; List *lst; |