Commit64b5868

ashutosh108

authored and

Anton Voloshin

committed

adapt shared_ispell for upcoming PostgreSQL 15

1. Only call RequestAddinShmemSpace and RequestNamedLWLockTranche from withinour implementation of shmem_request_hook (as required after commit 4f2400cb3in PostgreSQL 15).2. While we are here, remove _PG_fini, as it is now officially deadafter commit ab02d702e in PostgreSQL 15.

1 parentbe08627 commit64b5868Copy full SHA for 64b5868

File tree

1 file changed

+19

-15

lines changed

src
- shared_ispell.c

1 file changed

+19

-15

lines changed

`‎src/shared_ispell.c`

Lines changed: 19 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -66,12 +66,11 @@`
`66`	`66`	`PG_MODULE_MAGIC;`
`67`	`67`
`68`	`68`	`void_PG_init(void);`
`69`		`-void_PG_fini(void);`
`70`	`69`
`71`	`70`	`/* Memory for dictionaries in kbytes */`
`72`	`71`	`staticintmax_ispell_mem_size_kb;`
`73`	`72`
`74`		`-/* Saved hookvalues in case of unload */`
	`73`	`+/* Saved hookvalue for proper chaining */`
`75`	`74`	`staticshmem_startup_hook_typeprev_shmem_startup_hook=NULL;`
`76`	`75`
`77`	`76`	`/* These are used to allocate data within shared segment */`
`@@ -97,6 +96,11 @@ max_ispell_mem_size()`
`97`	`96`	`return (Size)max_ispell_mem_size_kb*1024L;`
`98`	`97`	`}`
`99`	`98`
	`99`	`+#if (PG_VERSION_NUM >=150000)`
	`100`	`+staticshmem_request_hook_typeprev_shmem_request_hook=NULL;`
	`101`	`+staticvoidshared_ispell_shmem_request(void);`
	`102`	`+#endif`
	`103`	`+`
`100`	`104`	`/*`
`101`	`105`	`* Module load callback`
`102`	`106`	`*/`
`@@ -127,33 +131,33 @@ _PG_init(void)`
`127`	`131`
`128`	`132`	`EmitWarningsOnPlaceholders("shared_ispell");`
`129`	`133`
`130`		`-/*`
`131`		`- * Request additional shared resources. (These are no-ops if we're not in`
`132`		`- * the postmaster process.) We'll allocate or attach to the shared`
`133`		`- * resources in ispell_shmem_startup().`
`134`		`- */`
	`134`	`+#ifPG_VERSION_NUM >=150000`
	`135`	`+prev_shmem_request_hook=shmem_request_hook;`
	`136`	`+shmem_request_hook=shared_ispell_shmem_request;`
	`137`	`+#else`
`135`	`138`	`RequestAddinShmemSpace(max_ispell_mem_size());`
`136`	`139`
`137`	`140`	`#ifPG_VERSION_NUM >=90600`
`138`	`141`	`RequestNamedLWLockTranche("shared_ispell",1);`
`139`	`142`	`#else`
`140`	`143`	`RequestAddinLWLocks(1);`
	`144`	`+#endif`
`141`	`145`	`#endif`
`142`	`146`
`143`	`147`	`/* Install hooks. */`
`144`	`148`	`prev_shmem_startup_hook=shmem_startup_hook;`
`145`	`149`	`shmem_startup_hook=ispell_shmem_startup;`
`146`	`150`	`}`
`147`	`151`
`148`		`-`
`149`		`-/*`
`150`		`- * Module unload callback`
`151`		`- */`
`152`		`-void`
`153`		`-_PG_fini(void)`
	`152`	`+staticvoid`
	`153`	`+shared_ispell_shmem_request(void)`
`154`	`154`	`{`
`155`		`-/* Uninstall hooks. */`
`156`		`-shmem_startup_hook=prev_shmem_startup_hook;`
	`155`	`+if (prev_shmem_request_hook)`
	`156`	`+prev_shmem_request_hook();`
	`157`	`+`
	`158`	`+RequestAddinShmemSpace(max_ispell_mem_size());`
	`159`	`+`
	`160`	`+RequestNamedLWLockTranche("shared_ispell",1);`
`157`	`161`	`}`
`158`	`162`
`159`	`163`	`/*`

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!

Commit64b5868

File tree

1 file changed

1 file changed

`‎src/shared_ispell.c`

0 commit comments