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 phase 2

Browse Source
This commit is contained in:
David Hall
2020-06-15 11:08:59 -05:00
parent 165ae4a6f3
commit d0818f2b4e
6 changed files with 40 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
utils/funcexp/func_trim.cpp
View File

@ -75,6 +75,8 @@ std::string Func_trim::getStrVal(rowgroup::Row& row,
if (strTLen == 0 || strTLen > strLen)
return src;
bool binaryCmp = (cs->state & MY_CS_BINSORT) || !cs->use_mb();
if (binTLen == 1)
{
// If the trim string is 1 byte, don't waste cpu for memcmp
@ -86,7 +88,7 @@ std::string Func_trim::getStrVal(rowgroup::Row& row,
}
// Trim trailing
const char* ptr = pos;
if (cs->use_mb()) // This is a multi-byte charset
if (!binaryCmp) // This is a multi-byte charset
{
const char* p = pos;
uint32 l;
@ -124,7 +126,7 @@ std::string Func_trim::getStrVal(rowgroup::Row& row,
}
// Trim trailing
if (cs->use_mb()) // This is a multi-byte charset
if (!binaryCmp) // This is a multi-byte charset
{
// The problem is that the byte pattern at the end could
// match memcmp, but not be correct since the first byte compared