database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-10 01:22:48 +03:00
Code Activity

Merge pull request #730 from mariadb-corporation/MCOL-1559

Browse Source 
Mcol 1559
This commit is contained in:
Andrew Hutchings
2019-04-11 08:00:02 +01:00
committed by GitHub
parent 67b42acc9c 28e743bf38
commit 8825c0928b
5 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
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"
@@ -456,16 +457,20 @@ inline bool PredicateOperator::getBoolVal(rowgroup::Row& row, bool& isNull, Retu
return !ret; return !ret;
} }
// MCOL-1559
std::string val1 = lop->getStrVal(row, isNull);
if (isNull) if (isNull)
return false; return false;
const std::string& val1 = lop->getStrVal(row, isNull); std::string val2 = rop->getStrVal(row, isNull);
if (isNull) if (isNull)
return false; return false;
return strCompare(val1, rop->getStrVal(row, isNull)) && !isNull; boost::trim_right_if(val1, boost::is_any_of(" "));
} boost::trim_right_if(val2, boost::is_any_of(" "));
return strCompare(val1, val2);
}
//FIXME: ??? //FIXME: ???
case execplan::CalpontSystemCatalog::VARBINARY: case execplan::CalpontSystemCatalog::VARBINARY:

1
dbcon/joblist/jlf_execplantojoblist.cpp
View File

@@ -1636,7 +1636,6 @@ const JobStepVector doSimpleFilter(SimpleFilter* sf, JobInfo& jobInfo)
string constval(cc->constval()); string constval(cc->constval());
CalpontSystemCatalog::OID dictOid = 0; CalpontSystemCatalog::OID dictOid = 0;
CalpontSystemCatalog::ColType ct = sc->colType(); CalpontSystemCatalog::ColType ct = sc->colType();
const PseudoColumn* pc = dynamic_cast<const PseudoColumn*>(sc); const PseudoColumn* pc = dynamic_cast<const PseudoColumn*>(sc);

1
dbcon/joblist/lbidlist.cpp
View File

@@ -749,6 +749,7 @@ bool LBIDList::CasualPartitionPredicate(const int64_t Min,
int64_t tMax = Max; int64_t tMax = Max;
dataconvert::DataConvert::trimWhitespace(tMin); dataconvert::DataConvert::trimWhitespace(tMin);
dataconvert::DataConvert::trimWhitespace(tMax); dataconvert::DataConvert::trimWhitespace(tMax);
dataconvert::DataConvert::trimWhitespace(value);
scan = compareVal(order_swap(tMin), order_swap(tMax), order_swap(value), scan = compareVal(order_swap(tMin), order_swap(tMax), order_swap(value),
op, lcf); op, lcf);

2
primitives/primproc/dictstep.cpp
View File

@@ -30,6 +30,7 @@
#include <unistd.h> #include <unistd.h>
#include <algorithm> #include <algorithm>
#include <boost/algorithm/string/trim.hpp>
#include "bpp.h" #include "bpp.h"
#include "primitiveserver.h" #include "primitiveserver.h"
@@ -93,6 +94,7 @@ void DictStep::createCommand(ByteStream& bs)
for (uint32_t i = 0; i < filterCount; i++) for (uint32_t i = 0; i < filterCount; i++)
{ {
bs >> strTmp; bs >> strTmp;
boost::trim_right_if(strTmp, boost::is_any_of(" "));
//cout << " " << strTmp << endl; //cout << " " << strTmp << endl;
eqFilter->insert(strTmp); eqFilter->insert(strTmp);
} }

2
primitives/primproc/primitiveserver.cpp
View File

@@ -28,6 +28,7 @@
#include <sys/stat.h> #include <sys/stat.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdexcept> #include <stdexcept>
#include <boost/algorithm/string/trim.hpp>
//#define NDEBUG //#define NDEBUG
#include <cassert> #include <cassert>
#include <boost/thread.hpp> #include <boost/thread.hpp>
@@ -1804,6 +1805,7 @@ private:
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
{ {
*bs >> str; *bs >> str;
boost::trim_right_if(str, boost::is_any_of(" "));
filter->insert(str); filter->insert(str);
} }