Allow _h_indexbuild() to be interrupted.

tglsfdc · tglsfdc · commit fae55f0bb385 · 2024-09-13T16:17:04.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
@@ -148,6 +148,9 @@ _h_indexbuild(HSpool *hspool, Relation heapRel)
 		/* the tuples are sorted by hashkey, so pass 'sorted' as true */
 		_hash_doinsert(hspool->index, itup, heapRel, true);
 
+		/* 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
`@@ -148,6 +148,9 @@ _h_indexbuild(HSpool *hspool, Relation heapRel)`
`148`	`148`	`/* the tuples are sorted by hashkey, so pass 'sorted' as true */`
`149`	`149`	`_hash_doinsert(hspool->index, itup, heapRel, true);`
`150`	`150`
	`151`	`+ /* allow insertion phase to be interrupted, and track progress */`
	`152`	`+ CHECK_FOR_INTERRUPTS();`
	`153`	`+`
`151`	`154`	`pgstat_progress_update_param(PROGRESS_CREATEIDX_TUPLES_DONE,`
`152`	`155`	`++tups_done);`
`153`	`156`	`}`