diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2000-11-16 22:30:52 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2000-11-16 22:30:52 +0000 |
| commit | a933ee38bbb8dffbc48a3363a94ff6f2a9f7964d (patch) | |
| tree | 1c32737389b2530e7152dc2287161b36d9001e8c /src/backend/rewrite/rewriteRemove.c | |
| parent | cff23842a4c68301ddf34559c7af383bb5557054 (diff) | |
| download | postgresql-a933ee38bbb8dffbc48a3363a94ff6f2a9f7964d.tar.gz postgresql-a933ee38bbb8dffbc48a3363a94ff6f2a9f7964d.zip | |
Change SearchSysCache coding conventions so that a reference count is
maintained for each cache entry. A cache entry will not be freed until
the matching ReleaseSysCache call has been executed. This eliminates
worries about cache entries getting dropped while still in use. See
my posting to pg-hackers of even date for more info.
Diffstat (limited to 'src/backend/rewrite/rewriteRemove.c')
| -rw-r--r-- | src/backend/rewrite/rewriteRemove.c | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c index ba409f4fbf6..760614461cd 100644 --- a/src/backend/rewrite/rewriteRemove.c +++ b/src/backend/rewrite/rewriteRemove.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.40 2000/09/29 18:21:24 tgl Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteRemove.c,v 1.41 2000/11/16 22:30:29 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -35,21 +35,26 @@ RewriteGetRuleEventRel(char *rulename) { HeapTuple htup; Oid eventrel; + char *result; - htup = SearchSysCacheTuple(RULENAME, - PointerGetDatum(rulename), - 0, 0, 0); + htup = SearchSysCache(RULENAME, + PointerGetDatum(rulename), + 0, 0, 0); if (!HeapTupleIsValid(htup)) elog(ERROR, "Rule or view \"%s\" not found", ((strncmp(rulename, "_RET", 4) == 0) ? (rulename + 4) : rulename)); eventrel = ((Form_pg_rewrite) GETSTRUCT(htup))->ev_class; - htup = SearchSysCacheTuple(RELOID, - PointerGetDatum(eventrel), - 0, 0, 0); + ReleaseSysCache(htup); + + htup = SearchSysCache(RELOID, + PointerGetDatum(eventrel), + 0, 0, 0); if (!HeapTupleIsValid(htup)) elog(ERROR, "Relation %u not found", eventrel); - return NameStr(((Form_pg_class) GETSTRUCT(htup))->relname); + result = pstrdup(NameStr(((Form_pg_class) GETSTRUCT(htup))->relname)); + ReleaseSysCache(htup); + return result; } /* @@ -75,9 +80,9 @@ RemoveRewriteRule(char *ruleName) /* * Find the tuple for the target rule. */ - tuple = SearchSysCacheTupleCopy(RULENAME, - PointerGetDatum(ruleName), - 0, 0, 0); + tuple = SearchSysCacheCopy(RULENAME, + PointerGetDatum(ruleName), + 0, 0, 0); /* * complain if no rule with such name existed |