diff options
Diffstat (limited to 'src/backend/executor')
| -rw-r--r-- | src/backend/executor/nodeAppend.c | 23 | ||||
| -rw-r--r-- | src/backend/executor/nodeSubqueryscan.c | 15 |
2 files changed, 30 insertions, 8 deletions
diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c index f8b4b89bc93..114f610c486 100644 --- a/src/backend/executor/nodeAppend.c +++ b/src/backend/executor/nodeAppend.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.40 2001/03/22 06:16:12 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeAppend.c,v 1.41 2001/05/08 19:47:02 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -362,14 +362,25 @@ ExecReScanAppend(Append *node, ExprContext *exprCtxt, Plan *parent) for (i = 0; i < nplans; i++) { - Plan *rescanNode; + Plan *subnode; - appendstate->as_whichplan = i; - rescanNode = (Plan *) nth(i, node->appendplans); - if (rescanNode->chgParam == NULL) + subnode = (Plan *) nth(i, node->appendplans); + /* + * ExecReScan doesn't know about my subplans, so I have to do + * changed-parameter signaling myself. + */ + if (node->plan.chgParam != NULL) + SetChangedParamList(subnode, node->plan.chgParam); + /* + * if chgParam of subnode is not null then plan will be re-scanned by + * first ExecProcNode. + */ + if (subnode->chgParam == NULL) { + /* make sure estate is correct for this subnode (needed??) */ + appendstate->as_whichplan = i; exec_append_initialize_next(node); - ExecReScan((Plan *) rescanNode, exprCtxt, (Plan *) node); + ExecReScan(subnode, exprCtxt, (Plan *) node); } } appendstate->as_whichplan = 0; diff --git a/src/backend/executor/nodeSubqueryscan.c b/src/backend/executor/nodeSubqueryscan.c index 54dec2d1eec..5eb0af0352c 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.6 2001/03/22 06:16:13 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/nodeSubqueryscan.c,v 1.7 2001/05/08 19:47:02 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -267,7 +267,18 @@ ExecSubqueryReScan(SubqueryScan *node, ExprContext *exprCtxt, Plan *parent) return; } - ExecReScan(node->subplan, NULL, node->subplan); + /* + * ExecReScan doesn't know about my subplan, so I have to do + * changed-parameter signaling myself. + */ + if (node->scan.plan.chgParam != NULL) + SetChangedParamList(node->subplan, node->scan.plan.chgParam); + /* + * if chgParam of subnode is not null then plan will be re-scanned by + * first ExecProcNode. + */ + if (node->subplan->chgParam == NULL) + ExecReScan(node->subplan, NULL, node->subplan); subquerystate->csstate.css_ScanTupleSlot = NULL; } |