Do a CHECK_FOR_INTERRUPTS immediately before terminating a fastpath

tglsfdc · tglsfdc · commit 067e40cc6d1c · 2006-06-14T01:24:14.000Z
function call.  Previously, there may have been no CHECK_FOR_INTERRUPTS
at all in the fastpath code path, making it impossible to cancel an
operation such as \lo_import externally.  This addition doesn't ensure
you can cancel, since your SIGINT may arrive while the backend is idle
waiting for the client, but it gives the largest window we can easily
provide.  Noted while experimenting with new control-C code for psql.
diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tcop/fastpath.c,v 1.87 2006/06/11 15:49:28 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/fastpath.c,v 1.88 2006/06/14 01:24:14 tgl Exp $
  *
  * NOTES
  *	  This cruft is the server side of PQfn.
@@ -382,6 +382,9 @@ HandleFunctionRequest(StringInfo msgBuf)
 		retval = (Datum) 0;
 	}
 
+	/* ensure we do at least one CHECK_FOR_INTERRUPTS per function call */
+	CHECK_FOR_INTERRUPTS();
+
 	SendFunctionResult(retval, fcinfo.isnull, fip->rettype, rformat);
 
 	return 0;

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/tcop/fastpath.c,v 1.87 2006/06/11 15:49:28 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/backend/tcop/fastpath.c,v 1.88 2006/06/14 01:24:14 tgl Exp $`
`12`	`12`	`*`
`13`	`13`	`* NOTES`
`14`	`14`	`* This cruft is the server side of PQfn.`
`@@ -382,6 +382,9 @@ HandleFunctionRequest(StringInfo msgBuf)`
`382`	`382`	`retval = (Datum) 0;`
`383`	`383`	`}`
`384`	`384`
	`385`	`+ /* ensure we do at least one CHECK_FOR_INTERRUPTS per function call */`
	`386`	`+ CHECK_FOR_INTERRUPTS();`
	`387`	`+`
`385`	`388`	`SendFunctionResult(retval, fcinfo.isnull, fip->rettype, rformat);`
`386`	`389`
`387`	`390`	`return 0;`