mirror of
https://github.com/postgres/postgres.git
synced 2025-07-14 08:21:07 +03:00
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 <tgl@sss.pgh.pa.us> Reviewed-by: Peter Eisentraut <peter.eisentraut@enterprisedb.com> Reviewed-by: David Rowley <dgrowleyml@gmail.com> Discussion: https://postgr.es/m/AD76405E-DB45-46B6-941F-17B1EB3A9076@yesql.se
This commit is contained in:
@ -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,
|
||||
|
Reference in New Issue
Block a user