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-523 std::string can't be SMALL_POLICY in static_any

Browse Source
This commit is contained in:
David Hall
2017-08-04 12:32:30 -05:00
parent 4f555ad8b3
commit a27d29c909
3 changed files with 28 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
utils/common/any.hpp
View File

@ -106,7 +106,6 @@ namespace anyimpl
SMALL_POLICY(float);
SMALL_POLICY(double);
SMALL_POLICY(bool);
SMALL_POLICY(std::string);
#undef SMALL_POLICY

28
utils/rowgroup/rowaggregation.cpp
View File

@ -2367,21 +2367,21 @@ void RowAggregationUM::calculateAvgColumns()
// Sets the value from valOut into column colOut, performing any conversions.
void RowAggregationUM::SetUDAFValue(static_any::any& valOut, int64_t colOut)
{
static const static_any::any& charTypeId = (char)1;
static const static_any::any& scharTypeId = (signed char)1;
static const static_any::any& shortTypeId = (short)1;
static const static_any::any& intTypeId = (int)1;
static const static_any::any& longTypeId = (long)1;
static const static_any::any& llTypeId = (long long)1;
static const static_any::any& ucharTypeId = (unsigned char)1;
static const static_any::any& ushortTypeId = (unsigned short)1;
static const static_any::any& uintTypeId = (unsigned int)1;
static const static_any::any& ulongTypeId = (unsigned long)1;
static const static_any::any& ullTypeId = (unsigned long long)1;
static const static_any::any& floatTypeId = (float)1;
static const static_any::any& doubleTypeId = (double)1;
static const static_any::any& charTypeId((char)1);
static const static_any::any& scharTypeId((signed char)1);
static const static_any::any& shortTypeId((short)1);
static const static_any::any& intTypeId((int)1);
static const static_any::any& longTypeId((long)1);
static const static_any::any& llTypeId((long long)1);
static const static_any::any& ucharTypeId((unsigned char)1);
static const static_any::any& ushortTypeId((unsigned short)1);
static const static_any::any& uintTypeId((unsigned int)1);
static const static_any::any& ulongTypeId((unsigned long)1);
static const static_any::any& ullTypeId((unsigned long long)1);
static const static_any::any& floatTypeId((float)1);
static const static_any::any& doubleTypeId((double)1);
static const std::string typeStr("");
static const static_any::any& strTypeId = typeStr;
static const static_any::any& strTypeId(typeStr);
execplan::CalpontSystemCatalog::ColDataType colDataType = fRowGroupOut->getColTypes()[colOut];
if (valOut.empty())

28
utils/udfsdk/mcsv1_udaf.cpp
View File

@ -240,19 +240,19 @@ void UserData::unserialize(messageqcpp::ByteStream& bs)
}
const std::string typeStr("");
const static_any::any& mcsv1_UDAF::charTypeId = (char)1;
const static_any::any& mcsv1_UDAF::scharTypeId = (signed char)1;
const static_any::any& mcsv1_UDAF::shortTypeId = (short)1;
const static_any::any& mcsv1_UDAF::intTypeId = (int)1;
const static_any::any& mcsv1_UDAF::longTypeId = (long)1;
const static_any::any& mcsv1_UDAF::llTypeId = (long long)1;
const static_any::any& mcsv1_UDAF::ucharTypeId = (unsigned char)1;
const static_any::any& mcsv1_UDAF::ushortTypeId = (unsigned short)1;
const static_any::any& mcsv1_UDAF::uintTypeId = (unsigned int)1;
const static_any::any& mcsv1_UDAF::ulongTypeId = (unsigned long)1;
const static_any::any& mcsv1_UDAF::ullTypeId = (unsigned long long)1;
const static_any::any& mcsv1_UDAF::floatTypeId = (float)1;
const static_any::any& mcsv1_UDAF::doubleTypeId = (double)1;
const static_any::any& mcsv1_UDAF::strTypeId = typeStr;
const static_any::any& mcsv1_UDAF::charTypeId((char)1);
const static_any::any& mcsv1_UDAF::scharTypeId((signed char)1);
const static_any::any& mcsv1_UDAF::shortTypeId((short)1);
const static_any::any& mcsv1_UDAF::intTypeId((int)1);
const static_any::any& mcsv1_UDAF::longTypeId((long)1);
const static_any::any& mcsv1_UDAF::llTypeId((long long)1);
const static_any::any& mcsv1_UDAF::ucharTypeId((unsigned char)1);
const static_any::any& mcsv1_UDAF::ushortTypeId((unsigned short)1);
const static_any::any& mcsv1_UDAF::uintTypeId((unsigned int)1);
const static_any::any& mcsv1_UDAF::ulongTypeId((unsigned long)1);
const static_any::any& mcsv1_UDAF::ullTypeId((unsigned long long)1);
const static_any::any& mcsv1_UDAF::floatTypeId((float)1);
const static_any::any& mcsv1_UDAF::doubleTypeId((double)1);
const static_any::any& mcsv1_UDAF::strTypeId(typeStr);