rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add sanity asserts for index OID and attnums during cache init 

There was already a check on the relation OID, but not its index OID and
the attributes that can be used during the syscache lookups.  The two
assertions added by this commit are cheap, and actually useful for
developers to fasten the detection of incorrect data in a new entry
added in the syscache list, as these assertions are triggered during the
initial cache loading (initdb, or just backend startup), not requiring a
syscache that uses the new entry.

While on it, the relation OID check is switched to use OidIsValid().

Author: Aleksander Alekseev
Reviewed-by: Dagfinn Ilmari Mannsåker, Zhang Mingli, Michael Paquier
Discussion: https://postgr.es/m/CAJ7c6TOjUTJ0jxvWY6oJeP2-840OF8ch7qscZQsuVuotXTOS_g@mail.gmail.com
This commit is contained in:
Michael Paquier 2023-07-27 10:55:16 +09:00
parent 31de7e60da
commit f6a84546b1
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/backend/utils/cache/catcache.c vendored
View File

@ -825,7 +825,10 @@ InitCatCache(int id,
cp->cc_nbuckets = nbuckets;
cp->cc_nkeys = nkeys;
for (i = 0; i < nkeys; ++i)
{
Assert(AttributeNumberIsValid(key[i]));
cp->cc_keyno[i] = key[i];
}
/*
* new cache is initialized as far as we can go for now. print some

4
src/backend/utils/cache/syscache.c vendored
View File

@ -720,7 +720,9 @@ InitCatalogCache(void)
* Assert that every enumeration value defined in syscache.h has been
* populated in the cacheinfo array.
*/
Assert(cacheinfo[cacheId].reloid != 0);
Assert(OidIsValid(cacheinfo[cacheId].reloid));
Assert(OidIsValid(cacheinfo[cacheId].indoid));
/* .nbuckets and .key[] are checked by InitCatCache() */
SysCache[cacheId] = InitCatCache(cacheId,
cacheinfo[cacheId].reloid,