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

MCOL-328 Fix func float -> str conversion

Browse Source 
Functions such as reverse() that do float/double to string conversion
use printf's %g to do it. Unfortunately this adds a '+' symbol before
the exponent symbol. MariaDB doesn't do this.

This patch builds the string in a way that does not have that problem,
it resembles the way it is done elsewhere in the codebase.
This commit is contained in:
Andrew Hutchings
2016-10-03 21:03:07 +01:00
parent a966fa3382
commit 0da005ddae
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
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.
// [ the default format in treenode.h is fixed-point notation ]
char buf[20];
double floatVal;
int exponent;
double base;
switch (fp->data()->resultType().colDataType)
{
case execplan::CalpontSystemCatalog::DOUBLE:
snprintf(buf, 20, "%.10g", fp->data()->getDoubleVal(row, isNull));
break;
floatVal = fp->data()->getDoubleVal(row, isNull);
break;
case execplan::CalpontSystemCatalog::FLOAT:
snprintf(buf, 20, "%g", fp->data()->getFloatVal(row, isNull));
break;
floatVal = fp->data()->getFloatVal(row, isNull);
break;
default:
return fp->data()->getStrVal(row, isNull);
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;
}