Merge lp:~percona-toolkit-dev/percona-toolkit/fix-ptc-index-bug-1199591 into lp:~percona-toolkit-dev/percona-toolkit/release-2.2.4

[Daniel Nichter]

[Daniel Nichter (daniel-nichter)]

review: Approve

=== modified file 'bin/pt-online-schema-change'
--- bin/pt-online-schema-change	2013-06-26 20:28:27 +0000
+++ bin/pt-online-schema-change	2013-07-10 17:30:39 +0000
@@ -5495,7 +5495,7 @@
       }
       @possible_indexes = sort {
          my $cmp
-            = $indexes->{$b}->{cardinality} <=> $indexes->{$b}->{cardinality};
+            = $indexes->{$b}->{cardinality} <=> $indexes->{$a}->{cardinality};
          if ( $cmp == 0 ) {
             $cmp = scalar @{$indexes->{$b}->{cols}}
                <=> scalar @{$indexes->{$a}->{cols}};

=== modified file 'bin/pt-table-checksum'
--- bin/pt-table-checksum	2013-06-26 01:30:12 +0000
+++ bin/pt-table-checksum	2013-07-10 17:30:39 +0000
@@ -6479,7 +6479,7 @@
       }
       @possible_indexes = sort {
          my $cmp
-            = $indexes->{$b}->{cardinality} <=> $indexes->{$b}->{cardinality};
+            = $indexes->{$b}->{cardinality} <=> $indexes->{$a}->{cardinality};
          if ( $cmp == 0 ) {
             $cmp = scalar @{$indexes->{$b}->{cols}}
                <=> scalar @{$indexes->{$a}->{cols}};

=== modified file 'lib/NibbleIterator.pm'
--- lib/NibbleIterator.pm	2013-03-01 02:26:04 +0000
+++ lib/NibbleIterator.pm	2013-07-10 17:30:39 +0000
@@ -554,7 +554,7 @@
       @possible_indexes = sort {
          # Prefer the index with the highest cardinality.
          my $cmp
-            = $indexes->{$b}->{cardinality} <=> $indexes->{$b}->{cardinality};
+            = $indexes->{$b}->{cardinality} <=> $indexes->{$a}->{cardinality};
          if ( $cmp == 0 ) {
             # Indexes have the same cardinality; prefer the one with
             # more columns.

=== modified file 't/lib/NibbleIterator.t'
--- t/lib/NibbleIterator.t	2013-03-13 19:49:44 +0000
+++ t/lib/NibbleIterator.t	2013-07-10 17:30:39 +0000
@@ -38,9 +38,6 @@
 if ( !$dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
-else {
-   plan tests => 54;
-}
 
 my $q   = new Quoter();
 my $tp  = new TableParser(Quoter=>$q);
@@ -831,6 +828,26 @@
    "Bug 995274: nibble iter works"
 );
 
+
+# #############################################################################
+# pt-table-checksum doesn't use non-unique index with highest cardinality
+# https://bugs.launchpad.net/percona-toolkit/+bug/1199591
+# #############################################################################
+
+diag(`/tmp/12345/use < $trunk/t/lib/samples/cardinality.sql >/dev/null`);
+
+$ni = make_nibble_iter(
+   db   => 'cardb',
+   tbl  => 't',
+   argv => [qw(--databases cardb --chunk-size 2)],
+);
+
+is(
+   $ni->{index},
+   'b',
+   "Use non-unique index with highest cardinality (bug 1199591)"
+);
+
 # #############################################################################
 # Done.
 # #############################################################################
@@ -846,4 +863,4 @@
 );
 $sb->wipe_clean($dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
-exit;
+done_testing;

=== added file 't/lib/samples/cardinality.sql'
--- t/lib/samples/cardinality.sql	1970-01-01 00:00:00 +0000
+++ t/lib/samples/cardinality.sql	2013-07-10 17:30:39 +0000
@@ -0,0 +1,49 @@
+DROP DATABASE IF EXISTS cardb;
+CREATE DATABASE cardb;
+USE cardb;
+CREATE TABLE t (
+  high  INT UNSIGNED NOT NULL,
+  low   INT UNSIGNED NOT NULL,
+  INDEX a (low),
+  INDEX b (high),
+  INDEX c (low)
+) ENGINE=InnoDB;
+INSERT INTO t VALUES
+  (1,   1),
+  (2,   1),
+  (3,   1),
+  (4,   1),
+  (5,   1),
+  (6,   1),
+  (7,   1),
+  (8,   1),
+  (9,   1),
+  (10,  1),
+  (11,  1),
+  (12,  1),
+  (13,  1),
+  (14,  1),
+  (15,  1),
+  (16,  1),
+  (17,  1),
+  (18,  1),
+  (19,  1),
+  (20,  1),
+  (21,  2),
+  (22,  2),
+  (23,  2),
+  (24,  2),
+  (25,  2),
+  (26,  2),
+  (27,  2),
+  (28,  2),
+  (29,  2),
+  (30,  2),
+  (31,  2),
+  (32,  2),
+  (33,  2),
+  (34,  2),
+  (35,  2),
+  (36,  2),
+  (37,  2);
+ANALYZE TABLE t;