Merge lp:~linuxjedi/drizzle/trunk-bug-660619 into lp:~drizzle-trunk/drizzle/development

[Andrew Hutchings]

DrizzleDump fixes:
* Fix error handling on --destination=database
* Stop --show-progress-size displaying by default
* Stop erroneous "),(" before "INSERT"
* Fix line length counting for --destination=database
* Fix some indentation

[Brian Aker (brianaker)]

Small request, in the future please try to use "x" or something other then "i" as an iterator. As you get older "i" is very difficult to distinguish :)

[Andrew Hutchings (linuxjedi)]

lol, no problem :)

[Jay Pipes (jaypipes)]

also, destination is misspelled "destnation"

[Andrew Hutchings (linuxjedi)]

doh! and that will teach me not to copy/paste ;)

=== modified file 'client/drizzledump.cc'
--- client/drizzledump.cc	2010-10-06 07:31:26 +0000
+++ client/drizzledump.cc	2010-10-15 19:09:43 +0000
@@ -207,6 +207,7 @@
   }
   sbuf.setConnection(destination_connection);
   std::ostream sout(&sbuf);
+  sout.exceptions(ios_base::badbit);
 
   if (path.empty())
   {
@@ -219,8 +220,17 @@
 
   for (i= database_store.begin(); i != database_store.end(); ++i)
   {
-    DrizzleDumpDatabase *database= *i;
-    sout << *database;
+    try
+    {
+      DrizzleDumpDatabase *database= *i;
+      sout << *database;
+    }
+    catch (...)
+    {
+      std::cout << _("Error inserting into destnation database") << std::endl;
+      if (not ignore_errors)
+        maybe_exit(EX_DRIZZLEERR);
+    }
   }
 
   if (path.empty())

=== modified file 'client/drizzledump_data.cc'
--- client/drizzledump_data.cc	2010-10-10 08:28:30 +0000
+++ client/drizzledump_data.cc	2010-10-15 19:09:43 +0000
@@ -222,6 +222,7 @@
   bool new_insert= true;
   bool first= true;
   uint64_t rownr= 0;
+  size_t byte_counter= 0;
 
   drizzle_row_t row;
 
@@ -256,18 +257,22 @@
   while((row= drizzle_row_next(obj.result)))
   {
     rownr++;
-    if ((rownr % show_progress_size) == 0)
+    if (verbose and (rownr % show_progress_size) == 0)
     {
       std::cerr << "-- " << rownr << _(" rows dumped for table ") << obj.table->displayName << std::endl;
     }
 
     size_t* row_sizes= drizzle_row_field_sizes(obj.result);
-    if (not first)
+    for (uint32_t i= 0; i < drizzle_result_column_count(obj.result); i++)
+      byte_counter+= row_sizes[i];
+
+    if (not first and not new_insert)
     {
       if (extended_insert)
         os << "),(";
       else
         os << ");" << std::endl;
+      byte_counter+= 3;
     }
     else
       first= false;
@@ -283,6 +288,7 @@
           os << "IGNORE ";
       }
       os << "INTO `" << obj.table->displayName << "` VALUES (";
+      byte_counter+= 28 + obj.table->displayName.length();
       if (extended_insert)
         new_insert= false;
     }
@@ -304,9 +310,13 @@
           /* Hex blob processing or escape text */
           if (((obj.table->fields[i]->type.compare("BLOB") == 0) or
             (obj.table->fields[i]->type.compare("VARBINARY") == 0)))
+          {
             os << obj.convertHex((unsigned char*)row[i], row_sizes[i]);
+            byte_counter+= row_sizes[i];
+          }
           else
             os << "'" << DrizzleDumpData::escape(row[i], row_sizes[i]) << "'";
+          byte_counter+= 3;
         }
         else
           os << row[i];
@@ -316,11 +326,11 @@
     }
     /* Break insert up if it is too long */
     if (extended_insert and
-      ((os.tellp() - out_position) >= DRIZZLE_MAX_LINE_LENGTH))
+      (byte_counter >= DRIZZLE_MAX_LINE_LENGTH))
     {
       os << ");" << std::endl;
       new_insert= true;
-      out_position= os.tellp();
+      byte_counter= 0;
     }
   }
   os << ");" << std::endl;

=== modified file 'client/drizzledump_data.h'
--- client/drizzledump_data.h	2010-10-05 21:10:25 +0000
+++ client/drizzledump_data.h	2010-10-15 19:09:43 +0000
@@ -226,7 +226,8 @@
 
     void writeString(std::string &str)
     {
-      connection->queryNoResult(str);
+      if (not connection->queryNoResult(str))
+        throw 1;
     }
 
     void setConnection(DrizzleDumpConnection *conn) { connection= conn; }
@@ -255,23 +256,23 @@
 
     int	sync()
     {
-        size_t len = size_t(pptr() - pbase());
-        std::string temp(pbase(), len);
-
-        /* Drop newlines */
-        temp.erase(std::remove(temp.begin(), temp.end(), '\n'), temp.end());
-
-        if (temp.compare(0, 2, "--") == 0)
-        {
-          /* Drop comments */
-          setp(pbase(), epptr());
-        }
-        if (temp.find(";") != std::string::npos)
-        {
-            writeString(temp);
-            setp(pbase(), epptr());
-        }
-        return 0;
+      size_t len = size_t(pptr() - pbase());
+      std::string temp(pbase(), len);
+
+      /* Drop newlines */
+      temp.erase(std::remove(temp.begin(), temp.end(), '\n'), temp.end());
+
+      if (temp.compare(0, 2, "--") == 0)
+      {
+        /* Drop comments */
+        setp(pbase(), epptr());
+      }
+      if (temp.find(";") != std::string::npos)
+      {
+        writeString(temp);
+        setp(pbase(), epptr());
+      }
+      return 0;
     }
 };