Add vacuum_delay_point call in compute_index_stats's per-sample-row loop.

tglsfdc · tglsfdc · commit 152c94632f1e · 2015-03-29T15:04:38.000-04:00
Slow functions in index expressions might cause this loop to take long
enough to make it worth being cancellable.  Probably it would be enough
to call CHECK_FOR_INTERRUPTS here, but for consistency with other
per-sample-row loops in this file, let's use vacuum_delay_point.

Report and patch by Jeff Janes.  Back-patch to all supported branches.
diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
@@ -679,6 +679,8 @@ compute_index_stats(Relation onerel, double totalrows,
 		{
 			HeapTuple	heapTuple = rows[rowno];
 
+			vacuum_delay_point();
+
 			/*
 			 * Reset the per-tuple context each time, to reclaim any cruft
 			 * left behind by evaluating the predicate or index expressions.

Original file line number	Diff line number	Diff line change
`@@ -679,6 +679,8 @@ compute_index_stats(Relation onerel, double totalrows,`
`679`	`679`	`{`
`680`	`680`	`HeapTuple heapTuple = rows[rowno];`
`681`	`681`
	`682`	`+ vacuum_delay_point();`
	`683`	`+`
`682`	`684`	`/*`
`683`	`685`	`* Reset the per-tuple context each time, to reclaim any cruft`
`684`	`686`	`* left behind by evaluating the predicate or index expressions.`