mirror of
https://github.com/postgres/postgres.git
synced 2025-11-15 03:41:20 +03:00
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.
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.31 1999/07/17 20:18:04 momjian Exp $
|
||||
* $Header: /cvsroot/pgsql/src/backend/utils/fmgr/dfmgr.c,v 1.32 1999/09/18 19:08:01 tgl Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@@ -56,8 +56,13 @@ fmgr_dynamic(Oid procedureId, int *pronargs)
|
||||
|
||||
/*
|
||||
* The procedure isn't a builtin, so we'll have to do a catalog lookup
|
||||
* to find its pg_proc entry.
|
||||
* to find its pg_proc entry. Moreover, since probin is varlena, we're
|
||||
* going to have to use heap_getattr, which means we need the reldesc,
|
||||
* which means we need to open the relation. So we might as well do that
|
||||
* first and get the benefit of SI inval if needed.
|
||||
*/
|
||||
rel = heap_openr(ProcedureRelationName, AccessShareLock);
|
||||
|
||||
procedureTuple = SearchSysCacheTuple(PROOID,
|
||||
ObjectIdGetDatum(procedureId),
|
||||
0, 0, 0);
|
||||
@@ -71,36 +76,24 @@ fmgr_dynamic(Oid procedureId, int *pronargs)
|
||||
procedureStruct = (Form_pg_proc) GETSTRUCT(procedureTuple);
|
||||
proname = procedureStruct->proname.data;
|
||||
pronargs_save = *pronargs = procedureStruct->pronargs;
|
||||
|
||||
/*
|
||||
* Extract the procedure info from the pg_proc tuple. Since probin is
|
||||
* varlena, do a amgetattr() on the procedure tuple. To do that, we
|
||||
* need the rel for the procedure relation, so...
|
||||
*/
|
||||
|
||||
/* open pg_procedure */
|
||||
|
||||
rel = heap_openr(ProcedureRelationName);
|
||||
if (!RelationIsValid(rel))
|
||||
{
|
||||
elog(ERROR, "fmgr: Could not open relation %s",
|
||||
ProcedureRelationName);
|
||||
return (func_ptr) NULL;
|
||||
}
|
||||
probinattr = heap_getattr(procedureTuple,
|
||||
Anum_pg_proc_probin,
|
||||
RelationGetDescr(rel), &isnull);
|
||||
if (!PointerIsValid(probinattr) /* || isnull */ )
|
||||
{
|
||||
heap_close(rel);
|
||||
heap_close(rel, AccessShareLock);
|
||||
elog(ERROR, "fmgr: Could not extract probin for %u from %s",
|
||||
procedureId, ProcedureRelationName);
|
||||
return (func_ptr) NULL;
|
||||
}
|
||||
probinstring = textout((struct varlena *) probinattr);
|
||||
|
||||
heap_close(rel, AccessShareLock);
|
||||
|
||||
user_fn = handle_load(probinstring, proname);
|
||||
|
||||
pfree(probinstring);
|
||||
|
||||
procedureId_save = procedureId;
|
||||
user_fn_save = user_fn;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user