mirror of
https://github.com/percona/percona-toolkit.git
synced 2025-09-10 05:00:45 +00:00
Update TableChunker in pt-table-checksum. Include COUNT in test samples.
This commit is contained in:
@@ -2863,7 +2863,7 @@ sub _chunk_numeric {
|
||||
|
||||
sub _chunk_char {
|
||||
my ( $self, %args ) = @_;
|
||||
my @required_args = qw(dbh db tbl tbl_struct chunk_col rows_in_range chunk_size);
|
||||
my @required_args = qw(dbh db tbl tbl_struct chunk_col min max rows_in_range chunk_size);
|
||||
foreach my $arg ( @required_args ) {
|
||||
die "I need a $arg argument" unless defined $args{$arg};
|
||||
}
|
||||
@@ -2874,12 +2874,7 @@ sub _chunk_char {
|
||||
my $row;
|
||||
my $sql;
|
||||
|
||||
$sql = "SELECT MIN($chunk_col), MAX($chunk_col) FROM $db_tbl "
|
||||
. "ORDER BY `$chunk_col`";
|
||||
MKDEBUG && _d($dbh, $sql);
|
||||
$row = $dbh->selectrow_arrayref($sql);
|
||||
my ($min_col, $max_col) = ($row->[0], $row->[1]);
|
||||
|
||||
my ($min_col, $max_col) = @{args}{qw(min max)};
|
||||
$sql = "SELECT ORD(?) AS min_col_ord, ORD(?) AS max_col_ord";
|
||||
MKDEBUG && _d($dbh, $sql);
|
||||
my $ord_sth = $dbh->prepare($sql); # avoid quoting issues
|
||||
@@ -2950,7 +2945,9 @@ sub _chunk_char {
|
||||
MKDEBUG && _d("Base", $base, "chars:", @chars);
|
||||
|
||||
|
||||
$sql = "SELECT MAX(LENGTH($chunk_col)) FROM $db_tbl ORDER BY `$chunk_col`";
|
||||
$sql = "SELECT MAX(LENGTH($chunk_col)) FROM $db_tbl "
|
||||
. ($args{where} ? "WHERE $args{where} " : "")
|
||||
. "ORDER BY `$chunk_col`";
|
||||
MKDEBUG && _d($dbh, $sql);
|
||||
$row = $dbh->selectrow_arrayref($sql);
|
||||
my $max_col_len = $row->[0];
|
||||
|
Reference in New Issue
Block a user