Skip to content
Snippets Groups Projects
Commit b16a8f49 authored by Tom Lane's avatar Tom Lane
Browse files

pg_stat_get_backend_idset should reset fmgr_info->fn_extra at end of

execution, so that it restarts correctly if query tree is used again.
parent f00da6d8
No related branches found
No related tags found
No related merge requests found
...@@ -179,33 +179,29 @@ Datum ...@@ -179,33 +179,29 @@ Datum
pg_stat_get_backend_idset(PG_FUNCTION_ARGS) pg_stat_get_backend_idset(PG_FUNCTION_ARGS)
{ {
FmgrInfo *fmgr_info = fcinfo->flinfo; FmgrInfo *fmgr_info = fcinfo->flinfo;
MemoryContext oldcxt;
int32 result; int32 result;
if (fcinfo->resultinfo == NULL) if (fcinfo->resultinfo == NULL ||
elog(ERROR, "called in context that does not accept a set result (1)"); !IsA(fcinfo->resultinfo, ReturnSetInfo))
if (!IsA(fcinfo->resultinfo, ReturnSetInfo)) elog(ERROR, "pg_stat_get_backend_idset: called in context that does not accept a set result");
elog(ERROR, "called in context that does not accept a set result (2)");
if (fmgr_info->fn_extra == NULL) if (fmgr_info->fn_extra == NULL)
{ {
if (fmgr_info->fn_mcxt == NULL) if (fmgr_info->fn_mcxt == NULL)
elog(ERROR, "No function memory context in set-function"); elog(ERROR, "No function memory context in set-function");
fmgr_info->fn_extra = MemoryContextAlloc(fmgr_info->fn_mcxt,
oldcxt = MemoryContextSwitchTo(fmgr_info->fn_mcxt); 2 * sizeof(int));
fmgr_info->fn_extra = palloc(sizeof(int32) * 2); ((int *)(fmgr_info->fn_extra))[0] = 0;
((int32 *)(fmgr_info->fn_extra))[0] = 0; ((int *)(fmgr_info->fn_extra))[1] = pgstat_fetch_stat_numbackends();
((int32 *)(fmgr_info->fn_extra))[1] =
(int32)pgstat_fetch_stat_numbackends();
MemoryContextSwitchTo(oldcxt);
} }
((int32 *)(fmgr_info->fn_extra))[0] += 1; ((int *)(fmgr_info->fn_extra))[0] += 1;
result = ((int32 *)(fmgr_info->fn_extra))[0]; result = ((int *)(fmgr_info->fn_extra))[0];
if (result > ((int32 *)(fmgr_info->fn_extra))[1]) if (result > ((int *)(fmgr_info->fn_extra))[1])
{ {
pfree(fmgr_info->fn_extra);
fmgr_info->fn_extra = NULL;
((ReturnSetInfo *)(fcinfo->resultinfo))->isDone = ExprEndResult; ((ReturnSetInfo *)(fcinfo->resultinfo))->isDone = ExprEndResult;
PG_RETURN_NULL(); PG_RETURN_NULL();
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment