Use less memory

pipelinedb · Nov 3, 2016 · 22bf40a · 22bf40a
1 parent cd90136
commit 22bf40a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
@@ -1568,7 +1568,7 @@ arrayaggstaterecv(PG_FUNCTION_ARGS)
 	MemoryContext context;
 
 	if (!AggCheckCallContext(fcinfo, &context))
-		context = fcinfo->flinfo->fn_mcxt;
+		context = CurrentMemoryContext;
 
 	if (PG_ARGISNULL(0))
 		PG_RETURN_NULL();

diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
@@ -2204,7 +2204,7 @@ jsonaggstaterecv(PG_FUNCTION_ARGS)
 		PG_RETURN_NULL();
 
 	if (!AggCheckCallContext(fcinfo, &context))
-		context = fcinfo->flinfo->fn_mcxt;
+		context = CurrentMemoryContext;
 
 	bytes = PG_GETARG_BYTEA_PP(0);
 

diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
@@ -1966,7 +1966,7 @@ jsonbaggstaterecv(PG_FUNCTION_ARGS)
 		PG_RETURN_NULL();
 
 	if (!AggCheckCallContext(fcinfo, &context))
-		context = fcinfo->flinfo->fn_mcxt;
+		context = CurrentMemoryContext;
 
 	jsonb = PG_GETARG_JSONB(0);
 

diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c
@@ -7727,7 +7727,7 @@ numaggstaterecv(PG_FUNCTION_ARGS)
 	int i;
 
 	if (!AggCheckCallContext(fcinfo, &context))
-		context = fcinfo->flinfo->fn_mcxt;
+		context = CurrentMemoryContext;
 
 	old = MemoryContextSwitchTo(context);
 
@@ -7826,7 +7826,7 @@ numpolyaggstaterecv(PG_FUNCTION_ARGS)
 		PG_RETURN_NULL();
 
 	if (!AggCheckCallContext(fcinfo, &context))
-		context = fcinfo->flinfo->fn_mcxt;
+		context = CurrentMemoryContext;
 
 	old = MemoryContextSwitchTo(context);
 	state = (Int128AggState *) VARDATA_ANY(PG_GETARG_ARRAYTYPE_P_COPY(0));