diff --git a/dbcon/execplan/treenode.h b/dbcon/execplan/treenode.h
index d246fae53..b80ecbc59 100644
--- a/dbcon/execplan/treenode.h
+++ b/dbcon/execplan/treenode.h
@@ -39,8 +39,7 @@
#include "calpontsystemcatalog.h"
#include "exceptclasses.h"
#include "dataconvert.h"
-
-namespace messageqcpp {
+namespace messageqecpp {
class ByteStream;
}
@@ -483,8 +482,24 @@ inline const std::string& TreeNode::getStrVal()
}
else
{
- snprintf(tmp, 312, "%e", fResult.floatVal);
- fResult.strVal = tmp;
+ // 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
+ double base = fResult.floatVal * pow(10, -1.0*exponent);
+ if (isnan(exponent) || isnan(base))
+ {
+ snprintf(tmp, 312, "%f", fResult.floatVal);
+ fResult.strVal = removeTrailing0(tmp, 312);
+ }
+ else
+ {
+ snprintf(tmp, 312, "%.5f", base);
+ fResult.strVal = removeTrailing0(tmp, 312);
+ snprintf(tmp, 312, "e%02d", exponent);
+ fResult.strVal += tmp;
+ }
+
+// snprintf(tmp, 312, "%e.5", fResult.floatVal);
+// fResult.strVal = tmp;
}
break;
}
@@ -499,8 +514,23 @@ inline const std::string& TreeNode::getStrVal()
}
else
{
- snprintf(tmp, 312, "%e", fResult.doubleVal);
- fResult.strVal = tmp;
+ // 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
+ double base = fResult.doubleVal * pow(10, -1.0*exponent);
+ if (isnan(exponent) || isnan(base))
+ {
+ snprintf(tmp, 312, "%f", fResult.doubleVal);
+ fResult.strVal = removeTrailing0(tmp, 312);
+ }
+ else
+ {
+ snprintf(tmp, 312, "%.9f", base);
+ fResult.strVal = removeTrailing0(tmp, 312);
+ snprintf(tmp, 312, "e%02d", exponent);
+ fResult.strVal += tmp;
+ }
+// snprintf(tmp, 312, "%e", fResult.doubleVal);
+// fResult.strVal = tmp;
}
break;
}
diff --git a/utils/joiner/joiner.vpj b/utils/joiner/joiner.vpj
index 65df93f5a..8de9d375f 100644
--- a/utils/joiner/joiner.vpj
+++ b/utils/joiner/joiner.vpj
@@ -1,228 +1,230 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Version="10.0"
+ VendorName="SlickEdit"
+ TemplateName="GNU C/C++"
+ WorkingDir=".">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/utils/utils.vpj b/utils/utils.vpj
index 52badc5cc..342be0482 100644
--- a/utils/utils.vpj
+++ b/utils/utils.vpj
@@ -1,243 +1,295 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ Version="10.0"
+ VendorName="SlickEdit"
+ TemplateName="GNU C/C++"
+ WorkingDir=".">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+