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

c++17 fix

Browse Source
This commit is contained in:
Leonid Fedorov
2021-10-26 15:02:34 +00:00
parent 56d8a33f0b
commit 1973168e03
3 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/joblist/tupleaggregatestep.cpp
View File

@ -80,7 +80,7 @@ namespace
struct cmpTuple struct cmpTuple
{ {
bool operator()(boost::tuple<uint32_t, int, mcsv1sdk::mcsv1_UDAF*, std::vector<uint32_t>* > a, bool operator()(boost::tuple<uint32_t, int, mcsv1sdk::mcsv1_UDAF*, std::vector<uint32_t>* > a,
boost::tuple<uint32_t, int, mcsv1sdk::mcsv1_UDAF*, std::vector<uint32_t>* > b) boost::tuple<uint32_t, int, mcsv1sdk::mcsv1_UDAF*, std::vector<uint32_t>* > b) const
{ {
uint32_t keya = boost::get<0>(a); uint32_t keya = boost::get<0>(a);
uint32_t keyb = boost::get<0>(b); uint32_t keyb = boost::get<0>(b);

2
primitives/blockcache/iomanager.cpp
View File

@ -261,7 +261,7 @@ typedef FdCountEntry FdCountEntry_t;
struct fdCountCompare struct fdCountCompare
{ {
bool operator() (const FdCountEntry_t& lhs, const FdCountEntry_t& rhs) bool operator() (const FdCountEntry_t& lhs, const FdCountEntry_t& rhs) const
{ {
return lhs.cnt > rhs.cnt; return lhs.cnt > rhs.cnt;
} }

12
tools/configMgt/autoConfigure.cpp
View File

@ -1033,13 +1033,11 @@ int main(int argc, char* argv[])
if ( moduleName == systemParentOAMModuleName ) if ( moduleName == systemParentOAMModuleName )
sysConfigNew->setConfig(dbrmMainProc, "IPAddr", moduleIPAddr); sysConfigNew->setConfig(dbrmMainProc, "IPAddr", moduleIPAddr);
//if ( moduleDisableState == oam::ENABLEDSTATE ) DBRMworkernodeID++;
//{ string DBRMSection = dbrmSubProc + oam.itoa(DBRMworkernodeID);
DBRMworkernodeID++; sysConfigNew->setConfig(DBRMSection, "IPAddr", moduleIPAddr);
string DBRMSection = dbrmSubProc + oam.itoa(DBRMworkernodeID); sysConfigNew->setConfig(DBRMSection, "Module", moduleName);
sysConfigNew->setConfig(DBRMSection, "IPAddr", moduleIPAddr);
sysConfigNew->setConfig(DBRMSection, "Module", moduleName);
//}
} //end of nicID loop } //end of nicID loop
//set dbroot assigments //set dbroot assigments