diff options
| author | Daniel Gustafsson | 2023-03-25 21:49:33 +0000 |
|---|---|---|
| committer | Daniel Gustafsson | 2023-03-25 21:49:33 +0000 |
| commit | d435f15fff3cf3cf5d6cfcfd63e21acc0f737829 (patch) | |
| tree | 9be0836e44c3b6809bf2f6910e9fd4a45ef1f217 /src/backend/executor | |
| parent | e33967b13bbc6e4e1c1b5e9ecd1c45148cffcc53 (diff) | |
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 <[email protected]>
Reviewed-by: Peter Eisentraut <[email protected]>
Reviewed-by: David Rowley <[email protected]>
Discussion: https://postgr.es/m/[email protected]
Diffstat (limited to 'src/backend/executor')
| -rw-r--r-- | src/backend/executor/execReplication.c | 6 | ||||
| -rw-r--r-- | src/backend/executor/functions.c | 7 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/backend/executor/execReplication.c b/src/backend/executor/execReplication.c index 349bed0f5d3..9dd71684615 100644 --- a/src/backend/executor/execReplication.c +++ b/src/backend/executor/execReplication.c @@ -60,14 +60,12 @@ build_replindex_scan_key(ScanKey skey, Relation rel, Relation idxrel, { int index_attoff; int skey_attoff = 0; - bool isnull; Datum indclassDatum; oidvector *opclass; int2vector *indkey = &idxrel->rd_index->indkey; - indclassDatum = SysCacheGetAttr(INDEXRELID, idxrel->rd_indextuple, - Anum_pg_index_indclass, &isnull); - Assert(!isnull); + indclassDatum = SysCacheGetAttrNotNull(INDEXRELID, idxrel->rd_indextuple, + Anum_pg_index_indclass); opclass = (oidvector *) DatumGetPointer(indclassDatum); /* Build scankey for every non-expression attribute in the index. */ diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c index 50e06ec6931..f55424eb5ad 100644 --- a/src/backend/executor/functions.c +++ b/src/backend/executor/functions.c @@ -660,12 +660,7 @@ init_sql_fcache(FunctionCallInfo fcinfo, Oid collation, bool lazyEvalOK) /* * And of course we need the function body text. */ - tmp = SysCacheGetAttr(PROCOID, - procedureTuple, - Anum_pg_proc_prosrc, - &isNull); - if (isNull) - elog(ERROR, "null prosrc for function %u", foid); + tmp = SysCacheGetAttrNotNull(PROCOID, procedureTuple, Anum_pg_proc_prosrc); fcache->src = TextDatumGetCString(tmp); /* If we have prosqlbody, pay attention to that not prosrc. */ |