From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 5 Mar 2004 00:21:51 +0000 (+0000)
Subject: Fix log_executor_stats for non-multi queries.  Backpatch to 7.4.X.
X-Git-Tag: REL7_4_2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4a6bf72c6576dafab8bbd6dd23b0d2ff00de1d4b;p=thirdparty%2Fpostgresql.git

Fix log_executor_stats for non-multi queries.  Backpatch to 7.4.X.
---

diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index 22cb49f973b..4ff3d8c7ba0 100644
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.73 2003/09/25 18:58:35 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/pquery.c,v 1.73.2.1 2004/03/05 00:21:51 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -406,6 +406,17 @@ PortalRun(Portal portal, long count,
 	if (completionTag)
 		completionTag[0] = '\0';
 
+	if (portal->strategy != PORTAL_MULTI_QUERY)
+	{
+		ereport(DEBUG3,
+			(errmsg_internal("PortalRun")));
+		/* PORTAL_MULTI_QUERY logs its own stats per query */
+		if (log_executor_stats)
+			ResetUsage();
+	}
+	
+	if (log_executor_stats && portal->strategy != PORTAL_MULTI_QUERY)
+
 	/*
 	 * Check for improper portal use, and mark portal active.
 	 */
@@ -500,6 +511,9 @@ PortalRun(Portal portal, long count,
 	PortalContext = savePortalContext;
 	QueryContext = saveQueryContext;
 
+	if (log_executor_stats && portal->strategy != PORTAL_MULTI_QUERY)
+		ShowUsage("EXECUTOR STATISTICS");
+
 	return result;
 }