summaryrefslogtreecommitdiff
path: root/src/backend/utils/adt/dbsize.c
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2021-06-12 13:29:24 -0400
committerTom Lane <tgl@sss.pgh.pa.us>2021-06-12 13:29:24 -0400
commitc1ffbbcbca93b3544c0b57b7ab063497794cb8ff (patch)
tree75e160fdc0fb92c84ea952792bfd4505f34ac15c /src/backend/utils/adt/dbsize.c
parentdee7ad20d018354a75f26c73ba26b8487b98e642 (diff)
Ensure pg_filenode_relation(0, 0) returns NULL.
Previously, a zero value for the relfilenode resulted in a confusing error message about "unexpected duplicate". This function returns NULL for other invalid relfilenode values, so zero should be treated likewise. It's been like this all along, so back-patch to all supported branches. Justin Pryzby Discussion: https://postgr.es/m/20210612023324.GT16435@telsasoft.com
Diffstat (limited to 'src/backend/utils/adt/dbsize.c')
-rw-r--r--src/backend/utils/adt/dbsize.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/backend/utils/adt/dbsize.c b/src/backend/utils/adt/dbsize.c
index 74cdbb05510..2227ccc2c45 100644
--- a/src/backend/utils/adt/dbsize.c
+++ b/src/backend/utils/adt/dbsize.c
@@ -919,7 +919,11 @@ pg_filenode_relation(PG_FUNCTION_ARGS)
{
Oid reltablespace = PG_GETARG_OID(0);
Oid relfilenode = PG_GETARG_OID(1);
- Oid heaprel = InvalidOid;
+ Oid heaprel;
+
+ /* test needed so RelidByRelfilenode doesn't misbehave */
+ if (!OidIsValid(relfilenode))
+ PG_RETURN_NULL();
heaprel = RelidByRelfilenode(reltablespace, relfilenode);