mirror of
https://github.com/postgres/postgres.git
synced 2025-11-04 20:11:56 +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:
27
src/backend/utils/cache/syscache.c
vendored
27
src/backend/utils/cache/syscache.c
vendored
@@ -77,6 +77,7 @@
|
||||
#include "catalog/pg_user_mapping.h"
|
||||
#include "lib/qunique.h"
|
||||
#include "utils/catcache.h"
|
||||
#include "utils/lsyscache.h"
|
||||
#include "utils/rel.h"
|
||||
#include "utils/syscache.h"
|
||||
|
||||
@@ -1099,6 +1100,32 @@ SysCacheGetAttr(int cacheId, HeapTuple tup,
|
||||
isNull);
|
||||
}
|
||||
|
||||
/*
|
||||
* SysCacheGetAttrNotNull
|
||||
*
|
||||
* As above, a version of SysCacheGetAttr which knows that the attr cannot
|
||||
* be NULL.
|
||||
*/
|
||||
Datum
|
||||
SysCacheGetAttrNotNull(int cacheId, HeapTuple tup,
|
||||
AttrNumber attributeNumber)
|
||||
{
|
||||
bool isnull;
|
||||
Datum attr;
|
||||
|
||||
attr = SysCacheGetAttr(cacheId, tup, attributeNumber, &isnull);
|
||||
|
||||
if (isnull)
|
||||
{
|
||||
elog(ERROR,
|
||||
"unexpected null value in cached tuple for catalog %s column %s",
|
||||
get_rel_name(cacheinfo[cacheId].reloid),
|
||||
NameStr(TupleDescAttr(SysCache[cacheId]->cc_tupdesc, attributeNumber - 1)->attname));
|
||||
}
|
||||
|
||||
return attr;
|
||||
}
|
||||
|
||||
/*
|
||||
* GetSysCacheHashValue
|
||||
*
|
||||
|
||||
Reference in New Issue
Block a user