open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary #ifdef USE_ICU and branch.

Browse Source 
Now that the provider-independent API pg_strnxfrm() is available, we
no longer need the special cases for ICU in hashfunc.c and varchar.c.

Reviewed-by: Peter Eisentraut, Peter Geoghegan
Discussion: https://postgr.es/m/a581136455c940d7bd0ff482d3a2bd51af25a94f.camel%40j-davis.com
pull/131/head
Jeff Davis 3 years ago
parent 6974a8f768
commit e0b3074e89
2 changed files with 71 additions and 102 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 17
      src/backend/access/hash/hashfunc.c
  2. 16
      src/backend/utils/adt/varchar.c

17
src/backend/access/hash/hashfunc.c
Unescape View File

@ -288,15 +288,13 @@ hashtext(PG_FUNCTION_ARGS)
VARSIZE_ANY_EXHDR(key)); VARSIZE_ANY_EXHDR(key));
} }
else else
{
#ifdef USE_ICU
if (mylocale->provider == COLLPROVIDER_ICU)
{ {
Size bsize, rsize; Size bsize, rsize;
char *buf; char *buf;
const char *keydata = VARDATA_ANY(key); const char *keydata = VARDATA_ANY(key);
size_t keylen = VARSIZE_ANY_EXHDR(key); size_t keylen = VARSIZE_ANY_EXHDR(key);
bsize = pg_strnxfrm(NULL, 0, keydata, keylen, mylocale); bsize = pg_strnxfrm(NULL, 0, keydata, keylen, mylocale);
buf = palloc(bsize + 1); buf = palloc(bsize + 1);
@ -313,11 +311,6 @@ hashtext(PG_FUNCTION_ARGS)
pfree(buf); pfree(buf);
} }
else
#endif
/* shouldn't happen */
elog(ERROR, "unsupported collprovider: %c", mylocale->provider);
}
/* Avoid leaking memory for toasted inputs */ /* Avoid leaking memory for toasted inputs */
PG_FREE_IF_COPY(key, 0); PG_FREE_IF_COPY(key, 0);
@ -349,9 +342,6 @@ hashtextextended(PG_FUNCTION_ARGS)
PG_GETARG_INT64(1)); PG_GETARG_INT64(1));
} }
else else
{
#ifdef USE_ICU
if (mylocale->provider == COLLPROVIDER_ICU)
{ {
Size bsize, rsize; Size bsize, rsize;
char *buf; char *buf;
@ -375,11 +365,6 @@ hashtextextended(PG_FUNCTION_ARGS)
pfree(buf); pfree(buf);
} }
else
#endif
/* shouldn't happen */
elog(ERROR, "unsupported collprovider: %c", mylocale->provider);
}
PG_FREE_IF_COPY(key, 0); PG_FREE_IF_COPY(key, 0);

16
src/backend/utils/adt/varchar.c
Unescape View File

@ -1020,9 +1020,6 @@ hashbpchar(PG_FUNCTION_ARGS)
result = hash_any((unsigned char *) keydata, keylen); result = hash_any((unsigned char *) keydata, keylen);
} }
else else
{
#ifdef USE_ICU
if (mylocale->provider == COLLPROVIDER_ICU)
{ {
Size bsize, rsize; Size bsize, rsize;
char *buf; char *buf;
@ -1043,11 +1040,6 @@ hashbpchar(PG_FUNCTION_ARGS)
pfree(buf); pfree(buf);
} }
else
#endif
/* shouldn't happen */
elog(ERROR, "unsupported collprovider: %c", mylocale->provider);
}
/* Avoid leaking memory for toasted inputs */ /* Avoid leaking memory for toasted inputs */
PG_FREE_IF_COPY(key, 0); PG_FREE_IF_COPY(key, 0);
@ -1083,9 +1075,6 @@ hashbpcharextended(PG_FUNCTION_ARGS)
PG_GETARG_INT64(1)); PG_GETARG_INT64(1));
} }
else else
{
#ifdef USE_ICU
if (mylocale->provider == COLLPROVIDER_ICU)
{ {
Size bsize, rsize; Size bsize, rsize;
char *buf; char *buf;
@ -1107,11 +1096,6 @@ hashbpcharextended(PG_FUNCTION_ARGS)
pfree(buf); pfree(buf);
} }
else
#endif
/* shouldn't happen */
elog(ERROR, "unsupported collprovider: %c", mylocale->provider);
}
PG_FREE_IF_COPY(key, 0); PG_FREE_IF_COPY(key, 0);

Write Preview
Loading…
Cancel
Save