diff options
Diffstat (limited to 'src/backend/utils/adt/varlena.c')
| -rw-r--r-- | src/backend/utils/adt/varlena.c | 57 |
1 files changed, 12 insertions, 45 deletions
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c index 433049ec022..164ff849560 100644 --- a/src/backend/utils/adt/varlena.c +++ b/src/backend/utils/adt/varlena.c @@ -8,7 +8,7 @@ * * * IDENTIFICATION - * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.166 2008/05/12 00:00:51 alvherre Exp $ + * $PostgreSQL: pgsql/src/backend/utils/adt/varlena.c,v 1.167 2008/05/27 00:13:09 tgl Exp $ * *------------------------------------------------------------------------- */ @@ -1309,22 +1309,27 @@ text_smaller(PG_FUNCTION_ARGS) /* * The following operators support character-by-character comparison - * of text data types, to allow building indexes suitable for LIKE - * clauses. + * of text datums, to allow building indexes suitable for LIKE clauses. + * Note that the regular texteq/textne comparison operators are assumed + * to be compatible with these! */ static int internal_text_pattern_compare(text *arg1, text *arg2) { int result; + int len1, + len2; + + len1 = VARSIZE_ANY_EXHDR(arg1); + len2 = VARSIZE_ANY_EXHDR(arg2); - result = memcmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2), - Min(VARSIZE_ANY_EXHDR(arg1), VARSIZE_ANY_EXHDR(arg2))); + result = strncmp(VARDATA_ANY(arg1), VARDATA_ANY(arg2), Min(len1, len2)); if (result != 0) return result; - else if (VARSIZE_ANY_EXHDR(arg1) < VARSIZE_ANY_EXHDR(arg2)) + else if (len1 < len2) return -1; - else if (VARSIZE_ANY_EXHDR(arg1) > VARSIZE_ANY_EXHDR(arg2)) + else if (len1 > len2) return 1; else return 0; @@ -1364,25 +1369,6 @@ text_pattern_le(PG_FUNCTION_ARGS) Datum -text_pattern_eq(PG_FUNCTION_ARGS) -{ - text *arg1 = PG_GETARG_TEXT_PP(0); - text *arg2 = PG_GETARG_TEXT_PP(1); - int result; - - if (VARSIZE_ANY_EXHDR(arg1) != VARSIZE_ANY_EXHDR(arg2)) - result = 1; - else - result = internal_text_pattern_compare(arg1, arg2); - - PG_FREE_IF_COPY(arg1, 0); - PG_FREE_IF_COPY(arg2, 1); - - PG_RETURN_BOOL(result == 0); -} - - -Datum text_pattern_ge(PG_FUNCTION_ARGS) { text *arg1 = PG_GETARG_TEXT_PP(0); @@ -1415,25 +1401,6 @@ text_pattern_gt(PG_FUNCTION_ARGS) Datum -text_pattern_ne(PG_FUNCTION_ARGS) -{ - text *arg1 = PG_GETARG_TEXT_PP(0); - text *arg2 = PG_GETARG_TEXT_PP(1); - int result; - - if (VARSIZE_ANY_EXHDR(arg1) != VARSIZE_ANY_EXHDR(arg2)) - result = 1; - else - result = internal_text_pattern_compare(arg1, arg2); - - PG_FREE_IF_COPY(arg1, 0); - PG_FREE_IF_COPY(arg2, 1); - - PG_RETURN_BOOL(result != 0); -} - - -Datum bttext_pattern_cmp(PG_FUNCTION_ARGS) { text *arg1 = PG_GETARG_TEXT_PP(0); |