From: Marko Kreen <markokr@gmail.com>
Date: Wed, 19 Nov 2008 11:27:33 +0000 (+0000)
Subject: If query is canceled by user, send cancel request
X-Git-Tag: plproxy_2_0_8rc1~6
X-Git-Url: http://git.postgresql.org/gitweb/review?a=commitdiff_plain;h=6ccba1a3a85bbfc9b3a5597020802fb5386b21e7;p=plproxy.git

If query is canceled by user, send cancel request
to remote databases too.

Patch by Ye Wenbin
---

diff --git a/src/execute.c b/src/execute.c
index a8b8cd0..385677a 100644
--- a/src/execute.c
+++ b/src/execute.c
@@ -31,6 +31,16 @@
 
 #include "poll_compat.h"
 
+#if PG_VERSION_NUM < 80400
+static int geterrcode(void)
+{
+	ErrorData *edata = CopyErrorData();
+	int code = edata->sqlerrcode;
+	FreeErrorData(edata); /* unnecessary? */
+	return code;
+}
+#endif
+
 /* some error happened */
 static void
 conn_error(ProxyFunction *func, ProxyConnection *conn, const char *desc)
@@ -613,6 +623,40 @@ remote_execute(ProxyFunction *func,
 	}
 }
 
+static void
+remote_cancel(ProxyFunction *func)
+{
+	ProxyConnection *conn;
+	ProxyCluster *cluster = func->cur_cluster;
+	PGcancel *cancel;
+	char errbuf[256];
+	int ret;
+	int i;
+
+	if (cluster == NULL)
+		return;
+
+	for (i = 0; i < cluster->conn_count; i++)
+	{
+		conn = &cluster->conn_list[i];
+		if (conn->state == C_NONE ||
+			conn->state == C_READY ||
+			conn->state == C_DONE)
+			continue;
+
+		cancel = PQgetCancel(conn->db);
+		if (cancel == NULL)
+		{
+			elog(NOTICE, "Invalid connection!");
+			continue;
+		}
+		ret = PQcancel(cancel, errbuf, sizeof(errbuf));
+		PQfreeCancel(cancel);
+		if (ret == 0)
+			elog(NOTICE, "Cancel query failed!");
+	}
+}
+
 /* Run hash function and tag connections */
 static void
 tag_hash_partitions(ProxyFunction *func, FunctionCallInfo fcinfo)
@@ -751,8 +795,21 @@ plproxy_exec(ProxyFunction *func, FunctionCallInfo fcinfo)
 		}
 	}
 
-	if (gotbin)
-		remote_execute(func, values, plengths, pformats);
-	else
-		remote_execute(func, values, NULL, NULL);
+	/*
+	 * Run query.  On cancel, send cancel request to partitions too.
+	 */
+	PG_TRY();
+	{
+		if (gotbin)
+			remote_execute(func, values, plengths, pformats);
+		else
+			remote_execute(func, values, NULL, NULL);
+	}
+	PG_CATCH();
+	{
+		if (geterrcode() == ERRCODE_QUERY_CANCELED)
+			remote_cancel(func);
+		PG_RE_THROW();
+	}
+	PG_END_TRY();
 }