Finish merging fix-ptc-diffs-bug-1030031

bin/pt-table-checksum

@@ -7690,6 +7690,7 @@ sub main {
             );
 
             # Check each slave for checksum diffs.
+            my %diff_chunks;
             foreach my $slave ( @$slaves ) {
                eval {
                   my $diffs = $rc->find_replication_differences(
@@ -7699,8 +7700,13 @@ sub main {
                   );
                   PTDEBUG && _d(scalar @$diffs, 'checksum diffs on',
                      $slave->name());
-                  if ( @$diffs ) {
+                  # Save unique chunks that differ.
-                     $tbl->{checksum_results}->{diffs} = scalar @$diffs;
+                  # https://bugs.launchpad.net/percona-toolkit/+bug/1030031
+                  if ( scalar @$diffs ) {
+                     # "chunk" is the chunk number.  See the SELECT
+                     # statement in RowChecksum::find_replication_differences()
+                     # for the full list of columns.
+                     map { $diff_chunks{ $_->{chunk} }++ } @$diffs;
                   }
                };
                if ($EVAL_ERROR) {
@@ -7714,6 +7720,7 @@ sub main {
                   $tbl->{checksum_results}->{errors}++;
                }
             }
+            $tbl->{checksum_results}->{diffs} = scalar keys %diff_chunks;
          }
 
          # Print table's checksum results if we're not being quiet,

t/pt-table-checksum/bugs.t

@@ -29,16 +29,17 @@ require "$trunk/bin/pt-table-checksum";
 my $dp = new DSNParser(opts=>$dsn_opts);
 my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
 my $master_dbh = $sb->get_dbh_for('master');
-my $slave_dbh  = $sb->get_dbh_for('slave1');
+my $slave1_dbh = $sb->get_dbh_for('slave1');
+my $slave2_dbh = $sb->get_dbh_for('slave2');
 
 if ( !$master_dbh ) {
    plan skip_all => 'Cannot connect to sandbox master';
 }
-elsif ( !$slave_dbh ) {
+elsif ( !$slave1_dbh ) {
    plan skip_all => 'Cannot connect to sandbox slave1';
 }
-else {
+elsif ( !$slave2_dbh ) {
-   plan tests => 8;
+   plan skip_all => 'Cannot connect to sandbox slave2';
 }
 
 # The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
@@ -134,9 +135,50 @@ is(
    "Bug 987393 (Perl 5.8 scoping): checksummed table"
 );
 
+# #############################################################################
+# https://bugs.launchpad.net/percona-toolkit/+bug/1030031
+# pt-table-checksum reports wrong number of DIFFS
+# #############################################################################
+$sb->load_file('master', "$sample/a-z.sql");
+$sb->wait_for_slaves();
+
+# Create 2 diffs on slave1 and 1 diff on slave2.
+$slave1_dbh->do("UPDATE test.t SET c='' WHERE id=5");  # diff on slave1 & 2
+$slave1_dbh->do("SET SQL_LOG_BIN=0");
+$slave1_dbh->do("UPDATE test.t SET c='' WHERE id=20"); # diff only on slave1
+
+# Restore sql_log_bin on slave1 in case later tests use it.
+$slave1_dbh->do("SET SQL_LOG_BIN=1");
+
+$output = output(
+   sub { pt_table_checksum::main(@args, qw(-t test.t --chunk-size 10)) },
+);
+
+is(
+   PerconaTest::count_checksum_results($output, 'diffs'),
+   2,
+   "Bug 1030031 (wrong DIFFS): 2 diffs"
+);
+
+# Restore slave2, but then give it 1 diff that's not the same chunk#
+# as slave1, so there's 3 unique chunk that differ.
+$slave2_dbh->do("UPDATE test.t SET c='e' WHERE id=5");
+$slave2_dbh->do("UPDATE test.t SET c='' WHERE id=26");
+
+$output = output(
+   sub { pt_table_checksum::main(@args, qw(-t test.t --chunk-size 10)) },
+);
+
+is(
+   PerconaTest::count_checksum_results($output, 'diffs'),
+   3,
+   "Bug 1030031 (wrong DIFFS): 3 diffs"
+);
+
 # #############################################################################
 # Done.
 # #############################################################################
 $sb->wipe_clean($master_dbh);
 ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+done_testing;
 exit;

t/pt-table-checksum/samples/a-z.sql

@@ -0,0 +1,10 @@
+drop database if exists test;
+create database test;
+use test;
+
+create table t (
+  id  int auto_increment primary key,
+  c   varchar(16) not null
+) engine=innodb;
+
+insert into t values (null, 'a'),(null, 'b'),(null, 'c'),(null, 'd'),(null, 'e'),(null, 'f'),(null, 'g'),(null, 'h'),(null, 'i'),(null, 'j'),(null, 'k'),(null, 'l'),(null, 'm'),(null, 'n'),(null, 'o'),(null, 'p'),(null, 'q'),(null, 'r'),(null, 's'),(null, 't'),(null, 'u'),(null, 'v'),(null, 'w'),(null, 'x'),(null, 'y'),(null, 'z');