mirror of
https://github.com/postgres/postgres.git
synced 2025-06-14 18:42:34 +03:00
Wrap calls to SearchSysCache and related functions using macros.
The purpose of this change is to eliminate the need for every caller of SearchSysCache, SearchSysCacheCopy, SearchSysCacheExists, GetSysCacheOid, and SearchSysCacheList to know the maximum number of allowable keys for a syscache entry (currently 4). This will make it far easier to increase the maximum number of keys in a future release should we choose to do so, and it makes the code shorter, too. Design and review by Tom Lane.
This commit is contained in:
Robert Haas
@ -8,7 +8,7 @@
|
||||
*
|
||||
*
|
||||
* IDENTIFICATION
|
||||
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.325 2010/02/07 20:48:10 tgl Exp $
|
||||
* $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.326 2010/02/14 18:42:14 rhaas Exp $
|
||||
*
|
||||
*-------------------------------------------------------------------------
|
||||
*/
|
||||
@ -728,9 +728,7 @@ RemoveRelations(DropStmt *drop)
|
||||
*/
|
||||
if (relkind == RELKIND_INDEX)
|
||||
{
|
||||
tuple = SearchSysCache(INDEXRELID,
|
||||
ObjectIdGetDatum(relOid),
|
||||
0, 0, 0);
|
||||
tuple = SearchSysCache1(INDEXRELID, ObjectIdGetDatum(relOid));
|
||||
if (HeapTupleIsValid(tuple))
|
||||
{
|
||||
Form_pg_index index = (Form_pg_index) GETSTRUCT(tuple);
|
||||
@ -743,9 +741,7 @@ RemoveRelations(DropStmt *drop)
|
||||
/* Get the lock before trying to fetch the syscache entry */
|
||||
LockRelationOid(relOid, AccessExclusiveLock);
|
||||
|
||||
tuple = SearchSysCache(RELOID,
|
||||
ObjectIdGetDatum(relOid),
|
||||
0, 0, 0);
|
||||
tuple = SearchSysCache1(RELOID, ObjectIdGetDatum(relOid));
|
||||
if (!HeapTupleIsValid(tuple))
|
||||
elog(ERROR, "cache lookup failed for relation %u", relOid);
|
||||
classform = (Form_pg_class) GETSTRUCT(tuple);
|
||||
@ -1906,9 +1902,7 @@ setRelhassubclassInRelation(Oid relationId, bool relhassubclass)
|
||||
* need to update it, but we still need to issue an SI inval message.
|
||||
*/
|
||||
relationRelation = heap_open(RelationRelationId, RowExclusiveLock);
|
||||
tuple = SearchSysCacheCopy(RELOID,
|
||||
ObjectIdGetDatum(relationId),
|
||||
0, 0, 0);
|
||||
tuple = SearchSysCacheCopy1(RELOID, ObjectIdGetDatum(relationId));
|
||||
if (!HeapTupleIsValid(tuple))
|
||||
elog(ERROR, "cache lookup failed for relation %u", relationId);
|
||||
classtuple = (Form_pg_class) GETSTRUCT(tuple);
|
||||
@ -2062,10 +2056,9 @@ renameatt(Oid myrelid,
|
||||
/* new name should not already exist */
|
||||
|
||||
/* this test is deliberately not attisdropped-aware */
|
||||
if (SearchSysCacheExists(ATTNAME,
|
||||
ObjectIdGetDatum(myrelid),
|
||||
PointerGetDatum(newattname),
|
||||
0, 0))
|
||||
if (SearchSysCacheExists2(ATTNAME,
|
||||
ObjectIdGetDatum(myrelid),
|
||||
PointerGetDatum(newattname)))
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_DUPLICATE_COLUMN),
|
||||
errmsg("column \"%s\" of relation \"%s\" already exists",
|
||||
@ -2172,9 +2165,7 @@ RenameRelationInternal(Oid myrelid, const char *newrelname, Oid namespaceId)
|
||||
*/
|
||||
relrelation = heap_open(RelationRelationId, RowExclusiveLock);
|
||||
|
||||
reltup = SearchSysCacheCopy(RELOID,
|
||||
ObjectIdGetDatum(myrelid),
|
||||
0, 0, 0);
|
||||
reltup = SearchSysCacheCopy1(RELOID, ObjectIdGetDatum(myrelid));
|
||||
if (!HeapTupleIsValid(reltup)) /* shouldn't happen */
|
||||
elog(ERROR, "cache lookup failed for relation %u", myrelid);
|
||||
relform = (Form_pg_class) GETSTRUCT(reltup);
|
||||
@ -3671,9 +3662,7 @@ ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
|
||||
|
||||
pgclass = heap_open(RelationRelationId, RowExclusiveLock);
|
||||
|
||||
reltup = SearchSysCacheCopy(RELOID,
|
||||
ObjectIdGetDatum(myrelid),
|
||||
0, 0, 0);
|
||||
reltup = SearchSysCacheCopy1(RELOID, ObjectIdGetDatum(myrelid));
|
||||
if (!HeapTupleIsValid(reltup))
|
||||
elog(ERROR, "cache lookup failed for relation %u", myrelid);
|
||||
relkind = ((Form_pg_class) GETSTRUCT(reltup))->relkind;
|
||||
@ -3682,10 +3671,9 @@ ATExecAddColumn(AlteredTableInfo *tab, Relation rel,
|
||||
* this test is deliberately not attisdropped-aware, since if one tries to
|
||||
* add a column matching a dropped column name, it's gonna fail anyway.
|
||||
*/
|
||||
if (SearchSysCacheExists(ATTNAME,
|
||||
ObjectIdGetDatum(myrelid),
|
||||
PointerGetDatum(colDef->colname),
|
||||
0, 0))
|
||||
if (SearchSysCacheExists2(ATTNAME,
|
||||
ObjectIdGetDatum(myrelid),
|
||||
PointerGetDatum(colDef->colname)))
|
||||
ereport(ERROR,
|
||||
(errcode(ERRCODE_DUPLICATE_COLUMN),
|
||||
errmsg("column \"%s\" of relation \"%s\" already exists",
|
||||
@ -3953,9 +3941,7 @@ ATExecDropNotNull(Relation rel, const char *colName)
|
||||
Form_pg_index indexStruct;
|
||||
int i;
|
||||
|
||||
indexTuple = SearchSysCache(INDEXRELID,
|
||||
ObjectIdGetDatum(indexoid),
|
||||
0, 0, 0);
|
||||
indexTuple = SearchSysCache1(INDEXRELID, ObjectIdGetDatum(indexoid));
|
||||
if (!HeapTupleIsValid(indexTuple))
|
||||
elog(ERROR, "cache lookup failed for index %u", indexoid);
|
||||
indexStruct = (Form_pg_index) GETSTRUCT(indexTuple);
|
||||
@ -4496,9 +4482,8 @@ ATExecDropColumn(List **wqueue, Relation rel, const char *colName,
|
||||
|
||||
class_rel = heap_open(RelationRelationId, RowExclusiveLock);
|
||||
|
||||
tuple = SearchSysCacheCopy(RELOID,
|
||||
ObjectIdGetDatum(RelationGetRelid(rel)),
|
||||
0, 0, 0);
|
||||
tuple = SearchSysCacheCopy1(RELOID,
|
||||
ObjectIdGetDatum(RelationGetRelid(rel)));
|
||||
if (!HeapTupleIsValid(tuple))
|
||||
elog(ERROR, "cache lookup failed for relation %u",
|
||||
RelationGetRelid(rel));
|
||||
@ -4876,9 +4861,7 @@ ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel,
|
||||
int16 eqstrategy;
|
||||
|
||||
/* We need several fields out of the pg_opclass entry */
|
||||
cla_ht = SearchSysCache(CLAOID,
|
||||
ObjectIdGetDatum(opclasses[i]),
|
||||
0, 0, 0);
|
||||
cla_ht = SearchSysCache1(CLAOID, ObjectIdGetDatum(opclasses[i]));
|
||||
if (!HeapTupleIsValid(cla_ht))
|
||||
elog(ERROR, "cache lookup failed for opclass %u", opclasses[i]);
|
||||
cla_tup = (Form_pg_opclass) GETSTRUCT(cla_ht);
|
||||
@ -5103,9 +5086,7 @@ transformFkeyGetPrimaryKey(Relation pkrel, Oid *indexOid,
|
||||
{
|
||||
Oid indexoid = lfirst_oid(indexoidscan);
|
||||
|
||||
indexTuple = SearchSysCache(INDEXRELID,
|
||||
ObjectIdGetDatum(indexoid),
|
||||
0, 0, 0);
|
||||
indexTuple = SearchSysCache1(INDEXRELID, ObjectIdGetDatum(indexoid));
|
||||
if (!HeapTupleIsValid(indexTuple))
|
||||
elog(ERROR, "cache lookup failed for index %u", indexoid);
|
||||
indexStruct = (Form_pg_index) GETSTRUCT(indexTuple);
|
||||
@ -5200,9 +5181,7 @@ transformFkeyCheckAttrs(Relation pkrel,
|
||||
j;
|
||||
|
||||
indexoid = lfirst_oid(indexoidscan);
|
||||
indexTuple = SearchSysCache(INDEXRELID,
|
||||
ObjectIdGetDatum(indexoid),
|
||||
0, 0, 0);
|
||||
indexTuple = SearchSysCache1(INDEXRELID, ObjectIdGetDatum(indexoid));
|
||||
if (!HeapTupleIsValid(indexTuple))
|
||||
elog(ERROR, "cache lookup failed for index %u", indexoid);
|
||||
indexStruct = (Form_pg_index) GETSTRUCT(indexTuple);
|
||||
@ -6432,9 +6411,7 @@ ATExecChangeOwner(Oid relationOid, Oid newOwnerId, bool recursing)
|
||||
/* Get its pg_class tuple, too */
|
||||
class_rel = heap_open(RelationRelationId, RowExclusiveLock);
|
||||
|
||||
tuple = SearchSysCache(RELOID,
|
||||
ObjectIdGetDatum(relationOid),
|
||||
0, 0, 0);
|
||||
tuple = SearchSysCache1(RELOID, ObjectIdGetDatum(relationOid));
|
||||
if (!HeapTupleIsValid(tuple))
|
||||
elog(ERROR, "cache lookup failed for relation %u", relationOid);
|
||||
tuple_class = (Form_pg_class) GETSTRUCT(tuple);
|
||||
@ -6788,9 +6765,7 @@ ATExecSetRelOptions(Relation rel, List *defList, bool isReset)
|
||||
|
||||
/* Get the old reloptions */
|
||||
relid = RelationGetRelid(rel);
|
||||
tuple = SearchSysCache(RELOID,
|
||||
ObjectIdGetDatum(relid),
|
||||
0, 0, 0);
|
||||
tuple = SearchSysCache1(RELOID, ObjectIdGetDatum(relid));
|
||||
if (!HeapTupleIsValid(tuple))
|
||||
elog(ERROR, "cache lookup failed for relation %u", relid);
|
||||
|
||||
@ -6853,9 +6828,7 @@ ATExecSetRelOptions(Relation rel, List *defList, bool isReset)
|
||||
toastrel = heap_open(toastid, AccessExclusiveLock);
|
||||
|
||||
/* Get the old reloptions */
|
||||
tuple = SearchSysCache(RELOID,
|
||||
ObjectIdGetDatum(toastid),
|
||||
0, 0, 0);
|
||||
tuple = SearchSysCache1(RELOID, ObjectIdGetDatum(toastid));
|
||||
if (!HeapTupleIsValid(tuple))
|
||||
elog(ERROR, "cache lookup failed for relation %u", toastid);
|
||||
|
||||
@ -6960,9 +6933,7 @@ ATExecSetTableSpace(Oid tableOid, Oid newTableSpace)
|
||||
/* Get a modifiable copy of the relation's pg_class row */
|
||||
pg_class = heap_open(RelationRelationId, RowExclusiveLock);
|
||||
|
||||
tuple = SearchSysCacheCopy(RELOID,
|
||||
ObjectIdGetDatum(tableOid),
|
||||
0, 0, 0);
|
||||
tuple = SearchSysCacheCopy1(RELOID, ObjectIdGetDatum(tableOid));
|
||||
if (!HeapTupleIsValid(tuple))
|
||||
elog(ERROR, "cache lookup failed for relation %u", tableOid);
|
||||
rd_rel = (Form_pg_class) GETSTRUCT(tuple);
|
||||
@ -7866,9 +7837,7 @@ AlterRelationNamespaceInternal(Relation classRel, Oid relOid,
|
||||
HeapTuple classTup;
|
||||
Form_pg_class classForm;
|
||||
|
||||
classTup = SearchSysCacheCopy(RELOID,
|
||||
ObjectIdGetDatum(relOid),
|
||||
0, 0, 0);
|
||||
classTup = SearchSysCacheCopy1(RELOID, ObjectIdGetDatum(relOid));
|
||||
if (!HeapTupleIsValid(classTup))
|
||||
elog(ERROR, "cache lookup failed for relation %u", relOid);
|
||||
classForm = (Form_pg_class) GETSTRUCT(classTup);
|
||||
|
||||
Reference in New Issue
Block a user