1
0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00

MCOL-4696: get rid of boost::iequals

This commit is contained in:
Leonid Fedorov
2024-08-13 13:54:45 +00:00
committed by Leonid Fedorov
parent 90023272dd
commit 25c20bae9b
9 changed files with 63 additions and 44 deletions

View File

@ -26,9 +26,10 @@
#include <sstream>
using namespace std;
#include <boost/algorithm/string.hpp>
#include "bytestream.h"
#include "collation.h"
using namespace messageqcpp;
#include "objectreader.h"
@ -197,37 +198,37 @@ bool PseudoColumn::operator!=(const TreeNode* t) const
uint32_t PseudoColumn::pseudoNameToType(string& name)
{
if (boost::iequals(name, "idbpm"))
if (datatypes::ASCIIStringCaseInsensetiveEquals(name, "idbpm"))
return PSEUDO_PM;
if (boost::iequals(name, "idbdbroot"))
if (datatypes::ASCIIStringCaseInsensetiveEquals(name, "idbdbroot"))
return PSEUDO_DBROOT;
if (boost::iequals(name, "idbextentrelativerid"))
if (datatypes::ASCIIStringCaseInsensetiveEquals(name, "idbextentrelativerid"))
return PSEUDO_EXTENTRELATIVERID;
if (boost::iequals(name, "idbsegment"))
if (datatypes::ASCIIStringCaseInsensetiveEquals(name, "idbsegment"))
return PSEUDO_SEGMENT;
if (boost::iequals(name, "idbsegmentdir"))
if (datatypes::ASCIIStringCaseInsensetiveEquals(name, "idbsegmentdir"))
return PSEUDO_SEGMENTDIR;
if (boost::iequals(name, "idbextentmin"))
if (datatypes::ASCIIStringCaseInsensetiveEquals(name, "idbextentmin"))
return PSEUDO_EXTENTMIN;
if (boost::iequals(name, "idbextentmax"))
if (datatypes::ASCIIStringCaseInsensetiveEquals(name, "idbextentmax"))
return PSEUDO_EXTENTMAX;
if (boost::iequals(name, "idbblockid"))
if (datatypes::ASCIIStringCaseInsensetiveEquals(name, "idbblockid"))
return PSEUDO_BLOCKID;
if (boost::iequals(name, "idbextentid"))
if (datatypes::ASCIIStringCaseInsensetiveEquals(name, "idbextentid"))
return PSEUDO_EXTENTID;
if (boost::iequals(name, "idbpartition"))
if (datatypes::ASCIIStringCaseInsensetiveEquals(name, "idbpartition"))
return PSEUDO_PARTITION;
if (boost::iequals(name, "idblocalpm"))
if (datatypes::ASCIIStringCaseInsensetiveEquals(name, "idblocalpm"))
return PSEUDO_LOCALPM;
return PSEUDO_UNKNOWN;

View File

@ -29,7 +29,6 @@
using namespace std;
#include <boost/tokenizer.hpp>
#include <boost/algorithm/string.hpp>
using namespace boost;
#include "bytestream.h"
@ -399,23 +398,23 @@ void WindowFunctionColumn::adjustResultType()
{
if ((fResultType.colDataType == CalpontSystemCatalog::DECIMAL ||
fResultType.colDataType == CalpontSystemCatalog::UDECIMAL) &&
!boost::iequals(fFunctionName, "COUNT") && !boost::iequals(fFunctionName, "COUNT(*)") &&
!boost::iequals(fFunctionName, "ROW_NUMBER") && !boost::iequals(fFunctionName, "RANK") &&
!boost::iequals(fFunctionName, "PERCENT_RANK") && !boost::iequals(fFunctionName, "DENSE_RANK") &&
!boost::iequals(fFunctionName, "CUME_DIST") && !boost::iequals(fFunctionName, "NTILE") &&
!boost::iequals(fFunctionName, "PERCENTILE") && !fFunctionParms.empty() &&
!datatypes::ASCIIStringCaseInsensetiveEquals(fFunctionName, "COUNT") && !datatypes::ASCIIStringCaseInsensetiveEquals(fFunctionName, "COUNT(*)") &&
!datatypes::ASCIIStringCaseInsensetiveEquals(fFunctionName, "ROW_NUMBER") && !datatypes::ASCIIStringCaseInsensetiveEquals(fFunctionName, "RANK") &&
!datatypes::ASCIIStringCaseInsensetiveEquals(fFunctionName, "PERCENT_RANK") && !datatypes::ASCIIStringCaseInsensetiveEquals(fFunctionName, "DENSE_RANK") &&
!datatypes::ASCIIStringCaseInsensetiveEquals(fFunctionName, "CUME_DIST") && !datatypes::ASCIIStringCaseInsensetiveEquals(fFunctionName, "NTILE") &&
!datatypes::ASCIIStringCaseInsensetiveEquals(fFunctionName, "PERCENTILE") && !fFunctionParms.empty() &&
fFunctionParms[0]->resultType().colDataType == CalpontSystemCatalog::DOUBLE)
fResultType = fFunctionParms[0]->resultType();
if ((boost::iequals(fFunctionName, "LEAD") || boost::iequals(fFunctionName, "LAG") ||
boost::iequals(fFunctionName, "MIN") || boost::iequals(fFunctionName, "MAX") ||
boost::iequals(fFunctionName, "FIRST_VALUE") || boost::iequals(fFunctionName, "LAST_VALUE") ||
boost::iequals(fFunctionName, "NTH_VALUE")) &&
if ((datatypes::ASCIIStringCaseInsensetiveEquals(fFunctionName, "LEAD") || datatypes::ASCIIStringCaseInsensetiveEquals(fFunctionName, "LAG") ||
datatypes::ASCIIStringCaseInsensetiveEquals(fFunctionName, "MIN") || datatypes::ASCIIStringCaseInsensetiveEquals(fFunctionName, "MAX") ||
datatypes::ASCIIStringCaseInsensetiveEquals(fFunctionName, "FIRST_VALUE") || datatypes::ASCIIStringCaseInsensetiveEquals(fFunctionName, "LAST_VALUE") ||
datatypes::ASCIIStringCaseInsensetiveEquals(fFunctionName, "NTH_VALUE")) &&
!fFunctionParms.empty())
fResultType = fFunctionParms[0]->resultType();
if (boost::iequals(fFunctionName, "SUM") || boost::iequals(fFunctionName, "AVG") ||
boost::iequals(fFunctionName, "AVG_DISTINCT") || boost::iequals(fFunctionName, "PERCENTILE"))
if (datatypes::ASCIIStringCaseInsensetiveEquals(fFunctionName, "SUM") || datatypes::ASCIIStringCaseInsensetiveEquals(fFunctionName, "AVG") ||
datatypes::ASCIIStringCaseInsensetiveEquals(fFunctionName, "AVG_DISTINCT") || datatypes::ASCIIStringCaseInsensetiveEquals(fFunctionName, "PERCENTILE"))
{
if (fFunctionParms[0]->resultType().colDataType == CalpontSystemCatalog::DECIMAL ||
fFunctionParms[0]->resultType().colDataType == CalpontSystemCatalog::UDECIMAL)