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/utils/adt/amutils.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'src/backend/utils/adt/amutils.c') diff --git a/src/backend/utils/adt/amutils.c b/src/backend/utils/adt/amutils.c index 2fb5f64d368..48852bf79e2 100644 --- a/src/backend/utils/adt/amutils.c +++ b/src/backend/utils/adt/amutils.c @@ -119,7 +119,6 @@ test_indoption(HeapTuple tuple, int attno, bool guard, bool *res) { Datum datum; - bool isnull; int2vector *indoption; int16 indoption_val; @@ -129,9 +128,7 @@ test_indoption(HeapTuple tuple, int attno, bool guard, return true; } - datum = SysCacheGetAttr(INDEXRELID, tuple, - Anum_pg_index_indoption, &isnull); - Assert(!isnull); + datum = SysCacheGetAttrNotNull(INDEXRELID, tuple, Anum_pg_index_indoption); indoption = ((int2vector *) DatumGetPointer(datum)); indoption_val = indoption->values[attno - 1]; -- cgit v1.2.3