Merge lp:~percona-toolkit-dev/percona-toolkit/fix-pqd-distill-bug-821690 into lp:percona-toolkit/2.2

[Daniel Nichter]

[lp:~percona-toolkit-dev/percona-toolkit/fix-pqd-distill-bug-821690]

587. By Daniel Nichter on 2013-08-03

Update QueryRewriter in pqd.

588. By Daniel Nichter on 2013-08-03

Fix 'unexpectedly succeeded' in t/pt-query-digest/processlist.t.

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'bin/pt-query-digest'
--- bin/pt-query-digest	2013-08-03 19:43:19 +0000
+++ bin/pt-query-digest	2013-08-03 21:09:30 +0000
@@ -2962,6 +2962,7 @@
    eval $QueryParser::tbl_ident;
    my ( $dds ) = $query =~ /^\s*($QueryParser::data_def_stmts)\b/i;
    if ( $dds) {
+      $query =~ s/\s+IF(?:\s+NOT)?\s+EXISTS/ /i;
       my ( $obj ) = $query =~ m/$dds.+(DATABASE|TABLE)\b/i;
       $obj = uc $obj if $obj;
       PTDEBUG && _d('Data def statment:', $dds, 'obj:', $obj);
 
=== modified file 'lib/QueryRewriter.pm'
--- lib/QueryRewriter.pm	2013-08-03 18:44:41 +0000
+++ lib/QueryRewriter.pm	2013-08-03 21:09:30 +0000
@@ -298,6 +298,8 @@
    eval $QueryParser::tbl_ident;
    my ( $dds ) = $query =~ /^\s*($QueryParser::data_def_stmts)\b/i;
    if ( $dds) {
+      # https://bugs.launchpad.net/percona-toolkit/+bug/821690
+      $query =~ s/\s+IF(?:\s+NOT)?\s+EXISTS/ /i;
       my ( $obj ) = $query =~ m/$dds.+(DATABASE|TABLE)\b/i;
       $obj = uc $obj if $obj;
       PTDEBUG && _d('Data def statment:', $dds, 'obj:', $obj);
 
=== modified file 't/lib/QueryRewriter.t'
--- t/lib/QueryRewriter.t	2013-08-03 18:44:41 +0000
+++ t/lib/QueryRewriter.t	2013-08-03 21:09:30 +0000
@@ -1440,6 +1440,20 @@
    "distill REPLACE without INTO (bug 984053)"
 );
 
+# IF EXISTS
+# https://bugs.launchpad.net/percona-toolkit/+bug/821690
+is(
+   $qr->distill("DROP TABLE IF EXISTS foo"),
+   "DROP TABLE foo",
+   "distill DROP TABLE IF EXISTS foo (bug 821690)"
+);
+
+is(
+   $qr->distill("CREATE TABLE IF NOT EXISTS foo"),
+   "CREATE TABLE foo",
+   "distill CREATE TABLE IF NOT EXISTS foo",
+);
+
 # #############################################################################
 # Done.
 # #############################################################################
 
=== modified file 't/pt-query-digest/processlist.t'
--- t/pt-query-digest/processlist.t	2012-11-21 16:58:40 +0000
+++ t/pt-query-digest/processlist.t	2013-08-03 21:09:30 +0000
@@ -27,9 +27,6 @@
 if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
-else {
-   plan tests => 3;
-}
 
 my @args = qw(-F /tmp/12345/my.sandbox.cnf --processlist h=127.1 --report-format query_report);
 
@@ -58,21 +55,18 @@
 # the usual stddev. -- stddev doesn't matter much.  It's the other vals
 # that indicate that --processlist works.
 $exec =~ s/(\S+)      3s$/786ms      3s/;
-TODO: {
-    local $::TODO = "This is a timing-related test, which may occasionally fail";
-    ok(
-    no_diff(
-        $exec,
-        "t/pt-query-digest/samples/proclist001.txt",
-        cmd_output => 1,
-    ),
-    "--processlist correctly observes and measures multiple queries"
-    );
-}
+ok(
+   no_diff(
+      $exec,
+      "t/pt-query-digest/samples/proclist001.txt",
+      cmd_output => 1,
+   ),
+   "--processlist correctly observes and measures multiple queries"
+);
 
 # #############################################################################
 # Done.
 # #############################################################################
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-exit;
+done_testing;