rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

int_array_enum function should be using fcinfo->flinfo->fn_extra for 

working state, not fcinfo->context.  Silly oversight on my part in last
go-round of fixes.
This commit is contained in:
Tom Lane 2005-08-15 19:05:16 +00:00
parent 87808aef05
commit e6a30121be
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
contrib/intagg/int_aggregate.c
View File

@ -220,9 +220,9 @@ int_enum(PG_FUNCTION_ARGS)
PG_RETURN_NULL();
}
if (!fcinfo->context)
if (!fcinfo->flinfo->fn_extra)
{
/* Allocate a working context */
/* Allocate working state */
MemoryContext oldcontext;
oldcontext = MemoryContextSwitchTo(fcinfo->flinfo->fn_mcxt);
@ -247,19 +247,20 @@ int_enum(PG_FUNCTION_ARGS)
if (pc->p->a.ndim > 1)
elog(ERROR, "int_enum only accepts 1-D arrays");
pc->num = 0;
fcinfo->context = (Node *) pc;
fcinfo->flinfo->fn_extra = (void *) pc;
MemoryContextSwitchTo(oldcontext);
}
else /* use an existing one */
pc = (CTX *) fcinfo->context;
else /* use existing working state */
pc = (CTX *) fcinfo->flinfo->fn_extra;
/* Are we done yet? */
if (pc->p->a.ndim < 1 || pc->num >= pc->p->items)
{
/* We are done */
if (pc->flags & TOASTED)
pfree(pc->p);
pfree(fcinfo->context);
fcinfo->context = NULL;
pfree(pc);
fcinfo->flinfo->fn_extra = NULL;
rsi->isDone = ExprEndResult;
}
else