Fix heap_multi_insert to set t_self field in the caller's tuples.

hlinnaka · hlinnaka · commit 21b16342750d · 2012-02-13T10:20:50.000+02:00
If tuples were toasted, heap_multi_insert didn't update the ctid on the
original tuples. This caused a failure if there was an after trigger
(including a foreign key), on the table, and a tuple got toasted.

Per off-list report and test case from Ted Phelps
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
@@ -2291,6 +2291,14 @@ heap_multi_insert(Relation relation, HeapTuple *tuples, int ntuples,
 			CacheInvalidateHeapTuple(relation, heaptuples[i], NULL);
 	}
 
+	/*
+	 * Copy t_self fields back to the caller's original tuples. This does
+	 * nothing for untoasted tuples (tuples[i] == heaptuples[i)], but it's
+	 * probably faster to always copy than check.
+	 */
+	for (i = 0; i < ntuples; i++)
+		tuples[i]->t_self = heaptuples[i]->t_self;
+
 	pgstat_count_heap_insert(relation, ntuples);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -2291,6 +2291,14 @@ heap_multi_insert(Relation relation, HeapTuple *tuples, int ntuples,`
`2291`	`2291`	`CacheInvalidateHeapTuple(relation, heaptuples[i], NULL);`
`2292`	`2292`	`}`
`2293`	`2293`
	`2294`	`+ /*`
	`2295`	`+ * Copy t_self fields back to the caller's original tuples. This does`
	`2296`	`+ * nothing for untoasted tuples (tuples[i] == heaptuples[i)], but it's`
	`2297`	`+ * probably faster to always copy than check.`
	`2298`	`+ */`
	`2299`	`+ for (i = 0; i < ntuples; i++)`
	`2300`	`+ tuples[i]->t_self = heaptuples[i]->t_self;`
	`2301`	`+`
`2294`	`2302`	`pgstat_count_heap_insert(relation, ntuples);`
`2295`	`2303`	`}`
`2296`	`2304`