NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit8a098f2

committed

Update array_iterator to use new fmgr interface.

1 parenta030113 commit8a098f2Copy full SHA for 8a098f2

File tree

1 file changed

+21

-20

lines changed

contrib/array
- array_iterator.c

1 file changed

+21

-20

lines changed

`‎contrib/array/array_iterator.c`

Lines changed: 21 additions & 20 deletions

Original file line number	Diff line number	Diff line change
`@@ -38,16 +38,13 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)`
`38`	`38`	`Form_pg_typetyp_struct;`
`39`	`39`	`booltypbyval;`
`40`	`40`	`inttyplen;`
`41`		`-func_ptrproc_fn;`
`42`		`-intpronargs;`
`43`	`41`	`intnitems,`
`44`		`-i,`
`45`		`-result;`
	`42`	`+i;`
	`43`	`+Datumresult;`
`46`	`44`	`intndim,`
`47`	`45`	`*dim;`
`48`	`46`	`char*p;`
`49`		`-FmgrInfofinf;/* Tobias Gabele Jan 18 1999 */`
`50`		`-`
	`47`	`+FmgrInfofinfo;`
`51`	`48`
`52`	`49`	`/* Sanity checks */`
`53`	`50`	`if ((array== (ArrayType*)NULL)`
`@@ -66,7 +63,8 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)`
`66`	`63`	`}`
`67`	`64`
`68`	`65`	`/* Lookup element type information */`
`69`		`-typ_tuple=SearchSysCacheTuple(TYPEOID,ObjectIdGetDatum(elemtype),0,0,0);`
	`66`	`+typ_tuple=SearchSysCacheTuple(TYPEOID,ObjectIdGetDatum(elemtype),`
	`67`	`+0,0,0);`
`70`	`68`	`if (!HeapTupleIsValid(typ_tuple))`
`71`	`69`	`{`
`72`	`70`	`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)`
`77`	`75`	`typbyval=typ_struct->typbyval;`
`78`	`76`
`79`	`77`	`/* Lookup the function entry point */`
`80`		`-proc_fn= (func_ptr)NULL;`
`81`		`-fmgr_info(proc,&finf);/* Tobias Gabele Jan 18 1999 */`
`82`		`-proc_fn=finf.fn_addr;/* Tobias Gabele Jan 18 1999 */`
`83`		`-pronargs=finf.fn_nargs;/* Tobias Gabele Jan 18 1999 */`
`84`		`-if ((proc_fn==NULL)\|\| (pronargs!=2))`
	`78`	`+fmgr_info(proc,&finfo);`
	`79`	`+if (finfo.fn_nargs!=2)`
`85`	`80`	`{`
`86`		`-elog(ERROR,"array_iterator:fmgr_info lookup failed for oid %u",proc);`
	`81`	`+elog(ERROR,"array_iterator:proc %u does not take 2 args",proc);`
`87`	`82`	`return (0);`
`88`	`83`	`}`
`89`	`84`
`90`	`85`	`/* Scan the array and apply the operator to each element */`
`91`		`-result=0;`
	`86`	`+result=BoolGetDatum(false);`
`92`	`87`	`p=ARR_DATA_PTR(array);`
`93`	`88`	`for (i=0;i<nitems;i++)`
`94`	`89`	`{`
`@@ -97,27 +92,33 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)`
`97`	`92`	`switch (typlen)`
`98`	`93`	`{`
`99`	`94`	`case1:`
`100`		`-result= (int) (proc_fn) (p,value);`
	`95`	`+result=FunctionCall2(&finfo,`
	`96`	`+CharGetDatum(*p),`
	`97`	`+value);`
`101`	`98`	`break;`
`102`	`99`	`case2:`
`103`		`-result= (int) (proc_fn) ((int16*)p,value);`
	`100`	`+result=FunctionCall2(&finfo,`
	`101`	`+Int16GetDatum((int16)p),`
	`102`	`+value);`
`104`	`103`	`break;`
`105`	`104`	`case3:`
`106`	`105`	`case4:`
`107`		`-result= (int) (proc_fn) ((int32*)p,value);`
	`106`	`+result=FunctionCall2(&finfo,`
	`107`	`+Int32GetDatum((int32)p),`
	`108`	`+value);`
`108`	`109`	`break;`
`109`	`110`	`}`
`110`	`111`	`p+=typlen;`
`111`	`112`	`}`
`112`	`113`	`else`
`113`	`114`	`{`
`114`		`-result=(int) (*proc_fn) (p,value);`
	`115`	`+result=FunctionCall2(&finfo,PointerGetDatum(p),value);`
`115`	`116`	`if (typlen>0)`
`116`	`117`	`p+=typlen;`
`117`	`118`	`else`
`118`	`119`	`p+=INTALIGN((int32)p);`
`119`	`120`	`}`
`120`		`-if (result)`
	`121`	`+if (DatumGetBool(result))`
`121`	`122`	`{`
`122`	`123`	`if (!and)`
`123`	`124`	`return (1);`
`@@ -129,7 +130,7 @@ array_iterator(Oid elemtype, Oid proc, int and, ArrayType *array, Datum value)`
`129`	`130`	`}`
`130`	`131`	`}`
`131`	`132`
`132`		`-if (and&&result)`
	`133`	`+if (and&&DatumGetBool(result))`
`133`	`134`	`return (1);`
`134`	`135`	`else`
`135`	`136`	`return (0);`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit8a098f2

File tree

1 file changed

1 file changed

`‎contrib/array/array_iterator.c`

0 commit comments