NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit792b2c7

committed

Remove pg_regex_collation

We can also use the existing pg_regex_locale as the cache key, whichis the only use of this variable.Reviewed-by: Jeff Davis <pgsql@j-davis.com>Discussion:https://www.postgresql.org/message-id/flat/b1b92ae1-2e06-4619-a87a-4b4858e547ec%40eisentraut.org

1 parent71cb352 commit792b2c7Copy full SHA for 792b2c7

File tree

1 file changed

-7

lines changed

src/backend/regex
- regc_pg_locale.c

1 file changed

-7

lines changed

`‎src/backend/regex/regc_pg_locale.c`

Lines changed: 4 additions & 7 deletions

Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,6 @@ typedef enum`
`74`	`74`
`75`	`75`	`staticPG_Locale_Strategypg_regex_strategy;`
`76`	`76`	`staticpg_locale_tpg_regex_locale;`
`77`		`-staticOidpg_regex_collation;`
`78`	`77`
`79`	`78`	`/*`
`80`	`79`	`* Hard-wired character properties for C locale`
`@@ -254,7 +253,7 @@ pg_set_regex_collation(Oid collation)`
`254`	`253`	`* pg_newlocale_from_collation().`
`255`	`254`	`*/`
`256`	`255`	`strategy=PG_REGEX_STRATEGY_C;`
`257`		`-collation=C_COLLATION_OID;`
	`256`	`+locale=0;`
`258`	`257`	`}`
`259`	`258`	`else`
`260`	`259`	`{`
`@@ -273,7 +272,6 @@ pg_set_regex_collation(Oid collation)`
`273`	`272`	`*/`
`274`	`273`	`strategy=PG_REGEX_STRATEGY_C;`
`275`	`274`	`locale=0;`
`276`		`-collation=C_COLLATION_OID;`
`277`	`275`	`}`
`278`	`276`	`elseif (locale->provider==COLLPROVIDER_BUILTIN)`
`279`	`277`	`{`
`@@ -298,7 +296,6 @@ pg_set_regex_collation(Oid collation)`
`298`	`296`
`299`	`297`	`pg_regex_strategy=strategy;`
`300`	`298`	`pg_regex_locale=locale;`
`301`		`-pg_regex_collation=collation;`
`302`	`299`	`}`
`303`	`300`
`304`	`301`	`staticint`
`@@ -628,7 +625,7 @@ typedef int (*pg_wc_probefunc) (pg_wchar c);`
`628`	`625`	`typedefstructpg_ctype_cache`
`629`	`626`	`{`
`630`	`627`	`pg_wc_probefuncprobefunc;/* pg_wc_isalpha or a sibling */`
`631`		`-Oidcollation;/collation this entry is for /`
	`628`	`+pg_locale_tlocale;/locale this entry is for /`
`632`	`629`	`structcveccv;/* cache entry contents */`
`633`	`630`	`structpg_ctype_cachenext;/ chain link */`
`634`	`631`	`}pg_ctype_cache;`
`@@ -697,7 +694,7 @@ pg_ctype_get_cache(pg_wc_probefunc probefunc, int cclasscode)`
`697`	`694`	`for (pcc=pg_ctype_cache_list;pcc!=NULL;pcc=pcc->next)`
`698`	`695`	`{`
`699`	`696`	`if (pcc->probefunc==probefunc&&`
`700`		`-pcc->collation==pg_regex_collation)`
	`697`	`+pcc->locale==pg_regex_locale)`
`701`	`698`	`return&pcc->cv;`
`702`	`699`	`}`
`703`	`700`
`@@ -708,7 +705,7 @@ pg_ctype_get_cache(pg_wc_probefunc probefunc, int cclasscode)`
`708`	`705`	`if (pcc==NULL)`
`709`	`706`	`returnNULL;`
`710`	`707`	`pcc->probefunc=probefunc;`
`711`		`-pcc->collation=pg_regex_collation;`
	`708`	`+pcc->locale=pg_regex_locale;`
`712`	`709`	`pcc->cv.nchrs=0;`
`713`	`710`	`pcc->cv.chrspace=128;`
`714`	`711`	`pcc->cv.chrs= (chr)malloc(pcc->cv.chrspacesizeof(chr));`

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!

Commit792b2c7

File tree

1 file changed

1 file changed

`‎src/backend/regex/regc_pg_locale.c`

0 commit comments