Avoid memory leakage during VACUUM FULL when an index expression or

tglsfdc · tglsfdc · commit 08457504f01b · 2004-12-23T22:42:15.000Z
index predicate uses temporary memory for evaluation.  Per example
from Jean-Gerard Pailloncy.
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
@@ -13,7 +13,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.297 2004/12/02 19:28:49 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.298 2004/12/23 22:42:15 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -2553,6 +2553,7 @@ move_chain_tuple(Relation rel,
 	{
 		ExecStoreTuple(&newtup, ec->slot, InvalidBuffer, false);
 		ExecInsertIndexTuples(ec->slot, &(newtup.t_self), ec->estate, true);
+		ResetPerTupleExprContext(ec->estate);
 	}
 }
 
@@ -2662,6 +2663,7 @@ move_plain_tuple(Relation rel,
 	{
 		ExecStoreTuple(&newtup, ec->slot, InvalidBuffer, false);
 		ExecInsertIndexTuples(ec->slot, &(newtup.t_self), ec->estate, true);
+		ResetPerTupleExprContext(ec->estate);
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`*`
`14`	`14`	`*`
`15`	`15`	`* IDENTIFICATION`
`16`		`- * $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.297 2004/12/02 19:28:49 tgl Exp $`
	`16`	`+ * $PostgreSQL: pgsql/src/backend/commands/vacuum.c,v 1.298 2004/12/23 22:42:15 tgl Exp $`
`17`	`17`	`*`
`18`	`18`	`*-------------------------------------------------------------------------`
`19`	`19`	`*/`
`@@ -2553,6 +2553,7 @@ move_chain_tuple(Relation rel,`
`2553`	`2553`	`{`
`2554`	`2554`	`ExecStoreTuple(&newtup, ec->slot, InvalidBuffer, false);`
`2555`	`2555`	`ExecInsertIndexTuples(ec->slot, &(newtup.t_self), ec->estate, true);`
	`2556`	`+ ResetPerTupleExprContext(ec->estate);`
`2556`	`2557`	`}`
`2557`	`2558`	`}`
`2558`	`2559`
`@@ -2662,6 +2663,7 @@ move_plain_tuple(Relation rel,`
`2662`	`2663`	`{`
`2663`	`2664`	`ExecStoreTuple(&newtup, ec->slot, InvalidBuffer, false);`
`2664`	`2665`	`ExecInsertIndexTuples(ec->slot, &(newtup.t_self), ec->estate, true);`
	`2666`	`+ ResetPerTupleExprContext(ec->estate);`
`2665`	`2667`	`}`
`2666`	`2668`	`}`
`2667`	`2669`