Commit6db75ed

committed

Update contrib/trgm_regexp's memory management.

While no code change was necessary for this code to keep working, wedon't need to use PG_TRY()/PG_FINALLY() with explicit clean-up whileworking with regexes anymore.Reviewed-by: Tom Lane <tgl@sss.pgh.pa.us>Discussion:https://postgr.es/m/CA%2BhUKGK3PGKwcKqzoosamn36YW-fsuTdOPPF1i_rtEO%3DnEYKSg%40mail.gmail.com

1 parent4f51429 commit6db75edCopy full SHA for 6db75ed

File tree

-15

lines changed

-15

lines changed

Lines changed: 2 additions & 15 deletions

Original file line number	Diff line number	Diff line change
`@@ -549,22 +549,9 @@ createTrgmNFA(text *text_re, Oid collation,`
`549`	`549`	`REG_ADVANCED \|REG_NOSUB,collation);`
`550`	`550`	`#endif`
`551`	`551`
`552`		`-/*`
`553`		`- * Since the regexp library allocates its internal data structures with`
`554`		`- * malloc, we need to use a PG_TRY block to ensure that pg_regfree() gets`
`555`		`- * done even if there's an error.`
`556`		`- */`
`557`		`-PG_TRY();`
`558`		`-{`
`559`		`-trg=createTrgmNFAInternal(&regex,graph,rcontext);`
`560`		`-}`
`561`		`-PG_FINALLY();`
`562`		`-{`
`563`		`-pg_regfree(&regex);`
`564`		`-}`
`565`		`-PG_END_TRY();`
	`552`	`+trg=createTrgmNFAInternal(&regex,graph,rcontext);`
`566`	`553`
`567`		`-/* Clean up all the cruft we created */`
	`554`	`+/* Clean up all the cruft we created(including regex)*/`
`568`	`555`	`MemoryContextSwitchTo(oldcontext);`
`569`	`556`	`MemoryContextDelete(tmpcontext);`
`570`	`557`

Comments

(0)