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

Update array_iterator to use new fmgr interface.

This commit is contained in:
Tom Lane 2000-05-29 20:30:11 +00:00
parent a030113197
commit 8a098f2f5d
1 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
contrib/array/array_iterator.c
View File

@ -38,16 +38,13 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)
Form_pg_type typ_struct; Form_pg_type typ_struct;
bool typbyval; bool typbyval;
int typlen; int typlen;
func_ptr proc_fn;
int pronargs;
int nitems, int nitems,
i, i;
result; Datum result;
int ndim, int ndim,
*dim; *dim;
char *p; char *p;
FmgrInfo finf; /* Tobias Gabele Jan 18 1999 */ FmgrInfo finfo;
/* Sanity checks */ /* Sanity checks */
if ((array == (ArrayType *) NULL) if ((array == (ArrayType *) NULL)
@ -66,7 +63,8 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)
} }
/* Lookup element type information */ /* Lookup element type information */
typ_tuple = SearchSysCacheTuple(TYPEOID, ObjectIdGetDatum(elemtype), 0, 0, 0); typ_tuple = SearchSysCacheTuple(TYPEOID, ObjectIdGetDatum(elemtype),
0, 0, 0);
if (!HeapTupleIsValid(typ_tuple)) if (!HeapTupleIsValid(typ_tuple))
{ {
elog(ERROR, "array_iterator: cache lookup failed for type %u", elemtype); elog(ERROR, "array_iterator: cache lookup failed for type %u", elemtype);
@ -77,18 +75,15 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)
typbyval = typ_struct->typbyval; typbyval = typ_struct->typbyval;
/* Lookup the function entry point */ /* Lookup the function entry point */
proc_fn = (func_ptr) NULL; fmgr_info(proc, &finfo);
fmgr_info(proc, &finf); /* Tobias Gabele Jan 18 1999 */ if (finfo.fn_nargs != 2)
proc_fn = finf.fn_addr; /* Tobias Gabele Jan 18 1999 */
pronargs = finf.fn_nargs; /* Tobias Gabele Jan 18 1999 */
if ((proc_fn == NULL) || (pronargs != 2))
{ {
elog(ERROR, "array_iterator: fmgr_info lookup failed for oid %u", proc); elog(ERROR, "array_iterator: proc %u does not take 2 args", proc);
return (0); return (0);
} }
/* Scan the array and apply the operator to each element */ /* Scan the array and apply the operator to each element */
result = 0; result = BoolGetDatum(false);
p = ARR_DATA_PTR(array); p = ARR_DATA_PTR(array);
for (i = 0; i < nitems; i++) for (i = 0; i < nitems; i++)
{ {
@ -97,27 +92,33 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)
switch (typlen) switch (typlen)
{ {
case 1: case 1:
result = (int) (*proc_fn) (*p, value); result = FunctionCall2(&finfo,
CharGetDatum(*p),
value);
break; break;
case 2: case 2:
result = (int) (*proc_fn) (*(int16 *) p, value); result = FunctionCall2(&finfo,
Int16GetDatum(*(int16 *) p),
value);
break; break;
case 3: case 3:
case 4: case 4:
result = (int) (*proc_fn) (*(int32 *) p, value); result = FunctionCall2(&finfo,
Int32GetDatum(*(int32 *) p),
value);
break; break;
} }
p += typlen; p += typlen;
} }
else else
{ {
result = (int) (*proc_fn) (p, value); result = FunctionCall2(&finfo, PointerGetDatum(p), value);
if (typlen > 0) if (typlen > 0)
p += typlen; p += typlen;
else else
p += INTALIGN(*(int32 *) p); p += INTALIGN(*(int32 *) p);
} }
if (result) if (DatumGetBool(result))
{ {
if (!and) if (!and)
return (1); return (1);
@ -129,7 +130,7 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)
} }
} }
if (and && result) if (and && DatumGetBool(result))
return (1); return (1);
else else
return (0); return (0);