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/matview.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/backend/commands/matview.c') diff --git a/src/backend/commands/matview.c b/src/backend/commands/matview.c index fb30d2595cf..c00b9df3e3b 100644 --- a/src/backend/commands/matview.c +++ b/src/backend/commands/matview.c @@ -692,15 +692,12 @@ refresh_by_match_merge(Oid matviewOid, Oid tempOid, Oid relowner, int indnkeyatts = indexStruct->indnkeyatts; oidvector *indclass; Datum indclassDatum; - bool isnull; int i; /* Must get indclass the hard way. */ - indclassDatum = SysCacheGetAttr(INDEXRELID, - indexRel->rd_indextuple, - Anum_pg_index_indclass, - &isnull); - Assert(!isnull); + indclassDatum = SysCacheGetAttrNotNull(INDEXRELID, + indexRel->rd_indextuple, + Anum_pg_index_indclass); indclass = (oidvector *) DatumGetPointer(indclassDatum); /* Add quals for all columns from this index. */ -- cgit v1.2.3