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

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

56
utils/udfsdk/mcsv1_udaf.cpp
View File

@ -75,41 +75,41 @@ int32_t mcsv1Context::getColWidth()
// JIT initialization for types that have a defined size.
switch (fResultType)
{
case CalpontSystemCatalog::BIT:
case CalpontSystemCatalog::TINYINT:
case CalpontSystemCatalog::UTINYINT:
case CalpontSystemCatalog::CHAR:
case execplan::CalpontSystemCatalog::BIT:
case execplan::CalpontSystemCatalog::TINYINT:
case execplan::CalpontSystemCatalog::UTINYINT:
case execplan::CalpontSystemCatalog::CHAR:
fColWidth = 1;
break;
case CalpontSystemCatalog::SMALLINT:
case CalpontSystemCatalog::USMALLINT:
case execplan::CalpontSystemCatalog::SMALLINT:
case execplan::CalpontSystemCatalog::USMALLINT:
fColWidth = 2;
break;
case CalpontSystemCatalog::MEDINT:
case CalpontSystemCatalog::INT:
case CalpontSystemCatalog::UMEDINT:
case CalpontSystemCatalog::UINT:
case CalpontSystemCatalog::FLOAT:
case CalpontSystemCatalog::UFLOAT:
case CalpontSystemCatalog::DATE:
case execplan::CalpontSystemCatalog::MEDINT:
case execplan::CalpontSystemCatalog::INT:
case execplan::CalpontSystemCatalog::UMEDINT:
case execplan::CalpontSystemCatalog::UINT:
case execplan::CalpontSystemCatalog::FLOAT:
case execplan::CalpontSystemCatalog::UFLOAT:
case execplan::CalpontSystemCatalog::DATE:
fColWidth = 4;
break;
case CalpontSystemCatalog::BIGINT:
case CalpontSystemCatalog::UBIGINT:
case CalpontSystemCatalog::DECIMAL:
case CalpontSystemCatalog::UDECIMAL:
case CalpontSystemCatalog::DOUBLE:
case CalpontSystemCatalog::UDOUBLE:
case CalpontSystemCatalog::DATETIME:
case CalpontSystemCatalog::TIME:
case CalpontSystemCatalog::STRINT:
case execplan::CalpontSystemCatalog::BIGINT:
case execplan::CalpontSystemCatalog::UBIGINT:
case execplan::CalpontSystemCatalog::DECIMAL:
case execplan::CalpontSystemCatalog::UDECIMAL:
case execplan::CalpontSystemCatalog::DOUBLE:
case execplan::CalpontSystemCatalog::UDOUBLE:
case execplan::CalpontSystemCatalog::DATETIME:
case execplan::CalpontSystemCatalog::TIME:
case execplan::CalpontSystemCatalog::STRINT:
fColWidth = 8;
break;
case CalpontSystemCatalog::LONGDOUBLE:
case execplan::CalpontSystemCatalog::LONGDOUBLE:
fColWidth = sizeof(long double);
break;
@ -212,7 +212,7 @@ void mcsv1Context::createUserData()
void mcsv1Context::serialize(messageqcpp::ByteStream& b) const
{
b.needAtLeast(sizeof(mcsv1Context));
b << (ObjectReader::id_t) ObjectReader::MCSV1_CONTEXT;
b << (execplan::ObjectReader::id_t) execplan::ObjectReader::MCSV1_CONTEXT;
b << functionName;
b << fRunFlags;
// Dont send context flags, These are set for each call
@ -232,21 +232,21 @@ void mcsv1Context::serialize(messageqcpp::ByteStream& b) const
void mcsv1Context::unserialize(messageqcpp::ByteStream& b)
{
ObjectReader::checkType(b, ObjectReader::MCSV1_CONTEXT);
execplan::ObjectReader::checkType(b, execplan::ObjectReader::MCSV1_CONTEXT);
b >> functionName;
b >> fRunFlags;
b >> fUserDataSize;
uint32_t iResultType;
b >> iResultType;
fResultType = (CalpontSystemCatalog::ColDataType)iResultType;
fResultType = (execplan::CalpontSystemCatalog::ColDataType)iResultType;
b >> fResultscale;
b >> fResultPrecision;
b >> errorMsg;
uint32_t frame;
b >> frame;
fStartFrame = (WF_FRAME)frame;
fStartFrame = (execplan::WF_FRAME)frame;
b >> frame;
fEndFrame = (WF_FRAME)frame;
fEndFrame = (execplan::WF_FRAME)frame;
b >> fStartConstant;
b >> fEndConstant;
b >> fParamCount;