postgres.git / summary / log / commit / refs

commit    c1ffbbcbca93b3544c0b57b7ab063497794cb8ff
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Sat Jun 12 17:29:24 2021 +0000
First released in: 14.0, 9.6.23, 10.18, 11.13, 12.8, 13.4

    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


 src/backend/utils/adt/dbsize.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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);
 


[parent: dee7ad20d018]