Repair incorrect cleanup of heap memory allocation during

tglsfdc · tglsfdc · commit 5bc0d31ae8c8 · 1999-09-09T16:25:35.000Z
transaction abort --- before it only worked if there was exactly one level
of allocation context stacked in the blank portal.  Now it does the right
thing for any depth, including zero...
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.50 1999/09/05 17:12:34 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/transam/xact.c,v 1.51 1999/09/09 16:25:35 tgl Exp $
  *
  * NOTES
  *		Transaction aborts can now occur two ways:
@@ -694,19 +694,13 @@ static void
 AtCommit_Memory()
 {
 	Portal		portal;
-	MemoryContext portalContext;
 
 	/* ----------------
-	 *	Release memory in the blank portal.
-	 *	Since EndPortalAllocMode implicitly works on the current context,
-	 *	first make real sure that the blank portal is the selected context.
-	 *	(This is probably not necessary, but seems like a good idea...)
+	 *	Release all heap memory in the blank portal.
 	 * ----------------
 	 */
 	portal = GetPortalByName(NULL);
-	portalContext = (MemoryContext) PortalGetHeapMemory(portal);
-	MemoryContextSwitchTo(portalContext);
-	EndPortalAllocMode();
+	PortalResetHeapMemory(portal);
 
 	/* ----------------
 	 *	Now that we're "out" of a transaction, have the
@@ -784,19 +778,13 @@ static void
 AtAbort_Memory()
 {
 	Portal		portal;
-	MemoryContext portalContext;
 
 	/* ----------------
-	 *	Release memory in the blank portal.
-	 *	Since EndPortalAllocMode implicitly works on the current context,
-	 *	first make real sure that the blank portal is the selected context.
-	 *	(This is ESSENTIAL in case we aborted from someplace where it wasn't.)
+	 *	Release all heap memory in the blank portal.
 	 * ----------------
 	 */
 	portal = GetPortalByName(NULL);
-	portalContext = (MemoryContext) PortalGetHeapMemory(portal);
-	MemoryContextSwitchTo(portalContext);
-	EndPortalAllocMode();
+	PortalResetHeapMemory(portal);
 
 	/* ----------------
 	 *	Now that we're "out" of a transaction, have the
diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c
@@ -7,7 +7,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.28 1999/07/17 20:18:15 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.29 1999/09/09 16:25:29 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -83,7 +83,6 @@
 static void CollectNamedPortals(Portal *portalP, int destroy);
 static Portal PortalHeapMemoryGetPortal(PortalHeapMemory context);
 static PortalVariableMemory PortalHeapMemoryGetVariableMemory(PortalHeapMemory context);
-static void PortalResetHeapMemory(Portal portal);
 static Portal PortalVariableMemoryGetPortal(PortalVariableMemory context);
 
 /* ----------------
@@ -838,7 +837,7 @@ PortalDestroy(Portal *portalP)
  *		BadArg if mode is invalid.
  * ----------------
  */
-static void
+void
 PortalResetHeapMemory(Portal portal)
 {
 	PortalHeapMemory context;
diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h
@@ -6,7 +6,7 @@
  *
  * Copyright (c) 1994, Regents of the University of California
  *
- * $Id: portal.h,v 1.17 1999/07/15 23:04:23 momjian Exp $
+ * $Id: portal.h,v 1.18 1999/09/09 16:25:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -75,6 +75,7 @@ extern Portal CreatePortal(char *name);
 extern void PortalDestroy(Portal *portalP);
 extern void StartPortalAllocMode(AllocMode mode, Size limit);
 extern void EndPortalAllocMode(void);
+extern void PortalResetHeapMemory(Portal portal);
 extern PortalVariableMemory PortalGetVariableMemory(Portal portal);
 extern PortalHeapMemory PortalGetHeapMemory(Portal portal);
 

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`*`
`8`	`8`	`*`
`9`	`9`	`* IDENTIFICATION`
`10`		`- * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.28 1999/07/17 20:18:15 momjian Exp $`
	`10`	`+ * $Header: /cvsroot/pgsql/src/backend/utils/mmgr/portalmem.c,v 1.29 1999/09/09 16:25:29 tgl Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -83,7 +83,6 @@`
`83`	`83`	`static void CollectNamedPortals(Portal *portalP, int destroy);`
`84`	`84`	`static Portal PortalHeapMemoryGetPortal(PortalHeapMemory context);`
`85`	`85`	`static PortalVariableMemory PortalHeapMemoryGetVariableMemory(PortalHeapMemory context);`
`86`		`-static void PortalResetHeapMemory(Portal portal);`
`87`	`86`	`static Portal PortalVariableMemoryGetPortal(PortalVariableMemory context);`
`88`	`87`
`89`	`88`	`/* ----------------`
`@@ -838,7 +837,7 @@ PortalDestroy(Portal *portalP)`
`838`	`837`	`* BadArg if mode is invalid.`
`839`	`838`	`* ----------------`
`840`	`839`	`*/`
`841`		`-static void`
	`840`	`+void`
`842`	`841`	`PortalResetHeapMemory(Portal portal)`
`843`	`842`	`{`
`844`	`843`	`PortalHeapMemory context;`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`* Copyright (c) 1994, Regents of the University of California`
`8`	`8`	`*`
`9`		`- * $Id: portal.h,v 1.17 1999/07/15 23:04:23 momjian Exp $`
	`9`	`+ * $Id: portal.h,v 1.18 1999/09/09 16:25:23 tgl Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -75,6 +75,7 @@ extern Portal CreatePortal(char *name);`
`75`	`75`	`extern void PortalDestroy(Portal *portalP);`
`76`	`76`	`extern void StartPortalAllocMode(AllocMode mode, Size limit);`
`77`	`77`	`extern void EndPortalAllocMode(void);`
	`78`	`+extern void PortalResetHeapMemory(Portal portal);`
`78`	`79`	`extern PortalVariableMemory PortalGetVariableMemory(Portal portal);`
`79`	`80`	`extern PortalHeapMemory PortalGetHeapMemory(Portal portal);`
`80`	`81`