diff options
| author | Robert Haas <rhaas@postgresql.org> | 2010-02-14 18:42:19 +0000 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2010-02-14 18:42:19 +0000 |
| commit | e26c539e9f326ea843c0ed005af093b56b55cd4d (patch) | |
| tree | 4f3830d394229b747cbceeab3cdbbfccccec74d1 /src/backend/utils/init | |
| parent | 1012492bc0bfb322d59db17e17735d17d634e264 (diff) | |
| download | postgresql-e26c539e9f326ea843c0ed005af093b56b55cd4d.tar.gz | |
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.
Diffstat (limited to 'src/backend/utils/init')
| -rw-r--r-- | src/backend/utils/init/miscinit.c | 10 | ||||
| -rw-r--r-- | src/backend/utils/init/postinit.c | 6 |
2 files changed, 5 insertions, 11 deletions
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c index 31bdc65ec1..fd653bcce5 100644 --- a/src/backend/utils/init/miscinit.c +++ b/src/backend/utils/init/miscinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.181 2010/02/07 20:48:10 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/init/miscinit.c,v 1.182 2010/02/14 18:42:17 rhaas Exp $ * *------------------------------------------------------------------------- */ @@ -406,9 +406,7 @@ InitializeSessionUserId(const char *rolename) /* call only once */ AssertState(!OidIsValid(AuthenticatedUserId)); - roleTup = SearchSysCache(AUTHNAME, - PointerGetDatum(rolename), - 0, 0, 0); + roleTup = SearchSysCache1(AUTHNAME, PointerGetDatum(rolename)); if (!HeapTupleIsValid(roleTup)) ereport(FATAL, (errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION), @@ -593,9 +591,7 @@ GetUserNameFromId(Oid roleid) HeapTuple tuple; char *result; - tuple = SearchSysCache(AUTHOID, - ObjectIdGetDatum(roleid), - 0, 0, 0); + tuple = SearchSysCache1(AUTHOID, ObjectIdGetDatum(roleid)); if (!HeapTupleIsValid(tuple)) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 0c6a59c80b..034c615403 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/init/postinit.c,v 1.202 2010/02/05 20:26:56 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/utils/init/postinit.c,v 1.203 2010/02/14 18:42:18 rhaas Exp $ * * *------------------------------------------------------------------------- @@ -240,9 +240,7 @@ CheckMyDatabase(const char *name, bool am_superuser) char *ctype; /* Fetch our pg_database row normally, via syscache */ - tup = SearchSysCache(DATABASEOID, - ObjectIdGetDatum(MyDatabaseId), - 0, 0, 0); + tup = SearchSysCache1(DATABASEOID, ObjectIdGetDatum(MyDatabaseId)); if (!HeapTupleIsValid(tup)) elog(ERROR, "cache lookup failed for database %u", MyDatabaseId); dbform = (Form_pg_database) GETSTRUCT(tup); |