diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2021-06-12 13:29:24 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2021-06-12 13:29:24 -0400 |
| commit | 1250aad42520fd5a3db68d6381997b7e1f9bb4aa (patch) | |
| tree | 9d6bcea75ba29ee8da3e8f78c1a8be6f9cfd9674 /src/backend/utils/adt/dbsize.c | |
| parent | fe6a20ce54cbbb6fcfe9f6675d563af836ae799a (diff) | |
| download | postgresql-1250aad42520fd5a3db68d6381997b7e1f9bb4aa.tar.gz postgresql-1250aad42520fd5a3db68d6381997b7e1f9bb4aa.zip | |
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.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/backend/utils/adt/dbsize.c b/src/backend/utils/adt/dbsize.c index 3c70bb59433..9c39e7d3b34 100644 --- a/src/backend/utils/adt/dbsize.c +++ b/src/backend/utils/adt/dbsize.c @@ -903,7 +903,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); |