postgres.git / summary / log / commit / refs

commit    a7496aee617314d77b52ee22c8f1f677888902ae
Author:   Teodor Sigaev <teodor@sigaev.ru>
Date:     Mon Sep 07 14:20:44 2015 +0000

    Make GIN's cleanup pending list process interruptable
    
    Cleanup process could be called by ordinary insert/update and could take a lot
    of time. Add vacuum_delay_point() to make this process interruptable. Under
    vacuum this call will also throttle a vacuum process to decrease system load,
    called from insert/update it will not throttle, and that reduces a latency.
    
    Backpatch for all supported branches.
    
    Jeff Janes <jeff.janes@gmail.com>


 src/backend/access/gin/ginfast.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c
index 6629d3ccafc..0c2b19884f7 100644
--- a/src/backend/access/gin/ginfast.c
+++ b/src/backend/access/gin/ginfast.c
@@ -759,8 +759,7 @@ ginInsertCleanup(Relation index, GinState *ginstate,
 		 */
 		processPendingPage(&accum, &datums, page, FirstOffsetNumber);
 
-		if (vac_delay)
-			vacuum_delay_point();
+		vacuum_delay_point();
 
 		/*
 		 * Is it time to flush memory to disk?	Flush if we are at the end of
@@ -797,8 +796,7 @@ ginInsertCleanup(Relation index, GinState *ginstate,
 			while ((list = ginGetEntry(&accum, &attnum, &entry, &nlist)) != NULL)
 			{
 				ginEntryInsert(index, ginstate, attnum, entry, list, nlist, FALSE);
-				if (vac_delay)
-					vacuum_delay_point();
+				vacuum_delay_point();
 			}
 
 			/*
@@ -877,7 +875,7 @@ ginInsertCleanup(Relation index, GinState *ginstate,
 		/*
 		 * Read next page in pending list
 		 */
-		CHECK_FOR_INTERRUPTS();
+		vacuum_delay_point();
 		buffer = ReadBuffer(index, blkno);
 		LockBuffer(buffer, GIN_SHARE);
 		page = BufferGetPage(buffer);


[parent: fad42aae97bf]