From 738304766896488da850bfc8a7824d93cc7cd7be Mon Sep 17 00:00:00 2001 From: Tom Lane Date: Tue, 26 Dec 2006 19:26:56 +0000 Subject: [PATCH] Repair bug #2839: the various ExecReScan functions need to reset ps_TupFromTlist in plan nodes that make use of it. This was being done correctly in join nodes and Result nodes but not in any relation-scan nodes. Bug would lead to bogus results if a set-returning function appeared in the targetlist of a subquery that could be rescanned after partial execution, for example a subquery within EXISTS(). Bug has been around forever :-( ... surprising it wasn't reported before. --- src/backend/executor/nodeBitmapHeapscan.c | 4 ++++ src/backend/executor/nodeFunctionscan.c | 1 + src/backend/executor/nodeIndexscan.c | 4 ++++ src/backend/executor/nodeResult.c | 2 ++ src/backend/executor/nodeSeqscan.c | 2 ++ src/backend/executor/nodeSubqueryscan.c | 1 + src/backend/executor/nodeTidscan.c | 4 ++++ src/backend/executor/nodeValuesscan.c | 1 + 8 files changed, 19 insertions(+) diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c index 820a386153..233d65032a 100644 --- a/src/backend/executor/nodeBitmapHeapscan.c +++ b/src/backend/executor/nodeBitmapHeapscan.c @@ -364,6 +364,8 @@ ExecBitmapHeapReScan(BitmapHeapScanState *node, ExprContext *exprCtxt) estate = node->ss.ps.state; scanrelid = ((BitmapHeapScan *) node->ss.ps.plan)->scan.scanrelid; + node->ss.ps.ps_TupFromTlist = false; + /* * If we are being passed an outer tuple, link it into the "regular" * per-tuple econtext for possible qual eval. @@ -488,6 +490,8 @@ ExecInitBitmapHeapScan(BitmapHeapScan *node, EState *estate, int eflags) */ ExecAssignExprContext(estate, &scanstate->ss.ps); + scanstate->ss.ps.ps_TupFromTlist = false; + /* * initialize child expressions */ diff --git a/src/backend/executor/nodeFunctionscan.c b/src/backend/executor/nodeFunctionscan.c index 40e48bf631..718934df21 100644 --- a/src/backend/executor/nodeFunctionscan.c +++ b/src/backend/executor/nodeFunctionscan.c @@ -317,6 +317,7 @@ void ExecFunctionReScan(FunctionScanState *node, ExprContext *exprCtxt) { ExecClearTuple(node->ss.ps.ps_ResultTupleSlot); + node->ss.ps.ps_TupFromTlist = false; /* * If we haven't materialized yet, just return. diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c index 85e61b915a..1b831ac8b5 100644 --- a/src/backend/executor/nodeIndexscan.c +++ b/src/backend/executor/nodeIndexscan.c @@ -168,6 +168,8 @@ ExecIndexReScan(IndexScanState *node, ExprContext *exprCtxt) econtext = node->iss_RuntimeContext; /* context for runtime keys */ scanrelid = ((IndexScan *) node->ss.ps.plan)->scan.scanrelid; + node->ss.ps.ps_TupFromTlist = false; + if (econtext) { /* @@ -476,6 +478,8 @@ ExecInitIndexScan(IndexScan *node, EState *estate, int eflags) */ ExecAssignExprContext(estate, &indexstate->ss.ps); + indexstate->ss.ps.ps_TupFromTlist = false; + /* * initialize child expressions * diff --git a/src/backend/executor/nodeResult.c b/src/backend/executor/nodeResult.c index 90b07a7269..b60486370c 100644 --- a/src/backend/executor/nodeResult.c +++ b/src/backend/executor/nodeResult.c @@ -200,6 +200,8 @@ ExecInitResult(Result *node, EState *estate, int eflags) */ ExecAssignExprContext(estate, &resstate->ps); + resstate->ps.ps_TupFromTlist = false; + #define RESULT_NSLOTS 1 /* diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c index 34567af477..e238aca3c4 100644 --- a/src/backend/executor/nodeSeqscan.c +++ b/src/backend/executor/nodeSeqscan.c @@ -295,6 +295,8 @@ ExecSeqReScan(SeqScanState *node, ExprContext *exprCtxt) estate = node->ps.state; scanrelid = ((SeqScan *) node->ps.plan)->scanrelid; + node->ps.ps_TupFromTlist = false; + /* If this is re-scanning of PlanQual ... */ if (estate->es_evTuple != NULL && estate->es_evTuple[scanrelid - 1] != NULL) diff --git a/src/backend/executor/nodeSubqueryscan.c b/src/backend/executor/nodeSubqueryscan.c index e9083fbbbd..3213f7ca4b 100644 --- a/src/backend/executor/nodeSubqueryscan.c +++ b/src/backend/executor/nodeSubqueryscan.c @@ -294,4 +294,5 @@ ExecSubqueryReScan(SubqueryScanState *node, ExprContext *exprCtxt) MemoryContextSwitchTo(oldcontext); node->ss.ss_ScanTupleSlot = NULL; + node->ss.ps.ps_TupFromTlist = false; } diff --git a/src/backend/executor/nodeTidscan.c b/src/backend/executor/nodeTidscan.c index b80ff11dc9..bcb0c48fb0 100644 --- a/src/backend/executor/nodeTidscan.c +++ b/src/backend/executor/nodeTidscan.c @@ -376,6 +376,8 @@ ExecTidReScan(TidScanState *node, ExprContext *exprCtxt) estate = node->ss.ps.state; scanrelid = ((TidScan *) node->ss.ps.plan)->scan.scanrelid; + node->ss.ps.ps_TupFromTlist = false; + /* If we are being passed an outer tuple, save it for runtime key calc */ if (exprCtxt != NULL) node->ss.ps.ps_ExprContext->ecxt_outertuple = @@ -482,6 +484,8 @@ ExecInitTidScan(TidScan *node, EState *estate, int eflags) */ ExecAssignExprContext(estate, &tidstate->ss.ps); + tidstate->ss.ps.ps_TupFromTlist = false; + /* * initialize child expressions */ diff --git a/src/backend/executor/nodeValuesscan.c b/src/backend/executor/nodeValuesscan.c index 5611fbcd52..e8f63ce796 100644 --- a/src/backend/executor/nodeValuesscan.c +++ b/src/backend/executor/nodeValuesscan.c @@ -334,6 +334,7 @@ void ExecValuesReScan(ValuesScanState *node, ExprContext *exprCtxt) { ExecClearTuple(node->ss.ps.ps_ResultTupleSlot); + node->ss.ps.ps_TupFromTlist = false; node->curr_idx = -1; } -- 2.39.5