From d435f15fff3cf3cf5d6cfcfd63e21acc0f737829 Mon Sep 17 00:00:00 2001 From: Daniel Gustafsson Date: Sat, 25 Mar 2023 22:49:33 +0100 Subject: Add SysCacheGetAttrNotNull for guaranteed not-null attrs When extracting an attr from a cached tuple in the syscache with SysCacheGetAttr the isnull parameter must be checked in case the attr cannot be NULL. For cases when this is known beforehand, a wrapper is introduced which perform the errorhandling internally on behalf of the caller, invoking an elog in case of a NULL attr. Reviewed-by: Tom Lane Reviewed-by: Peter Eisentraut Reviewed-by: David Rowley Discussion: https://postgr.es/m/AD76405E-DB45-46B6-941F-17B1EB3A9076@yesql.se --- src/backend/commands/indexcmds.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/backend/commands/indexcmds.c') diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c index 3ec8b5cca6c..e6ee99e51f6 100644 --- a/src/backend/commands/indexcmds.c +++ b/src/backend/commands/indexcmds.c @@ -189,7 +189,6 @@ CheckIndexCompatible(Oid oldId, IndexInfo *indexInfo; int numberOfAttributes; int old_natts; - bool isnull; bool ret = true; oidvector *old_indclass; oidvector *old_indcollation; @@ -270,12 +269,10 @@ CheckIndexCompatible(Oid oldId, old_natts = indexForm->indnkeyatts; Assert(old_natts == numberOfAttributes); - d = SysCacheGetAttr(INDEXRELID, tuple, Anum_pg_index_indcollation, &isnull); - Assert(!isnull); + d = SysCacheGetAttrNotNull(INDEXRELID, tuple, Anum_pg_index_indcollation); old_indcollation = (oidvector *) DatumGetPointer(d); - d = SysCacheGetAttr(INDEXRELID, tuple, Anum_pg_index_indclass, &isnull); - Assert(!isnull); + d = SysCacheGetAttrNotNull(INDEXRELID, tuple, Anum_pg_index_indclass); old_indclass = (oidvector *) DatumGetPointer(d); ret = (memcmp(old_indclass->values, classObjectId, -- cgit v1.2.3