Do a CHECK_FOR_INTERRUPTS after emitting a message of less than ERROR

tglsfdc · tglsfdc · commit 8e4fe3ba1ed8 · 2006-10-01T22:08:18.000Z
severity.  This is to ensure the user can cancel a query that's spitting
out lots of notice/warning messages, even if they're coming from a loop
that doesn't otherwise contain a CHECK_FOR_INTERRUPTS.  Per gripe from
Stephen Frost.
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
@@ -42,7 +42,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.174 2006/09/27 18:40:09 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.175 2006/10/01 22:08:18 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -451,7 +451,14 @@ errfinish(int dummy,...)
 		abort();
 	}
 
-	/* We reach here if elevel <= WARNING. OK to return to caller. */
+	/*
+	 * We reach here if elevel <= WARNING. OK to return to caller.
+	 *
+	 * But check for cancel/die interrupt first --- this is so that the user
+	 * can stop a query emitting tons of notice or warning messages, even if
+	 * it's in a loop that otherwise fails to check for interrupts.
+	 */
+	CHECK_FOR_INTERRUPTS();
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@`
`42`	`42`	`*`
`43`	`43`	`*`
`44`	`44`	`* IDENTIFICATION`
`45`		`- * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.174 2006/09/27 18:40:09 tgl Exp $`
	`45`	`+ * $PostgreSQL: pgsql/src/backend/utils/error/elog.c,v 1.175 2006/10/01 22:08:18 tgl Exp $`
`46`	`46`	`*`
`47`	`47`	`*-------------------------------------------------------------------------`
`48`	`48`	`*/`
`@@ -451,7 +451,14 @@ errfinish(int dummy,...)`
`451`	`451`	`abort();`
`452`	`452`	`}`
`453`	`453`
`454`		`- /* We reach here if elevel <= WARNING. OK to return to caller. */`
	`454`	`+ /*`
	`455`	`+ * We reach here if elevel <= WARNING. OK to return to caller.`
	`456`	`+ *`
	`457`	`+ * But check for cancel/die interrupt first --- this is so that the user`
	`458`	`+ * can stop a query emitting tons of notice or warning messages, even if`
	`459`	`+ * it's in a loop that otherwise fails to check for interrupts.`
	`460`	`+ */`
	`461`	`+ CHECK_FOR_INTERRUPTS();`
`455`	`462`	`}`
`456`	`463`
`457`	`464`