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

Revert "MCOL-1559 Some string trailing blank stuff"

Browse Source 
This reverts commit e5d76e142b.
This commit is contained in:
Andrew Hutchings
2019-05-23 13:49:08 +01:00
parent 922e828d6c
commit 9390ee05fb
5 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/joblist/jlf_execplantojoblist.cpp
View File

@ -36,7 +36,6 @@ using namespace std;
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/case_conv.hpp>
#include <boost/algorithm/string/split.hpp>
#include <boost/algorithm/string/trim.hpp>
namespace ba = boost::algorithm;
#include "calpontexecutionplan.h"
@ -1636,7 +1635,6 @@ const JobStepVector doSimpleFilter(SimpleFilter* sf, JobInfo& jobInfo)
}
string constval(cc->constval());
boost::trim_right_if(constval, boost::is_any_of(" "));
CalpontSystemCatalog::OID dictOid = 0;

1
dbcon/joblist/lbidlist.cpp
View File

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

2
dbcon/mysql/ha_calpont_execplan.cpp
View File

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

2
primitives/primproc/dictstep.cpp
View File

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

2
primitives/primproc/primitiveserver.cpp
View File

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