Merge lp:~linuxjedi/drizzle/trunk-bug-683940 into lp:drizzle/7.0

[Andrew Hutchings]

In some cases foreign keys were not migrated in drizzledump, performance also sucked. An improved method still had poor performance and hits bugs in MySQL 5.5. Switching to regex of SHOW CREATE TABLE for fkeys during migration instead.

=== modified file 'client/drizzledump_mysql.cc'
--- client/drizzledump_mysql.cc	2010-11-02 10:28:05 +0000
+++ client/drizzledump_mysql.cc	2010-12-02 14:54:12 +0000
@@ -306,96 +306,55 @@
   if (verbose)
     std::cerr << _("-- Retrieving foreign keys for ") << tableName << "..." << std::endl;
 
-  query= "SHOW TABLES FROM INFORMATION_SCHEMA LIKE 'REFERENTIAL_CONSTRAINTS'";
-
+  query= "SHOW CREATE TABLE `";
+  query.append(database->databaseName);
+  query.append("`.`");
+  query.append(tableName);
+  query.append("`");
   result= dcon->query(query);
 
   if (result == NULL)
     return false;
 
-  uint64_t search_count = drizzle_result_row_count(result);
-
-  dcon->freeResult(result);
-
-  /* MySQL 5.0 will be 0 and MySQL 5.1 will be 1 */
-  if (search_count > 0)
+  if ((row= drizzle_row_next(result)))
   {
-    query= "select rc.constraint_name, rc.referenced_table_name, group_concat(distinct concat('`',kc.column_name,'`')), rc.update_rule, rc.delete_rule, rc.match_option, group_concat(distinct concat('`',kt.column_name,'`')) from information_schema.referential_constraints rc join information_schema.key_column_usage kt on (rc.constraint_schema = kt.constraint_schema and rc.constraint_name = kt.constraint_name) join information_schema.key_column_usage kc on (rc.constraint_schema = kc.constraint_schema and rc.referenced_table_name = kc.table_name and rc.unique_constraint_name = kc.constraint_name) where rc.constraint_schema='";
-    query.append(database->databaseName);
-    query.append("' and rc.table_name='");
-    query.append(tableName);
-    query.append("' group by rc.constraint_name");
-
-    result= dcon->query(query);
-
-    if (result == NULL)
-      return false;
-
-    while ((row= drizzle_row_next(result)))
+    boost::match_flag_type flags = boost::match_default;
+    boost::regex constraint_regex("CONSTRAINT `(.*)` FOREIGN KEY \\((.*)\\) REFERENCES `(.*)` \\((.*)\\)( ON (UPDATE|DELETE) (CASCADE|RESTRICT|SET NULL))?( ON (UPDATE|DELETE) (CASCADE|RESTRICT|SET NULL))?");
+
+    boost::match_results<std::string::const_iterator> constraint_results;
+
+    std::string search_body(row[1]);
+    std::string::const_iterator start, end;
+    start= search_body.begin();
+    end= search_body.end();
+    while (regex_search(start, end, constraint_results, constraint_regex, flags))
     {
-      fkey= new DrizzleDumpForeignKey(row[0], dcon);
-      fkey->parentColumns= row[6];
-      fkey->childTable= row[1];
-      fkey->childColumns= row[2];
-      fkey->updateRule= (strcmp(row[3], "RESTRICT") != 0) ? row[3] : "";
-      fkey->deleteRule= (strcmp(row[4], "RESTRICT") != 0) ? row[4] : "";
-      fkey->matchOption= (strcmp(row[5], "NONE") != 0) ? row[5] : "";
+      fkey= new DrizzleDumpForeignKey(constraint_results[1], dcon);
+      fkey->parentColumns= constraint_results[2];
+      fkey->childTable= constraint_results[3];
+      fkey->childColumns= constraint_results[4];
+        
+      if (constraint_results[5].compare("") != 0)
+      {
+        if (constraint_results[6].compare("UPDATE") == 0)
+          fkey->updateRule= constraint_results[7];
+        else if (constraint_results[6].compare("DELETE") == 0)
+          fkey->deleteRule= constraint_results[7];
+      }
+      if (constraint_results[8].compare("") != 0)
+      {
+        if (constraint_results[9].compare("UPDATE") == 0)
+          fkey->updateRule= constraint_results[10];
+        else if (constraint_results[9].compare("DELETE") == 0)
+          fkey->deleteRule= constraint_results[10];
+      }
+      fkey->matchOption= "";
 
       fkeys.push_back(fkey);
-    }
-  }
-  else
-  {
-    query= "SHOW CREATE TABLE `";
-    query.append(database->databaseName);
-    query.append("`.`");
-    query.append(tableName);
-    query.append("`");
-    result= dcon->query(query);
-
-    if (result == NULL)
-      return false;
-
-    if ((row= drizzle_row_next(result)))
-    {
-      boost::match_flag_type flags = boost::match_default;
-      boost::regex constraint_regex("CONSTRAINT `(.*)` FOREIGN KEY \\((.*)\\) REFERENCES `(.*)` \\((.*)\\)( ON (UPDATE|DELETE) (CASCADE|RESTRICT|SET NULL))?( ON (UPDATE|DELETE) (CASCADE|RESTRICT|SET NULL))?");
-
-      boost::match_results<std::string::const_iterator> constraint_results;
-
-      std::string search_body(row[1]);
-      std::string::const_iterator start, end;
-      start= search_body.begin();
-      end= search_body.end();
-      while (regex_search(start, end, constraint_results, constraint_regex, flags))
-      {
-        fkey= new DrizzleDumpForeignKey(constraint_results[1], dcon);
-        fkey->parentColumns= constraint_results[2];
-        fkey->childTable= constraint_results[3];
-        fkey->childColumns= constraint_results[4];
-        
-        if (constraint_results[5].compare("") != 0)
-        {
-          if (constraint_results[6].compare("UPDATE") == 0)
-            fkey->updateRule= constraint_results[7];
-          else if (constraint_results[6].compare("DELETE") == 0)
-            fkey->deleteRule= constraint_results[7];
-        }
-        if (constraint_results[8].compare("") != 0)
-        {
-          if (constraint_results[9].compare("UPDATE") == 0)
-            fkey->updateRule= constraint_results[10];
-          else if (constraint_results[9].compare("DELETE") == 0)
-            fkey->deleteRule= constraint_results[10];
-        }
-        fkey->matchOption= "";
-
-        fkeys.push_back(fkey);
-
-        start= constraint_results[0].second;
-        flags |= boost::match_prev_avail; 
-        flags |= boost::match_not_bob;
-      }
+
+      start= constraint_results[0].second;
+      flags |= boost::match_prev_avail; 
+      flags |= boost::match_not_bob;
     }
   }
   dcon->freeResult(result);