From 53e757689ce94520f1c53a89dbaa14ea57b09da7 Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Mon, 12 Jul 2010 17:01:06 +0000 Subject: 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. --- src/backend/executor/nodeTidscan.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) (limited to 'src/backend/executor/nodeTidscan.c') diff --git a/src/backend/executor/nodeTidscan.c b/src/backend/executor/nodeTidscan.c index e66f97833fe..7a8c7479aa8 100644 --- a/src/backend/executor/nodeTidscan.c +++ b/src/backend/executor/nodeTidscan.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/executor/nodeTidscan.c,v 1.65 2010/01/02 16:57:45 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/executor/nodeTidscan.c,v 1.66 2010/07/12 17:01:05 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -17,7 +17,7 @@ * * ExecTidScan scans a relation using tids * ExecInitTidScan creates and initializes state info. - * ExecTidReScan rescans the tid relation. + * ExecReScanTidScan rescans the tid relation. * ExecEndTidScan releases all storage. * ExecTidMarkPos marks scan position. * ExecTidRestrPos restores scan position. @@ -398,17 +398,12 @@ ExecTidScan(TidScanState *node) } /* ---------------------------------------------------------------- - * ExecTidReScan(node) + * ExecReScanTidScan(node) * ---------------------------------------------------------------- */ void -ExecTidReScan(TidScanState *node, ExprContext *exprCtxt) +ExecReScanTidScan(TidScanState *node) { - /* If we are being passed an outer tuple, save it for runtime key calc */ - if (exprCtxt != NULL) - node->ss.ps.ps_ExprContext->ecxt_outertuple = - exprCtxt->ecxt_outertuple; - if (node->tss_TidList) pfree(node->tss_TidList); node->tss_TidList = NULL; -- cgit v1.2.3