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-1559 trailing white space comparison

Browse Source
This commit is contained in:
David Hall
2019-03-29 08:37:16 -06:00
parent e5d76e142b
commit aa802f44c5
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dbcon/execplan/predicateoperator.h
View File

@ -36,6 +36,7 @@
#endif #endif
#include <cstring> #include <cstring>
#include <boost/regex.hpp> #include <boost/regex.hpp>
#include <boost/algorithm/string/trim.hpp>
#include "expressionparser.h" #include "expressionparser.h"
#include "returnedcolumn.h" #include "returnedcolumn.h"
@ -460,11 +461,17 @@ inline bool PredicateOperator::getBoolVal(rowgroup::Row& row, bool& isNull, Retu
return false; return false;
const std::string& val1 = lop->getStrVal(row, isNull); const std::string& val1 = lop->getStrVal(row, isNull);
if (isNull) if (isNull)
return false; return false;
return strCompare(val1, rop->getStrVal(row, isNull)) && !isNull; const std::string& val2 = rop->getStrVal(row, isNull);
if (isNull)
return false;
boost::trim_right_if(val1, boost::is_any_of(" "));
boost::trim_right_if(val2, boost::is_any_of(" "));
return strCompare(val1, val2);
} }
//FIXME: ??? //FIXME: ???