NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit30a5c8b

committed

PL/Perl portability fix: avoid including XSUB.h in plperl.c.

Back-patch of commitbebe174,which see for more info.Patch by me, with some help from Ashutosh SharmaDiscussion:https://postgr.es/m/CANFyU97OVQ3+Mzfmt3MhuUm5NwPU=-FtbNH5Eb7nZL9ua8=rcA@mail.gmail.com

1 parentd38e706 commit30a5c8bCopy full SHA for 30a5c8b

File tree

6 files changed

+210

-137

lines changed

contrib/hstore_plperl
- hstore_plperl.c
src/pl/plperl

6 files changed

+210

-137

lines changed

`‎contrib/hstore_plperl/hstore_plperl.c`

Lines changed: 3 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ PG_FUNCTION_INFO_V1(hstore_to_plperl);`
`13`	`13`	`Datum`
`14`	`14`	`hstore_to_plperl(PG_FUNCTION_ARGS)`
`15`	`15`	`{`
	`16`	`+dTHX;`
`16`	`17`	`HStore*in=PG_GETARG_HS(0);`
`17`	`18`	`inti;`
`18`	`19`	`intcount=HS_COUNT(in);`
`@@ -45,16 +46,15 @@ PG_FUNCTION_INFO_V1(plperl_to_hstore);`
`45`	`46`	`Datum`
`46`	`47`	`plperl_to_hstore(PG_FUNCTION_ARGS)`
`47`	`48`	`{`
`48`		`-HV*hv;`
	`49`	`+dTHX;`
	`50`	`+HVhv= (HV)SvRV((SV*)PG_GETARG_POINTER(0));`
`49`	`51`	`HE*he;`
`50`	`52`	`int32buflen;`
`51`	`53`	`int32i;`
`52`	`54`	`int32pcount;`
`53`	`55`	`HStore*out;`
`54`	`56`	`Pairs*pairs;`
`55`	`57`
`56`		`-hv= (HV)SvRV((SV)PG_GETARG_POINTER(0));`
`57`		`-`
`58`	`58`	`pcount=hv_iterinit(hv);`
`59`	`59`
`60`	`60`	`pairs=palloc(pcount*sizeof(Pairs));`

`‎src/pl/plperl/SPI.xs`

Lines changed: 2 additions & 30 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,44 +9,16 @@`
`9`	`9`
`10`	`10`	`/* this must be first: */`
`11`	`11`	`#include"postgres.h"`
`12`		`-#include"mb/pg_wchar.h"/* for GetDatabaseEncoding */`
`13`	`12`
`14`	`13`	`/* Defined by Perl */`
`15`	`14`	`#undef _`
`16`	`15`
`17`	`16`	`/* perl stuff */`
	`17`	`+#definePG_NEED_PERL_XSUB_H`
`18`	`18`	`#include"plperl.h"`
`19`	`19`	`#include"plperl_helpers.h"`
`20`	`20`
`21`	`21`
`22`		`-/*`
`23`		`- * Interface routine to catch ereports and punt them to Perl`
`24`		`- */`
`25`		`-staticvoid`
`26`		`-do_plperl_return_next(SV*sv)`
`27`		`-{`
`28`		`-MemoryContextoldcontext=CurrentMemoryContext;`
`29`		`-`
`30`		`-PG_TRY();`
`31`		`-{`
`32`		`-plperl_return_next(sv);`
`33`		`-}`
`34`		`-PG_CATCH();`
`35`		`-{`
`36`		`-ErrorData*edata;`
`37`		`-`
`38`		`-/* Must reset elog.c's state */`
`39`		`-MemoryContextSwitchTo(oldcontext);`
`40`		`-edata=CopyErrorData();`
`41`		`-FlushErrorState();`
`42`		`-`
`43`		`-/* Punt the error to Perl */`
`44`		`-croak_cstr(edata->message);`
`45`		`-}`
`46`		`-PG_END_TRY();`
`47`		`-}`
`48`		`-`
`49`		`-`
`50`	`22`	`MODULE=PostgreSQL::InServer::SPIPREFIX=spi_`
`51`	`23`
`52`	`24`	`PROTOTYPES:ENABLE`
`@@ -76,7 +48,7 @@ void`
`76`	`48`	`spi_return_next(rv)`
`77`	`49`	`SV*rv;`
`78`	`50`	`CODE:`
`79`		`-do_plperl_return_next(rv);`
	`51`	`+plperl_return_next(rv);`
`80`	`52`
`81`	`53`	`SV*`
`82`	`54`	`spi_spi_query(sv)`

`‎src/pl/plperl/Util.xs`

Lines changed: 3 additions & 41 deletions

Original file line number	Diff line number	Diff line change
`@@ -15,53 +15,15 @@`
`15`	`15`	`#include"fmgr.h"`
`16`	`16`	`#include"utils/builtins.h"`
`17`	`17`	`#include"utils/bytea.h"/* for byteain & byteaout */`
`18`		`-#include"mb/pg_wchar.h"/* for GetDatabaseEncoding */`
	`18`	`+`
`19`	`19`	`/* Defined by Perl */`
`20`	`20`	`#undef _`
`21`	`21`
`22`	`22`	`/* perl stuff */`
	`23`	`+#definePG_NEED_PERL_XSUB_H`
`23`	`24`	`#include"plperl.h"`
`24`	`25`	`#include"plperl_helpers.h"`
`25`	`26`
`26`		`-/*`
`27`		`- * Implementation of plperl's elog() function`
`28`		`- *`
`29`		`- * If the error level is less than ERROR, we'll just emit the message and`
`30`		`- * return. When it is ERROR, elog() will longjmp, which we catch and`
`31`		`- * turn into a Perl croak(). Note we are assuming that elog() can't have`
`32`		`- * any internal failures that are so bad as to require a transaction abort.`
`33`		`- *`
`34`		`- * This is out-of-line to suppress "might be clobbered by longjmp" warnings.`
`35`		`- */`
`36`		`-staticvoid`
`37`		`-do_util_elog(intlevel,SV*msg)`
`38`		`-{`
`39`		`-MemoryContextoldcontext=CurrentMemoryContext;`
`40`		`-char*volatilecmsg=NULL;`
`41`		`-`
`42`		`-PG_TRY();`
`43`		`-{`
`44`		`-cmsg=sv2cstr(msg);`
`45`		`-elog(level,"%s",cmsg);`
`46`		`-pfree(cmsg);`
`47`		`-}`
`48`		`-PG_CATCH();`
`49`		`-{`
`50`		`-ErrorData*edata;`
`51`		`-`
`52`		`-/* Must reset elog.c's state */`
`53`		`-MemoryContextSwitchTo(oldcontext);`
`54`		`-edata=CopyErrorData();`
`55`		`-FlushErrorState();`
`56`		`-`
`57`		`-if (cmsg)`
`58`		`-pfree(cmsg);`
`59`		`-`
`60`		`-/* Punt the error to Perl */`
`61`		`-croak_cstr(edata->message);`
`62`		`-}`
`63`		`-PG_END_TRY();`
`64`		`-}`
`65`	`27`
`66`	`28`	`statictext*`
`67`	`29`	`sv2text(SV*sv)`
`@@ -105,7 +67,7 @@ util_elog(level, msg)`
`105`	`67`	`level=ERROR;`
`106`	`68`	`if (level<DEBUG5)`
`107`	`69`	`level=DEBUG5;`
`108`		`-do_util_elog(level,msg);`
	`70`	`+plperl_util_elog(level,msg);`
`109`	`71`
`110`	`72`	`SV*`
`111`	`73`	`util_quote_literal(sv)`

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!

Commit30a5c8b

File tree

6 files changed

6 files changed

`‎contrib/hstore_plperl/hstore_plperl.c`

`‎src/pl/plperl/SPI.xs`

`‎src/pl/plperl/Util.xs`

0 commit comments