Skip to content

P
Postgres FD Implementation
Commit 7845bfc0 authored by Tom Lane's avatar Tom Lane
Browse files
Options

Dept of second thoughts: don't use the new wide-character upper/lower 

code if we are running in a single-byte encoding.  No point in the
extra overhead in that case.
parent b8312c5f
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 93 deletions
src/backend/utils/adt/oracle_compat.c
View file @ 7845bfc0
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/oracle_compat.c,v 1.52 2004/05/26 16:16:03 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/oracle_compat.c,v 1.53 2004/06/06 22:17:01 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
...@@ -166,40 +166,44 @@ Datum ...@@ -166,40 +166,44 @@ Datum
lower(PG_FUNCTION_ARGS) lower(PG_FUNCTION_ARGS)
{ {
#ifdef USE_WIDE_UPPER_LOWER #ifdef USE_WIDE_UPPER_LOWER
text *string = PG_GETARG_TEXT_P(0); /* use wide char code only when max encoding length > one */
text *result; if (pg_database_encoding_max_length() > 1)
wchar_t *workspace; {
int i; text *string = PG_GETARG_TEXT_P(0);
text *result;
workspace = texttowcs(string); wchar_t *workspace;
int i;
for (i = 0; workspace[i] != 0; i++) workspace = texttowcs(string);
workspace[i] = towlower(workspace[i]);
result = wcstotext(workspace, i); for (i = 0; workspace[i] != 0; i++)
workspace[i] = towlower(workspace[i]);
pfree(workspace); result = wcstotext(workspace, i);
PG_RETURN_TEXT_P(result); pfree(workspace);
#else /* !USE_WIDE_UPPER_LOWER */ PG_RETURN_TEXT_P(result);
}
else
#endif /* USE_WIDE_UPPER_LOWER */
{
text *string = PG_GETARG_TEXT_P_COPY(0);
char *ptr;
int m;
text *string = PG_GETARG_TEXT_P_COPY(0); /* Since we copied the string, we can scribble directly on the value */
char *ptr; ptr = VARDATA(string);
int m; m = VARSIZE(string) - VARHDRSZ;
/* Since we copied the string, we can scribble directly on the value */ while (m-- > 0)
ptr = VARDATA(string); {
m = VARSIZE(string) - VARHDRSZ; *ptr = tolower((unsigned char) *ptr);
ptr++;
}
while (m-- > 0) PG_RETURN_TEXT_P(string);
{
*ptr = tolower((unsigned char) *ptr);
ptr++;
} }
PG_RETURN_TEXT_P(string);
#endif /* USE_WIDE_UPPER_LOWER */
} }
...@@ -221,40 +225,44 @@ Datum ...@@ -221,40 +225,44 @@ Datum
upper(PG_FUNCTION_ARGS) upper(PG_FUNCTION_ARGS)
{ {
#ifdef USE_WIDE_UPPER_LOWER #ifdef USE_WIDE_UPPER_LOWER
text *string = PG_GETARG_TEXT_P(0); /* use wide char code only when max encoding length > one */
text *result; if (pg_database_encoding_max_length() > 1)
wchar_t *workspace; {
int i; text *string = PG_GETARG_TEXT_P(0);
text *result;
workspace = texttowcs(string); wchar_t *workspace;
int i;
for (i = 0; workspace[i] != 0; i++) workspace = texttowcs(string);
workspace[i] = towupper(workspace[i]);
result = wcstotext(workspace, i); for (i = 0; workspace[i] != 0; i++)
workspace[i] = towupper(workspace[i]);
pfree(workspace); result = wcstotext(workspace, i);
PG_RETURN_TEXT_P(result); pfree(workspace);
#else /* !USE_WIDE_UPPER_LOWER */ PG_RETURN_TEXT_P(result);
}
else
#endif /* USE_WIDE_UPPER_LOWER */
{
text *string = PG_GETARG_TEXT_P_COPY(0);
char *ptr;
int m;
text *string = PG_GETARG_TEXT_P_COPY(0); /* Since we copied the string, we can scribble directly on the value */
char *ptr; ptr = VARDATA(string);
int m; m = VARSIZE(string) - VARHDRSZ;
/* Since we copied the string, we can scribble directly on the value */ while (m-- > 0)
ptr = VARDATA(string); {
m = VARSIZE(string) - VARHDRSZ; *ptr = toupper((unsigned char) *ptr);
ptr++;
}
while (m-- > 0) PG_RETURN_TEXT_P(string);
{
*ptr = toupper((unsigned char) *ptr);
ptr++;
} }
PG_RETURN_TEXT_P(string);
#endif /* USE_WIDE_UPPER_LOWER */
} }
...@@ -279,58 +287,56 @@ Datum ...@@ -279,58 +287,56 @@ Datum
initcap(PG_FUNCTION_ARGS) initcap(PG_FUNCTION_ARGS)
{ {
#ifdef USE_WIDE_UPPER_LOWER #ifdef USE_WIDE_UPPER_LOWER
text *string = PG_GETARG_TEXT_P(0); /* use wide char code only when max encoding length > one */
text *result; if (pg_database_encoding_max_length() > 1)
wchar_t *workspace;
int wasalnum = 0;
int i;
workspace = texttowcs(string);
for (i = 0; workspace[i] != 0; i++)
{ {
if (wasalnum) text *string = PG_GETARG_TEXT_P(0);
workspace[i] = towlower(workspace[i]); text *result;
else wchar_t *workspace;
workspace[i] = towupper(workspace[i]); int wasalnum = 0;
wasalnum = iswalnum(workspace[i]); int i;
}
result = wcstotext(workspace, i); workspace = texttowcs(string);
pfree(workspace); for (i = 0; workspace[i] != 0; i++)
{
if (wasalnum)
workspace[i] = towlower(workspace[i]);
else
workspace[i] = towupper(workspace[i]);
wasalnum = iswalnum(workspace[i]);
}
PG_RETURN_TEXT_P(result); result = wcstotext(workspace, i);
#else /* !USE_WIDE_UPPER_LOWER */ pfree(workspace);
text *string = PG_GETARG_TEXT_P_COPY(0); PG_RETURN_TEXT_P(result);
char *ptr; }
int m; else
#endif /* USE_WIDE_UPPER_LOWER */
{
text *string = PG_GETARG_TEXT_P_COPY(0);
int wasalnum = 0;
char *ptr;
int m;
/* Since we copied the string, we can scribble directly on the value */ /* Since we copied the string, we can scribble directly on the value */
ptr = VARDATA(string); ptr = VARDATA(string);
m = VARSIZE(string) - VARHDRSZ; m = VARSIZE(string) - VARHDRSZ;
if (m > 0) while (m-- > 0)
{ {
*ptr = toupper((unsigned char) *ptr); if (wasalnum)
ptr++; *ptr = tolower((unsigned char) *ptr);
m--; else
} *ptr = toupper((unsigned char) *ptr);
wasalnum = isalnum((unsigned char) *ptr);
ptr++;
}
while (m-- > 0) PG_RETURN_TEXT_P(string);
{
/* Oracle capitalizes after all non-alphanumeric */
if (!isalnum((unsigned char) ptr[-1]))
*ptr = toupper((unsigned char) *ptr);
else
*ptr = tolower((unsigned char) *ptr);
ptr++;
} }
PG_RETURN_TEXT_P(string);
#endif /* USE_WIDE_UPPER_LOWER */
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment