diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2000-02-03 00:02:58 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2000-02-03 00:02:58 +0000 |
| commit | 40055db1eb9db0518119bdf2bfedde5c31b1f70d (patch) | |
| tree | 8bbe9aff0de7ca20d6f3cddee84dc00568e98555 /src/backend/executor/execMain.c | |
| parent | 31a8996ba49c996dd22f4d9395cb829de080efec (diff) | |
| download | postgresql-40055db1eb9db0518119bdf2bfedde5c31b1f70d.tar.gz postgresql-40055db1eb9db0518119bdf2bfedde5c31b1f70d.zip | |
Repair relation refcount leakage caused by SELECT FOR UPDATE.
Diffstat (limited to 'src/backend/executor/execMain.c')
| -rw-r--r-- | src/backend/executor/execMain.c | 41 |
1 files changed, 26 insertions, 15 deletions
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 2f118069c1a..899885dc316 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -27,7 +27,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.107 2000/01/26 05:56:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.108 2000/02/03 00:02:58 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -596,19 +596,19 @@ InitPlan(CmdType operation, Query *parseTree, Plan *plan, EState *estate) estate->es_rowMark = NULL; if (parseTree->rowMark != NULL) { - Relation relation; - Oid relid; - RowMark *rm; List *l; - execRowMark *erm; foreach(l, parseTree->rowMark) { - rm = lfirst(l); - relid = rt_fetch(rm->rti, rangeTable)->relid; - relation = heap_open(relid, RowShareLock); + RowMark *rm = lfirst(l); + Oid relid; + Relation relation; + execRowMark *erm; + if (!(rm->info & ROW_MARK_FOR_UPDATE)) continue; + relid = rt_fetch(rm->rti, rangeTable)->relid; + relation = heap_open(relid, RowShareLock); erm = (execRowMark *) palloc(sizeof(execRowMark)); erm->relation = relation; erm->rti = rm->rti; @@ -756,6 +756,7 @@ EndPlan(Plan *plan, EState *estate) { RelationInfo *resultRelationInfo; Relation intoRelationDesc; + List *l; /* * get information from state @@ -796,10 +797,20 @@ EndPlan(Plan *plan, EState *estate) } /* - * close the "into" relation if necessary + * close the "into" relation if necessary, again keeping lock */ if (intoRelationDesc != NULL) heap_close(intoRelationDesc, NoLock); + + /* + * close any relations selected FOR UPDATE, again keeping locks + */ + foreach(l, estate->es_rowMark) + { + execRowMark *erm = lfirst(l); + + heap_close(erm->relation, NoLock); + } } /* ---------------------------------------------------------------- @@ -926,16 +937,16 @@ lnext: ; else if (estate->es_rowMark != NULL) { List *l; - execRowMark *erm; - Buffer buffer; - HeapTupleData tuple; - TupleTableSlot *newSlot; - int test; lmark: ; foreach(l, estate->es_rowMark) { - erm = lfirst(l); + execRowMark *erm = lfirst(l); + Buffer buffer; + HeapTupleData tuple; + TupleTableSlot *newSlot; + int test; + if (!ExecGetJunkAttribute(junkfilter, slot, erm->resname, |