database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-30 11:03:19 +03:00
Code Activity

The idea of using _strncoll() on Windows doesn't work. Revert to same

Browse Source 
code as we use on other platforms when encoding is not UTF8.
This commit is contained in:
Tom Lane
2005-08-26 17:40:36 +00:00
parent 396526d8c3
commit a9118fc5a8
1 changed files with 31 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
src/backend/utils/adt/varlena.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.132 2005/08/24 17:50:00 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.133 2005/08/26 17:40:36 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -840,40 +840,22 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2)
* C. We also try to optimize relatively-short strings by avoiding * C. We also try to optimize relatively-short strings by avoiding
* palloc/pfree overhead. * palloc/pfree overhead.
*/ */
if (lc_collate_is_c())
{
result = strncmp(arg1, arg2, Min(len1, len2));
if ((result == 0) && (len1 != len2))
result = (len1 < len2) ? -1 : 1;
}
else
{
#define STACKBUFLEN 1024 #define STACKBUFLEN 1024
if (!lc_collate_is_c())
{
char a1buf[STACKBUFLEN]; char a1buf[STACKBUFLEN];
char a2buf[STACKBUFLEN]; char a2buf[STACKBUFLEN];
char *a1p, char *a1p,
*a2p; *a2p;
#ifndef WIN32 #ifdef WIN32
if (len1 >= STACKBUFLEN)
a1p = (char *) palloc(len1 + 1);
else
a1p = a1buf;
if (len2 >= STACKBUFLEN)
a2p = (char *) palloc(len2 + 1);
else
a2p = a2buf;
memcpy(a1p, arg1, len1);
a1p[len1] = '\0';
memcpy(a2p, arg2, len2);
a2p[len2] = '\0';
result = strcoll(a1p, a2p);
if (a1p != a1buf)
pfree(a1p);
if (a2p != a2buf)
pfree(a2p);
#else /* WIN32 */
/* Win32 does not have UTF-8, so we need to map to UTF-16 */ /* Win32 does not have UTF-8, so we need to map to UTF-16 */
if (GetDatabaseEncoding() == PG_UTF8) if (GetDatabaseEncoding() == PG_UTF8)
{ {
@ -943,17 +925,28 @@ varstr_cmp(char *arg1, int len1, char *arg2, int len2)
return result; return result;
} }
/* Win32 has strncoll(), so use it to avoid copying */
return _strncoll(arg1, arg2, Min(len1, len2));
#endif /* WIN32 */ #endif /* WIN32 */
}
else if (len1 >= STACKBUFLEN)
{ a1p = (char *) palloc(len1 + 1);
result = strncmp(arg1, arg2, Min(len1, len2)); else
if ((result == 0) && (len1 != len2)) a1p = a1buf;
result = (len1 < len2) ? -1 : 1; if (len2 >= STACKBUFLEN)
a2p = (char *) palloc(len2 + 1);
else
a2p = a2buf;
memcpy(a1p, arg1, len1);
a1p[len1] = '\0';
memcpy(a2p, arg2, len2);
a2p[len2] = '\0';
result = strcoll(a1p, a2p);
if (a1p != a1buf)
pfree(a1p);
if (a2p != a2buf)
pfree(a2p);
} }
return result; return result;