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

tglsfdc · tglsfdc · commit d12afe114403 · 2015-03-29T15:04:28.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
@@ -738,6 +738,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
`@@ -738,6 +738,8 @@ compute_index_stats(Relation onerel, double totalrows,`
`738`	`738`	`{`
`739`	`739`	`HeapTuple heapTuple = rows[rowno];`
`740`	`740`
	`741`	`+ vacuum_delay_point();`
	`742`	`+`
`741`	`743`	`/*`
`742`	`744`	`* Reset the per-tuple context each time, to reclaim any cruft`
`743`	`745`	`* left behind by evaluating the predicate or index expressions.`