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/include/executor | |
| 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/include/executor')
| -rw-r--r-- | src/include/executor/executor.h | 5 | ||||
| -rw-r--r-- | src/include/executor/nodeSubplan.h | 12 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h index bdcb3a6afa5..9b7af6d36fb 100644 --- a/src/include/executor/executor.h +++ b/src/include/executor/executor.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: executor.h,v 1.82 2002/12/13 19:45:56 tgl Exp $ + * $Id: executor.h,v 1.83 2002/12/14 00:17:59 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -92,8 +92,7 @@ extern Datum ExecEvalExpr(ExprState *expression, ExprContext *econtext, extern Datum ExecEvalExprSwitchContext(ExprState *expression, ExprContext *econtext, bool *isNull, ExprDoneCond *isDone); extern ExprState *ExecInitExpr(Expr *node, PlanState *parent); -extern SubPlanExprState *ExecInitExprInitPlan(SubPlanExpr *node, - PlanState *parent); +extern SubPlanState *ExecInitExprInitPlan(SubPlan *node, PlanState *parent); extern bool ExecQual(List *qual, ExprContext *econtext, bool resultForNull); extern int ExecTargetListLength(List *targetlist); extern int ExecCleanTargetListLength(List *targetlist); diff --git a/src/include/executor/nodeSubplan.h b/src/include/executor/nodeSubplan.h index 97f4b66bcd6..8a3e74ebd1c 100644 --- a/src/include/executor/nodeSubplan.h +++ b/src/include/executor/nodeSubplan.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: nodeSubplan.h,v 1.14 2002/12/13 19:45:56 tgl Exp $ + * $Id: nodeSubplan.h,v 1.15 2002/12/14 00:17:59 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -16,13 +16,13 @@ #include "nodes/execnodes.h" -extern void ExecInitSubPlan(SubPlanExprState *sstate, EState *estate); -extern Datum ExecSubPlan(SubPlanExprState *node, +extern void ExecInitSubPlan(SubPlanState *node, EState *estate); +extern Datum ExecSubPlan(SubPlanState *node, ExprContext *econtext, bool *isNull); -extern void ExecEndSubPlan(SubPlanExprState *node); -extern void ExecReScanSetParamPlan(SubPlanExprState *node, PlanState *parent); +extern void ExecEndSubPlan(SubPlanState *node); +extern void ExecReScanSetParamPlan(SubPlanState *node, PlanState *parent); -extern void ExecSetParamPlan(SubPlanExprState *node, ExprContext *econtext); +extern void ExecSetParamPlan(SubPlanState *node, ExprContext *econtext); #endif /* NODESUBPLAN_H */ |