diff options
| author | Marc G. Fournier <scrappy@hub.org> | 1996-10-24 07:33:52 +0000 |
|---|---|---|
| committer | Marc G. Fournier <scrappy@hub.org> | 1996-10-24 07:33:52 +0000 |
| commit | ee0ef186ac2830614bed1370b727b63982cfc547 (patch) | |
| tree | e35f21795d46470bcbec01fb4461dcfb48de96fb /src | |
| parent | 352e2ae2ab0a18a46ec79753e746fa33c4de69f5 (diff) | |
Fixes: Growing backend when using nested function calls
Submitted by: wieck@sapserv.debis.de
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/cache/catcache.c | 33 |
1 files changed, 32 insertions, 1 deletions
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c index 93ea9be8282..4ee208e1088 100644 --- a/src/backend/utils/cache/catcache.c +++ b/src/backend/utils/cache/catcache.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.1.1.1 1996/07/09 06:22:06 scrappy Exp $ + * $Header: /cvsroot/pgsql/src/backend/utils/cache/catcache.c,v 1.1.1.1.2.1 1996/10/24 07:33:52 scrappy Exp $ * * Notes: * XXX This needs to use exception.h to handle recovery when @@ -860,6 +860,13 @@ SearchSysCache(struct catcache *cache, if ((RelationGetRelationTupleForm(relation))->relhasindex && !IsBootstrapProcessingMode()) { + /* ---------- + * Switch back to old memory context so memory not freed + * in the scan function will go away at transaction end. + * wieck - 10/18/1996 + * ---------- + */ + MemoryContextSwitchTo(oldcxt); Assert(cache->cc_iscanfunc); switch(cache->cc_nkeys) { @@ -868,22 +875,46 @@ SearchSysCache(struct catcache *cache, case 2: ntp = cache->cc_iscanfunc(relation,v1,v2); break; case 1: ntp = cache->cc_iscanfunc(relation,v1); break; } + /* ---------- + * Back to Cache context. If we got a tuple copy it + * into our context. + * wieck - 10/18/1996 + * ---------- + */ + MemoryContextSwitchTo((MemoryContext)CacheCxt); + if(HeapTupleIsValid(ntp)) { + ntp = heap_copytuple(ntp); + } } else { HeapScanDesc sd; + /* ---------- + * As above do the lookup in the callers memory + * context. + * wieck - 10/18/1996 + * ---------- + */ + MemoryContextSwitchTo(oldcxt); + sd = heap_beginscan(relation, 0, NowTimeQual, cache->cc_nkeys, cache->cc_skey); ntp = heap_getnext(sd, 0, &buffer); + MemoryContextSwitchTo((MemoryContext)CacheCxt); + if (HeapTupleIsValid(ntp)) { CACHE1_elog(DEBUG, "SearchSysCache: found tuple"); ntp = heap_copytuple(ntp); } + MemoryContextSwitchTo(oldcxt); + heap_endscan(sd); + + MemoryContextSwitchTo((MemoryContext)CacheCxt); } DisableCache = 0; |