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 Some string trailing blank stuff

Browse Source
This commit is contained in:
David Hall
2019-03-28 15:25:49 -06:00
parent 8090d6dd9c
commit e5d76e142b
5 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/joblist/jlf_execplantojoblist.cpp
View File

@ -36,6 +36,7 @@ using namespace std;
#include <boost/algorithm/string.hpp> #include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/case_conv.hpp> #include <boost/algorithm/string/case_conv.hpp>
#include <boost/algorithm/string/split.hpp> #include <boost/algorithm/string/split.hpp>
#include <boost/algorithm/string/trim.hpp>
namespace ba = boost::algorithm; namespace ba = boost::algorithm;
#include "calpontexecutionplan.h" #include "calpontexecutionplan.h"
@ -1635,6 +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(" "));
CalpontSystemCatalog::OID dictOid = 0; CalpontSystemCatalog::OID dictOid = 0;

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
dbcon/mysql/ha_calpont_execplan.cpp
View File

@ -49,6 +49,7 @@ using namespace std;
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <boost/algorithm/string/case_conv.hpp> #include <boost/algorithm/string/case_conv.hpp>
#include <boost/algorithm/string/trim.hpp>
#include <boost/regex.hpp> #include <boost/regex.hpp>
#include <boost/thread.hpp> #include <boost/thread.hpp>
@ -4868,6 +4869,7 @@ void gp_walk(const Item* item, void* arg)
{ {
cval.assign(str->ptr(), str->length()); cval.assign(str->ptr(), str->length());
} }
// boost::trim_right_if(cval, boost::is_any_of(" "));
gwip->rcWorkStack.push(new ConstantColumn(cval)); gwip->rcWorkStack.push(new ConstantColumn(cval));
break; break;

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);
} }