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/typecmds.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'src/backend/commands/typecmds.c') diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c index 04bddaef81e..3440dbc4405 100644 --- a/src/backend/commands/typecmds.c +++ b/src/backend/commands/typecmds.c @@ -3039,7 +3039,6 @@ AlterDomainValidateConstraint(List *names, const char *constrName) char *conbin; SysScanDesc scan; Datum val; - bool isnull; HeapTuple tuple; HeapTuple copyTuple; ScanKeyData skey[3]; @@ -3094,12 +3093,7 @@ AlterDomainValidateConstraint(List *names, const char *constrName) errmsg("constraint \"%s\" of domain \"%s\" is not a check constraint", constrName, TypeNameToString(typename)))); - val = SysCacheGetAttr(CONSTROID, tuple, - Anum_pg_constraint_conbin, - &isnull); - if (isnull) - elog(ERROR, "null conbin for constraint %u", - con->oid); + val = SysCacheGetAttrNotNull(CONSTROID, tuple, Anum_pg_constraint_conbin); conbin = TextDatumGetCString(val); validateDomainConstraint(domainoid, conbin); -- cgit v1.2.3