database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

MCOL-3536 trim shouldn't look for MY_CS_BINSORT

Browse Source
This commit is contained in:
David Hall
2020-06-15 11:16:02 -05:00
parent d0818f2b4e
commit 88f291903e
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
utils/funcexp/func_rtrim.cpp
View File

@ -76,12 +76,10 @@ std::string Func_rtrim::getStrVal(rowgroup::Row& row,
if (strTLen == 0 || strTLen > strLen) if (strTLen == 0 || strTLen > strLen)
return src; return src;
bool binaryCmp = (cs->state & MY_CS_BINSORT) || !cs->use_mb();
if (binTLen == 1) if (binTLen == 1)
{ {
const char* ptr = pos; const char* ptr = pos;
if (!binaryCmp) // This is a multi-byte charset if (cs->use_mb()) // This is a multi-byte charset
{ {
const char* p = pos; const char* p = pos;
uint32 l; uint32 l;
@ -112,7 +110,7 @@ std::string Func_rtrim::getStrVal(rowgroup::Row& row,
else else
{ {
// An uncommon case where the space character is > 1 byte // An uncommon case where the space character is > 1 byte
if (binaryCmp) // This is a multi-byte charset if (cs->use_mb()) // This is a multi-byte charset
{ {
// The problem is that the byte pattern at the end could // The problem is that the byte pattern at the end could
// match memcmp, but not be correct since the first byte compared // match memcmp, but not be correct since the first byte compared

6
utils/funcexp/func_trim.cpp
View File

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