From: Michael Paquier <michael@paquier.xyz>
Date: Sat, 12 Jun 2021 07:29:11 +0000 (+0900)
Subject: Simplify some code in getObjectTypeDescription()
X-Git-Tag: REL_14_BETA2~52
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b56b83aa0d6e044cf38d553f7a87f4b84708cac6;p=thirdparty%2Fpostgresql.git

Simplify some code in getObjectTypeDescription()

This routine is designed to never return an empty description or NULL,
providing description fallbacks even if missing objects are accepted,
but it included a code path where this was considered possible.  All the
callers of this routine already consider NULL as not possible, so
change a bit the code to map with the assumptions of the callers, and
add more comments close to the callers of this routine to outline the
behavior expected.

This code is new as of 2a10fdc, so no backpatch is needed.

Discussion: https://postgr.es/m/YMNY6RGPBRCeLmFb@paquier.xyz
---

diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index d79c3cde7c6..9882e549c4e 100644
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -4278,7 +4278,7 @@ pg_identify_object_as_address(PG_FUNCTION_ARGS)
 
 	tupdesc = BlessTupleDesc(tupdesc);
 
-	/* object type */
+	/* object type, which can never be NULL */
 	values[0] = CStringGetTextDatum(getObjectTypeDescription(&address, true));
 	nulls[0] = false;
 
@@ -4490,9 +4490,8 @@ getObjectTypeDescription(const ObjectAddress *object, bool missing_ok)
 			 */
 	}
 
-	/* an empty string is equivalent to no object found */
-	if (buffer.len == 0)
-		return NULL;
+	/* the result can never be empty */
+	Assert(buffer.len > 0);
 
 	return buffer.data;
 }