mirror of
https://github.com/postgres/postgres.git
synced 2025-11-06 07:49:08 +03:00
Simplify checks for deterministic collations.
Remove redundant checks for locale->collate_is_c now that we always
have a valid pg_locale_t.
Also, remove pg_locale_deterministic() wrapper, which is no longer
useful after commit e9931bfb75. Just check the field directly,
consistent with other fields in pg_locale_t.
Author: Andreas Karlsson
Discussion: https://postgr.es/m/60929555-4709-40a7-b136-bcb44cff5a3c@proxel.se
This commit is contained in:
@@ -757,7 +757,7 @@ bpchareq(PG_FUNCTION_ARGS)
|
||||
|
||||
mylocale = pg_newlocale_from_collation(collid);
|
||||
|
||||
if (mylocale->collate_is_c || pg_locale_deterministic(mylocale))
|
||||
if (mylocale->deterministic)
|
||||
{
|
||||
/*
|
||||
* Since we only care about equality or not-equality, we can avoid all
|
||||
@@ -798,7 +798,7 @@ bpcharne(PG_FUNCTION_ARGS)
|
||||
|
||||
mylocale = pg_newlocale_from_collation(collid);
|
||||
|
||||
if (mylocale->collate_is_c || pg_locale_deterministic(mylocale))
|
||||
if (mylocale->deterministic)
|
||||
{
|
||||
/*
|
||||
* Since we only care about equality or not-equality, we can avoid all
|
||||
@@ -1005,7 +1005,7 @@ hashbpchar(PG_FUNCTION_ARGS)
|
||||
|
||||
mylocale = pg_newlocale_from_collation(collid);
|
||||
|
||||
if (pg_locale_deterministic(mylocale))
|
||||
if (mylocale->deterministic)
|
||||
{
|
||||
result = hash_any((unsigned char *) keydata, keylen);
|
||||
}
|
||||
@@ -1061,7 +1061,7 @@ hashbpcharextended(PG_FUNCTION_ARGS)
|
||||
|
||||
mylocale = pg_newlocale_from_collation(collid);
|
||||
|
||||
if (pg_locale_deterministic(mylocale))
|
||||
if (mylocale->deterministic)
|
||||
{
|
||||
result = hash_any_extended((unsigned char *) keydata, keylen,
|
||||
PG_GETARG_INT64(1));
|
||||
|
||||
Reference in New Issue
Block a user