Persuade GIN to react to control-C in a reasonable amount of time

while building a GIN index.

diff --git a/src/backend/access/gin/gininsert.c b/src/backend/access/gin/gininsert.c
index 4449928caeead00b57800c0d5bd6f1524cd85ce6..654bf137e23fafec79e11ecbaa02d591cd68501e 100644 (file)
--- a/src/backend/access/gin/gininsert.c
+++ b/src/backend/access/gin/gininsert.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *         $PostgreSQL: pgsql/src/backend/access/gin/gininsert.c,v 1.12 2008/05/12 00:00:44 alvherre Exp $
+ *         $PostgreSQL: pgsql/src/backend/access/gin/gininsert.c,v 1.13 2008/05/16 01:27:06 tgl Exp $
  *-------------------------------------------------------------------------
  */
 
@@ -246,7 +246,11 @@ ginBuildCallback(Relation index, HeapTuple htup, Datum *values,
        uint32      nlist;
 
        while ((list = ginGetEntry(&buildstate->accum, &entry, &nlist)) != NULL)
+       {
+           /* there could be many entries, so be willing to abort here */
+           CHECK_FOR_INTERRUPTS();
            ginEntryInsert(index, &buildstate->ginstate, entry, list, nlist, TRUE);
+       }
 
        MemoryContextReset(buildstate->tmpCtx);
        ginInitBA(&buildstate->accum);
@@ -331,9 +335,14 @@ ginbuild(PG_FUNCTION_ARGS)
    reltuples = IndexBuildHeapScan(heap, index, indexInfo,
                                   ginBuildCallback, (void *) &buildstate);
 
+   /* dump remaining entries to the index */
    oldCtx = MemoryContextSwitchTo(buildstate.tmpCtx);
    while ((list = ginGetEntry(&buildstate.accum, &entry, &nlist)) != NULL)
+   {
+       /* there could be many entries, so be willing to abort here */
+       CHECK_FOR_INTERRUPTS();
        ginEntryInsert(index, &buildstate.ginstate, entry, list, nlist, TRUE);
+   }
    MemoryContextSwitchTo(oldCtx);
 
    MemoryContextDelete(buildstate.tmpCtx);