|
27 | 27 | * |
28 | 28 | * |
29 | 29 | * IDENTIFICATION |
30 | | - * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.110 2000/03/09 05:15:33 tgl Exp $ |
| 30 | + * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.111 2000/04/07 00:59:17 tgl Exp $ |
31 | 31 | * |
32 | 32 | *------------------------------------------------------------------------- |
33 | 33 | */ |
@@ -73,6 +73,7 @@ static void ExecDelete(TupleTableSlot *slot, ItemPointer tupleid, |
73 | 73 | staticvoidExecReplace(TupleTableSlot*slot,ItemPointertupleid, |
74 | 74 | EState*estate); |
75 | 75 | staticTupleTableSlot*EvalPlanQualNext(EState*estate); |
| 76 | +staticvoidEndEvalPlanQual(EState*estate); |
76 | 77 | staticvoidExecCheckQueryPerms(CmdTypeoperation,Query*parseTree, |
77 | 78 | Plan*plan); |
78 | 79 | staticvoidExecCheckPlanPerms(Plan*plan,CmdTypeoperation, |
@@ -925,6 +926,12 @@ EndPlan(Plan *plan, EState *estate) |
925 | 926 | resultRelationInfo=estate->es_result_relation_info; |
926 | 927 | intoRelationDesc=estate->es_into_relation_descriptor; |
927 | 928 |
|
| 929 | +/* |
| 930 | + * shut down any PlanQual processing we were doing |
| 931 | + */ |
| 932 | +if (estate->es_evalPlanQual!=NULL) |
| 933 | +EndEvalPlanQual(estate); |
| 934 | + |
928 | 935 | /* |
929 | 936 | * shut down the query |
930 | 937 | */ |
@@ -2007,3 +2014,36 @@ lpqnext:; |
2007 | 2014 |
|
2008 | 2015 | return (slot); |
2009 | 2016 | } |
| 2017 | + |
| 2018 | +staticvoid |
| 2019 | +EndEvalPlanQual(EState*estate) |
| 2020 | +{ |
| 2021 | +evalPlanQual*epq= (evalPlanQual*)estate->es_evalPlanQual; |
| 2022 | +EState*epqstate=&(epq->estate); |
| 2023 | +evalPlanQual*oldepq; |
| 2024 | + |
| 2025 | +if (epq->rti==0)/* still live? */ |
| 2026 | +return; |
| 2027 | + |
| 2028 | +for (;;) |
| 2029 | +{ |
| 2030 | +ExecEndNode(epq->plan,epq->plan); |
| 2031 | +epqstate->es_tupleTable->next=0; |
| 2032 | +heap_freetuple(epqstate->es_evTuple[epq->rti-1]); |
| 2033 | +epqstate->es_evTuple[epq->rti-1]=NULL; |
| 2034 | +/* pop old PQ from the stack */ |
| 2035 | +oldepq= (evalPlanQual*)epqstate->es_evalPlanQual; |
| 2036 | +if (oldepq== (evalPlanQual*)NULL) |
| 2037 | +{ |
| 2038 | +epq->rti=0;/* this is the first (oldest) */ |
| 2039 | +estate->es_useEvalPlan= false;/* PQ - mark as free */ |
| 2040 | +break; |
| 2041 | +} |
| 2042 | +Assert(oldepq->rti!=0); |
| 2043 | +/* push current PQ to freePQ stack */ |
| 2044 | +oldepq->free=epq; |
| 2045 | +epq=oldepq; |
| 2046 | +epqstate=&(epq->estate); |
| 2047 | +estate->es_evalPlanQual= (Pointer)epq; |
| 2048 | +} |
| 2049 | +} |