Merge lp:~percona-toolkit-dev/percona-toolkit/fix-1074179-ptc-replicate-check-only-filters into lp:percona-toolkit/2.1

[Brian Fraser]

[Daniel Nichter (daniel-nichter)]

Before merging, could you please add TODO or XXX to

20 + # SchemaIterator has the methdos to filter the dbs & tables,
21 + # but we don't actually need a real iterator beyond that
22 + my $filter = new SchemaIterator(

so we can grep for it later. We need to refactor-fix SchemaIterator so we can use its filters sub without fake input.

review: Approve

=== modified file 'bin/pt-table-checksum'
--- bin/pt-table-checksum	2012-11-13 15:22:01 +0000
+++ bin/pt-table-checksum	2012-11-16 14:27:22 +0000
@@ -8810,6 +8810,7 @@
             );
             PTDEBUG && _d(scalar @$diffs, 'checksum diffs on',
                $slave->name());
+            $diffs = filter_tables_replicate_check_only($diffs, $o);
             if ( @$diffs ) {
                $exit_status |= 1;
                if ( $o->get('quiet') < 2 ) { 
@@ -9943,6 +9944,30 @@
 }
 }
 
+sub filter_tables_replicate_check_only {
+   my ($diffs, $o) = @_;
+   my @filtered_diffs;
+
+   # SchemaIterator has the methdos to filter the dbs & tables,
+   # but we don't actually need a real iterator beyond that
+   my $filter = new SchemaIterator(
+      file_itr     => "Fake",
+      OptionParser => $o,
+      Quoter       => "Quoter",
+      TableParser  => "TableParser",
+   );
+
+   for my $diff (@$diffs) {
+      my ($db, $table) = Quoter->split_unquote($diff->{table});
+      next unless $filter->database_is_allowed($db)
+               && $filter->table_is_allowed($db, $table);
+      push @filtered_diffs, $diff;
+
+   }
+
+   return \@filtered_diffs;
+}
+
 sub check_repl_table {
    my ( %args ) = @_;
    my @required_args = qw(dbh repl_table slaves

=== modified file 't/pt-table-checksum/bugs.t'
--- t/pt-table-checksum/bugs.t	2012-11-08 20:38:04 +0000
+++ t/pt-table-checksum/bugs.t	2012-11-16 14:27:22 +0000
@@ -176,6 +176,23 @@
 );
 
 # #############################################################################
+# pt-table-checksum does't ignore tables for --replicate-check-only
+# https://bugs.launchpad.net/percona-toolkit/+bug/1074179
+# #############################################################################
+
+$output = output(
+   sub { pt_table_checksum::main(@args, qw(--replicate-check-only --ignore-tables-regex=t)) },
+   stderr => 1,
+);
+
+chomp($output);
+
+is(
+   $output,
+   '',
+   "Bug 1074179: ignore-tables-regex works with --replicate-check-only"
+);
+# #############################################################################
 # pt-table-checksum can crash with --columns if none match
 # https://bugs.launchpad.net/percona-toolkit/+bug/1016131
 # #############################################################################