aboutsummaryrefslogtreecommitdiff
path: root/src/backend/utils/adt/amutils.c
diff options
context:
space:
mode:
authorDaniel Gustafsson <dgustafsson@postgresql.org>2023-03-25 22:49:33 +0100
committerDaniel Gustafsson <dgustafsson@postgresql.org>2023-03-25 22:49:33 +0100
commitd435f15fff3cf3cf5d6cfcfd63e21acc0f737829 (patch)
tree9be0836e44c3b6809bf2f6910e9fd4a45ef1f217 /src/backend/utils/adt/amutils.c
parente33967b13bbc6e4e1c1b5e9ecd1c45148cffcc53 (diff)
downloadpostgresql-d435f15fff3cf3cf5d6cfcfd63e21acc0f737829.tar.gz
postgresql-d435f15fff3cf3cf5d6cfcfd63e21acc0f737829.zip
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
Diffstat (limited to 'src/backend/utils/adt/amutils.c')
-rw-r--r--src/backend/utils/adt/amutils.c5
1 files changed, 1 insertions, 4 deletions
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];