Cancel query support from Massimo

bmomjian · bmomjian · commit 12a932251c9c · 1999-09-27T20:00:44.000Z
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
@@ -6,7 +6,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.88 1999/09/18 19:06:40 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.89 1999/09/27 20:00:44 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -29,6 +29,7 @@
 #include "lib/stringinfo.h"
 #include "libpq/libpq.h"
 #include "miscadmin.h"
+#include "tcop/tcopprot.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
 #include "utils/syscache.h"
@@ -414,6 +415,8 @@ CopyTo(Relation rel, bool binary, bool oids, FILE *fp, char *delim)
 
 	while (HeapTupleIsValid(tuple = heap_getnext(scandesc, 0)))
 	{
+		if (QueryCancel)
+			CancelQuery();
 
 		if (oids && !binary)
 		{
@@ -686,6 +689,9 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE *fp, char *delim)
 
 	while (!done)
 	{
+		if (QueryCancel)
+			CancelQuery();
+
 		if (!binary)
 		{
 			int			newline = 0;

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`*`
`7`	`7`	`*`
`8`	`8`	`* IDENTIFICATION`
`9`		`- * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.88 1999/09/18 19:06:40 tgl Exp $`
	`9`	`+ * $Header: /cvsroot/pgsql/src/backend/commands/copy.c,v 1.89 1999/09/27 20:00:44 momjian Exp $`
`10`	`10`	`*`
`11`	`11`	`*-------------------------------------------------------------------------`
`12`	`12`	`*/`
`@@ -29,6 +29,7 @@`
`29`	`29`	`#include "lib/stringinfo.h"`
`30`	`30`	`#include "libpq/libpq.h"`
`31`	`31`	`#include "miscadmin.h"`
	`32`	`+#include "tcop/tcopprot.h"`
`32`	`33`	`#include "utils/acl.h"`
`33`	`34`	`#include "utils/builtins.h"`
`34`	`35`	`#include "utils/syscache.h"`
`@@ -414,6 +415,8 @@ CopyTo(Relation rel, bool binary, bool oids, FILE fp, char delim)`
`414`	`415`
`415`	`416`	`while (HeapTupleIsValid(tuple = heap_getnext(scandesc, 0)))`
`416`	`417`	`{`
	`418`	`+ if (QueryCancel)`
	`419`	`+ CancelQuery();`
`417`	`420`
`418`	`421`	`if (oids && !binary)`
`419`	`422`	`{`
`@@ -686,6 +689,9 @@ CopyFrom(Relation rel, bool binary, bool oids, FILE fp, char delim)`
`686`	`689`
`687`	`690`	`while (!done)`
`688`	`691`	`{`
	`692`	`+ if (QueryCancel)`
	`693`	`+ CancelQuery();`
	`694`	`+`
`689`	`695`	`if (!binary)`
`690`	`696`	`{`
`691`	`697`	`int newline = 0;`