Add a CHECK_FOR_INTERRUPTS() to the loop in ExecMakeTableFunctionResult.

tglsfdc · tglsfdc · commit bbfa1c39a146 · 2006-03-10T01:51:23.000Z
Otherwise you can't cancel queries like select ... from generate_series(1,1000000).
diff --git a/src/backend/executor/execQual.c b/src/backend/executor/execQual.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.188 2006/03/05 15:58:26 momjian Exp $
+ *	  $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.189 2006/03/10 01:51:23 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1280,6 +1280,8 @@ ExecMakeTableFunctionResult(ExprState *funcexpr,
 		Datum		result;
 		HeapTuple	tuple;
 
+		CHECK_FOR_INTERRUPTS();
+
 		/*
 		 * reset per-tuple memory context before each call of the function or
 		 * expression. This cleans up any local memory the function may leak

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/executor/execQual.c,v 1.188 2006/03/05 15:58:26 momjian Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/executor/execQual.c,v 1.189 2006/03/10 01:51:23 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -1280,6 +1280,8 @@ ExecMakeTableFunctionResult(ExprState *funcexpr,`
`1280`	`1280`	`Datum result;`
`1281`	`1281`	`HeapTuple tuple;`
`1282`	`1282`
	`1283`	`+ CHECK_FOR_INTERRUPTS();`
	`1284`	`+`
`1283`	`1285`	`/*`
`1284`	`1286`	`* reset per-tuple memory context before each call of the function or`
`1285`	`1287`	`* expression. This cleans up any local memory the function may leak`