mirrors
/
postgres
mirror of https://github.com/postgres/postgres
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:58 +00:00
parent 76f39619d7
commit f739566069
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

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