From 0fbfdf55f82cec91bd3cd1ba136e29f85f359a1a Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 26 Dec 2006 19:27:20 +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/nodeFunctionscan.c | 3 ++-
src/backend/executor/nodeIndexscan.c | 6 +++++-
src/backend/executor/nodeResult.c | 4 +++-
src/backend/executor/nodeSeqscan.c | 4 +++-
src/backend/executor/nodeSubqueryscan.c | 3 ++-
src/backend/executor/nodeTidscan.c | 6 +++++-
6 files changed, 20 insertions(+), 6 deletions(-)
diff --git a/src/backend/executor/nodeFunctionscan.c b/src/backend/executor/nodeFunctionscan.c
index a47e37d7e5..f39eaeff04 100644
--- a/src/backend/executor/nodeFunctionscan.c
+++ b/src/backend/executor/nodeFunctionscan.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeFunctionscan.c,v 1.22 2003/09/25 23:02:12 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeFunctionscan.c,v 1.22.2.1 2006/12/26 19:27:20 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -341,6 +341,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 0f8fb32824..2ff45e9a4f 100644
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.84.2.2 2006/05/19 16:31:05 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeIndexscan.c,v 1.84.2.3 2006/12/26 19:27:20 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -375,6 +375,8 @@ ExecIndexReScan(IndexScanState *node, ExprContext *exprCtxt)
numScanKeys = node->iss_NumScanKeys;
scanrelid = ((IndexScan *) node->ss.ps.plan)->scan.scanrelid;
+ node->ss.ps.ps_TupFromTlist = false;
+
if (econtext)
{
/*
@@ -647,6 +649,8 @@ ExecInitIndexScan(IndexScan *node, EState *estate)
*/
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 361d5d23a0..5b01171e76 100644
--- a/src/backend/executor/nodeResult.c
+++ b/src/backend/executor/nodeResult.c
@@ -34,7 +34,7 @@
* Portions Copyright (c) 1994, Regents of the University of California
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeResult.c,v 1.26 2003/08/04 02:39:59 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeResult.c,v 1.26.4.1 2006/12/26 19:27:20 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -194,6 +194,8 @@ ExecInitResult(Result *node, EState *estate)
*/
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 21a5eee342..b8d5f19516 100644
--- a/src/backend/executor/nodeSeqscan.c
+++ b/src/backend/executor/nodeSeqscan.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.46 2003/08/08 21:41:42 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeSeqscan.c,v 1.46.4.1 2006/12/26 19:27:20 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -311,6 +311,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 1c15f5ff39..3497b16d1e 100644
--- a/src/backend/executor/nodeSubqueryscan.c
+++ b/src/backend/executor/nodeSubqueryscan.c
@@ -12,7 +12,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeSubqueryscan.c,v 1.22 2003/10/01 21:30:52 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeSubqueryscan.c,v 1.22.2.1 2006/12/26 19:27:20 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -278,4 +278,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 179aa887fd..0796f19104 100644
--- a/src/backend/executor/nodeTidscan.c
+++ b/src/backend/executor/nodeTidscan.c
@@ -8,7 +8,7 @@
*
*
* IDENTIFICATION
- * $Header: /cvsroot/pgsql/src/backend/executor/nodeTidscan.c,v 1.35 2003/09/26 01:17:01 tgl Exp $
+ * $Header: /cvsroot/pgsql/src/backend/executor/nodeTidscan.c,v 1.35.2.1 2006/12/26 19:27:20 tgl Exp $
*
*-------------------------------------------------------------------------
*/
@@ -270,6 +270,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 =
@@ -385,6 +387,8 @@ ExecInitTidScan(TidScan *node, EState *estate)
*/
ExecAssignExprContext(estate, &tidstate->ss.ps);
+ tidstate->ss.ps.ps_TupFromTlist = false;
+
/*
* initialize child expressions
*/
--
2.40.0