Allow ALTER TABLE .. SET TABLESPACE to be interrupted.

robertmhaas · robertmhaas · commit 6ec7b0bd1bd5 · 2010-07-01T14:10:42.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.142.4.11 2009/12/09 21:58:54 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.142.4.12 2010/07/01 14:10:42 rhaas Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -5756,6 +5756,9 @@ copy_relation_data(Relation rel, 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, 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.142.4.11 2009/12/09 21:58:54 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/commands/tablecmds.c,v 1.142.4.12 2010/07/01 14:10:42 rhaas Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -5756,6 +5756,9 @@ copy_relation_data(Relation rel, SMgrRelation dst)`
`5756`	`5756`
`5757`	`5757`	`for (blkno = 0; blkno < nblocks; blkno++)`
`5758`	`5758`	`{`
	`5759`	`+ /* If we got a cancel signal during the copy of the data, quit */`
	`5760`	`+ CHECK_FOR_INTERRUPTS();`
	`5761`	`+`
`5759`	`5762`	`smgrread(src, blkno, buf);`
`5760`	`5763`
`5761`	`5764`	`/* XLOG stuff */`