database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-07 03:22:57 +03:00
Code Activity

Merge pull request #31 from mariadb-corporation/MCOL-328-mk2

Browse Source 
MCOL-328 Fix func float -> str conversion
This commit is contained in:
dhall-InfiniDB
2016-10-04 12:43:08 -05:00
committed by GitHub
parent d857a0ffe6 0da005ddae
commit 84d4ccfdd2
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
utils/funcexp/functor_str.h
View File

@@ -90,22 +90,37 @@ protected:
// Bug3788, use the shorter of fixed or scientific notation for floating point values. // Bug3788, use the shorter of fixed or scientific notation for floating point values.
// [ the default format in treenode.h is fixed-point notation ] // [ the default format in treenode.h is fixed-point notation ]
char buf[20]; char buf[20];
double floatVal;
int exponent;
double base;
switch (fp->data()->resultType().colDataType) switch (fp->data()->resultType().colDataType)
{ {
case execplan::CalpontSystemCatalog::DOUBLE: case execplan::CalpontSystemCatalog::DOUBLE:
snprintf(buf, 20, "%.10g", fp->data()->getDoubleVal(row, isNull)); floatVal = fp->data()->getDoubleVal(row, isNull);
break; break;
case execplan::CalpontSystemCatalog::FLOAT: case execplan::CalpontSystemCatalog::FLOAT:
snprintf(buf, 20, "%g", fp->data()->getFloatVal(row, isNull)); floatVal = fp->data()->getFloatVal(row, isNull);
break; break;
default: default:
return fp->data()->getStrVal(row, isNull); return fp->data()->getStrVal(row, isNull);
break; break;
} }
exponent = (int)floor(log10( fabs(floatVal)));
base = floatVal * pow(10, -1.0*exponent);
if (isnan(exponent) || isnan(base))
{
snprintf(buf, 20, "%f", floatVal);
fFloatStr = execplan::removeTrailing0(buf, 20);
}
else
{
snprintf(buf, 20, "%.5f", base);
fFloatStr = execplan::removeTrailing0(buf, 20);
snprintf(buf, 20, "e%02d", exponent);
fFloatStr += buf;
}
fFloatStr = std::string(buf);
return fFloatStr; return fFloatStr;
} }