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-1559 only trim on spaces, not on tabs. Don't ask me why that is.

Browse Source
This commit is contained in:
David Hall
2019-07-05 12:53:01 -05:00
parent db597e914b
commit b3df052b9f
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
dbcon/joblist/jlf_execplantojoblist.cpp
View File

@ -1636,7 +1636,7 @@ const JobStepVector doSimpleFilter(SimpleFilter* sf, JobInfo& jobInfo)
string constval(cc->constval()); string constval(cc->constval());
// Because, on a filter, we want to compare ignoring trailing spaces // Because, on a filter, we want to compare ignoring trailing spaces
boost::algorithm::trim_right(constval); boost::algorithm::trim_right_if(constval, boost::is_any_of(" "));
CalpontSystemCatalog::OID dictOid = 0; CalpontSystemCatalog::OID dictOid = 0;
@ -2773,7 +2773,7 @@ const JobStepVector doConstantFilter(const ConstantFilter* cf, JobInfo& jobInfo)
string value = cc->constval(); string value = cc->constval();
// Because, on a filter, we want to compare ignoring trailing spaces // Because, on a filter, we want to compare ignoring trailing spaces
boost::algorithm::trim_right(value); boost::algorithm::trim_right_if(value, boost::is_any_of(" "));
pds->addFilter(cop, value); pds->addFilter(cop, value);
} }
@ -2857,7 +2857,7 @@ const JobStepVector doConstantFilter(const ConstantFilter* cf, JobInfo& jobInfo)
string value = cc->constval(); string value = cc->constval();
// Because, on a filter, we want to compare ignoring trailing spaces // Because, on a filter, we want to compare ignoring trailing spaces
boost::algorithm::trim_right(value); boost::algorithm::trim_right_if(value, boost::is_any_of(" "));
pds->addFilter(cop, value); pds->addFilter(cop, value);
} }

3
primitives/linux-port/dictionary.cpp
View File

@ -188,8 +188,7 @@ void PrimitiveProcessor::p_TokenByScan(const TokenByScanRequestHeader* h,
{ {
// MCOL-1246 Trim whitespace before match // MCOL-1246 Trim whitespace before match
string strData(sig, siglen); string strData(sig, siglen);
// boost::trim_right_if(strData, boost::is_any_of(" ")); boost::trim_right_if(strData, boost::is_any_of(" "));
boost::algorithm::trim_right(strData);
bool gotIt = eqFilter->find(strData) != eqFilter->end(); bool gotIt = eqFilter->find(strData) != eqFilter->end();
if ((h->COP1 == COMPARE_EQ && gotIt) || (h->COP1 == COMPARE_NE && if ((h->COP1 == COMPARE_EQ && gotIt) || (h->COP1 == COMPARE_NE &&