percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-11 13:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix --where with one nibble. Update chunk_index.t.

Browse Source
This commit is contained in:
Daniel Nichter
2011-12-27 11:12:40 -07:00
parent 66c0abfe8e
commit f122861808
9 changed files with 46 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/pt-table-checksum
View File

@@ -3514,7 +3514,7 @@ sub new {
. ($args{select} ? $args{select} . ($args{select} ? $args{select}
: join(', ', map { $q->quote($_) } @cols)) : join(', ', map { $q->quote($_) } @cols))
. " FROM " . $q->quote(@{$tbl}{qw(db tbl)}) . " FROM " . $q->quote(@{$tbl}{qw(db tbl)})
. ($where ? " AND ($where)" : '') . ($where ? " WHERE $where" : '')
. " /*checksum table*/"; . " /*checksum table*/";
MKDEBUG && _d('One nibble statement:', $nibble_sql); MKDEBUG && _d('One nibble statement:', $nibble_sql);
@@ -3523,7 +3523,7 @@ sub new {
. ($args{select} ? $args{select} . ($args{select} ? $args{select}
: join(', ', map { $q->quote($_) } @cols)) : join(', ', map { $q->quote($_) } @cols))
. " FROM " . $q->quote(@{$tbl}{qw(db tbl)}) . " FROM " . $q->quote(@{$tbl}{qw(db tbl)})
. ($where ? " AND ($where)" : '') . ($where ? " WHERE $where" : '')
. " /*explain checksum table*/"; . " /*explain checksum table*/";
MKDEBUG && _d('Explain one nibble statement:', $explain_nibble_sql); MKDEBUG && _d('Explain one nibble statement:', $explain_nibble_sql);

4
lib/NibbleIterator.pm
View File

@@ -95,7 +95,7 @@ sub new {
. ($args{select} ? $args{select} . ($args{select} ? $args{select}
: join(', ', map { $q->quote($_) } @cols)) : join(', ', map { $q->quote($_) } @cols))
. " FROM " . $q->quote(@{$tbl}{qw(db tbl)}) . " FROM " . $q->quote(@{$tbl}{qw(db tbl)})
. ($where ? " AND ($where)" : '') . ($where ? " WHERE $where" : '')
. " /*checksum table*/"; . " /*checksum table*/";
MKDEBUG && _d('One nibble statement:', $nibble_sql); MKDEBUG && _d('One nibble statement:', $nibble_sql);
@@ -104,7 +104,7 @@ sub new {
. ($args{select} ? $args{select} . ($args{select} ? $args{select}
: join(', ', map { $q->quote($_) } @cols)) : join(', ', map { $q->quote($_) } @cols))
. " FROM " . $q->quote(@{$tbl}{qw(db tbl)}) . " FROM " . $q->quote(@{$tbl}{qw(db tbl)})
. ($where ? " AND ($where)" : '') . ($where ? " WHERE $where" : '')
. " /*explain checksum table*/"; . " /*explain checksum table*/";
MKDEBUG && _d('Explain one nibble statement:', $explain_nibble_sql); MKDEBUG && _d('Explain one nibble statement:', $explain_nibble_sql);

18
t/lib/NibbleIterator.t
View File

@@ -39,7 +39,7 @@ if ( !$dbh ) {
plan skip_all => 'Cannot connect to sandbox master'; plan skip_all => 'Cannot connect to sandbox master';
} }
else { else {
plan tests => 45; plan tests => 46;
} }
my $q = new Quoter(); my $q = new Quoter();
@@ -711,6 +711,21 @@ is_deeply(
"Nibbles only values in --where clause range" "Nibbles only values in --where clause range"
); );
$ni = make_nibble_iter(
sql_file => "a-z.sql",
db => 'test',
tbl => 't',
one_nibble => 1,
argv => [qw(--databases test --where c>'m')],
);
1 while $ni->next();
my $sql = $ni->statements()->{nibble}->{Statement};
is(
$sql,
"SELECT `c` FROM `test`.`t` WHERE c>'m' /*checksum table*/",
"One nibble SQL with where"
);
# The real number of rows is 13, but MySQL may estimate a little. # The real number of rows is 13, but MySQL may estimate a little.
cmp_ok( cmp_ok(
$ni->row_estimate(), $ni->row_estimate(),
@@ -719,7 +734,6 @@ cmp_ok(
"row_estimate()" "row_estimate()"
); );
# ############################################################################ # ############################################################################
# Empty table. # Empty table.
# ############################################################################ # ############################################################################

22
t/pt-table-checksum/chunk_index.t
View File

@@ -32,7 +32,7 @@ else {
# so we need to specify --lock-wait-timeout=3 else the tool will die. # so we need to specify --lock-wait-timeout=3 else the tool will die.
# And --max-load "" prevents waiting for status variables. # And --max-load "" prevents waiting for status variables.
my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox'; my $master_dsn = 'h=127.1,P=12345,u=msandbox,p=msandbox';
my @args = ($master_dsn, qw(--lock-wait-timeout 3 -d issue_519 --explain --explain --chunk-size 3), '--max-load', ''); my @args = ($master_dsn, qw(--lock-wait-timeout 3 --explain --chunk-size 3), '--max-load', '');
my $output; my $output;
my $out = "t/pt-table-checksum/samples/"; my $out = "t/pt-table-checksum/samples/";
@@ -40,7 +40,7 @@ $sb->load_file('master', "t/pt-table-checksum/samples/issue_519.sql");
ok( ok(
no_diff( no_diff(
sub { pt_table_checksum::main(@args) }, sub { pt_table_checksum::main(@args, qw(-t issue_519.t --explain)) },
"$out/chunkidx001.txt", "$out/chunkidx001.txt",
), ),
"Chooses chunk index by default" "Chooses chunk index by default"
@@ -48,7 +48,8 @@ ok(
ok( ok(
no_diff( no_diff(
sub { pt_table_checksum::main(@args, qw(--chunk-index dog)) }, sub { pt_table_checksum::main(@args, qw(--chunk-index dog),
qw(-t issue_519.t --explain)) },
"$out/chunkidx001.txt", "$out/chunkidx001.txt",
), ),
"Chooses chunk index if --chunk-index doesn't exist" "Chooses chunk index if --chunk-index doesn't exist"
@@ -56,7 +57,8 @@ ok(
ok( ok(
no_diff( no_diff(
sub { pt_table_checksum::main(@args, qw(--chunk-index myidx)) }, sub { pt_table_checksum::main(@args, qw(--chunk-index myidx),
qw(-t issue_519.t --explain)) },
"$out/chunkidx002.txt", "$out/chunkidx002.txt",
), ),
"Use --chunk-index" "Use --chunk-index"
@@ -66,7 +68,8 @@ ok(
# is a single column index, so there's really not "left-most". # is a single column index, so there's really not "left-most".
ok( ok(
no_diff( no_diff(
sub { pt_table_checksum::main(@args, qw(--chunk-index y)) }, sub { pt_table_checksum::main(@args, qw(--chunk-index y),
qw(-t issue_519.t --explain)) },
"$out/chunkidx003.txt", "$out/chunkidx003.txt",
), ),
"Chunks on left-most --chunk-index column" "Chunks on left-most --chunk-index column"
@@ -79,22 +82,23 @@ ok(
# This issue affect --chunk-index. Tool should auto-choose chunk-index # This issue affect --chunk-index. Tool should auto-choose chunk-index
# when --where is given but no explicit --chunk-index|column is given. # when --where is given but no explicit --chunk-index|column is given.
# Given the --where clause, MySQL will prefer the y index. # Given the --where clause, MySQL will prefer the idx_fk_country_id index.
ok( ok(
no_diff( no_diff(
sub { pt_table_checksum::main(@args, "--where", "y > 2009") }, sub { pt_table_checksum::main(@args, "--where", "country_id > 100",
qw(-t sakila.city)) },
"$out/chunkidx004.txt", "$out/chunkidx004.txt",
), ),
"Auto-chosen --chunk-index for --where (issue 378)" "Auto-chosen --chunk-index for --where (issue 378)"
); );
# If user specifies --chunk-index, then ignore the index MySQL wants to # If user specifies --chunk-index, then ignore the index MySQL wants to
# use (y in this case) and use the user's index. # use (idx_fk_country_id in this case) and use the user's index.
ok( ok(
no_diff( no_diff(
sub { pt_table_checksum::main(@args, qw(--chunk-index PRIMARY), sub { pt_table_checksum::main(@args, qw(--chunk-index PRIMARY),
"--where", "y > 2009") }, "--where", "country_id > 100", qw(-t sakila.city)) },
"$out/chunkidx005.txt", "$out/chunkidx005.txt",
), ),
"Explicit --chunk-index overrides MySQL's index for --where" "Explicit --chunk-index overrides MySQL's index for --where"

2
t/pt-table-checksum/samples/chunkidx001.txt
View File

@@ -2,7 +2,7 @@
-- issue_519.t -- issue_519.t
-- --
REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*) AS cnt, COALESCE(LOWER(CONV(BIT_XOR(CAST(CRC32(CONCAT_WS('#', `i`, `y`, `t`, CONCAT(ISNULL(`t`)))) AS UNSIGNED)), 10, 16)), 0) AS crc FROM `issue_519`.`t` FORCE INDEX(`PRIMARY`) WHERE ((`i` >= ?)) AND ((`i` <= ?)) ORDER BY `i` /*checksum chunk*/ REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*) AS cnt, COALESCE(LOWER(CONV(BIT_XOR(CAST(CRC32(CONCAT_WS('#', `i`, `y`, `t`, CONCAT(ISNULL(`t`)))) AS UNSIGNED)), 10, 16)), 0) AS crc FROM `issue_519`.`t` FORCE INDEX(`PRIMARY`) WHERE ((`i` >= ?)) AND ((`i` <= ?)) /*checksum chunk*/
REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*), '0' FROM `issue_519`.`t` FORCE INDEX(`PRIMARY`) WHERE ((`i` < ?)) ORDER BY `i` /*past lower chunk*/ REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*), '0' FROM `issue_519`.`t` FORCE INDEX(`PRIMARY`) WHERE ((`i` < ?)) ORDER BY `i` /*past lower chunk*/

2
t/pt-table-checksum/samples/chunkidx002.txt
View File

@@ -2,7 +2,7 @@
-- issue_519.t -- issue_519.t
-- --
REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*) AS cnt, COALESCE(LOWER(CONV(BIT_XOR(CAST(CRC32(CONCAT_WS('#', `i`, `y`, `t`, CONCAT(ISNULL(`t`)))) AS UNSIGNED)), 10, 16)), 0) AS crc FROM `issue_519`.`t` FORCE INDEX(`myidx`) WHERE ((`i` > ?) OR (`i` = ? AND `y` >= ?)) AND ((`i` < ?) OR (`i` = ? AND `y` <= ?)) ORDER BY `i`, `y` /*checksum chunk*/ REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*) AS cnt, COALESCE(LOWER(CONV(BIT_XOR(CAST(CRC32(CONCAT_WS('#', `i`, `y`, `t`, CONCAT(ISNULL(`t`)))) AS UNSIGNED)), 10, 16)), 0) AS crc FROM `issue_519`.`t` FORCE INDEX(`myidx`) WHERE ((`i` > ?) OR (`i` = ? AND `y` >= ?)) AND ((`i` < ?) OR (`i` = ? AND `y` <= ?)) /*checksum chunk*/
REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*), '0' FROM `issue_519`.`t` FORCE INDEX(`myidx`) WHERE ((`i` < ?) OR (`i` = ? AND `y` < ?)) ORDER BY `i`, `y` /*past lower chunk*/ REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*), '0' FROM `issue_519`.`t` FORCE INDEX(`myidx`) WHERE ((`i` < ?) OR (`i` = ? AND `y` < ?)) ORDER BY `i`, `y` /*past lower chunk*/

2
t/pt-table-checksum/samples/chunkidx003.txt
View File

@@ -2,7 +2,7 @@
-- issue_519.t -- issue_519.t
-- --
REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*) AS cnt, COALESCE(LOWER(CONV(BIT_XOR(CAST(CRC32(CONCAT_WS('#', `i`, `y`, `t`, CONCAT(ISNULL(`t`)))) AS UNSIGNED)), 10, 16)), 0) AS crc FROM `issue_519`.`t` FORCE INDEX(`y`) WHERE ((`y` >= ?)) AND ((`y` <= ?)) ORDER BY `y` /*checksum chunk*/ REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*) AS cnt, COALESCE(LOWER(CONV(BIT_XOR(CAST(CRC32(CONCAT_WS('#', `i`, `y`, `t`, CONCAT(ISNULL(`t`)))) AS UNSIGNED)), 10, 16)), 0) AS crc FROM `issue_519`.`t` FORCE INDEX(`y`) WHERE ((`y` >= ?)) AND ((`y` <= ?)) /*checksum chunk*/
REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*), '0' FROM `issue_519`.`t` FORCE INDEX(`y`) WHERE ((`y` < ?)) ORDER BY `y` /*past lower chunk*/ REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*), '0' FROM `issue_519`.`t` FORCE INDEX(`y`) WHERE ((`y` < ?)) ORDER BY `y` /*past lower chunk*/

14
t/pt-table-checksum/samples/chunkidx004.txt
View File

@@ -1,16 +1,12 @@
-- --
-- issue_519.t -- sakila.city
-- --
REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*) AS cnt, COALESCE(LOWER(CONV(BIT_XOR(CAST(CRC32(CONCAT_WS('#', `i`, `y`, `t`, CONCAT(ISNULL(`t`)))) AS UNSIGNED)), 10, 16)), 0) AS crc FROM `issue_519`.`t` FORCE INDEX(`y`) WHERE ((`y` >= ?)) AND ((`y` <= ?)) AND (y > 2009) ORDER BY `y` /*checksum chunk*/ REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*) AS cnt, COALESCE(LOWER(CONV(BIT_XOR(CAST(CRC32(CONCAT_WS('#', `city_id`, `city`, `country_id`, `last_update` + 0)) AS UNSIGNED)), 10, 16)), 0) AS crc FROM `sakila`.`city` FORCE INDEX(`idx_fk_country_id`) WHERE ((`country_id` >= ?)) AND ((`country_id` <= ?)) AND (country_id > 100) /*checksum chunk*/
REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*), '0' FROM `issue_519`.`t` FORCE INDEX(`y`) WHERE ((`y` < ?)) AND (y > 2009) ORDER BY `y` /*past lower chunk*/ REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*), '0' FROM `sakila`.`city` FORCE INDEX(`idx_fk_country_id`) WHERE ((`country_id` < ?)) AND (country_id > 100) ORDER BY `country_id` /*past lower chunk*/
REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*), '0' FROM `issue_519`.`t` FORCE INDEX(`y`) WHERE ((`y` > ?)) AND (y > 2009) ORDER BY `y` /*past upper chunk*/ REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*), '0' FROM `sakila`.`city` FORCE INDEX(`idx_fk_country_id`) WHERE ((`country_id` > ?)) AND (country_id > 100) ORDER BY `country_id` /*past upper chunk*/
SELECT /*!40001 SQL_NO_CACHE */ `y` FROM `issue_519`.`t` FORCE INDEX(`y`) WHERE ((`y` >= ?)) AND (y > 2009) ORDER BY `y` LIMIT ?, 2 /*next chunk boundary*/ SELECT /*!40001 SQL_NO_CACHE */ `country_id` FROM `sakila`.`city` FORCE INDEX(`idx_fk_country_id`) WHERE ((`country_id` >= ?)) AND (country_id > 100) ORDER BY `country_id` LIMIT ?, 2 /*next chunk boundary*/
1 2010 2010
2 2010
3 2010

14
t/pt-table-checksum/samples/chunkidx005.txt
View File

@@ -1,16 +1,12 @@
-- --
-- issue_519.t -- sakila.city
-- --
REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*) AS cnt, COALESCE(LOWER(CONV(BIT_XOR(CAST(CRC32(CONCAT_WS('#', `i`, `y`, `t`, CONCAT(ISNULL(`t`)))) AS UNSIGNED)), 10, 16)), 0) AS crc FROM `issue_519`.`t` FORCE INDEX(`PRIMARY`) WHERE ((`i` >= ?)) AND ((`i` <= ?)) AND (y > 2009) ORDER BY `i` /*checksum chunk*/ REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*) AS cnt, COALESCE(LOWER(CONV(BIT_XOR(CAST(CRC32(CONCAT_WS('#', `city_id`, `city`, `country_id`, `last_update` + 0)) AS UNSIGNED)), 10, 16)), 0) AS crc FROM `sakila`.`city` FORCE INDEX(`PRIMARY`) WHERE ((`city_id` >= ?)) AND ((`city_id` <= ?)) AND (country_id > 100) /*checksum chunk*/
REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*), '0' FROM `issue_519`.`t` FORCE INDEX(`PRIMARY`) WHERE ((`i` < ?)) AND (y > 2009) ORDER BY `i` /*past lower chunk*/ REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*), '0' FROM `sakila`.`city` FORCE INDEX(`PRIMARY`) WHERE ((`city_id` < ?)) AND (country_id > 100) ORDER BY `city_id` /*past lower chunk*/
REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*), '0' FROM `issue_519`.`t` FORCE INDEX(`PRIMARY`) WHERE ((`i` > ?)) AND (y > 2009) ORDER BY `i` /*past upper chunk*/ REPLACE INTO `percona`.`checksums` (db, tbl, chunk, chunk_index, lower_boundary, upper_boundary, this_cnt, this_crc) SELECT ?, ?, ?, ?, ?, ?, COUNT(*), '0' FROM `sakila`.`city` FORCE INDEX(`PRIMARY`) WHERE ((`city_id` > ?)) AND (country_id > 100) ORDER BY `city_id` /*past upper chunk*/
SELECT /*!40001 SQL_NO_CACHE */ `i` FROM `issue_519`.`t` FORCE INDEX(`PRIMARY`) WHERE ((`i` >= ?)) AND (y > 2009) ORDER BY `i` LIMIT ?, 2 /*next chunk boundary*/ SELECT /*!40001 SQL_NO_CACHE */ `city_id` FROM `sakila`.`city` FORCE INDEX(`PRIMARY`) WHERE ((`city_id` >= ?)) AND (country_id > 100) ORDER BY `city_id` LIMIT ?, 2 /*next chunk boundary*/
1 11 11
2 11
3 11