rdelaage/postgresql
1
0
Fork 0
mirror of https://git.postgresql.org/git/postgresql.git synced 2024-08-28 10:17:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

In libpq, free any partial query result before collecting a server error.

Browse Source 
We'd throw away the partial result anyway after parsing the error message.
Throwing it away beforehand costs nothing and reduces the risk of
out-of-memory failure.  Also, at least in systems that behave like
glibc/Linux, if the partial result was very large then the error PGresult
would get allocated at high heap addresses, preventing the heap storage
used by the partial result from being released to the OS until the error
PGresult is freed.

In psql >= 9.6, we hold onto the error PGresult until another error is
received (for \errverbose), so that this behavior causes a seeming
memory leak to persist for awhile, as in a recent complaint from
Darafei Praliaskouski.  This is a potential performance regression from
older versions, justifying back-patching at least that far.  But similar
behavior may occur in other client applications, so it seems worth just
back-patching to all supported branches.

Discussion: https://postgr.es/m/CAC8Q8tJ=7cOkPePyAbJE_Pf691t8nDFhJp0KZxHvnq_uicfyVg@mail.gmail.com
This commit is contained in:
Tom Lane 2018-04-13 12:53:46 -04:00
parent 0f439c8dd2
commit 131f6a9583
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/interfaces/libpq/fe-protocol2.c
View File

@ -967,6 +967,14 @@ pqGetErrorNotice2(PGconn *conn, bool isError)
char *startp;
char *splitp;
/*
* If this is an error message, pre-emptively clear any incomplete query
* result we may have. We'd just throw it away below anyway, and
* releasing it before collecting the error might avoid out-of-memory.
*/
if (isError)
pqClearAsyncResult(conn);
/*
* Since the message might be pretty long, we create a temporary
* PQExpBuffer rather than using conn->workBuffer. workBuffer is intended
@ -1039,7 +1047,7 @@ pqGetErrorNotice2(PGconn *conn, bool isError)
*/
if (isError)
{
pqClearAsyncResult(conn);
pqClearAsyncResult(conn); /* redundant, but be safe */
conn->result = res;
resetPQExpBuffer(&conn->errorMessage);
if (res && !PQExpBufferDataBroken(workBuf) && res->errMsg)

10
src/interfaces/libpq/fe-protocol3.c
View File

@ -880,6 +880,14 @@ pqGetErrorNotice3(PGconn *conn, bool isError)
PQExpBufferData workBuf;
char id;
/*
* If this is an error message, pre-emptively clear any incomplete query
* result we may have. We'd just throw it away below anyway, and
* releasing it before collecting the error might avoid out-of-memory.
*/
if (isError)
pqClearAsyncResult(conn);
/*
* Since the fields might be pretty long, we create a temporary
* PQExpBuffer rather than using conn->workBuffer. workBuffer is intended
@ -944,7 +952,7 @@ pqGetErrorNotice3(PGconn *conn, bool isError)
{
if (res)
res->errMsg = pqResultStrdup(res, workBuf.data);
pqClearAsyncResult(conn);
pqClearAsyncResult(conn); /* redundant, but be safe */
conn->result = res;
if (PQExpBufferDataBroken(workBuf))
printfPQExpBuffer(&conn->errorMessage,