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

Fully resolve potentially ambiguous symbols by removing using namespace statements from headers which have a cascading effect. This causes potential behavior changes when switching to c++11 since symbols can be exported from std and boost while both have been imported into the global namespace.

Browse Source
This commit is contained in:
David Mott
2019-04-26 08:21:47 -05:00
parent 1813add162
commit 4b9d046c6e
131 changed files with 600 additions and 630 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
utils/funcexp/func_date.cpp
View File

@ -56,8 +56,8 @@ int64_t Func_date::getIntVal(rowgroup::Row& row,
string value = "";
DateTime aDateTime;
Time aTime;
dataconvert::DateTime aDateTime;
dataconvert::Time aTime;
switch (type)
{
@ -79,7 +79,7 @@ int64_t Func_date::getIntVal(rowgroup::Row& row,
case CalpontSystemCatalog::TIME:
{
int64_t val;
aDateTime = static_cast<DateTime>(nowDatetime());
aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
aTime = parm[0]->data()->getTimeIntVal(row, isNull);
aTime.day = 0;
aDateTime.hour = 0;

6
utils/funcexp/func_day.cpp
View File

@ -49,8 +49,8 @@ int64_t Func_day::getIntVal(rowgroup::Row& row,
{
int64_t val = 0;
DateTime aDateTime;
Time aTime;
dataconvert::DateTime aDateTime;
dataconvert::Time aTime;
switch (parm[0]->data()->resultType().colDataType)
{
@ -64,7 +64,7 @@ int64_t Func_day::getIntVal(rowgroup::Row& row,
// Time adds to now() and then gets value
case CalpontSystemCatalog::TIME:
aDateTime = static_cast<DateTime>(nowDatetime());
aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
aTime = parm[0]->data()->getTimeIntVal(row, isNull);
aTime.day = 0;
val = addTime(aDateTime, aTime);

6
utils/funcexp/func_dayname.cpp
View File

@ -54,8 +54,8 @@ int64_t Func_dayname::getIntVal(rowgroup::Row& row,
int64_t val = 0;
int32_t dayofweek = 0;
DateTime aDateTime;
Time aTime;
dataconvert::DateTime aDateTime;
dataconvert::Time aTime;
switch (parm[0]->data()->resultType().colDataType)
{
@ -75,7 +75,7 @@ int64_t Func_dayname::getIntVal(rowgroup::Row& row,
// Time adds to now() and then gets value
case CalpontSystemCatalog::TIME:
aDateTime = static_cast<DateTime>(nowDatetime());
aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
aTime = parm[0]->data()->getTimeIntVal(row, isNull);
aTime.day = 0;
val = addTime(aDateTime, aTime);

6
utils/funcexp/func_dayofweek.cpp
View File

@ -52,8 +52,8 @@ int64_t Func_dayofweek::getIntVal(rowgroup::Row& row,
uint32_t day = 0;
int64_t val = 0;
DateTime aDateTime;
Time aTime;
dataconvert::DateTime aDateTime;
dataconvert::Time aTime;
switch (parm[0]->data()->resultType().colDataType)
{
@ -73,7 +73,7 @@ int64_t Func_dayofweek::getIntVal(rowgroup::Row& row,
// Time adds to now() and then gets value
case CalpontSystemCatalog::TIME:
aDateTime = static_cast<DateTime>(nowDatetime());
aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
aTime = parm[0]->data()->getTimeIntVal(row, isNull);
aTime.day = 0;
val = addTime(aDateTime, aTime);

6
utils/funcexp/func_dayofyear.cpp
View File

@ -52,8 +52,8 @@ int64_t Func_dayofyear::getIntVal(rowgroup::Row& row,
uint32_t day = 0;
int64_t val = 0;
DateTime aDateTime;
Time aTime;
dataconvert::DateTime aDateTime;
dataconvert::Time aTime;
switch (parm[0]->data()->resultType().colDataType)
{
@ -73,7 +73,7 @@ int64_t Func_dayofyear::getIntVal(rowgroup::Row& row,
// Time adds to now() and then gets value
case CalpontSystemCatalog::TIME:
aDateTime = static_cast<DateTime>(nowDatetime());
aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
aTime = parm[0]->data()->getTimeIntVal(row, isNull);
aTime.day = 0;
val = addTime(aDateTime, aTime);

6
utils/funcexp/func_month.cpp
View File

@ -48,8 +48,8 @@ int64_t Func_month::getIntVal(rowgroup::Row& row,
CalpontSystemCatalog::ColType& op_ct)
{
int64_t val = 0;
DateTime aDateTime;
Time aTime;
dataconvert::DateTime aDateTime;
dataconvert::Time aTime;
switch (parm[0]->data()->resultType().colDataType)
{
@ -63,7 +63,7 @@ int64_t Func_month::getIntVal(rowgroup::Row& row,
// Time adds to now() and then gets value
case CalpontSystemCatalog::TIME:
aDateTime = static_cast<DateTime>(nowDatetime());
aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
aTime = parm[0]->data()->getTimeIntVal(row, isNull);
aTime.day = 0;
val = addTime(aDateTime, aTime);

6
utils/funcexp/func_monthname.cpp
View File

@ -79,8 +79,8 @@ int64_t Func_monthname::getIntVal(rowgroup::Row& row,
CalpontSystemCatalog::ColType& op_ct)
{
int64_t val = 0;
DateTime aDateTime;
Time aTime;
dataconvert::DateTime aDateTime;
dataconvert::Time aTime;
switch (parm[0]->data()->resultType().colDataType)
{
@ -94,7 +94,7 @@ int64_t Func_monthname::getIntVal(rowgroup::Row& row,
// Time adds to now() and then gets value
case CalpontSystemCatalog::TIME:
aDateTime = static_cast<DateTime>(nowDatetime());
aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
aTime = parm[0]->data()->getTimeIntVal(row, isNull);
aTime.day = 0;
val = addTime(aDateTime, aTime);

6
utils/funcexp/func_quarter.cpp
View File

@ -50,8 +50,8 @@ int64_t Func_quarter::getIntVal(rowgroup::Row& row,
{
// try to cast to date/datetime
int64_t val = 0, month = 0;
DateTime aDateTime;
Time aTime;
dataconvert::DateTime aDateTime;
dataconvert::Time aTime;
switch (parm[0]->data()->resultType().colDataType)
{
@ -67,7 +67,7 @@ int64_t Func_quarter::getIntVal(rowgroup::Row& row,
// Time adds to now() and then gets value
case CalpontSystemCatalog::TIME:
aDateTime = static_cast<DateTime>(nowDatetime());
aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
aTime = parm[0]->data()->getTimeIntVal(row, isNull);
aTime.day = 0;
val = addTime(aDateTime, aTime);

6
utils/funcexp/func_to_days.cpp
View File

@ -59,8 +59,8 @@ int64_t Func_to_days::getIntVal(rowgroup::Row& row,
month = 0,
day = 0;
DateTime aDateTime;
Time aTime;
dataconvert::DateTime aDateTime;
dataconvert::Time aTime;
switch (type)
{
@ -89,7 +89,7 @@ int64_t Func_to_days::getIntVal(rowgroup::Row& row,
case CalpontSystemCatalog::TIME:
{
int64_t val;
aDateTime = static_cast<DateTime>(nowDatetime());
aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
aTime = parm[0]->data()->getTimeIntVal(row, isNull);
aDateTime.hour = 0;
aDateTime.minute = 0;

6
utils/funcexp/func_week.cpp
View File

@ -53,8 +53,8 @@ int64_t Func_week::getIntVal(rowgroup::Row& row,
int64_t val = 0;
int16_t mode = 0;
DateTime aDateTime;
Time aTime;
dataconvert::DateTime aDateTime;
dataconvert::Time aTime;
if (parm.size() > 1) // mode value
mode = parm[1]->data()->getIntVal(row, isNull);
@ -77,7 +77,7 @@ int64_t Func_week::getIntVal(rowgroup::Row& row,
// Time adds to now() and then gets value
case CalpontSystemCatalog::TIME:
aDateTime = static_cast<DateTime>(nowDatetime());
aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
aTime = parm[0]->data()->getTimeIntVal(row, isNull);
aTime.day = 0;
val = addTime(aDateTime, aTime);

6
utils/funcexp/func_weekday.cpp
View File

@ -52,8 +52,8 @@ int64_t Func_weekday::getIntVal(rowgroup::Row& row,
uint32_t month = 0;
uint32_t day = 0;
int64_t val = 0;
DateTime aDateTime;
Time aTime;
dataconvert::DateTime aDateTime;
dataconvert::Time aTime;
switch (parm[0]->data()->resultType().colDataType)
{
@ -73,7 +73,7 @@ int64_t Func_weekday::getIntVal(rowgroup::Row& row,
// Time adds to now() and then gets value
case CalpontSystemCatalog::TIME:
aDateTime = static_cast<DateTime>(nowDatetime());
aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
aTime = parm[0]->data()->getTimeIntVal(row, isNull);
aTime.day = 0;
val = addTime(aDateTime, aTime);

6
utils/funcexp/func_year.cpp
View File

@ -48,8 +48,8 @@ int64_t Func_year::getIntVal(rowgroup::Row& row,
CalpontSystemCatalog::ColType& op_ct)
{
int64_t val = 0;
DateTime aDateTime;
Time aTime;
dataconvert::DateTime aDateTime;
dataconvert::Time aTime;
switch (parm[0]->data()->resultType().colDataType)
{
@ -63,7 +63,7 @@ int64_t Func_year::getIntVal(rowgroup::Row& row,
// Time adds to now() and then gets value
case CalpontSystemCatalog::TIME:
aDateTime = static_cast<DateTime>(nowDatetime());
aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
aTime = parm[0]->data()->getTimeIntVal(row, isNull);
aTime.day = 0;
val = addTime(aDateTime, aTime);

6
utils/funcexp/func_yearweek.cpp
View File

@ -54,8 +54,8 @@ int64_t Func_yearweek::getIntVal(rowgroup::Row& row,
int64_t val = 0;
int16_t mode = 0; // default to 2
DateTime aDateTime;
Time aTime;
dataconvert::DateTime aDateTime;
dataconvert::Time aTime;
if (parm.size() > 1) // mode value
mode = parm[1]->data()->getIntVal(row, isNull);
@ -80,7 +80,7 @@ int64_t Func_yearweek::getIntVal(rowgroup::Row& row,
// Time adds to now() and then gets value
case CalpontSystemCatalog::TIME:
aDateTime = static_cast<DateTime>(nowDatetime());
aDateTime = static_cast<dataconvert::DateTime>(nowDatetime());
aTime = parm[0]->data()->getTimeIntVal(row, isNull);
aTime.day = 0;
val = addTime(aDateTime, aTime);

3
utils/funcexp/functor.h
View File

@ -36,7 +36,6 @@
#include "calpontsystemcatalog.h"
#include "dataconvert.h"
using namespace dataconvert;
namespace rowgroup
{
@ -178,7 +177,7 @@ protected:
virtual std::string longDoubleToString(long double);
virtual int64_t nowDatetime();
virtual int64_t addTime(DateTime& dt1, dataconvert::Time& dt2);
virtual int64_t addTime(dataconvert::DateTime& dt1, dataconvert::Time& dt2);
virtual int64_t addTime(dataconvert::Time& dt1, dataconvert::Time& dt2);
std::string fFuncName;

8
utils/funcexp/functor_str.h
View File

@ -25,8 +25,6 @@
#include "functor.h"
using namespace std;
namespace funcexp
{
@ -141,7 +139,7 @@ protected:
exponent = (int)floor(log10( fabsl(floatVal)));
base = floatVal * pow(10, -1.0 * exponent);
if (isnan(exponent) || isnan(base))
if (std::isnan(exponent) || std::isnan(base))
{
snprintf(buf, 20, "%Lf", floatVal);
fFloatStr = execplan::removeTrailing0(buf, 20);
@ -325,7 +323,7 @@ public:
*/
class Func_lpad : public Func_Str
{
static const string fPad;
static const std::string fPad;
public:
Func_lpad() : Func_Str("lpad") {}
virtual ~Func_lpad() {}
@ -343,7 +341,7 @@ public:
*/
class Func_rpad : public Func_Str
{
static const string fPad;
static const std::string fPad;
public:
Func_rpad() : Func_Str("rpad") {}
virtual ~Func_rpad() {}

15
utils/funcexp/utils_utf8.h
View File

@ -37,12 +37,9 @@
#include <clocale>
#include "alarmmanager.h"
using namespace alarmmanager;
#include "ALARMManager.h"
#include "liboamcpp.h"
using namespace oam;
/** @file */
@ -63,7 +60,7 @@ std::string idb_setlocale()
{
// get and set locale language
std::string systemLang("C");
Oam oam;
oam::Oam oam;
try
{
@ -81,9 +78,9 @@ std::string idb_setlocale()
try
{
//send alarm
ALARMManager alarmMgr;
alarmmanager::ALARMManager alarmMgr;
std::string alarmItem = "system";
alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, SET);
alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, alarmmanager::SET);
printf("Failed to set locale : %s, Critical alarm generated\n", systemLang.c_str());
}
catch (...)
@ -96,9 +93,9 @@ std::string idb_setlocale()
try
{
//send alarm
ALARMManager alarmMgr;
alarmmanager::ALARMManager alarmMgr;
std::string alarmItem = "system";
alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, CLEAR);
alarmMgr.sendAlarmReport(alarmItem.c_str(), oam::INVALID_LOCALE, alarmmanager::CLEAR);
}
catch (...)
{