diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-07-12 17:01:06 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-07-12 17:01:06 +0000 |
| commit | 53e757689ce94520f1c53a89dbaa14ea57b09da7 (patch) | |
| tree | afa68ba05699223a719104b953bc20f37d4c33d1 /src/backend/executor/nodeSubplan.c | |
| parent | 5a3489357fb61f1ea76412ada33549aca152ad55 (diff) | |
| download | postgresql-53e757689ce94520f1c53a89dbaa14ea57b09da7.tar.gz postgresql-53e757689ce94520f1c53a89dbaa14ea57b09da7.zip | |
Make NestLoop plan nodes pass outer-relation variables into their inner
relation using the general PARAM_EXEC executor parameter mechanism, rather
than the ad-hoc kluge of passing the outer tuple down through ExecReScan.
The previous method was hard to understand and could never be extended to
handle parameters coming from multiple join levels. This patch doesn't
change the set of possible plans nor have any significant performance effect,
but it's necessary infrastructure for future generalization of the concept
of an inner indexscan plan.
ExecReScan's second parameter is now unused, so it's removed.
Diffstat (limited to 'src/backend/executor/nodeSubplan.c')
| -rw-r--r-- | src/backend/executor/nodeSubplan.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c index f5ac47402e1..419f3f36bd2 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 - * $PostgreSQL: pgsql/src/backend/executor/nodeSubplan.c,v 1.101 2010/01/02 16:57:45 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeSubplan.c,v 1.102 2010/07/12 17:01:05 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -256,7 +256,7 @@ ExecScanSubPlan(SubPlanState *node, /* * Now that we've set up its parameters, we can reset the subplan. */ - ExecReScan(planstate, NULL); + ExecReScan(planstate); /* * For all sublink types except EXPR_SUBLINK and ARRAY_SUBLINK, the result @@ -508,7 +508,7 @@ buildSubPlanHash(SubPlanState *node, ExprContext *econtext) /* * Reset subplan to start. */ - ExecReScan(planstate, NULL); + ExecReScan(planstate); /* * Scan the subplan and load the hash table(s). Note that when there are @@ -884,7 +884,7 @@ ExecInitSubPlan(SubPlan *subplan, PlanState *parent) * * Executes an InitPlan subplan and sets its output parameters. * - * This is called from ExecEvalParam() when the value of a PARAM_EXEC + * This is called from ExecEvalParamExec() when the value of a PARAM_EXEC * parameter is requested and the param's execPlan field is set (indicating * that the param has not yet been evaluated). This allows lazy evaluation * of initplans: we don't run the subplan until/unless we need its output. |