diff options
Diffstat (limited to 'src/backend/utils/adt/int.c')
| -rw-r--r-- | src/backend/utils/adt/int.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c index d47dbfdab68..fa3d5fa8db2 100644 --- a/src/backend/utils/adt/int.c +++ b/src/backend/utils/adt/int.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/int.c,v 1.69 2005/11/17 22:14:53 tgl Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/int.c,v 1.70 2006/03/02 21:13:04 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -212,13 +212,28 @@ Datum int2vectorrecv(PG_FUNCTION_ARGS) { StringInfo buf = (StringInfo) PG_GETARG_POINTER(0); + FunctionCallInfoData locfcinfo; int2vector *result; - result = (int2vector *) - DatumGetPointer(DirectFunctionCall3(array_recv, - PointerGetDatum(buf), - ObjectIdGetDatum(INT2OID), - Int32GetDatum(-1))); + /* + * Normally one would call array_recv() using DirectFunctionCall3, + * but that does not work since array_recv wants to cache some data + * using fcinfo->flinfo->fn_extra. So we need to pass it our own + * flinfo parameter. + */ + InitFunctionCallInfoData(locfcinfo, fcinfo->flinfo, 3, NULL, NULL); + + locfcinfo.arg[0] = PointerGetDatum(buf); + locfcinfo.arg[1] = ObjectIdGetDatum(INT2OID); + locfcinfo.arg[2] = Int32GetDatum(-1); + locfcinfo.argnull[0] = false; + locfcinfo.argnull[1] = false; + locfcinfo.argnull[2] = false; + + result = (int2vector *) DatumGetPointer(array_recv(&locfcinfo)); + + Assert(!locfcinfo.isnull); + /* sanity checks: int2vector must be 1-D, no nulls */ if (ARR_NDIM(result) != 1 || ARR_HASNULL(result) || |