Need to switch to tuples memory context when replacing the toasted

Jan Wieck · Jan Wieck · commit 0143d391c637 · 2000-07-21T11:18:51.000Z
one with the plain one.

Jan
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.80 2000/07/21 10:31:30 wieck Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.81 2000/07/21 11:18:51 wieck Exp $
  *
  *
  * INTERFACE ROUTINES
@@ -1360,7 +1360,11 @@ heap_insert(Relation relation, HeapTuple tup)
 	{
 		if (tup->t_datamcxt != NULL && (char *) (tup->t_data) !=
 					((char *) tup + HEAPTUPLESIZE))
+		{
+			MemoryContext oldcxt = MemoryContextSwitchTo(tup->t_datamcxt);
 			pfree(tup->t_data);
+			MemoryContextSwitchTo(oldcxt);
+		}
 	    tup->t_data = plaintdata;
 		tup->t_len  = plaintlen;
 	}
@@ -1672,7 +1676,11 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,
 	{
 		if (newtup->t_datamcxt != NULL && (char *) (newtup->t_data) !=
 					((char *) newtup + HEAPTUPLESIZE))
+		{
+			MemoryContext oldcxt = MemoryContextSwitchTo(newtup->t_datamcxt);
 			pfree(newtup->t_data);
+			MemoryContextSwitchTo(oldcxt);
+		}
 	    newtup->t_data = plaintdata;
 		newtup->t_len  = plaintlen;
 	}

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.80 2000/07/21 10:31:30 wieck Exp $`
	`11`	`+ * $Header: /cvsroot/pgsql/src/backend/access/heap/heapam.c,v 1.81 2000/07/21 11:18:51 wieck Exp $`
`12`	`12`	`*`
`13`	`13`	`*`
`14`	`14`	`* INTERFACE ROUTINES`
`@@ -1360,7 +1360,11 @@ heap_insert(Relation relation, HeapTuple tup)`
`1360`	`1360`	`{`
`1361`	`1361`	`if (tup->t_datamcxt != NULL && (char *) (tup->t_data) !=`
`1362`	`1362`	`((char *) tup + HEAPTUPLESIZE))`
	`1363`	`+ {`
	`1364`	`+ MemoryContext oldcxt = MemoryContextSwitchTo(tup->t_datamcxt);`
`1363`	`1365`	`pfree(tup->t_data);`
	`1366`	`+ MemoryContextSwitchTo(oldcxt);`
	`1367`	`+ }`
`1364`	`1368`	`tup->t_data = plaintdata;`
`1365`	`1369`	`tup->t_len = plaintlen;`
`1366`	`1370`	`}`
`@@ -1672,7 +1676,11 @@ heap_update(Relation relation, ItemPointer otid, HeapTuple newtup,`
`1672`	`1676`	`{`
`1673`	`1677`	`if (newtup->t_datamcxt != NULL && (char *) (newtup->t_data) !=`
`1674`	`1678`	`((char *) newtup + HEAPTUPLESIZE))`
	`1679`	`+ {`
	`1680`	`+ MemoryContext oldcxt = MemoryContextSwitchTo(newtup->t_datamcxt);`
`1675`	`1681`	`pfree(newtup->t_data);`
	`1682`	`+ MemoryContextSwitchTo(oldcxt);`
	`1683`	`+ }`
`1676`	`1684`	`newtup->t_data = plaintdata;`
`1677`	`1685`	`newtup->t_len = plaintlen;`
`1678`	`1686`	`}`