Merge lp:~percona-toolkit-dev/percona-toolkit/fix-dupe-key-bug-894140 into lp:percona-toolkit/2.1

[Daniel Nichter]

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'bin/pt-duplicate-key-checker'
--- bin/pt-duplicate-key-checker	2012-04-03 19:42:45 +0000
+++ bin/pt-duplicate-key-checker	2012-05-15 01:11:18 +0000
@@ -2664,7 +2664,7 @@
          }
          else {
             PTDEBUG && _d($right_name, 'not left-prefix of', $left_name);
-            next LEFT_KEY;
+            next RIGHT_KEY;
          }
       } # RIGHT_KEY
    } # LEFT_KEY
 
=== modified file 'lib/DuplicateKeyFinder.pm'
--- lib/DuplicateKeyFinder.pm	2012-01-19 19:46:56 +0000
+++ lib/DuplicateKeyFinder.pm	2012-05-15 01:11:18 +0000
@@ -359,7 +359,7 @@
          }
          else {
             PTDEBUG && _d($right_name, 'not left-prefix of', $left_name);
-            next LEFT_KEY;
+            next RIGHT_KEY;
          }
       } # RIGHT_KEY
    } # LEFT_KEY
 
=== modified file 't/lib/DuplicateKeyFinder.t'
--- t/lib/DuplicateKeyFinder.t	2012-03-06 13:56:08 +0000
+++ t/lib/DuplicateKeyFinder.t	2012-05-15 01:11:18 +0000
@@ -9,7 +9,7 @@
 use strict;
 use warnings FATAL => 'all';
 use English qw(-no_match_vars);
-use Test::More tests => 37;
+use Test::More tests => 38;
 
 use DuplicateKeyFinder;
 use Quoter;
@@ -729,6 +729,48 @@
    'Issue 1192'
 );
 
+
+# #############################################################################
+# https://bugs.launchpad.net/percona-toolkit/+bug/894140
+# #############################################################################
+$ddl   = load_file('t/lib/samples/dupekeys/dupe-cluster-bug-894140.sql');
+$dupes = [];
+($keys, $ck) = $tp->get_keys($ddl, $opt);
+$dk->get_duplicate_keys(
+   $keys,
+   clustered_key => $ck,
+   clustered     => 1,
+   callback      => $callback,
+   tbl_info      => { engine => 'InnoDB', ddl => $ddl },
+);
+
+is_deeply(
+   $dupes,
+   [
+     {
+       cols              => [ 'row_id' ],
+       ddl               => 'UNIQUE KEY `row_id` (`row_id`),',
+       dupe_type         => 'exact',
+       duplicate_of      => 'PRIMARY',
+       duplicate_of_cols => [ 'row_id' ],
+       duplicate_of_ddl  => 'PRIMARY KEY (`row_id`),',
+       key               => 'row_id',
+       reason            => 'row_id is a duplicate of PRIMARY',
+     },
+     {
+       cols              => [ 'player_id' ],
+       ddl               => 'KEY `player_id_2` (`player_id`)',
+       dupe_type         => 'exact',
+       duplicate_of      => 'player_id',
+       duplicate_of_cols => [ 'player_id' ],
+       duplicate_of_ddl  => 'UNIQUE KEY `player_id` (`player_id`),',
+       key               => 'player_id_2',
+       reason            => 'player_id_2 is a duplicate of player_id',
+     },
+   ],
+   'Finds duplicates OK on uppercase columns',
+);
+
 # #############################################################################
 # Done.
 # #############################################################################
 
=== added file 't/lib/samples/dupekeys/dupe-cluster-bug-894140.sql'
--- t/lib/samples/dupekeys/dupe-cluster-bug-894140.sql	1970-01-01 00:00:00 +0000
+++ t/lib/samples/dupekeys/dupe-cluster-bug-894140.sql	2012-05-15 01:11:18 +0000
@@ -0,0 +1,8 @@
+CREATE TABLE `bug_894140` (
+  `row_id` bigint(20) NOT NULL AUTO_INCREMENT,
+  `player_id` bigint(20) DEFAULT NULL,
+  PRIMARY KEY (`row_id`),
+  UNIQUE KEY `row_id` (`row_id`),
+  UNIQUE KEY `player_id` (`player_id`),
+  KEY `player_id_2` (`player_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8
 
=== modified file 't/pt-duplicate-key-checker/basics.t'
--- t/pt-duplicate-key-checker/basics.t	2011-07-12 22:56:55 +0000
+++ t/pt-duplicate-key-checker/basics.t	2012-05-15 01:11:18 +0000
@@ -23,7 +23,7 @@
    plan skip_all => 'Cannot connect to sandbox master';
 }
 else {
-   plan tests => 8;
+   plan tests => 9;
 }
 
 my $output;
@@ -95,6 +95,17 @@
    'No results for nonexistent db'
 );
 
+$dbh->do('create database test');
+$sb->load_file('master', 't/lib/samples/dupekeys/dupe-cluster-bug-894140.sql', 'test');
+
+ok(
+   no_diff(
+      sub { pt_duplicate_key_checker::main(@args, qw(-d test)) },
+      "$sample/bug-894140.txt",
+    ),
+   "Bug 894140"
+);
+
 # #############################################################################
 # Done.
 # #############################################################################
 
=== added file 't/pt-duplicate-key-checker/samples/bug-894140.txt'
--- t/pt-duplicate-key-checker/samples/bug-894140.txt	1970-01-01 00:00:00 +0000
+++ t/pt-duplicate-key-checker/samples/bug-894140.txt	2012-05-15 01:11:18 +0000
@@ -0,0 +1,29 @@
+# ########################################################################
+# test.bug_894140                                                         
+# ########################################################################
+
+# row_id is a duplicate of PRIMARY
+# Key definitions:
+#   UNIQUE KEY `row_id` (`row_id`),
+#   PRIMARY KEY (`row_id`),
+# Column types:
+#	  `row_id` bigint(20) not null auto_increment
+# To remove this duplicate index, execute:
+ALTER TABLE `test`.`bug_894140` DROP INDEX `row_id`;
+
+# player_id_2 is a duplicate of player_id
+# Key definitions:
+#   KEY `player_id_2` (`player_id`)
+#   UNIQUE KEY `player_id` (`player_id`),
+# Column types:
+#	  `player_id` bigint(20) default null
+# To remove this duplicate index, execute:
+ALTER TABLE `test`.`bug_894140` DROP INDEX `player_id_2`;
+
+# ########################################################################
+# Summary of indexes                                                      
+# ########################################################################
+
+# Size Duplicate Indexes   17
+# Total Duplicate Indexes  2
+# Total Indexes            4