Allow _h_indexbuild() to be interrupted.

tglsfdc · tglsfdc · commit e0857898b87b · 2024-09-13T16:16:47.000-04:00
When we are building a hash index that is large enough to need pre-sorting (larger than either maintenance_work_mem or NBuffers), the initial sorting phase is interruptible, but the insertion phase wasn't. Add the missing CHECK_FOR_INTERRUPTS(). Per bug #18616 from Alexander Lakhin. Back-patch to all supported branches. Pavel Borisov Discussion: https://postgr.es/m/18616-acbb9e5caf41e964@postgresql.org
diff --git a/src/backend/access/hash/hashsort.c b/src/backend/access/hash/hashsort.c
@@ -146,6 +146,9 @@ _h_indexbuild(HSpool *hspool, Relation heapRel)
 
 		_hash_doinsert(hspool->index, itup, heapRel);
 
+		/* allow insertion phase to be interrupted, and track progress */
+		CHECK_FOR_INTERRUPTS();
+
 		pgstat_progress_update_param(PROGRESS_CREATEIDX_TUPLES_DONE,
 									 ++tups_done);
 	}

Original file line number	Diff line number	Diff line change
`@@ -146,6 +146,9 @@ _h_indexbuild(HSpool *hspool, Relation heapRel)`
`146`	`146`
`147`	`147`	`_hash_doinsert(hspool->index, itup, heapRel);`
`148`	`148`
	`149`	`+ /* allow insertion phase to be interrupted, and track progress */`
	`150`	`+ CHECK_FOR_INTERRUPTS();`
	`151`	`+`
`149`	`152`	`pgstat_progress_update_param(PROGRESS_CREATEIDX_TUPLES_DONE,`
`150`	`153`	`++tups_done);`
`151`	`154`	`}`