Allow ALTER TABLE .. SET TABLESPACE to be interrupted.

robertmhaas · robertmhaas · commit c6cf3060d69d · 2010-07-01T14:10:21.000Z
Backpatch to 8.0, where tablespaces were introduced.

Guillaume Lelarge
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.330 2010/04/28 16:10:41 heikki Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.331 2010/07/01 14:10:21 rhaas Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -7049,6 +7049,9 @@ copy_relation_data(SMgrRelation src, SMgrRelation dst,
 
 	for (blkno = 0; blkno < nblocks; blkno++)
 	{
+        /* If we got a cancel signal during the copy of the data, quit */
+        CHECK_FOR_INTERRUPTS();
+        
 		smgrread(src, forkNum, blkno, buf);
 
 		/* XLOG stuff */

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.330 2010/04/28 16:10:41 heikki Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.331 2010/07/01 14:10:21 rhaas Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -7049,6 +7049,9 @@ copy_relation_data(SMgrRelation src, SMgrRelation dst,`
`7049`	`7049`
`7050`	`7050`	`for (blkno = 0; blkno < nblocks; blkno++)`
`7051`	`7051`	`{`
	`7052`	`+ /* If we got a cancel signal during the copy of the data, quit */`
	`7053`	`+ CHECK_FOR_INTERRUPTS();`
	`7054`	`+`
`7052`	`7055`	`smgrread(src, forkNum, blkno, buf);`
`7053`	`7056`
`7054`	`7057`	`/* XLOG stuff */`