From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 30 Jan 2010 20:10:22 +0000 (+0000)
Subject: Avoid performing encoding conversion on command tag strings during EndCommand.
X-Git-Tag: REL8_0_24~18
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3255ea02309c5b655a61f3a74742675cb629842d;p=thirdparty%2Fpostgresql.git

Avoid performing encoding conversion on command tag strings during EndCommand.

Since all current and foreseeable future command tags will be pure ASCII,
there is no need to do conversion on them.  This saves a few cycles and also
avoids polluting otherwise-pristine subtransaction memory contexts, which
is the cause of the backend memory leak exhibited in bug #5302.  (Someday
we'll probably want to have a better method of determining whether
subtransaction contexts need to be kept around, but today is not that day.)

Backpatch to 8.0.  The cycle-shaving aspect of this would work in 7.4
too, but without subtransactions the memory-leak aspect doesn't apply,
so it doesn't seem worth touching 7.4.
---

diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c
index ca741cd2b3a..1eaa0ce1061 100644
--- a/src/backend/tcop/dest.c
+++ b/src/backend/tcop/dest.c
@@ -8,7 +8,7 @@
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/backend/tcop/dest.c,v 1.64 2004/12/31 22:01:16 pgsql Exp $
+ *	  $PostgreSQL: pgsql/src/backend/tcop/dest.c,v 1.64.4.1 2010/01/30 20:10:22 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -141,7 +141,11 @@ EndCommand(const char *commandTag, CommandDest dest)
 	{
 		case Remote:
 		case RemoteExecute:
-			pq_puttextmessage('C', commandTag);
+			/*
+			 * We assume the commandTag is plain ASCII and therefore
+			 * requires no encoding conversion.
+			 */
+			pq_putmessage('C', commandTag, strlen(commandTag) + 1);
 			break;
 
 		case None:
@@ -180,7 +184,7 @@ NullCommand(CommandDest dest)
 			if (PG_PROTOCOL_MAJOR(FrontendProtocol) >= 3)
 				pq_putemptymessage('I');
 			else
-				pq_puttextmessage('I', "");
+				pq_putmessage('I', "", 1);
 			break;
 
 		case None: