diff options
| author | Tom Lane | 2010-07-12 17:01:06 +0000 |
|---|---|---|
| committer | Tom Lane | 2010-07-12 17:01:06 +0000 |
| commit | 53e757689ce94520f1c53a89dbaa14ea57b09da7 (patch) | |
| tree | afa68ba05699223a719104b953bc20f37d4c33d1 /src/backend/executor/nodeAgg.c | |
| parent | 5a3489357fb61f1ea76412ada33549aca152ad55 (diff) | |
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/nodeAgg.c')
| -rw-r--r-- | src/backend/executor/nodeAgg.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c index 74fc87a66a5..a28d73fd32e 100644 --- a/src/backend/executor/nodeAgg.c +++ b/src/backend/executor/nodeAgg.c @@ -71,7 +71,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeAgg.c,v 1.175 2010/02/26 02:00:41 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeAgg.c,v 1.176 2010/07/12 17:01:05 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1886,7 +1886,7 @@ ExecEndAgg(AggState *node) } void -ExecReScanAgg(AggState *node, ExprContext *exprCtxt) +ExecReScanAgg(AggState *node) { ExprContext *econtext = node->ss.ps.ps_ExprContext; int aggno; @@ -1911,7 +1911,7 @@ ExecReScanAgg(AggState *node, ExprContext *exprCtxt) * parameter changes, then we can just rescan the existing hash table; * no need to build it again. */ - if (((PlanState *) node)->lefttree->chgParam == NULL) + if (node->ss.ps.lefttree->chgParam == NULL) { ResetTupleHashIterator(node->hashtable, &node->hashiter); return; @@ -1967,8 +1967,8 @@ ExecReScanAgg(AggState *node, ExprContext *exprCtxt) * if chgParam of subnode is not null then plan will be re-scanned by * first ExecProcNode. */ - if (((PlanState *) node)->lefttree->chgParam == NULL) - ExecReScan(((PlanState *) node)->lefttree, exprCtxt); + if (node->ss.ps.lefttree->chgParam == NULL) + ExecReScan(node->ss.ps.lefttree); } /* |