cleanup: remove String::append_float

between set_real() and set_fcvt(), a third String method for
real->string conversion looks definitely redundant

Author: vuvova

sql/sql_string.cc

@@ -118,38 +118,6 @@ bool Binary_string::realloc_raw(size_t alloc_length)
 }
 
 
-static uint32 write_float_str_to_buff(char *buff, int buff_len,
-                                      float num, uint decimals)
-{
-  if (decimals >= FLOATING_POINT_DECIMALS)
-    return (uint32)my_gcvt(num, MY_GCVT_ARG_FLOAT, buff_len - 1, buff, NULL);
-  else
-    return (uint32)my_fcvt(num, decimals, buff, NULL);
-}
-
-bool String::append_float(float num, uint decimals)
-{
-  uint dummy_errors;
-  size_t len;
-  DBUG_ASSERT(!std::isnan(num));
-  DBUG_ASSERT(!std::isinf(num));
-  if (realloc_with_extra_if_needed(str_length + FLOATING_POINT_BUFFER))
-    return true;
-
-  if (charset()->mbminlen > 1)
-  {
-    char buff[FLOATING_POINT_BUFFER];
-    len= write_float_str_to_buff(buff, sizeof(buff), num, decimals);
-    str_length+= copy_and_convert(Ptr + str_length, len, charset(), buff, len,
-                                  &my_charset_latin1, &dummy_errors);
-  }
-  else
-    str_length+= write_float_str_to_buff(Ptr + str_length,
-                                         FLOATING_POINT_BUFFER, num, decimals);
-  return false;
-}
-
-
 bool String::set_int(longlong num, bool unsigned_flag, CHARSET_INFO *cs)
 {
   /*
@@ -242,7 +210,8 @@ bool Binary_string::set_fcvt(double num, uint decimals)
 }
 
 
-bool String::set_real(double num,uint decimals, CHARSET_INFO *cs)
+bool String::set_real_with_type(double num, uint decimals, CHARSET_INFO *cs,
+                                my_gcvt_arg_type type)
 {
   char buff[FLOATING_POINT_BUFFER];
   uint dummy_errors;
@@ -251,12 +220,11 @@ bool String::set_real(double num,uint decimals, CHARSET_INFO *cs)
   set_charset(cs);
   if (decimals >= FLOATING_POINT_DECIMALS)
   {
-    len= my_gcvt(num, MY_GCVT_ARG_DOUBLE, sizeof(buff) - 1, buff, NULL);
+    len= my_gcvt(num, type, sizeof(buff) - 1, buff, NULL);
     return copy(buff, (uint)len, &my_charset_latin1, cs, &dummy_errors);
   }
   len= my_fcvt(num, decimals, buff, NULL);
-  return copy(buff, (uint32) len, &my_charset_latin1, cs,
-              &dummy_errors);
+  return copy(buff, (uint32) len, &my_charset_latin1, cs, &dummy_errors);
 }
 
 

sql/sql_string.h

@@ -897,7 +897,11 @@ class String: public Charset, public Binary_string
   bool set(ulong num, CHARSET_INFO *cs) { return set_int(num, true, cs); }
   bool set(longlong num, CHARSET_INFO *cs) { return set_int(num, false, cs); }
   bool set(ulonglong num, CHARSET_INFO *cs) { return set_int((longlong)num, true, cs); }
-  bool set_real(double num,uint decimals, CHARSET_INFO *cs);
+  bool set_real_with_type(double num, uint decimals, CHARSET_INFO *cs, my_gcvt_arg_type);
+  bool set_real(double num,uint decimals, CHARSET_INFO *cs)
+  { return set_real_with_type(num,decimals,cs,MY_GCVT_ARG_DOUBLE); }
+  bool set_real(float num,uint decimals, CHARSET_INFO *cs)
+  { return set_real_with_type(num,decimals,cs,MY_GCVT_ARG_FLOAT); }
   bool set_fcvt(double num, uint decimals)
   {
     set_charset(&my_charset_latin1);
@@ -1012,11 +1016,6 @@ class String: public Charset, public Binary_string
     return Binary_string::append(s);
   }
 
-  // Append a float value to the string keeping the string's charset.
-  //
-  // The float value must not be NaN or Inf, it will be represented as 0 in
-  // that case.
-  bool append_float(float num, uint decimals);
   inline bool append(char chr)
   {
     return Binary_string::append_char(chr);

sql/sql_type.cc

@@ -331,9 +331,7 @@ Type_handler_data *type_handler_data= NULL;
 
 bool Float::to_string(String *val_buffer, uint dec) const
 {
-  val_buffer->set_charset(&my_charset_numeric);
-  val_buffer->length(0);
-  return val_buffer->append_float(m_value, dec);
+  return val_buffer->set_real(m_value, dec, &my_charset_numeric);
 }