diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 1999-09-18 19:08:25 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 1999-09-18 19:08:25 +0000 |
| commit | bd272cace63effa23d68a6b344a07e326b6a41e2 (patch) | |
| tree | 3026c545c238bd38eadc7fb1fac89d636cf51673 /src/backend/rewrite/rewriteDefine.c | |
| parent | 6c86fd5ba49bc03949ea1c788023f39da9c0b9fe (diff) | |
| download | postgresql-bd272cace63effa23d68a6b344a07e326b6a41e2.tar.gz | |
Mega-commit to make heap_open/heap_openr/heap_close take an
additional argument specifying the kind of lock to acquire/release (or
'NoLock' to do no lock processing). Ensure that all relations are locked
with some appropriate lock level before being examined --- this ensures
that relevant shared-inval messages have been processed and should prevent
problems caused by concurrent VACUUM. Fix several bugs having to do with
mismatched increment/decrement of relation ref count and mismatched
heap_open/close (which amounts to the same thing). A bogus ref count on
a relation doesn't matter much *unless* a SI Inval message happens to
arrive at the wrong time, which is probably why we got away with this
sloppiness for so long. Repair missing grab of AccessExclusiveLock in
DROP TABLE, ALTER/RENAME TABLE, etc, as noted by Hiroshi.
Recommend 'make clean all' after pulling this update; I modified the
Relation struct layout slightly.
Will post further discussion to pghackers list shortly.
Diffstat (limited to 'src/backend/rewrite/rewriteDefine.c')
| -rw-r--r-- | src/backend/rewrite/rewriteDefine.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c index b118bf8de5..c9be17151a 100644 --- a/src/backend/rewrite/rewriteDefine.c +++ b/src/backend/rewrite/rewriteDefine.c @@ -7,7 +7,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.35 1999/07/19 07:07:21 momjian Exp $ + * $Header: /cvsroot/pgsql/src/backend/rewrite/rewriteDefine.c,v 1.36 1999/09/18 19:07:18 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -78,9 +78,7 @@ InsertRule(char *rulname, extern void eval_as_new_xact(); char *template; - eventrel = heap_openr(evobj); - if (eventrel == NULL) - elog(ERROR, "rules cannot be defined on relations not in schema"); + eventrel = heap_openr(evobj, AccessShareLock); eventrel_oid = RelationGetRelid(eventrel); /* @@ -90,7 +88,7 @@ InsertRule(char *rulname, evslot_index = -1; else evslot_index = attnameAttNum(eventrel, (char *) evslot); - heap_close(eventrel); + heap_close(eventrel, AccessShareLock); if (evinstead) is_instead = "t"; @@ -258,9 +256,7 @@ DefineQueryRewrite(RuleStmt *stmt) * ... the targetlist of the SELECT action must exactly match the * event relation, ... */ - event_relation = heap_openr(event_obj->relname); - if (event_relation == NULL) - elog(ERROR, "virtual relations not supported yet"); + event_relation = heap_openr(event_obj->relname, AccessShareLock); if (event_relation->rd_att->natts != length(query->targetList)) elog(ERROR, "select rules target list must match event relations structure"); @@ -297,7 +293,7 @@ DefineQueryRewrite(RuleStmt *stmt) } } - heap_close(event_relation); + heap_close(event_relation, AccessShareLock); /* * LIMIT in view is not supported @@ -332,9 +328,7 @@ DefineQueryRewrite(RuleStmt *stmt) * This rule is allowed - install it. */ - event_relation = heap_openr(event_obj->relname); - if (event_relation == NULL) - elog(ERROR, "virtual relations not supported yet"); + event_relation = heap_openr(event_obj->relname, AccessShareLock); ev_relid = RelationGetRelid(event_relation); if (eslot_string == NULL) @@ -347,7 +341,7 @@ DefineQueryRewrite(RuleStmt *stmt) event_attno = attnameAttNum(event_relation, eslot_string); event_attype = attnumTypeId(event_relation, event_attno); } - heap_close(event_relation); + heap_close(event_relation, AccessShareLock); /* fix bug about instead nothing */ ValidateRule(event_type, event_obj->relname, |