Merge pull request #366 from percona/PT-1616

PT-1616 pt-table-checksum fails to --resume on certain binary strings

Gopkg.lock

@@ -73,6 +73,18 @@
   packages = ["."]
   revision = "bf9dde6d0d2c004a008c27aaee91170c786f6db8"
 
+[[projects]]
+  name = "github.com/kr/pretty"
+  packages = ["."]
+  revision = "73f6ac0b30a98e433b289500d779f50c1a6f0712"
+  version = "v0.1.0"
+
+[[projects]]
+  name = "github.com/kr/text"
+  packages = ["."]
+  revision = "e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f"
+  version = "v0.1.0"
+
 [[projects]]
   name = "github.com/mattn/go-shellwords"
   packages = ["."]
@@ -195,6 +207,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "6e2c1fd110c892297e79498479e87f7d4c63755a5a1d63d13c82eb42a7e5fbf2"
+  inputs-digest = "35a93d0003438bc707c085101ccfca910f349d201cd01edc986d0ed64ef2a12f"
   solver-name = "gps-cdcl"
   solver-version = 1

bin/pt-table-checksum

@@ -469,11 +469,11 @@ sub _split_url {
 
    sub write_header_lines {
        (@_ == 2 && ref $_[1] eq 'HASH') || croak(q/Usage: $handle->write_header_lines(headers)/);
-       my($self, $headers) = @_;
+       my($self, $headers) = @_; 
 
        my $buf = '';
        while (my ($k, $v) = each %$headers) {
-           my $field_name = lc $k;
+           my $field_name = lc $k;           
             $field_name =~ /\A [\x21\x23-\x27\x2A\x2B\x2D\x2E\x30-\x39\x41-\x5A\x5E-\x7A\x7C\x7E]+ \z/x
                or croak(q/Invalid HTTP header field name: / . $Printable->($field_name));
             $field_name =~ s/\b(\w)/\u$1/g;
@@ -6890,7 +6890,7 @@ sub _get_bounds {
       if (    defined $nibble->{lower_boundary}
            && defined $nibble->{upper_boundary} ) {
          my $sth = $dbh->prepare($self->{resume_lb_sql});
-         my @ub  = split ',', $nibble->{upper_boundary};
+         my @ub = $self->{Quoter}->deserialize_list($nibble->{upper_boundary});
          PTDEBUG && _d($sth->{Statement}, 'params:', @ub);
          $sth->execute(@ub);
          $self->{next_lower} = $sth->fetchrow_arrayref();
@@ -9899,6 +9899,7 @@ my %ignore_code = (
    # Ignore this warning because we have purposely set statement-based
    # replication.
    1592 => 1,
+   1300 => 1,
 );
 
 # Warn once per-table for these error codes if the error message

t/pt-table-checksum/pt-1616.t

@@ -0,0 +1,105 @@
+#!/usr/bin/env perl
+
+BEGIN {
+    die "The PERCONA_TOOLKIT_BRANCH environment variable is not set.\n"
+    unless $ENV{PERCONA_TOOLKIT_BRANCH} && -d $ENV{PERCONA_TOOLKIT_BRANCH};
+    unshift @INC, "$ENV{PERCONA_TOOLKIT_BRANCH}/lib";
+};
+
+use strict;
+use warnings FATAL => 'all';
+use English qw(-no_match_vars);
+use Test::More;
+
+use PerconaTest;
+use Sandbox;
+use SqlModes;
+require "$trunk/bin/pt-table-checksum";
+
+my $dp  = new DSNParser(opts=>$dsn_opts);
+my $sb  = new Sandbox(basedir => '/tmp', DSNParser => $dp);
+my $dbh = $sb->get_dbh_for('master');
+
+if ( !$dbh ) {
+    plan skip_all => 'Cannot connect to sandbox master';
+}
+else {
+    plan tests => 4;
+}
+
+diag("loading samples");
+$sb->load_file('master', 't/pt-table-checksum/samples/pt-1616.sql');
+
+my $num_rows = 50000;
+diag("Loading $num_rows rows into the table. This might take some time.");
+# diag(`util/mysql_random_data_load --host=127.0.0.1 --port=12345 --user=msandbox --password=msandbox junk pt_test_100 $num_rows`);
+
+my $sql = "INSERT INTO junk.pt_test_100 (id1, id2) VALUES (?, ?)";
+my $sth = $dbh->prepare($sql);
+my @chars = ("A".."Z", "a".."z");
+
+# Generate some random data haivng commas
+for (my $i=0; $i < $num_rows; $i++) {
+    # Generate random strings having commas
+    my ($id1, $id2) = (",,,,", ",,,,");
+    $id1 .= $chars[rand @chars] for 1..10;
+    $id2 .= $chars[rand @chars] for 1..10;
+    
+    $sth->execute($id1, $id2);
+}
+$sth->finish();
+$dbh->do('INSERT INTO junk.pt_test_100 (id1, id2) VALUES(UNHEX("F96DD7"), UNHEX("F96DD7"))');
+
+# The sandbox servers run with lock_wait_timeout=3 and it's not dynamic
+# so we need to specify --set-vars innodb_lock_wait_timeout=3 else the tool will die.
+my $master_dsn = $sb->dsn_for('master');
+
+my @args = ($master_dsn, "--set-vars", "innodb_lock_wait_timeout=50", 
+    "--ignore-databases", "mysql", "--no-check-binlog-format", 
+    "--chunk-size", "1", 
+    "--empty-replicate-table", "--run-time", "2s"
+);
+
+my $output;
+my $exit_status;
+
+$output = output(
+    sub { $exit_status = pt_table_checksum::main(@args) },
+    stderr => 1,
+);
+
+is(
+    $exit_status,
+    0,
+    "PT-1616 pt-table-cheksum before --resume with binary fields exit status",
+);
+
+@args = ("--set-vars", "innodb_lock_wait_timeout=50", 
+    "--ignore-databases", "mysql", "--no-check-binlog-format", 
+    "--chunk-size", "1", 
+    "--resume", "--run-time", "5s", $master_dsn
+);
+
+$output = output(
+    sub { $exit_status = pt_table_checksum::main(@args) },
+    stderr => 1,
+);
+
+is(
+    $exit_status,
+    0,
+    "PT-1616 pt-table-cheksum --resume with binary fields exit status",
+);
+
+unlike(
+    $output,
+    qr/called with \d+ bind variables when \d+ are needed/,
+    "PT-1616 pt-table-cheksum --resume parameters binding error",
+) or die($output);
+
+# #############################################################################
+# Done.
+# #############################################################################
+$sb->wipe_clean($dbh);
+ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
+exit;

t/pt-table-checksum/samples/pt-1616.sql

@@ -0,0 +1,30 @@
+DROP DATABASE IF EXISTS junk;
+CREATE DATABASE junk;
+CREATE TABLE junk.pt_test_100 (
+    id1 binary(16), 
+    id2 binary(16), 
+    PRIMARY KEY(id1, id2)
+);
+
+
+CREATE DATABASE IF NOT EXISTS percona;
+CREATE TABLE IF NOT EXISTS percona.checksums (
+   db             CHAR(64)     NOT NULL,
+   tbl            CHAR(64)     NOT NULL,
+   chunk          INT          NOT NULL,
+   chunk_time     FLOAT            NULL,
+   chunk_index    VARCHAR(200)     NULL,
+   lower_boundary TEXT             NULL,
+   upper_boundary TEXT             NULL,
+   this_crc       CHAR(40)     NOT NULL,
+   this_cnt       INT          NOT NULL,
+   master_crc     CHAR(40)         NULL,
+   master_cnt     INT              NULL,
+   ts             TIMESTAMP    NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+   PRIMARY KEY (db, tbl, chunk),
+   INDEX ts_db_tbl (ts, db, tbl)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+TRUNCATE TABLE percona.checksums;
+
+ALTER TABLE percona.checksums MODIFY upper_boundary BLOB, MODIFY lower_boundary BLOB;