>From f4ae516d643dee43200053533dbcc8b362e3f92b Mon Sep 17 00:00:00 2001 From: Craig Ringer Date: Mon, 3 Feb 2014 09:47:34 +0800 Subject: [PATCH] Fix leaked memory context in json_array_each and json_each json_array_each and json_each leaked a memory context with each invocation, causing profiles involving many invocations in a single query context to be dominated by MemoryContextReset because of MemoryContextResetChildren calls made after each tuple is emitted. See initial bug report: http://stackoverflow.com/q/21507127/398670 and list discussion: http://www.postgresql.org/message-id/52EEEC37.9040305@2ndquadrant.com --- src/backend/utils/adt/jsonfuncs.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c index a19b222..116d7a0 100644 --- a/src/backend/utils/adt/jsonfuncs.c +++ b/src/backend/utils/adt/jsonfuncs.c @@ -975,6 +975,9 @@ each_worker(PG_FUNCTION_ARGS, bool as_text) rsi->setResult = state->tuple_store; rsi->setDesc = state->ret_tdesc; + MemoryContextDelete(state->tmp_cxt); + state->tmp_cxt = NULL; + PG_RETURN_NULL(); } @@ -1157,6 +1160,9 @@ elements_worker(PG_FUNCTION_ARGS, bool as_text) rsi->setResult = state->tuple_store; rsi->setDesc = state->ret_tdesc; + MemoryContextDelete(state->tmp_cxt); + state->tmp_cxt = NULL; + PG_RETURN_NULL(); } -- 1.8.3.1