Restructure command-completion-report code so that there is just one

report for each received SQL command, regardless of rewriting activity.
Also ensure that this report comes from the 'original' command, not the
last command generated by rewrite; this fixes 7.2 breakage for INSERT
commands that have actions added by rules.  Fernando Nasser and Tom Lane.

Author: tglsfdc

src/backend/commands/command.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.154 2002/02/19 20:11:12 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/commands/Attic/command.c,v 1.155 2002/02/26 22:47:04 tgl Exp $
  *
  * NOTES
  *	  The PerformAddAttribute() code, like most of the relation
@@ -89,16 +89,25 @@ PortalCleanup(Portal portal)
 	MemoryContextSwitchTo(oldcontext);
 }
 
-/* --------------------------------
- *		PerformPortalFetch
- * --------------------------------
+
+/*
+ * PerformPortalFetch
+ *
+ *	name: name of portal
+ *	forward: forward or backward fetch?
+ *	count: # of tuples to fetch (0 implies all)
+ *	dest: where to send results
+ *	completionTag: points to a buffer of size COMPLETION_TAG_BUFSIZE
+ *		in which to store a command completion status string.
+ *
+ * completionTag may be NULL if caller doesn't want a status string.
  */
 void
 PerformPortalFetch(char *name,
 				   bool forward,
 				   int count,
-				   char *tag,
-				   CommandDest dest)
+				   CommandDest dest,
+				   char *completionTag)
 {
 	Portal		portal;
 	QueryDesc  *queryDesc;
@@ -107,6 +116,10 @@ PerformPortalFetch(char *name,
 	CommandId	savedId;
 	bool		temp_desc = false;
 
+	/* initialize completion status in case of early exit */
+	if (completionTag)
+		strcpy(completionTag, (dest == None) ? "MOVE 0" : "FETCH 0");
+
 	/*
 	 * sanity checks
 	 */
@@ -167,7 +180,7 @@ PerformPortalFetch(char *name,
 								 * relations */
 				 false,			/* this is a portal fetch, not a "retrieve
 								 * portal" */
-				 tag,
+				 NULL,			/* not used */
 				 queryDesc->dest);
 
 	/*
@@ -193,16 +206,15 @@ PerformPortalFetch(char *name,
 		{
 			ExecutorRun(queryDesc, estate, EXEC_FOR, (long) count);
 
-			/*
-			 * I use CMD_UPDATE, because no CMD_MOVE or the like exists,
-			 * and I would like to provide the same kind of info as
-			 * CMD_UPDATE
-			 */
-			UpdateCommandInfo(CMD_UPDATE, 0, estate->es_processed);
 			if (estate->es_processed > 0)
 				portal->atStart = false;		/* OK to back up now */
 			if (count <= 0 || (int) estate->es_processed < count)
 				portal->atEnd = true;	/* we retrieved 'em all */
+
+			if (completionTag)
+				snprintf(completionTag, COMPLETION_TAG_BUFSIZE, "%s %u",
+						 (dest == None) ? "MOVE" : "FETCH",
+						 estate->es_processed);
 		}
 	}
 	else
@@ -211,16 +223,15 @@ PerformPortalFetch(char *name,
 		{
 			ExecutorRun(queryDesc, estate, EXEC_BACK, (long) count);
 
-			/*
-			 * I use CMD_UPDATE, because no CMD_MOVE or the like exists,
-			 * and I would like to provide the same kind of info as
-			 * CMD_UPDATE
-			 */
-			UpdateCommandInfo(CMD_UPDATE, 0, estate->es_processed);
 			if (estate->es_processed > 0)
 				portal->atEnd = false;	/* OK to go forward now */
 			if (count <= 0 || (int) estate->es_processed < count)
 				portal->atStart = true; /* we retrieved 'em all */
+
+			if (completionTag)
+				snprintf(completionTag, COMPLETION_TAG_BUFSIZE, "%s %u",
+						 (dest == None) ? "MOVE" : "FETCH",
+						 estate->es_processed);
 		}
 	}
 
@@ -236,11 +247,6 @@ PerformPortalFetch(char *name,
 		pfree(queryDesc);
 
 	MemoryContextSwitchTo(oldcontext);
-
-	/*
-	 * Note: the "end-of-command" tag is returned by higher-level utility
-	 * code
-	 */
 }
 
 /* --------------------------------

src/backend/commands/explain.c

@@ -5,7 +5,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994-5, Regents of the University of California
  *
- * $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.67 2001/10/25 05:49:25 momjian Exp $
+ * $Header: /cvsroot/pgsql/src/backend/commands/explain.c,v 1.68 2002/02/26 22:47:04 tgl Exp $
  *
  */
 
@@ -120,7 +120,7 @@ ExplainOneQuery(Query *query, bool verbose, bool analyze, CommandDest dest)
 		plan->instrument = InstrAlloc();
 
 		gettimeofday(&starttime, NULL);
-		ProcessQuery(query, plan, None);
+		ProcessQuery(query, plan, None, NULL);
 		CommandCounterIncrement();
 		gettimeofday(&endtime, NULL);
 

src/backend/executor/functions.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.47 2001/10/28 06:25:43 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/functions.c,v 1.48 2002/02/26 22:47:05 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -275,7 +275,7 @@ postquel_getnext(execution_state *es)
 		/*
 		 * Process a utility command. (create, destroy...)	DZ - 30-8-1996
 		 */
-		ProcessUtility(es->qd->parsetree->utilityStmt, es->qd->dest);
+		ProcessUtility(es->qd->parsetree->utilityStmt, es->qd->dest, NULL);
 		if (!LAST_POSTQUEL_COMMAND(es))
 			CommandCounterIncrement();
 		return (TupleTableSlot *) NULL;

src/backend/executor/spi.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/executor/spi.c,v 1.65 2002/02/14 15:24:08 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/executor/spi.c,v 1.66 2002/02/26 22:47:05 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1011,7 +1011,7 @@ _SPI_execute(char *src, int tcount, _SPI_plan *plan)
 			res = SPI_OK_UTILITY;
 			if (plan == NULL)
 			{
-				ProcessUtility(queryTree->utilityStmt, None);
+				ProcessUtility(queryTree->utilityStmt, None, NULL);
 				if (!islastquery)
 					CommandCounterIncrement();
 				else
@@ -1085,7 +1085,7 @@ _SPI_execute_plan(_SPI_plan *plan, Datum *Values, char *Nulls, int tcount)
 
 		if (queryTree->commandType == CMD_UTILITY)
 		{
-			ProcessUtility(queryTree->utilityStmt, None);
+			ProcessUtility(queryTree->utilityStmt, None, NULL);
 			if (!islastquery)
 				CommandCounterIncrement();
 			else

src/backend/nodes/copyfuncs.c

@@ -15,7 +15,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.162 2002/02/24 20:20:20 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/copyfuncs.c,v 1.163 2002/02/26 22:47:05 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -1755,6 +1755,7 @@ _copyQuery(Query *from)
 	newnode->isTemp = from->isTemp;
 	newnode->hasAggs = from->hasAggs;
 	newnode->hasSubLinks = from->hasSubLinks;
+	newnode->originalQuery = from->originalQuery;
 
 	Node_Copy(from, newnode, rtable);
 	Node_Copy(from, newnode, jointree);

src/backend/nodes/equalfuncs.c

@@ -20,7 +20,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.110 2002/02/24 20:20:20 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/equalfuncs.c,v 1.111 2002/02/26 22:47:05 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -593,6 +593,7 @@ _equalQuery(Query *a, Query *b)
 		return false;
 	if (a->hasSubLinks != b->hasSubLinks)
 		return false;
+	/* we deliberately ignore originalQuery */
 	if (!equal(a->rtable, b->rtable))
 		return false;
 	if (!equal(a->jointree, b->jointree))

src/backend/nodes/readfuncs.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.113 2001/10/25 05:49:31 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/nodes/readfuncs.c,v 1.114 2002/02/26 22:47:07 tgl Exp $
  *
  * NOTES
  *	  Most of the read functions for plan nodes are tested. (In fact, they
@@ -168,6 +168,9 @@ _readQuery(void)
 	token = pg_strtok(&length); /* get hasSubLinks */
 	local_node->hasSubLinks = strtobool(token);
 
+	/* we always want originalQuery to be false in a read-in query */
+	local_node->originalQuery = false;
+
 	token = pg_strtok(&length); /* skip :rtable */
 	local_node->rtable = nodeRead(true);
 

src/backend/parser/analyze.c

@@ -6,7 +6,7 @@
  * Portions Copyright (c) 1996-2001, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- *	$Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.214 2002/02/25 04:21:55 momjian Exp $
+ *	$Header: /cvsroot/pgsql/src/backend/parser/analyze.c,v 1.215 2002/02/26 22:47:08 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -122,10 +122,11 @@ parse_analyze(Node *parseTree, ParseState *parentParseState)
 {
 	List	   *result = NIL;
 	ParseState *pstate = make_parsestate(parentParseState);
-	Query	   *query;
 	/* Lists to return extra commands from transformation */
-	List *extras_before = NIL;
-	List *extras_after = NIL;
+	List	   *extras_before = NIL;
+	List	   *extras_after = NIL;
+	Query	   *query;
+	List	   *listscan;
 
 	query = transformStmt(pstate, parseTree, &extras_before, &extras_after);
 	release_pstate_resources(pstate);
@@ -144,6 +145,18 @@ parse_analyze(Node *parseTree, ParseState *parentParseState)
 		extras_after = lnext(extras_after);
 	}
 
+	/*
+	 * Make sure that only the original query is marked original.
+	 * We have to do this explicitly since recursive calls of parse_analyze
+	 * will have set originalQuery in some of the added-on queries.
+	 */
+	foreach(listscan, result)
+	{
+		Query  *q = lfirst(listscan);
+
+		q->originalQuery = (q == query);
+	}
+
 	pfree(pstate);
 
 	return result;

src/backend/tcop/dest.c

@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.46 2001/10/28 06:25:51 momjian Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/tcop/dest.c,v 1.47 2002/02/26 22:47:08 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -41,8 +41,6 @@
 #include "libpq/pqformat.h"
 
 
-static char CommandInfo[32] = {0};
-
 /* ----------------
  *		dummy DestReceiver functions
  * ----------------
@@ -102,7 +100,6 @@ BeginCommand(char *pname,
 			 * if this is a "retrieve into portal" query, done because
 			 * nothing needs to be sent to the fe.
 			 */
-			CommandInfo[0] = '\0';
 			if (isIntoPortal)
 				break;
 
@@ -198,30 +195,22 @@ DestToFunction(CommandDest dest)
 }
 
 /* ----------------
- *		EndCommand - tell destination that no more tuples will arrive
+ *		EndCommand - tell destination that query is complete
  * ----------------
  */
 void
-EndCommand(char *commandTag, CommandDest dest)
+EndCommand(const char *commandTag, CommandDest dest)
 {
-	char		buf[64];
-
 	switch (dest)
 	{
 		case Remote:
 		case RemoteInternal:
-
-			/*
-			 * tell the fe that the query is over
-			 */
-			sprintf(buf, "%s%s", commandTag, CommandInfo);
-			pq_puttextmessage('C', buf);
-			CommandInfo[0] = '\0';
+			pq_puttextmessage('C', commandTag);
 			break;
 
-		case Debug:
 		case None:
-		default:
+		case Debug:
+		case SPI:
 			break;
 	}
 }
@@ -317,23 +306,3 @@ ReadyForQuery(CommandDest dest)
 			break;
 	}
 }
-
-void
-UpdateCommandInfo(int operation, Oid lastoid, uint32 tuples)
-{
-	switch (operation)
-	{
-		case CMD_INSERT:
-			if (tuples > 1)
-				lastoid = InvalidOid;
-			sprintf(CommandInfo, " %u %u", lastoid, tuples);
-			break;
-		case CMD_DELETE:
-		case CMD_UPDATE:
-			sprintf(CommandInfo, " %u", tuples);
-			break;
-		default:
-			CommandInfo[0] = '\0';
-			break;
-	}
-}