database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-29 08:21:15 +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 90023272dd
commit 25c20bae9b
9 changed files with 63 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/mysql/ha_mcs_client_udfs.cpp
View File

@ -406,7 +406,7 @@ extern "C"
localModule = boost::get<0>(st);
PrimaryUMModuleName = config::Config::makeConfig()->getConfig("SystemConfig", "PrimaryUMModuleName");
if (boost::iequals(localModule, PrimaryUMModuleName))
if (datatypes::ASCIIStringCaseInsensetiveEquals(localModule, PrimaryUMModuleName))
rtn = 1;
if (PrimaryUMModuleName == "unassigned")
rtn = 1;

20
dbcon/mysql/ha_mcs_ddl.cpp
View File

@ -37,7 +37,6 @@
using namespace std;
#include <boost/shared_ptr.hpp>
#include <boost/algorithm/string/case_conv.hpp>
#include <boost/tokenizer.hpp>
using namespace boost;
@ -1014,8 +1013,13 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
if (autoIncre)
{
// Check whether there is a column with autoincrement already
if ((isAnyAutoincreCol) &&
!(boost::iequals(autoiColName, createTable->fTableDef->fColumns[i]->fName)))
bool isAutoIncrementColumn =
default_table_charset ? datatypes::CollationAwareComparator(default_table_charset)(
autoiColName, createTable->fTableDef->fColumns[i]->fName)
: datatypes::ASCIIStringCaseInsensetiveEquals(
autoiColName, createTable->fTableDef->fColumns[i]->fName);
if (isAnyAutoincreCol && !isAutoIncrementColumn)
{
rc = 1;
thd->get_stmt_da()->set_overwrite_status(true);
@ -1060,8 +1064,14 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
}
}
if (!autoIncre && isAnyAutoincreCol &&
(boost::iequals(autoiColName, createTable->fTableDef->fColumns[i]->fName)))
bool isAutoIncrementColumn =
default_table_charset ? datatypes::CollationAwareComparator(default_table_charset)(
autoiColName, createTable->fTableDef->fColumns[i]->fName)
: datatypes::ASCIIStringCaseInsensetiveEquals(
autoiColName, createTable->fTableDef->fColumns[i]->fName);
if (!autoIncre && isAnyAutoincreCol && isAutoIncrementColumn)
{
autoIncre = true;
matchedCol = true;

2
dbcon/mysql/ha_mcs_impl_if.h
View File

@ -331,7 +331,7 @@ struct cal_connection_info
configVal = cf->getConfig("SystemConfig", "PrimaryUMModuleName");
std::string module = execplan::ClientRotator::getModule();
if (boost::iequals(configVal, module))
if (datatypes::ASCIIStringCaseInsensetiveEquals(configVal, module))
return false;
return true;