mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 15:15:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

CHARSET_INFO::instr was extended to return more substring match results:

Browse source 
- offset of substr begining
- offset of substr end
- number of characters (MB compatible)
This commit is contained in:
bar@bar.mysql.r18.ru 2003-09-25 13:35:21 +05:00
commit 9b4b9f91de
5 changed files with 106 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

32
strings/ctype-bin.c
View file

@ -263,16 +263,25 @@ static int my_strnxfrm_bin(CHARSET_INFO *cs __attribute__((unused)),
}
static
int my_instr_bin(CHARSET_INFO *cs __attribute__((unused)),
uint my_instr_bin(CHARSET_INFO *cs __attribute__((unused)),
const char *big, uint b_length,
const char *small, uint s_length)
const char *small, uint s_length,
my_match_t *match, uint nmatch)
{
register const uchar *str, *search, *end, *search_end;
if (s_length <= b_length)
{
if (!s_length)
return 0; /* Empty string is always found */
{
if (nmatch)
{
match->beg= 0;
match->end= 0;
match->mblen= 0;
}
return 1; /* Empty string is always found */
}
str= (const uchar*) big;
search= (const uchar*) small;
@ -293,11 +302,24 @@ skipp:
if ((*i++) != (*j++))
goto skipp;
return (int) (str- (const uchar*)big) -1;
if (nmatch > 0)
{
match[0].beg= 0;
match[0].end= str- (const uchar*)big-1;
match[0].mblen= match[0].end;
if (nmatch > 1)
{
match[1].beg= match[0].end;
match[1].end= match[0].end+s_length;
match[1].mblen= match[1].end-match[1].beg;
}
}
return 2;
}
}
}
return -1;
return 0;
}

39
strings/ctype-mb.c
View file

@ -274,18 +274,28 @@ uint my_charpos_mb(CHARSET_INFO *cs __attribute__((unused)),
return b-b0;
}
int my_instr_mb(CHARSET_INFO *cs,
const char *big, uint b_length,
const char *small, uint s_length)
uint my_instr_mb(CHARSET_INFO *cs,
const char *big, uint b_length,
const char *small, uint s_length,
my_match_t *match, uint nmatch)
{
register const char *end;
register const char *end, *big0;
int res= 0;
if (s_length <= b_length)
{
if (!s_length)
return 0; // Empty string is always found
{
if (nmatch)
{
match->beg= 0;
match->end= 0;
match->mblen= 0;
}
return 1; // Empty string is always found
}
big0= big;
end= big+b_length-s_length+1;
while (big < end)
@ -294,15 +304,28 @@ int my_instr_mb(CHARSET_INFO *cs,
if (!cs->coll->strnncoll(cs, (unsigned char*) big, s_length,
(unsigned char*) small, s_length))
return res;
{
if (nmatch)
{
match[0].beg= big0;
match[0].end= big-big0;
match[0].mblen= res;
if (nmatch > 1)
{
match[1].beg= match[0].end;
match[1].end= match[0].end+s_length;
match[1].mblen= 0; /* Not computed */
}
}
return 2;
}
mblen= (mblen= my_ismbchar(cs, big, end)) ? mblen : 1;
big+= mblen;
b_length-= mblen;
res++;
}
}
return -1;
return 0;
}
/* BINARY collations handlers for MB charsets */

32
strings/ctype-simple.c
View file

@ -1030,16 +1030,25 @@ uint my_lengthsp_8bit(CHARSET_INFO *cs __attribute__((unused)),
}
int my_instr_simple(CHARSET_INFO *cs,
uint my_instr_simple(CHARSET_INFO *cs,
const char *big, uint b_length,
const char *small, uint s_length)
const char *small, uint s_length,
my_match_t *match, uint nmatch)
{
register const uchar *str, *search, *end, *search_end;
if (s_length <= b_length)
{
if (!s_length)
return 0; // Empty string is always found
{
if (nmatch)
{
match->beg= 0;
match->end= 0;
match->mblen= 0;
}
return 1; /* Empty string is always found */
}
str= (const uchar*) big;
search= (const uchar*) small;
@ -1060,11 +1069,24 @@ skipp:
if (cs->sort_order[*i++] != cs->sort_order[*j++])
goto skipp;
return (int) (str- (const uchar*)big) -1;
if (nmatch > 0)
{
match[0].beg= 0;
match[0].end= str- (const uchar*)big-1;
match[0].mblen= match[0].end;
if (nmatch > 1)
{
match[1].beg= match[0].end;
match[1].end= match[0].end+s_length;
match[1].mblen= match[1].end-match[1].beg;
}
}
return 2;
}
}
}
return -1;
return 0;
}