NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commitf6a8454

committed

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 andthe attributes that can be used during the syscache lookups. The twoassertions added by this commit are cheap, and actually useful fordevelopers to fasten the detection of incorrect data in a new entryadded in the syscache list, as these assertions are triggered during theinitial cache loading (initdb, or just backend startup), not requiring asyscache that uses the new entry.While on it, the relation OID check is switched to use OidIsValid().Author: Aleksander AlekseevReviewed-by: Dagfinn Ilmari Mannsåker, Zhang Mingli, Michael PaquierDiscussion:https://postgr.es/m/CAJ7c6TOjUTJ0jxvWY6oJeP2-840OF8ch7qscZQsuVuotXTOS_g@mail.gmail.com

1 parent31de7e6 commitf6a8454Copy full SHA for f6a8454

File tree

2 files changed

-1

lines changed

src/backend/utils/cache
- catcache.c
- syscache.c

2 files changed

-1

lines changed

`‎src/backend/utils/cache/catcache.c`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -825,7 +825,10 @@ InitCatCache(int id,`
`825`	`825`	`cp->cc_nbuckets=nbuckets;`
`826`	`826`	`cp->cc_nkeys=nkeys;`
`827`	`827`	`for (i=0;i<nkeys;++i)`
	`828`	`+{`
	`829`	`+Assert(AttributeNumberIsValid(key[i]));`
`828`	`830`	`cp->cc_keyno[i]=key[i];`
	`831`	`+}`
`829`	`832`
`830`	`833`	`/*`
`831`	`834`	`* new cache is initialized as far as we can go for now. print some`

`‎src/backend/utils/cache/syscache.c`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -720,7 +720,9 @@ InitCatalogCache(void)`
`720`	`720`	`* Assert that every enumeration value defined in syscache.h has been`
`721`	`721`	`* populated in the cacheinfo array.`
`722`	`722`	`*/`
`723`		`-Assert(cacheinfo[cacheId].reloid!=0);`
	`723`	`+Assert(OidIsValid(cacheinfo[cacheId].reloid));`
	`724`	`+Assert(OidIsValid(cacheinfo[cacheId].indoid));`
	`725`	`+/* .nbuckets and .key[] are checked by InitCatCache() */`
`724`	`726`
`725`	`727`	`SysCache[cacheId]=InitCatCache(cacheId,`
`726`	`728`	`cacheinfo[cacheId].reloid,`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitf6a8454

File tree

2 files changed

2 files changed

`‎src/backend/utils/cache/catcache.c`

`‎src/backend/utils/cache/syscache.c`

0 commit comments