Merge lp:~billy-earney/drizzle/bug621331 into lp:~drizzle-trunk/drizzle/development

[Billy Earney]

modified simple uses of stringstream to use boost::lexical_cast instead.

Lines directly related to stringstream were only commented out. Whomever inspects this modification may want to remove the comments once they are happy with the changes.

[Stewart Smith (stewart)]

started a param-build for it: http://hudson.drizzle.org/view/Drizzle-param/job/drizzle-param/497/

[Brian Aker (brianaker)]

My concern with this patch is that we won't get consistent formatting (especially with Decimal). I believe LinuxJedi and Monty should chime in here.

review: Needs Information

[Billy Earney (billy-earney)]

Brian,

Yes, that was a concern of mine as well. Most of the stringstreams I didn't replace modified the precision with setprecision. I could create a wrapper function with an argument for the precision. We could set the default to be 0. For decimals we would set it to some other value. Or we could create a wrapper function that deals only with decimals and leave the other modifications as is

Let me know your thoughts.

Billy

[Monty Taylor (mordred)]

Yes. Sorry - I should have been more clear. If there is actually real value coming from the use of stringstream (such as using precision) then we should keep stringstream in those cases.

However, where it's being used purely to cast the value one way or the other, boost::lexical_cast I believe reads much cleaner. (for instance, first change in drizzled/field/date.cc should be reverted, second change is good)

If you could put the ones with precision calls back to stringstream, and then delete the comments from the other ones, I think we'll be good to go to merge this in!

review: Needs Fixing

[Monty Taylor (mordred)]

PS. I put this back to "work-in-progress" - set the status to "needs review" once you're ready for it to be looked at again. Thanks for the work!

=== modified file 'drizzled/field/date.cc'
--- drizzled/field/date.cc	2010-09-22 17:46:49 +0000
+++ drizzled/field/date.cc	2010-10-04 13:27:46 +0000
@@ -19,6 +19,8 @@
  */
 
 #include "config.h"
+#include <boost/lexical_cast.hpp>
+
 #include "drizzled/field/date.h"
 #include "drizzled/error.h"
 #include "drizzled/table.h"
@@ -108,10 +110,8 @@
   DateTime temporal;
   if (! temporal.from_int64_t(from))
   {
-    /* Convert the integer to a string using stringstream */
-    std::stringstream ss;
-    std::string tmp;
-    ss << from; ss >> tmp;
+    /* Convert the integer to a string using boost::lexical_cast */
+    std::string tmp(boost::lexical_cast<std::string>(from)); 
 
     my_error(ER_INVALID_DATETIME_VALUE, MYF(ME_FATALERROR), tmp.c_str());
     return 2;

=== modified file 'drizzled/field/datetime.cc'
--- drizzled/field/datetime.cc	2010-09-22 17:46:49 +0000
+++ drizzled/field/datetime.cc	2010-10-04 13:27:46 +0000
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include <boost/lexical_cast.hpp>
 #include "drizzled/field/datetime.h"
 #include "drizzled/error.h"
 #include "drizzled/table.h"
@@ -75,11 +76,8 @@
   ASSERT_COLUMN_MARKED_FOR_WRITE;
   if (from < 0.0 || from > 99991231235959.0)
   {
-    /* Convert the double to a string using stringstream */
-    std::stringstream ss;
-    std::string tmp;
-    ss.precision(18); /* 18 places should be fine for error display of double input. */
-    ss << from; ss >> tmp;
+    /* Convert the double to a string using boost::lexical_cast */
+    std::string tmp(boost::lexical_cast<std::string>(from));
 
     my_error(ER_INVALID_DATETIME_VALUE, MYF(ME_FATALERROR), tmp.c_str());
     return 2;
@@ -97,10 +95,8 @@
   DateTime temporal;
   if (! temporal.from_int64_t(from))
   {
-    /* Convert the integer to a string using stringstream */
-    std::stringstream ss;
-    std::string tmp;
-    ss << from; ss >> tmp;
+    /* Convert the integer to a string using boost::lexical_cast */
+    std::string tmp(boost::lexical_cast<std::string>(from));
 
     my_error(ER_INVALID_DATETIME_VALUE, MYF(ME_FATALERROR), tmp.c_str());
     return 2;

=== modified file 'drizzled/field/enum.cc'
--- drizzled/field/enum.cc	2010-09-22 22:29:55 +0000
+++ drizzled/field/enum.cc	2010-10-04 13:27:46 +0000
@@ -18,8 +18,8 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
 #include "config.h"
+#include <boost/lexical_cast.hpp>
 #include "drizzled/field/enum.h"
 #include "drizzled/error.h"
 #include "drizzled/table.h"
@@ -110,10 +110,8 @@
 
   if (from <= 0 || (uint64_t) from > typelib->count)
   {
-    /* Convert the integer to a string using stringstream */
-    std::stringstream ss;
-    std::string tmp;
-    ss << from; ss >> tmp;
+    /* Convert the integer to a string using boost::lexical_cast */
+    std::string tmp(boost::lexical_cast<std::string>(from));
 
     my_error(ER_INVALID_ENUM_VALUE, MYF(ME_FATALERROR), tmp.c_str());
     return 1;

=== modified file 'drizzled/field/timestamp.cc'
--- drizzled/field/timestamp.cc	2010-09-22 15:41:38 +0000
+++ drizzled/field/timestamp.cc	2010-10-04 13:27:46 +0000
@@ -18,8 +18,8 @@
  *  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-
 #include "config.h"
+#include <boost/lexical_cast.hpp>
 #include <drizzled/field/timestamp.h>
 #include <drizzled/error.h>
 #include <drizzled/tztime.h>
@@ -187,7 +187,8 @@
     std::stringstream ss;
     std::string tmp;
     ss.precision(18); /* 18 places should be fine for error display of double input. */
-    ss << from; ss >> tmp;
+    ss << from; 
+    ss >> tmp;
 
     my_error(ER_INVALID_UNIX_TIMESTAMP_VALUE, MYF(ME_FATALERROR), tmp.c_str());
     return 2;
@@ -206,10 +207,8 @@
   Timestamp temporal;
   if (! temporal.from_int64_t(from))
   {
-    /* Convert the integer to a string using stringstream */
-    std::stringstream ss;
-    std::string tmp;
-    ss << from; ss >> tmp;
+    /* Convert the integer to a string using boost::lexical_cast */
+    std::string tmp(boost::lexical_cast<std::string>(from));
 
     my_error(ER_INVALID_UNIX_TIMESTAMP_VALUE, MYF(ME_FATALERROR), tmp.c_str());
     return 2;

=== modified file 'drizzled/function/time/from_days.cc'
--- drizzled/function/time/from_days.cc	2010-02-04 08:14:46 +0000
+++ drizzled/function/time/from_days.cc	2010-10-04 13:27:46 +0000
@@ -18,6 +18,7 @@
  */
 
 #include "config.h"
+#include <boost/lexical_cast.hpp>
 #include "drizzled/function/time/from_days.h"
 #include "drizzled/error.h"
 #include "drizzled/temporal.h"
@@ -54,9 +55,7 @@
   if (! to.from_julian_day_number(int_value))
   {
     /* Bad input, throw an error */
-    std::stringstream ss;
-    std::string tmp;
-    ss << int_value; ss >> tmp;
+    std::string tmp(boost::lexical_cast<std::string>(int_value));
 
     my_error(ER_ARGUMENT_OUT_OF_RANGE, MYF(ME_FATALERROR), tmp.c_str(), func_name());
     return false;

=== modified file 'drizzled/function/time/from_unixtime.cc'
--- drizzled/function/time/from_unixtime.cc	2010-02-04 08:14:46 +0000
+++ drizzled/function/time/from_unixtime.cc	2010-10-04 13:27:46 +0000
@@ -18,7 +18,7 @@
  */
 
 #include "config.h"
-
+#include <boost/lexical_cast.hpp>
 #include "drizzled/function/time/from_unixtime.h"
 #include "drizzled/session.h"
 #include "drizzled/temporal.h"
@@ -85,9 +85,7 @@
   if (! temporal.from_time_t((time_t) tmp))
   {
     null_value= true;
-    std::stringstream ss;
-    std::string tmp_string;
-    ss << tmp; ss >> tmp_string;
+    std::string tmp_string(boost::lexical_cast<std::string>(tmp));
     my_error(ER_INVALID_UNIX_TIMESTAMP_VALUE, MYF(0), tmp_string.c_str());
     return 0;
   }

=== modified file 'drizzled/identifier/table.cc'
--- drizzled/identifier/table.cc	2010-09-23 01:53:13 +0000
+++ drizzled/identifier/table.cc	2010-10-04 13:27:46 +0000
@@ -21,7 +21,7 @@
 #include "config.h"
 
 #include <assert.h>
-
+#include <boost/lexical_cast.hpp>
 #include "drizzled/identifier.h"
 #include "drizzled/session.h"
 #include "drizzled/internal/my_sys.h"

=== modified file 'drizzled/message/statement_transform.cc'
--- drizzled/message/statement_transform.cc	2010-09-22 21:51:30 +0000
+++ drizzled/message/statement_transform.cc	2010-10-04 13:27:46 +0000
@@ -31,6 +31,7 @@
 
 #include "config.h"
 
+#include <boost/lexical_cast.hpp>
 #include "drizzled/message/statement_transform.h"
 #include "drizzled/message/transaction.pb.h"
 #include "drizzled/message/table.pb.h"
@@ -1036,8 +1037,6 @@
   if (sql_variant == ANSI)
     return NONE; /* ANSI does not support table options... */
 
-  stringstream ss;
-
   if (options.has_comment())
   {
     destination.append(" COMMENT=", 9);
@@ -1066,35 +1065,27 @@
 
   if (options.has_max_rows())
   {
-    ss << options.max_rows();
     destination.append("\nMAX_ROWS = ", 12);
-    destination.append(ss.str());
-    ss.clear();
+    destination.append(boost::lexical_cast<string>(options.max_rows()));
   }
 
   if (options.has_min_rows())
   {
-    ss << options.min_rows();
     destination.append("\nMIN_ROWS = ", 12);
-    destination.append(ss.str());
-    ss.clear();
+    destination.append(boost::lexical_cast<string>(options.min_rows()));
   }
 
   if (options.has_user_set_auto_increment_value()
       && options.has_auto_increment_value())
   {
-    ss << options.auto_increment_value();
     destination.append(" AUTO_INCREMENT=", 16);
-    destination.append(ss.str());
-    ss.clear();
+    destination.append(boost::lexical_cast<string>(options.auto_increment_value()));
   }
 
   if (options.has_avg_row_length())
   {
-    ss << options.avg_row_length();
     destination.append("\nAVG_ROW_LENGTH = ", 18);
-    destination.append(ss.str());
-    ss.clear();
+    destination.append(boost::lexical_cast<string>(options.avg_row_length()));
   }
 
   if (options.has_checksum() &&
@@ -1160,10 +1151,8 @@
       {
         if (part.compare_length() != field.string_options().length())
         {
-          stringstream ss;
           destination.push_back('(');
-          ss << part.compare_length();
-          destination.append(ss.str());
+          destination.append(boost::lexical_cast<string>(part.compare_length()));
           destination.push_back(')');
         }
       }
@@ -1325,9 +1314,8 @@
       else
         destination.append(" VARCHAR(", 9);
 
-      stringstream ss;
-      ss << field.string_options().length() << ")";
-      destination.append(ss.str());
+      destination.append(boost::lexical_cast<string>(field.string_options().length()));
+      destination.append(")");
     }
     break;
   case Table::Field::BLOB:

=== modified file 'drizzled/status_helper.cc'
--- drizzled/status_helper.cc	2010-08-21 21:31:59 +0000
+++ drizzled/status_helper.cc	2010-10-04 13:27:46 +0000
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include <boost/lexical_cast.hpp>
 #include "status_helper.h"
 #include "drizzled/set_var.h"
 #include "drizzled/drizzled.h"
@@ -77,23 +78,19 @@
     value= ((char *) status_var + (ulong) value);
     /* fall through */
   case SHOW_LONG:
-    oss << *(long*) value;
-    return_value= oss.str();
+    return_value=boost::lexical_cast<std::string>(*(long*) value);
     break;
   case SHOW_LONGLONG_STATUS:
     value= ((char *) status_var + (uint64_t) value);
     /* fall through */
   case SHOW_LONGLONG:
-    oss << *(int64_t*) value;
-    return_value= oss.str();
+    return_value=boost::lexical_cast<std::string>(*(int64_t*) value);
     break;
   case SHOW_SIZE:
-    oss << *(size_t*) value;
-    return_value= oss.str();
+    return_value=boost::lexical_cast<std::string>(*(size_t*) value);
     break;
   case SHOW_HA_ROWS:
-    oss << (int64_t) *(ha_rows*) value;
-    return_value= oss.str();
+    return_value=boost::lexical_cast<std::string>((int64_t) *(ha_rows*) value);
     break;
   case SHOW_BOOL:
   case SHOW_MY_BOOL:
@@ -101,8 +98,7 @@
     break;
   case SHOW_INT:
   case SHOW_INT_NOFLUSH: // the difference lies in refresh_status()
-    oss << (long) *(uint32_t*) value;
-    return_value= oss.str();
+    return_value=boost::lexical_cast<std::string>((long) *(uint32_t*) value);
     break;
   case SHOW_CHAR:
     {

=== modified file 'drizzled/util/convert.h'
--- drizzled/util/convert.h	2010-03-18 18:07:58 +0000
+++ drizzled/util/convert.h	2010-10-04 13:27:46 +0000
@@ -21,6 +21,7 @@
 #ifndef DRIZZLED_UTIL_CONVERT_H
 #define DRIZZLED_UTIL_CONVERT_H
 
+#include <boost/lexical_cast.hpp>
 #include <string>
 #include <iostream>
 #include <sstream>
@@ -31,9 +32,7 @@
 template <class T>
 std::string to_string(T t)
 {
-  std::ostringstream o;
-  o << t;
-  return o.str();
+  return boost::lexical_cast<std::string>(t);
 }
 
 template <class T>