Use <unnamed> for name of unnamed portal's memory context

petere · petere · commit 728d4bc16b79 · 2020-09-08T17:15:00.000+02:00
Otherwise just printing an empty string makes the memory context debug output slightly confusing. Discussion: https://www.postgresql.org/message-id/flat/ccb353ef-89ff-09b3-8046-1d2514624b9c%402ndquadrant.com
diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c
@@ -220,8 +220,8 @@ CreatePortal(const char *name, bool allowDup, bool dupSilent)
 	/* put portal in table (sets portal->name) */
 	PortalHashTableInsert(portal, name);
 
-	/* reuse portal->name copy */
-	MemoryContextSetIdentifier(portal->portalContext, portal->name);
+	/* for named portals reuse portal->name copy */
+	MemoryContextSetIdentifier(portal->portalContext, portal->name[0] ? portal->name : "<unnamed>");
 
 	return portal;
 }

Original file line number	Diff line number	Diff line change
`@@ -220,8 +220,8 @@ CreatePortal(const char *name, bool allowDup, bool dupSilent)`
`220`	`220`	`/* put portal in table (sets portal->name) */`
`221`	`221`	`PortalHashTableInsert(portal, name);`
`222`	`222`
`223`		`- /* reuse portal->name copy */`
`224`		`- MemoryContextSetIdentifier(portal->portalContext, portal->name);`
	`223`	`+ /* for named portals reuse portal->name copy */`
	`224`	`+ MemoryContextSetIdentifier(portal->portalContext, portal->name[0] ? portal->name : "<unnamed>");`
`225`	`225`
`226`	`226`	`return portal;`
`227`	`227`	`}`