percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-28 00:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update TableChunker in pt-table-sync, pt-upgrade, and pt-online-schema-change.

Browse Source
This commit is contained in:
Daniel Nichter
2012-03-30 10:37:16 -06:00
parent 688570de79
commit a1cba706ec
3 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bin/pt-online-schema-change
View File

@@ -2773,10 +2773,11 @@ sub _chunk_char {
foreach my $arg ( @required_args ) { foreach my $arg ( @required_args ) {
die "I need a $arg argument" unless defined $args{$arg}; die "I need a $arg argument" unless defined $args{$arg};
} }
my $q = $self->{Quoter}; my $q = $self->{Quoter};
my $db_tbl = $q->quote($args{db}, $args{tbl}); my $db_tbl = $q->quote($args{db}, $args{tbl});
my $dbh = $args{dbh}; my $dbh = $args{dbh};
my $chunk_col = $args{chunk_col}; my $chunk_col = $args{chunk_col};
my $qchunk_col = $q->quote($args{chunk_col});
my $row; my $row;
my $sql; my $sql;
@@ -2834,9 +2835,9 @@ sub _chunk_char {
$ins_char_sth->execute($char_code); $ins_char_sth->execute($char_code);
} }
$sql = "SELECT `$chunk_col` FROM $tmp_db_tbl " $sql = "SELECT $qchunk_col FROM $tmp_db_tbl "
. "WHERE `$chunk_col` BETWEEN ? AND ? " . "WHERE $qchunk_col BETWEEN ? AND ? "
. "ORDER BY `$chunk_col`"; . "ORDER BY $qchunk_col";
PTDEBUG && _d($dbh, $sql); PTDEBUG && _d($dbh, $sql);
my $sel_char_sth = $dbh->prepare($sql); my $sel_char_sth = $dbh->prepare($sql);
$sel_char_sth->execute($min_col, $max_col); $sel_char_sth->execute($min_col, $max_col);
@@ -2851,9 +2852,9 @@ sub _chunk_char {
PTDEBUG && _d("Base", $base, "chars:", @chars); PTDEBUG && _d("Base", $base, "chars:", @chars);
$sql = "SELECT MAX(LENGTH($chunk_col)) FROM $db_tbl " $sql = "SELECT MAX(LENGTH($qchunk_col)) FROM $db_tbl "
. ($args{where} ? "WHERE $args{where} " : "") . ($args{where} ? "WHERE $args{where} " : "")
. "ORDER BY `$chunk_col`"; . "ORDER BY $qchunk_col";
PTDEBUG && _d($dbh, $sql); PTDEBUG && _d($dbh, $sql);
$row = $dbh->selectrow_arrayref($sql); $row = $dbh->selectrow_arrayref($sql);
my $max_col_len = $row->[0]; my $max_col_len = $row->[0];
@@ -2887,7 +2888,7 @@ sub _chunk_char {
}; };
return ( return (
col => $q->quote($chunk_col), col => $qchunk_col,
start_point => 0, start_point => 0,
end_point => $n_values, end_point => $n_values,
interval => $interval, interval => $interval,

21
bin/pt-table-sync
View File

@@ -3231,10 +3231,11 @@ sub _chunk_char {
foreach my $arg ( @required_args ) { foreach my $arg ( @required_args ) {
die "I need a $arg argument" unless defined $args{$arg}; die "I need a $arg argument" unless defined $args{$arg};
} }
my $q = $self->{Quoter}; my $q = $self->{Quoter};
my $db_tbl = $q->quote($args{db}, $args{tbl}); my $db_tbl = $q->quote($args{db}, $args{tbl});
my $dbh = $args{dbh}; my $dbh = $args{dbh};
my $chunk_col = $args{chunk_col}; my $chunk_col = $args{chunk_col};
my $qchunk_col = $q->quote($args{chunk_col});
my $row; my $row;
my $sql; my $sql;
@@ -3292,9 +3293,9 @@ sub _chunk_char {
$ins_char_sth->execute($char_code); $ins_char_sth->execute($char_code);
} }
$sql = "SELECT `$chunk_col` FROM $tmp_db_tbl " $sql = "SELECT $qchunk_col FROM $tmp_db_tbl "
. "WHERE `$chunk_col` BETWEEN ? AND ? " . "WHERE $qchunk_col BETWEEN ? AND ? "
. "ORDER BY `$chunk_col`"; . "ORDER BY $qchunk_col";
PTDEBUG && _d($dbh, $sql); PTDEBUG && _d($dbh, $sql);
my $sel_char_sth = $dbh->prepare($sql); my $sel_char_sth = $dbh->prepare($sql);
$sel_char_sth->execute($min_col, $max_col); $sel_char_sth->execute($min_col, $max_col);
@@ -3309,9 +3310,9 @@ sub _chunk_char {
PTDEBUG && _d("Base", $base, "chars:", @chars); PTDEBUG && _d("Base", $base, "chars:", @chars);
$sql = "SELECT MAX(LENGTH($chunk_col)) FROM $db_tbl " $sql = "SELECT MAX(LENGTH($qchunk_col)) FROM $db_tbl "
. ($args{where} ? "WHERE $args{where} " : "") . ($args{where} ? "WHERE $args{where} " : "")
. "ORDER BY `$chunk_col`"; . "ORDER BY $qchunk_col";
PTDEBUG && _d($dbh, $sql); PTDEBUG && _d($dbh, $sql);
$row = $dbh->selectrow_arrayref($sql); $row = $dbh->selectrow_arrayref($sql);
my $max_col_len = $row->[0]; my $max_col_len = $row->[0];
@@ -3345,7 +3346,7 @@ sub _chunk_char {
}; };
return ( return (
col => $q->quote($chunk_col), col => $qchunk_col,
start_point => 0, start_point => 0,
end_point => $n_values, end_point => $n_values,
interval => $interval, interval => $interval,

21
bin/pt-upgrade
View File

@@ -5437,10 +5437,11 @@ sub _chunk_char {
foreach my $arg ( @required_args ) { foreach my $arg ( @required_args ) {
die "I need a $arg argument" unless defined $args{$arg}; die "I need a $arg argument" unless defined $args{$arg};
} }
my $q = $self->{Quoter}; my $q = $self->{Quoter};
my $db_tbl = $q->quote($args{db}, $args{tbl}); my $db_tbl = $q->quote($args{db}, $args{tbl});
my $dbh = $args{dbh}; my $dbh = $args{dbh};
my $chunk_col = $args{chunk_col}; my $chunk_col = $args{chunk_col};
my $qchunk_col = $q->quote($args{chunk_col});
my $row; my $row;
my $sql; my $sql;
@@ -5498,9 +5499,9 @@ sub _chunk_char {
$ins_char_sth->execute($char_code); $ins_char_sth->execute($char_code);
} }
$sql = "SELECT `$chunk_col` FROM $tmp_db_tbl " $sql = "SELECT $qchunk_col FROM $tmp_db_tbl "
. "WHERE `$chunk_col` BETWEEN ? AND ? " . "WHERE $qchunk_col BETWEEN ? AND ? "
. "ORDER BY `$chunk_col`"; . "ORDER BY $qchunk_col";
PTDEBUG && _d($dbh, $sql); PTDEBUG && _d($dbh, $sql);
my $sel_char_sth = $dbh->prepare($sql); my $sel_char_sth = $dbh->prepare($sql);
$sel_char_sth->execute($min_col, $max_col); $sel_char_sth->execute($min_col, $max_col);
@@ -5515,9 +5516,9 @@ sub _chunk_char {
PTDEBUG && _d("Base", $base, "chars:", @chars); PTDEBUG && _d("Base", $base, "chars:", @chars);
$sql = "SELECT MAX(LENGTH($chunk_col)) FROM $db_tbl " $sql = "SELECT MAX(LENGTH($qchunk_col)) FROM $db_tbl "
. ($args{where} ? "WHERE $args{where} " : "") . ($args{where} ? "WHERE $args{where} " : "")
. "ORDER BY `$chunk_col`"; . "ORDER BY $qchunk_col";
PTDEBUG && _d($dbh, $sql); PTDEBUG && _d($dbh, $sql);
$row = $dbh->selectrow_arrayref($sql); $row = $dbh->selectrow_arrayref($sql);
my $max_col_len = $row->[0]; my $max_col_len = $row->[0];
@@ -5551,7 +5552,7 @@ sub _chunk_char {
}; };
return ( return (
col => $q->quote($chunk_col), col => $qchunk_col,
start_point => 0, start_point => 0,
end_point => $n_values, end_point => $n_values,
interval => $interval, interval => $interval,