mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-11 05:29:30 +00:00
PT-2309 - pt-table-sync hits an error when the primary key is uuid binary
- Implemented fix for the "Cannot nibble" error - Added test case
This commit is contained in:
Sveta Smirnova
@@ -11784,19 +11784,17 @@ sub diff_where {
|
||||
my ($lb_sql, $ub_sql);
|
||||
|
||||
if ( defined $diff->{lower_boundary} ) {
|
||||
my $i = 0;
|
||||
my @deserialized = $q->deserialize_list($diff->{lower_boundary});
|
||||
$lb_sql = $asc->{boundaries}->{'>='};
|
||||
foreach my $val ( $q->deserialize_list($diff->{lower_boundary}) ) {
|
||||
my $quoted_val = $q->quote_val($val);
|
||||
$lb_sql =~ s/\?/$quoted_val/;
|
||||
}
|
||||
$lb_sql =~ s/\?/$q->quote_val($deserialized[$i++])/eg;
|
||||
}
|
||||
|
||||
if ( defined $diff->{upper_boundary} ) {
|
||||
my $i = 0;
|
||||
my @deserialized = $q->deserialize_list($diff->{upper_boundary});
|
||||
$ub_sql = $asc->{boundaries}->{'<='};
|
||||
foreach my $val ( $q->deserialize_list($diff->{upper_boundary}) ) {
|
||||
my $quoted_val = $q->quote_val($val);
|
||||
$ub_sql =~ s/\?/$quoted_val/;
|
||||
}
|
||||
$ub_sql =~ s/\?/$q->quote_val($deserialized[$i++])/eg;
|
||||
}
|
||||
|
||||
die "Invalid checksum diff: " . Dumper($diff)
|
||||
|
||||
121
t/pt-table-sync/pt-2309.t
Normal file
121
t/pt-table-sync/pt-2309.t
Normal file
@@ -0,0 +1,121 @@
|
||||
#!/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";
|
||||
};
|
||||
|
||||
binmode(STDIN, ':utf8') or die "Can't binmode(STDIN, ':utf8'): $OS_ERROR";
|
||||
binmode(STDOUT, ':utf8') or die "Can't binmode(STDOUT, ':utf8'): $OS_ERROR";
|
||||
|
||||
use strict;
|
||||
use utf8;
|
||||
use Encode qw(decode encode);
|
||||
use warnings FATAL => 'all';
|
||||
use English qw(-no_match_vars);
|
||||
use Test::More;
|
||||
|
||||
use PerconaTest;
|
||||
use Sandbox;
|
||||
require "$trunk/bin/pt-table-sync";
|
||||
|
||||
my $dp = new DSNParser(opts=>$dsn_opts);
|
||||
my $sb = new Sandbox(basedir => '/tmp', DSNParser => $dp);
|
||||
my $master_dbh = $sb->get_dbh_for('master');
|
||||
my $slave1_dbh = $sb->get_dbh_for('slave1');
|
||||
my $slave2_dbh = $sb->get_dbh_for('slave2');
|
||||
|
||||
#plan skip_all => 'Skipping';
|
||||
|
||||
if ( !$master_dbh ) {
|
||||
plan skip_all => 'Cannot connect to sandbox master';
|
||||
}
|
||||
elsif ( !$slave1_dbh ) {
|
||||
plan skip_all => 'Cannot connect to sandbox slave1';
|
||||
}
|
||||
elsif ( !$slave1_dbh ) {
|
||||
plan skip_all => 'Cannot connect to sandbox slave2';
|
||||
}
|
||||
else {
|
||||
plan tests => 7;
|
||||
}
|
||||
|
||||
my ($output, $status);
|
||||
my @args = ('h=127.0.0.1,P=12346,u=msandbox,p=msandbox', '--databases=pt_ts', '--sync-to-master', '--execute');
|
||||
|
||||
# use lib/samples dir since the main change is in DSNParser
|
||||
$sb->load_file('master', "t/pt-table-sync/samples/pt-2309.sql");
|
||||
|
||||
$sb->wait_for_slaves();
|
||||
|
||||
$slave1_dbh->do("DELETE FROM pt_ts.test_table LIMIT 1000");
|
||||
$slave1_dbh->do("DELETE FROM pt_ts.test_table_char LIMIT 1000");
|
||||
$slave1_dbh->do("FLUSH TABLES");
|
||||
|
||||
# 1
|
||||
push(@args, ('--tables=test_table'));
|
||||
$output = output(
|
||||
sub { pt_table_sync::main(@args) },
|
||||
stderr => 1,
|
||||
);
|
||||
|
||||
unlike(
|
||||
$output,
|
||||
qr/Cannot nibble table/,
|
||||
'No "Cannot nibble table" error for binary data',
|
||||
) or diag($output);
|
||||
|
||||
$sb->wait_for_slaves();
|
||||
|
||||
my $source_rows = $master_dbh->selectrow_arrayref("SELECT COUNT(*) FROM pt_ts.test_table");
|
||||
my $replica_rows = $slave1_dbh->selectrow_arrayref("SELECT COUNT(*) FROM pt_ts.test_table");
|
||||
|
||||
is(
|
||||
$replica_rows->[0],
|
||||
$source_rows->[0],
|
||||
"Rows synced correctly for test_table"
|
||||
) or diag($output);
|
||||
|
||||
is(
|
||||
pop(@args),
|
||||
"--tables=test_table",
|
||||
"test_table popped from the arguments array",
|
||||
);
|
||||
|
||||
# 2
|
||||
push(@args, ('--tables=test_table_char'));
|
||||
$output = output(
|
||||
sub { pt_table_sync::main(@args) },
|
||||
stderr => 1,
|
||||
);
|
||||
|
||||
unlike(
|
||||
$output,
|
||||
qr/Cannot nibble table/,
|
||||
'No "Cannot nibble table" error for UUID in CHAR column',
|
||||
) or diag($output);
|
||||
|
||||
$sb->wait_for_slaves();
|
||||
|
||||
$source_rows = $master_dbh->selectrow_arrayref("SELECT COUNT(*) FROM pt_ts.test_table_char");
|
||||
$replica_rows = $slave1_dbh->selectrow_arrayref("SELECT COUNT(*) FROM pt_ts.test_table_char");
|
||||
|
||||
is(
|
||||
$replica_rows->[0],
|
||||
$source_rows->[0],
|
||||
"Rows synced correctly for test_table_char"
|
||||
) or diag($output);
|
||||
|
||||
is(
|
||||
pop(@args),
|
||||
"--tables=test_table_char",
|
||||
"test_table_char popped from the arguments array",
|
||||
);
|
||||
|
||||
# #############################################################################
|
||||
# Done.
|
||||
# #############################################################################
|
||||
$sb->wipe_clean($master_dbh);
|
||||
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
|
||||
exit;
|
||||
45
t/pt-table-sync/samples/pt-2309.sql
Normal file
45
t/pt-table-sync/samples/pt-2309.sql
Normal file
@@ -0,0 +1,45 @@
|
||||
DROP DATABASE IF EXISTS pt_ts;
|
||||
CREATE DATABASE pt_ts;
|
||||
USE pt_ts;
|
||||
|
||||
CREATE TABLE `test_table` (
|
||||
`test_table_id` binary(16) NOT NULL,
|
||||
`test_table_number` int(11) NOT NULL,
|
||||
PRIMARY KEY (`test_table_id`,`test_table_number`)
|
||||
) ENGINE=InnoDB;
|
||||
|
||||
INSERT INTO test_table VALUES (unhex(replace('00002fac-2166-493f-b97c-634ef9d714f3','-','')), (FLOOR( 1 + RAND( ) *1000000 )));
|
||||
INSERT INTO test_table SELECT unhex(replace(uuid(),'-','')), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table;
|
||||
INSERT INTO test_table SELECT unhex(replace(uuid(),'-','')), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table;
|
||||
INSERT INTO test_table SELECT unhex(replace(uuid(),'-','')), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table;
|
||||
INSERT INTO test_table SELECT unhex(replace(uuid(),'-','')), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table;
|
||||
INSERT INTO test_table SELECT unhex(replace(uuid(),'-','')), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table;
|
||||
INSERT INTO test_table SELECT unhex(replace(uuid(),'-','')), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table;
|
||||
INSERT INTO test_table SELECT unhex(replace(uuid(),'-','')), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table;
|
||||
INSERT INTO test_table SELECT unhex(replace(uuid(),'-','')), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table;
|
||||
INSERT INTO test_table SELECT unhex(replace(uuid(),'-','')), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table;
|
||||
INSERT INTO test_table SELECT unhex(replace(uuid(),'-','')), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table;
|
||||
INSERT INTO test_table SELECT unhex(replace(uuid(),'-','')), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table;
|
||||
INSERT INTO test_table SELECT unhex(replace(uuid(),'-','')), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table;
|
||||
INSERT INTO test_table SELECT unhex(replace(uuid(),'-','')), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table;
|
||||
|
||||
CREATE TABLE `test_table_char` (
|
||||
`test_table_id` char(32) NOT NULL,
|
||||
`test_table_number` int(11) NOT NULL,
|
||||
PRIMARY KEY (`test_table_id`,`test_table_number`)
|
||||
) ENGINE=InnoDB;
|
||||
|
||||
INSERT INTO test_table_char VALUES (replace('00002fac-2166-493f-b97c-634ef9d714f3','-',''), (FLOOR( 1 + RAND( ) *1000000 )));
|
||||
INSERT INTO test_table_char SELECT replace(uuid(),'-',''), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table_char;
|
||||
INSERT INTO test_table_char SELECT replace(uuid(),'-',''), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table_char;
|
||||
INSERT INTO test_table_char SELECT replace(uuid(),'-',''), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table_char;
|
||||
INSERT INTO test_table_char SELECT replace(uuid(),'-',''), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table_char;
|
||||
INSERT INTO test_table_char SELECT replace(uuid(),'-',''), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table_char;
|
||||
INSERT INTO test_table_char SELECT replace(uuid(),'-',''), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table_char;
|
||||
INSERT INTO test_table_char SELECT replace(uuid(),'-',''), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table_char;
|
||||
INSERT INTO test_table_char SELECT replace(uuid(),'-',''), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table_char;
|
||||
INSERT INTO test_table_char SELECT replace(uuid(),'-',''), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table_char;
|
||||
INSERT INTO test_table_char SELECT replace(uuid(),'-',''), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table_char;
|
||||
INSERT INTO test_table_char SELECT replace(uuid(),'-',''), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table_char;
|
||||
INSERT INTO test_table_char SELECT replace(uuid(),'-',''), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table_char;
|
||||
INSERT INTO test_table_char SELECT replace(uuid(),'-',''), (FLOOR( 1 + RAND( ) *1000000 )) FROM test_table_char;
|
||||
Reference in New Issue
Block a user