diff options
| author | Joe Conway | 2014-06-20 19:22:50 +0000 |
|---|---|---|
| committer | Joe Conway | 2014-06-20 19:26:43 +0000 |
| commit | b3a3f3d2f437922258371aee78c587b3f774b992 (patch) | |
| tree | d8d43ed859ab3e4317a1425de88b89648fdfcd78 /contrib | |
| parent | 46c450c0b04471fc52602520c0a436bda42a3c0d (diff) | |
Clean up data conversion short-lived memory context.
dblink uses a short-lived data conversion memory context. However it
was not deleted when no longer needed, leading to a noticeable memory
leak under some circumstances. Plug the hole, along with minor
refactoring. Backpatch to 9.2 where the leak was introduced.
Report and initial patch by MauMau. Reviewed/modified slightly by
Tom Lane and me.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/dblink/dblink.c | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c index 4688a8d86b..b216a7042c 100644 --- a/contrib/dblink/dblink.c +++ b/contrib/dblink/dblink.c @@ -977,6 +977,13 @@ materializeQueryResult(FunctionCallInfo fcinfo, PG_TRY(); { + /* Create short-lived memory context for data conversions */ + sinfo.tmpcontext = AllocSetContextCreate(CurrentMemoryContext, + "dblink temporary context", + ALLOCSET_DEFAULT_MINSIZE, + ALLOCSET_DEFAULT_INITSIZE, + ALLOCSET_DEFAULT_MAXSIZE); + /* execute query, collecting any tuples into the tuplestore */ res = storeQueryResult(&sinfo, conn, sql); @@ -1041,6 +1048,12 @@ materializeQueryResult(FunctionCallInfo fcinfo, PQclear(res); res = NULL; } + + /* clean up data conversion short-lived memory context */ + if (sinfo.tmpcontext != NULL) + MemoryContextDelete(sinfo.tmpcontext); + sinfo.tmpcontext = NULL; + PQclear(sinfo.last_res); sinfo.last_res = NULL; PQclear(sinfo.cur_res); @@ -1204,15 +1217,6 @@ storeRow(storeInfo *sinfo, PGresult *res, bool first) if (sinfo->cstrs) pfree(sinfo->cstrs); sinfo->cstrs = (char **) palloc(nfields * sizeof(char *)); - - /* Create short-lived memory context for data conversions */ - if (!sinfo->tmpcontext) - sinfo->tmpcontext = - AllocSetContextCreate(CurrentMemoryContext, - "dblink temporary context", - ALLOCSET_DEFAULT_MINSIZE, - ALLOCSET_DEFAULT_INITSIZE, - ALLOCSET_DEFAULT_MAXSIZE); } /* Should have a single-row result if we get here */ |