database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

LPAD() and RPAD() are now multibyte-compatible

Browse Source
This commit is contained in:
bar@bar.mysql.r18.ru
2003-09-25 17:31:20 +05:00
parent 9b4b9f91de
commit ebbc1dc13e
2 changed files with 61 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/r/func_str.result
View File

@ -410,7 +410,7 @@ collation(concat(_latin2'a',_latin2'b')) coercibility(concat(_latin2'a',_latin2'
latin2_general_ci 3 latin2_general_ci 3
select collation(lpad(_latin2'a',4,_latin2'b')), coercibility(lpad(_latin2'a',4,_latin2'b')); select collation(lpad(_latin2'a',4,_latin2'b')), coercibility(lpad(_latin2'a',4,_latin2'b'));
collation(lpad(_latin2'a',4,_latin2'b')) coercibility(lpad(_latin2'a',4,_latin2'b')) collation(lpad(_latin2'a',4,_latin2'b')) coercibility(lpad(_latin2'a',4,_latin2'b'))
binary 3 latin2_general_ci 3
select collation(rpad(_latin2'a',4,_latin2'b')), coercibility(rpad(_latin2'a',4,_latin2'b')); select collation(rpad(_latin2'a',4,_latin2'b')), coercibility(rpad(_latin2'a',4,_latin2'b'));
collation(rpad(_latin2'a',4,_latin2'b')) coercibility(rpad(_latin2'a',4,_latin2'b')) collation(rpad(_latin2'a',4,_latin2'b')) coercibility(rpad(_latin2'a',4,_latin2'b'))
latin2_general_ci 3 latin2_general_ci 3

115
sql/item_strfunc.cc
View File

@ -1885,7 +1885,7 @@ void Item_func_rpad::fix_length_and_dec()
if (args[1]->const_item()) if (args[1]->const_item())
{ {
uint32 length= (uint32) args[1]->val_int(); uint32 length= (uint32) args[1]->val_int() * collation.collation->mbmaxlen;
max_length=max(args[0]->max_length,length); max_length=max(args[0]->max_length,length);
if (max_length >= MAX_BLOB_WIDTH) if (max_length >= MAX_BLOB_WIDTH)
{ {
@ -1903,36 +1903,46 @@ void Item_func_rpad::fix_length_and_dec()
String *Item_func_rpad::val_str(String *str) String *Item_func_rpad::val_str(String *str)
{ {
uint32 res_length,length_pad; uint32 res_byte_length,res_char_length,pad_char_length,pad_byte_length;
char *to; char *to;
const char *ptr_pad; const char *ptr_pad;
int32 count= (int32) args[1]->val_int(); int32 count= (int32) args[1]->val_int();
int32 byte_count= count * collation.collation->mbmaxlen;
String *res =args[0]->val_str(str); String *res =args[0]->val_str(str);
String *rpad = args[2]->val_str(str); String *rpad = args[2]->val_str(str);
if (!res || args[1]->null_value || !rpad || count < 0) if (!res || args[1]->null_value || !rpad || count < 0)
goto err; goto err;
null_value=0; null_value=0;
if (count <= (int32) (res_length=res->length())) if (count <= (int32) (res_char_length=res->numchars()))
{ // String to pad is big enough { // String to pad is big enough
res->length(count); // Shorten result if longer res->length(res->charpos(count)); // Shorten result if longer
return (res); return (res);
} }
length_pad= rpad->length(); pad_char_length= rpad->numchars();
if ((ulong) count > current_thd->variables.max_allowed_packet || if ((ulong) byte_count > current_thd->variables.max_allowed_packet ||
args[2]->null_value || !length_pad) args[2]->null_value || !pad_char_length)
goto err; goto err;
if (!(res= alloc_buffer(res,str,&tmp_value,count))) res_byte_length= res->length(); /* Must be done before alloc_buffer */
if (!(res= alloc_buffer(res,str,&tmp_value,byte_count)))
goto err; goto err;
to= (char*) res->ptr()+res_length; to= (char*) res->ptr()+res_byte_length;
ptr_pad=rpad->ptr(); ptr_pad=rpad->ptr();
for (count-= res_length; (uint32) count > length_pad; count-= length_pad) pad_byte_length= rpad->length();
count-= res_char_length;
for ( ; (uint32) count > pad_char_length; count-= pad_char_length)
{ {
memcpy(to,ptr_pad,length_pad); memcpy(to,ptr_pad,pad_byte_length);
to+= length_pad; to+= pad_byte_length;
} }
memcpy(to,ptr_pad,(size_t) count); if (count)
{
pad_byte_length= rpad->charpos(count);
memcpy(to,ptr_pad,(size_t) pad_byte_length);
to+= pad_byte_length;
}
res->length(to- (char*) res->ptr());
return (res); return (res);
err: err:
@ -1951,7 +1961,7 @@ void Item_func_lpad::fix_length_and_dec()
if (args[1]->const_item()) if (args[1]->const_item())
{ {
uint32 length= (uint32) args[1]->val_int(); uint32 length= (uint32) args[1]->val_int() * collation.collation->mbmaxlen;
max_length=max(args[0]->max_length,length); max_length=max(args[0]->max_length,length);
if (max_length >= MAX_BLOB_WIDTH) if (max_length >= MAX_BLOB_WIDTH)
{ {
@ -1969,57 +1979,52 @@ void Item_func_lpad::fix_length_and_dec()
String *Item_func_lpad::val_str(String *str) String *Item_func_lpad::val_str(String *str)
{ {
uint32 res_length,length_pad; uint32 res_byte_length,res_char_length,pad_byte_length,pad_char_length;
char *to; ulong count= (long) args[1]->val_int(), byte_count;
const char *ptr_pad; String a1,a3;
ulong count= (long) args[1]->val_int(); String *res= args[0]->val_str(&a1);
String *res= args[0]->val_str(str); String *pad= args[2]->val_str(&a3);
String *lpad= args[2]->val_str(str);
if (!res || args[1]->null_value || !lpad) if (!res || args[1]->null_value || !pad)
goto err; goto err;
null_value=0; null_value=0;
if (count <= (res_length=res->length())) res_byte_length= res->length();
{ // String to pad is big enough res_char_length= res->numchars();
res->length(count); // Shorten result if longer
return (res); if (count <= res_char_length)
{
res->length(res->charpos(count));
return res;
} }
length_pad= lpad->length();
if (count > current_thd->variables.max_allowed_packet || pad_byte_length= pad->length();
args[2]->null_value || !length_pad) pad_char_length= pad->numchars();
byte_count= count * collation.collation->mbmaxlen;
if (byte_count > current_thd->variables.max_allowed_packet ||
args[2]->null_value || !pad_char_length || str->alloc(byte_count))
goto err; goto err;
if (res->alloced_length() < count) str->length(0);
str->set_charset(collation.collation);
count-= res_char_length;
while (count >= pad_char_length)
{ {
if (str->alloced_length() >= count) str->append(*pad);
{ count-= pad_char_length;
memcpy((char*) str->ptr()+(count-res_length),res->ptr(),res_length);
res=str;
}
else
{
if (tmp_value.alloc(count))
goto err;
memcpy((char*) tmp_value.ptr()+(count-res_length),res->ptr(),res_length);
res=&tmp_value;
}
} }
else if (count > 0)
bmove_upp((char*) res->ptr()+count,res->ptr()+res_length,res_length);
res->length(count);
to= (char*) res->ptr();
ptr_pad= lpad->ptr();
for (count-= res_length; count > length_pad; count-= length_pad)
{ {
memcpy(to,ptr_pad,length_pad); pad->length(pad->charpos(count));
to+= length_pad; str->append(*pad);
} }
memcpy(to,ptr_pad,(size_t) count); str->append(*res);
return (res); null_value= 0;
return str;
err: err:
null_value=1; null_value= 1;
return 0; return 0;
} }