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

Revert "MCOL-1559 trailing space compare"

Browse Source 
This reverts commit 5b581f53cb.
This commit is contained in:
Andrew Hutchings
2019-05-23 13:48:31 +01:00
parent 73f7307ca2
commit f3449fe2f4
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
dbcon/execplan/predicateoperator.h
View File

@ -456,19 +456,11 @@ inline bool PredicateOperator::getBoolVal(rowgroup::Row& row, bool& isNull, Retu
isNull = false; isNull = false;
return !ret; return !ret;
} }
#if 0
if (isNull)
return false;
const std::string& val1 = lop->getStrVal(row, isNull);
if (isNull) if (isNull)
return false; return false;
return strCompare(val1, rop->getStrVal(row, isNull)) && !isNull; std::string val1 = lop->getStrVal(row, isNull);
#endif
// MCOL-1559
std::string val1 = lop->getStrVal(row, isNull);
if (isNull) if (isNull)
return false; return false;
@ -480,7 +472,7 @@ inline bool PredicateOperator::getBoolVal(rowgroup::Row& row, bool& isNull, Retu
boost::trim_right_if(val2, boost::is_any_of(" ")); boost::trim_right_if(val2, boost::is_any_of(" "));
return strCompare(val1, val2); return strCompare(val1, val2);
} }
//FIXME: ??? //FIXME: ???
case execplan::CalpontSystemCatalog::VARBINARY: case execplan::CalpontSystemCatalog::VARBINARY:

2
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());
// boost::trim_right_if(constval, boost::is_any_of(" ")); boost::trim_right_if(constval, boost::is_any_of(" "));
CalpontSystemCatalog::OID dictOid = 0; CalpontSystemCatalog::OID dictOid = 0;