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

MCOL-4696: get rid of boost::iequals

Browse Source
This commit is contained in:
Leonid Fedorov
2024-08-13 13:54:45 +00:00
committed by Leonid Fedorov
parent 4aa281645e
commit 4b411b3968
9 changed files with 62 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
utils/common/collation.h
View File

@ -275,4 +275,12 @@ class CollationAwareComparator : public Charset
}
};
inline bool ASCIIStringCaseInsensetiveEquals(const std::string& left, const std::string& right)
{
auto asciiHigher = [](char c) { return (c >= 'a' && c <= 'z') ? c - 'a' + 'A' : c; };
return left.size() == right.size() &&
std::equal(left.begin(), left.end(), right.begin(),
[&asciiHigher](char l, char r) { return asciiHigher(l) == asciiHigher(r); });
}
} // end of namespace datatypes

19
utils/configcpp/xmlparser.cpp
View File

@ -22,11 +22,12 @@
#include "mcsconfig.h"
#include <string>
#include <boost/algorithm/string.hpp>
#include <stdexcept>
#include <libxml/xmlmemory.h>
#include <libxml/parser.h>
#include <vector>
#include "collation.h"
using namespace std;
#include "xmlparser.h"
@ -47,7 +48,7 @@ const string XMLParser::getConfig(const xmlDocPtr doc, const string& section, co
{
string cur1name = (const char*)cur1->name;
if ((boost::iequals(cur1name, section)))
if ((datatypes::ASCIIStringCaseInsensetiveEquals(cur1name, section)))
{
xmlNodePtr cur2 = cur1->xmlChildrenNode;
@ -55,7 +56,7 @@ const string XMLParser::getConfig(const xmlDocPtr doc, const string& section, co
{
string cur2name = (const char*)cur2->name;
if ((boost::iequals(cur2name, name)))
if ((datatypes::ASCIIStringCaseInsensetiveEquals(cur2name, name)))
{
xmlNodePtr cur3 = cur2->xmlChildrenNode;
@ -92,7 +93,7 @@ void XMLParser::getConfig(const xmlDocPtr doc, const string& section, const stri
{
string cur1name = (const char*)cur1->name;
if ((boost::iequals(cur1name, section)))
if (datatypes::ASCIIStringCaseInsensetiveEquals(cur1name, section))
{
xmlNodePtr cur2 = cur1->xmlChildrenNode;
@ -100,7 +101,7 @@ void XMLParser::getConfig(const xmlDocPtr doc, const string& section, const stri
{
string cur2name = (const char*)cur2->name;
if ((boost::iequals(cur2name, name)))
if (datatypes::ASCIIStringCaseInsensetiveEquals(cur2name, name))
{
res.clear();
xmlNodePtr cur3 = cur2->xmlChildrenNode;
@ -134,7 +135,7 @@ void XMLParser::setConfig(xmlDocPtr doc, const string& section, const string& na
{
string cur1name = (const char*)cur1->name;
if (boost::iequals(cur1name, section))
if (datatypes::ASCIIStringCaseInsensetiveEquals(cur1name, section))
{
cur2 = cur1->xmlChildrenNode;
@ -142,7 +143,7 @@ void XMLParser::setConfig(xmlDocPtr doc, const string& section, const string& na
{
string cur2name = (const char*)cur2->name;
if (boost::iequals(cur2name, name))
if (datatypes::ASCIIStringCaseInsensetiveEquals(cur2name, name))
{
xmlNodePtr cur3 = cur2->xmlChildrenNode;
@ -201,7 +202,7 @@ void XMLParser::delConfig(xmlDocPtr doc, const string& section, const string& na
{
string cur1name = (const char*)cur1->name;
if ((boost::iequals(cur1name, section)))
if (datatypes::ASCIIStringCaseInsensetiveEquals(cur1name, section))
{
xmlNodePtr cur2 = cur1->xmlChildrenNode;
@ -211,7 +212,7 @@ void XMLParser::delConfig(xmlDocPtr doc, const string& section, const string& na
cur2 = cur2->next;
string tmpname = (const char*)tmp->name;
if ((boost::iequals(tmpname, name)))
if (datatypes::ASCIIStringCaseInsensetiveEquals(tmpname, name))
{
xmlUnlinkNode(tmp);
xmlFreeNode(tmp);

4
utils/dataconvert/dataconvert.cpp
View File

@ -124,12 +124,12 @@ void number_int_value(const string& data, cscDataType typeCode,
if (y != string::npos)
throw QueryDataExcept("')' is not matched.", formatErr);
if (boost::iequals(valStr, "true"))
if (datatypes::ASCIIStringCaseInsensetiveEquals(valStr, "true"))
{
intVal = 1;
return;
}
if (boost::iequals(valStr, "false"))
if (datatypes::ASCIIStringCaseInsensetiveEquals(valStr, "false"))
{
intVal = 0;
return;