diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2010-01-30 20:09:59 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2010-01-30 20:09:59 +0000 |
| commit | b7445b685c0bf45c7a01a248d6cb97ac19b02a73 (patch) | |
| tree | c7a068a6f9d6664147578ecfd071a9e5b1a9889b | |
| parent | 1ff05d09a01b660285f78ffb57dbaf79c83b09b8 (diff) | |
| download | postgresql-b7445b685c0bf45c7a01a248d6cb97ac19b02a73.tar.gz postgresql-b7445b685c0bf45c7a01a248d6cb97ac19b02a73.zip | |
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.
| -rw-r--r-- | src/backend/tcop/dest.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c index 129cd77570f..77ae7ad124e 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.75 2009/01/01 17:23:48 momjian Exp $ + * $PostgreSQL: pgsql/src/backend/tcop/dest.c,v 1.75.2.1 2010/01/30 20:09:59 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -142,7 +142,11 @@ EndCommand(const char *commandTag, CommandDest dest) { case DestRemote: case DestRemoteExecute: - 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 DestNone: @@ -183,7 +187,7 @@ NullCommand(CommandDest dest) if (PG_PROTOCOL_MAJOR(FrontendProtocol) >= 3) pq_putemptymessage('I'); else - pq_puttextmessage('I', ""); + pq_putmessage('I', "", 1); break; case DestNone: |