diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/utils/adt/pg_locale.c | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c index 643cca05d38..d82e816230f 100644 --- a/src/backend/utils/adt/pg_locale.c +++ b/src/backend/utils/adt/pg_locale.c @@ -151,6 +151,13 @@ typedef struct static MemoryContext CollationCacheContext = NULL; static collation_cache_hash *CollationCache = NULL; +/* + * The collation cache is often accessed repeatedly for the same collation, so + * remember the last one used. + */ +static Oid last_collation_cache_oid = InvalidOid; +static pg_locale_t last_collation_cache_locale = NULL; + #if defined(WIN32) && defined(LC_MESSAGES) static char *IsoLocaleName(const char *); #endif @@ -1570,6 +1577,9 @@ pg_newlocale_from_collation(Oid collid) if (collid == DEFAULT_COLLATION_OID) return &default_locale; + if (last_collation_cache_oid == collid) + return last_collation_cache_locale; + cache_entry = lookup_collation_cache(collid); if (cache_entry->locale == 0) @@ -1695,6 +1705,9 @@ pg_newlocale_from_collation(Oid collid) cache_entry->locale = resultp; } + last_collation_cache_oid = collid; + last_collation_cache_locale = cache_entry->locale; + return cache_entry->locale; } |