database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

MCOL-3536 collation

Browse Source
This commit is contained in:
David Hall
2020-06-08 16:09:46 -05:00
parent 236b92d706
commit 938ee6d308
3 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
utils/funcexp/func_concat_ws.cpp
View File

@ -103,21 +103,21 @@ string Func_concat_ws::getStrVal(Row& row,
#endif #endif
string str; string str;
string tmp; string tmp;
// Work on reallocation. use std::string::resize() to
// grab larger chunks in some intellegent manner.
for ( uint32_t i = 1 ; i < parm.size() ; i++) for ( uint32_t i = 1 ; i < parm.size() ; i++)
{ {
stringValue(parm[i], row, isNull, tmp); stringValue(parm[i], row, isNull, tmp);
str += tmp;
if (isNull) if (isNull)
{ {
isNull = false; isNull = false;
continue; continue;
} }
if (!str.empty() && !isNull) if (!str.empty())
str += delim; str += delim;
// TODO: Work on string reallocation. Use std::string::resize() to
// grab larger chunks in some intellegent manner.
str += tmp;
} }
if (str.empty()) if (str.empty())

28
utils/funcexp/func_find_in_set.cpp
View File

@ -69,18 +69,18 @@ int64_t Func_find_in_set::getIntVal(rowgroup::Row& row,
if (searchStr.find(",") != string::npos) if (searchStr.find(",") != string::npos)
return 0; return 0;
if (setString.length() > searchStr.length()) if (setString.length() < searchStr.length())
return 0; return 0;
CHARSET_INFO *cs= op_ct.getCharset(); CHARSET_INFO *cs= op_ct.getCharset();
my_wc_t wc= 0; my_wc_t wc= 0;
const char *str_begin= setString.c_str(); const char *str_begin = setString.c_str();
const char *str_end= setString.c_str(); const char *str_end = setString.c_str();
const char *real_end= str_end + setString.length(); const char *real_end = str_end + setString.length();
const char *find_str= searchStr.c_str(); const char *find_str = searchStr.c_str();
uint find_str_len= searchStr.length(); size_t find_str_len = searchStr.length();
int position= 0; int position = 0;
static const char separator=','; static const char separator=',';
while (1) while (1)
{ {
@ -88,21 +88,21 @@ int64_t Func_find_in_set::getIntVal(rowgroup::Row& row,
if ((symbol_len= cs->mb_wc(&wc, (uchar*) str_end, if ((symbol_len= cs->mb_wc(&wc, (uchar*) str_end,
(uchar*) real_end)) > 0) (uchar*) real_end)) > 0)
{ {
const char *substr_end= str_end + symbol_len; const char *substr_end = str_end + symbol_len;
bool is_last_item= (substr_end == real_end); bool is_last_item= (substr_end == real_end);
bool is_separator= (wc == (my_wc_t) separator); bool is_separator = (wc == (my_wc_t) separator);
if (is_separator || is_last_item) if (is_separator || is_last_item)
{ {
position++; position++;
if (is_last_item && !is_separator) if (is_last_item && !is_separator)
str_end= substr_end; str_end = substr_end;
if (!cs->strnncoll(str_begin, (uint) (str_end - str_begin), if (!cs->strnncoll(str_begin, (size_t) (str_end - str_begin),
find_str, find_str_len)) find_str, find_str_len))
return (longlong) position; return (int64_t) position;
else else
str_begin= substr_end; str_begin = substr_end;
} }
str_end= substr_end; str_end = substr_end;
} }
else if (str_end - str_begin == 0 && else if (str_end - str_begin == 0 &&
find_str_len == 0 && find_str_len == 0 &&

5
utils/funcexp/func_insert.cpp
View File

@ -88,7 +88,7 @@ std::string Func_insert::getStrVal(rowgroup::Row& row,
int64_t strLen = cs->numchars(pos, end); int64_t strLen = cs->numchars(pos, end);
// Return the original string if start isn't within the string. // Return the original string if start isn't within the string.
if ((start <= 1) || start >= strLen) if ((start < 1) || start >= strLen)
return src; return src;
if ((length < 0) || (length > strLen)) if ((length < 0) || (length > strLen))
@ -103,7 +103,8 @@ std::string Func_insert::getStrVal(rowgroup::Row& row,
out.append(src.c_str(), start); out.append(src.c_str(), start);
out.append(tnewstr.c_str(), tnewstr.length()); out.append(tnewstr.c_str(), tnewstr.length());
out.append(src.c_str() + start + length, binLen - start - length); if (binLen - start - length > 0)
out.append(src.c_str() + start + length, binLen - start - length);
return out; return out;
} }