database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-05 16:15:50 +03:00
Code Activity

Fix build issues

Browse Source 
Fix jemalloc issues and a namespace issue
This commit is contained in:
Andrew Hutchings
2016-09-23 17:28:41 -05:00
parent 9915ed31f9
commit 650dba47fc
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@@ -75,9 +75,10 @@ if (NOT NETSNMP_FOUND)
MESSAGE(FATAL_ERROR "Could not find net-snmp!") MESSAGE(FATAL_ERROR "Could not find net-snmp!")
endif() endif()
INCLUDE (FindJeMalloc) INCLUDE (FindJeMalloc.cmake)
if (NOT JEMALLOC_FOUND) if (NOT JEMALLOC_FOUND)
message(WARNING "jemalloc not found! Compiling with standard malloc") message(NOTICE "jemalloc not found! Compiling with standard malloc")
SET(JEMALLOC_LIBRARIES "")
endif() endif()
FIND_PROGRAM(AWK_EXECUTABLE awk DOC "path to the awk executable") FIND_PROGRAM(AWK_EXECUTABLE awk DOC "path to the awk executable")

4
dbcon/execplan/treenode.h
View File

@@ -485,7 +485,7 @@ inline const std::string& TreeNode::getStrVal()
// MCOL-299 Print scientific with 5 mantissa and no + sign for exponent // MCOL-299 Print scientific with 5 mantissa and no + sign for exponent
int exponent = (int)floor(log10( fabs(fResult.floatVal))); // This will round down the exponent int exponent = (int)floor(log10( fabs(fResult.floatVal))); // This will round down the exponent
double base = fResult.floatVal * pow(10, -1.0*exponent); double base = fResult.floatVal * pow(10, -1.0*exponent);
if (isnan(exponent) || isnan(base)) if (std::isnan(exponent) || std::isnan(base))
{ {
snprintf(tmp, 312, "%f", fResult.floatVal); snprintf(tmp, 312, "%f", fResult.floatVal);
fResult.strVal = removeTrailing0(tmp, 312); fResult.strVal = removeTrailing0(tmp, 312);
@@ -517,7 +517,7 @@ inline const std::string& TreeNode::getStrVal()
// MCOL-299 Print scientific with 9 mantissa and no + sign for exponent // MCOL-299 Print scientific with 9 mantissa and no + sign for exponent
int exponent = (int)floor(log10( fabs(fResult.doubleVal))); // This will round down the exponent int exponent = (int)floor(log10( fabs(fResult.doubleVal))); // This will round down the exponent
double base = fResult.doubleVal * pow(10, -1.0*exponent); double base = fResult.doubleVal * pow(10, -1.0*exponent);
if (isnan(exponent) || isnan(base)) if (std::isnan(exponent) || std::isnan(base))
{ {
snprintf(tmp, 312, "%f", fResult.doubleVal); snprintf(tmp, 312, "%f", fResult.doubleVal);
fResult.strVal = removeTrailing0(tmp, 312); fResult.strVal = removeTrailing0(tmp, 312);