percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2026-04-26 01:02:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove ndb_binlog_index from auto-skipped sys tables in SchemaIterator because it wasn't previously skipped in 5.1 and 5.5.

Browse Source
This commit is contained in:
Daniel Nichter
2012-12-20 23:05:06 +00:00
parent ca5b2ecfea
commit dad38169bf
8 changed files with 84 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/pt-duplicate-key-checker
+22 -11
View File
@@ -3026,11 +3026,16 @@ sub next {
if ( !$self->{initialized} ) { if ( !$self->{initialized} ) {
$self->{initialized} = 1; $self->{initialized} = 1;
if ( $self->{resume}->{tbl} if ( $self->{resume}->{tbl} ) {
&& !$self->table_is_allowed(@{$self->{resume}}{qw(db tbl)}) ) { if ( !$self->table_is_allowed(@{$self->{resume}}{qw(db tbl)}) ) {
PTDEBUG && _d('Will resume after', PTDEBUG && _d('Will resume after',
join('.', @{$self->{resume}}{qw(db tbl)})); join('.', @{$self->{resume}}{qw(db tbl)}));
$self->{resume}->{after} = 1; $self->{resume}->{after}->{tbl} = 1;
}
if ( !$self->database_is_allowed($self->{resume}->{db}) ) {
PTDEBUG && _d('Will resume after', $self->{resume}->{db});
$self->{resume}->{after}->{db} = 1;
}
} }
} }
@@ -3128,16 +3133,17 @@ sub _iterate_dbh {
if ( !defined $self->{dbs} ) { if ( !defined $self->{dbs} ) {
my $sql = 'SHOW DATABASES'; my $sql = 'SHOW DATABASES';
PTDEBUG && _d($sql); PTDEBUG && _d($sql);
my @dbs = grep { $self->database_is_allowed($_) } my @dbs = grep {
@{$dbh->selectcol_arrayref($sql)}; $self->_resume_from_database($_)
&&
$self->database_is_allowed($_)
} @{$dbh->selectcol_arrayref($sql)};
PTDEBUG && _d('Found', scalar @dbs, 'databases'); PTDEBUG && _d('Found', scalar @dbs, 'databases');
$self->{dbs} = \@dbs; $self->{dbs} = \@dbs;
} }
if ( !$self->{db} ) { if ( !$self->{db} ) {
do {
$self->{db} = shift @{$self->{dbs}}; $self->{db} = shift @{$self->{dbs}};
} until $self->_resume_from_database($self->{db});
PTDEBUG && _d('Next database:', $self->{db}); PTDEBUG && _d('Next database:', $self->{db});
return unless $self->{db}; return unless $self->{db};
} }
@@ -3244,7 +3250,6 @@ sub table_is_allowed {
|slow_log |slow_log
|innodb_index_stats |innodb_index_stats
|innodb_table_stats |innodb_table_stats
|ndb_binlog_index
|slave_master_info |slave_master_info
|slave_relay_log_info |slave_relay_log_info
|slave_worker_info |slave_worker_info
@@ -3317,12 +3322,18 @@ sub _resume_from_database {
my ($self, $db) = @_; my ($self, $db) = @_;
return 1 unless $self->{resume}->{db}; return 1 unless $self->{resume}->{db};
if ( $db eq $self->{resume}->{db} ) { if ( $db eq $self->{resume}->{db} ) {
PTDEBUG && _d('At resume db', $db); if ( !$self->{resume}->{after}->{db} ) {
PTDEBUG && _d('Resuming from db', $db);
delete $self->{resume}->{db}; delete $self->{resume}->{db};
return 1; return 1;
} }
else {
PTDEBUG && _d('Resuming after db', $db);
delete $self->{resume}->{db};
delete $self->{resume}->{tbl};
}
}
return 0; return 0;
} }
@@ -3333,7 +3344,7 @@ sub _resume_from_table {
return 1 unless $self->{resume}->{tbl}; return 1 unless $self->{resume}->{tbl};
if ( $tbl eq $self->{resume}->{tbl} ) { if ( $tbl eq $self->{resume}->{tbl} ) {
if ( !$self->{resume}->{after} ) { if ( !$self->{resume}->{after}->{tbl} ) {
PTDEBUG && _d('Resuming from table', $tbl); PTDEBUG && _d('Resuming from table', $tbl);
delete $self->{resume}->{tbl}; delete $self->{resume}->{tbl};
return 1; return 1;
bin/pt-index-usage
+22 -11
View File
@@ -3844,11 +3844,16 @@ sub next {
if ( !$self->{initialized} ) { if ( !$self->{initialized} ) {
$self->{initialized} = 1; $self->{initialized} = 1;
if ( $self->{resume}->{tbl} if ( $self->{resume}->{tbl} ) {
&& !$self->table_is_allowed(@{$self->{resume}}{qw(db tbl)}) ) { if ( !$self->table_is_allowed(@{$self->{resume}}{qw(db tbl)}) ) {
PTDEBUG && _d('Will resume after', PTDEBUG && _d('Will resume after',
join('.', @{$self->{resume}}{qw(db tbl)})); join('.', @{$self->{resume}}{qw(db tbl)}));
$self->{resume}->{after} = 1; $self->{resume}->{after}->{tbl} = 1;
}
if ( !$self->database_is_allowed($self->{resume}->{db}) ) {
PTDEBUG && _d('Will resume after', $self->{resume}->{db});
$self->{resume}->{after}->{db} = 1;
}
} }
} }
@@ -3946,16 +3951,17 @@ sub _iterate_dbh {
if ( !defined $self->{dbs} ) { if ( !defined $self->{dbs} ) {
my $sql = 'SHOW DATABASES'; my $sql = 'SHOW DATABASES';
PTDEBUG && _d($sql); PTDEBUG && _d($sql);
my @dbs = grep { $self->database_is_allowed($_) } my @dbs = grep {
@{$dbh->selectcol_arrayref($sql)}; $self->_resume_from_database($_)
&&
$self->database_is_allowed($_)
} @{$dbh->selectcol_arrayref($sql)};
PTDEBUG && _d('Found', scalar @dbs, 'databases'); PTDEBUG && _d('Found', scalar @dbs, 'databases');
$self->{dbs} = \@dbs; $self->{dbs} = \@dbs;
} }
if ( !$self->{db} ) { if ( !$self->{db} ) {
do {
$self->{db} = shift @{$self->{dbs}}; $self->{db} = shift @{$self->{dbs}};
} until $self->_resume_from_database($self->{db});
PTDEBUG && _d('Next database:', $self->{db}); PTDEBUG && _d('Next database:', $self->{db});
return unless $self->{db}; return unless $self->{db};
} }
@@ -4062,7 +4068,6 @@ sub table_is_allowed {
|slow_log |slow_log
|innodb_index_stats |innodb_index_stats
|innodb_table_stats |innodb_table_stats
|ndb_binlog_index
|slave_master_info |slave_master_info
|slave_relay_log_info |slave_relay_log_info
|slave_worker_info |slave_worker_info
@@ -4135,12 +4140,18 @@ sub _resume_from_database {
my ($self, $db) = @_; my ($self, $db) = @_;
return 1 unless $self->{resume}->{db}; return 1 unless $self->{resume}->{db};
if ( $db eq $self->{resume}->{db} ) { if ( $db eq $self->{resume}->{db} ) {
PTDEBUG && _d('At resume db', $db); if ( !$self->{resume}->{after}->{db} ) {
PTDEBUG && _d('Resuming from db', $db);
delete $self->{resume}->{db}; delete $self->{resume}->{db};
return 1; return 1;
} }
else {
PTDEBUG && _d('Resuming after db', $db);
delete $self->{resume}->{db};
delete $self->{resume}->{tbl};
}
}
return 0; return 0;
} }
@@ -4151,7 +4162,7 @@ sub _resume_from_table {
return 1 unless $self->{resume}->{tbl}; return 1 unless $self->{resume}->{tbl};
if ( $tbl eq $self->{resume}->{tbl} ) { if ( $tbl eq $self->{resume}->{tbl} ) {
if ( !$self->{resume}->{after} ) { if ( !$self->{resume}->{after}->{tbl} ) {
PTDEBUG && _d('Resuming from table', $tbl); PTDEBUG && _d('Resuming from table', $tbl);
delete $self->{resume}->{tbl}; delete $self->{resume}->{tbl};
return 1; return 1;
bin/pt-table-checksum
-1
View File
@@ -6991,7 +6991,6 @@ sub table_is_allowed {
|slow_log |slow_log
|innodb_index_stats |innodb_index_stats
|innodb_table_stats |innodb_table_stats
|ndb_binlog_index
|slave_master_info |slave_master_info
|slave_relay_log_info |slave_relay_log_info
|slave_worker_info |slave_worker_info
bin/pt-table-sync
+22 -11
View File
@@ -7521,11 +7521,16 @@ sub next {
if ( !$self->{initialized} ) { if ( !$self->{initialized} ) {
$self->{initialized} = 1; $self->{initialized} = 1;
if ( $self->{resume}->{tbl} if ( $self->{resume}->{tbl} ) {
&& !$self->table_is_allowed(@{$self->{resume}}{qw(db tbl)}) ) { if ( !$self->table_is_allowed(@{$self->{resume}}{qw(db tbl)}) ) {
PTDEBUG && _d('Will resume after', PTDEBUG && _d('Will resume after',
join('.', @{$self->{resume}}{qw(db tbl)})); join('.', @{$self->{resume}}{qw(db tbl)}));
$self->{resume}->{after} = 1; $self->{resume}->{after}->{tbl} = 1;
}
if ( !$self->database_is_allowed($self->{resume}->{db}) ) {
PTDEBUG && _d('Will resume after', $self->{resume}->{db});
$self->{resume}->{after}->{db} = 1;
}
} }
} }
@@ -7623,16 +7628,17 @@ sub _iterate_dbh {
if ( !defined $self->{dbs} ) { if ( !defined $self->{dbs} ) {
my $sql = 'SHOW DATABASES'; my $sql = 'SHOW DATABASES';
PTDEBUG && _d($sql); PTDEBUG && _d($sql);
my @dbs = grep { $self->database_is_allowed($_) } my @dbs = grep {
@{$dbh->selectcol_arrayref($sql)}; $self->_resume_from_database($_)
&&
$self->database_is_allowed($_)
} @{$dbh->selectcol_arrayref($sql)};
PTDEBUG && _d('Found', scalar @dbs, 'databases'); PTDEBUG && _d('Found', scalar @dbs, 'databases');
$self->{dbs} = \@dbs; $self->{dbs} = \@dbs;
} }
if ( !$self->{db} ) { if ( !$self->{db} ) {
do {
$self->{db} = shift @{$self->{dbs}}; $self->{db} = shift @{$self->{dbs}};
} until $self->_resume_from_database($self->{db});
PTDEBUG && _d('Next database:', $self->{db}); PTDEBUG && _d('Next database:', $self->{db});
return unless $self->{db}; return unless $self->{db};
} }
@@ -7739,7 +7745,6 @@ sub table_is_allowed {
|slow_log |slow_log
|innodb_index_stats |innodb_index_stats
|innodb_table_stats |innodb_table_stats
|ndb_binlog_index
|slave_master_info |slave_master_info
|slave_relay_log_info |slave_relay_log_info
|slave_worker_info |slave_worker_info
@@ -7812,12 +7817,18 @@ sub _resume_from_database {
my ($self, $db) = @_; my ($self, $db) = @_;
return 1 unless $self->{resume}->{db}; return 1 unless $self->{resume}->{db};
if ( $db eq $self->{resume}->{db} ) { if ( $db eq $self->{resume}->{db} ) {
PTDEBUG && _d('At resume db', $db); if ( !$self->{resume}->{after}->{db} ) {
PTDEBUG && _d('Resuming from db', $db);
delete $self->{resume}->{db}; delete $self->{resume}->{db};
return 1; return 1;
} }
else {
PTDEBUG && _d('Resuming after db', $db);
delete $self->{resume}->{db};
delete $self->{resume}->{tbl};
}
}
return 0; return 0;
} }
@@ -7828,7 +7839,7 @@ sub _resume_from_table {
return 1 unless $self->{resume}->{tbl}; return 1 unless $self->{resume}->{tbl};
if ( $tbl eq $self->{resume}->{tbl} ) { if ( $tbl eq $self->{resume}->{tbl} ) {
if ( !$self->{resume}->{after} ) { if ( !$self->{resume}->{after}->{tbl} ) {
PTDEBUG && _d('Resuming from table', $tbl); PTDEBUG && _d('Resuming from table', $tbl);
delete $self->{resume}->{tbl}; delete $self->{resume}->{tbl};
return 1; return 1;
lib/SchemaIterator.pm
-1
View File
@@ -449,7 +449,6 @@ sub table_is_allowed {
|slow_log |slow_log
|innodb_index_stats |innodb_index_stats
|innodb_table_stats |innodb_table_stats
|ndb_binlog_index
|slave_master_info |slave_master_info
|slave_relay_log_info |slave_relay_log_info
|slave_worker_info |slave_worker_info
t/pt-table-checksum/basics.t
+1 -1
View File
@@ -97,7 +97,7 @@ ok(
"Static chunk size (--chunk-time 0)" "Static chunk size (--chunk-time 0)"
); );
my $n_checksums = $sandbox_version eq "5.6" ? 88 my $n_checksums = $sandbox_version eq "5.6" ? 89
: $sandbox_version eq "5.5" ? 90 : $sandbox_version eq "5.5" ? 90
: $sandbox_version eq "5.1" ? 89 : $sandbox_version eq "5.1" ? 89
: 85; : 85;
t/pt-table-checksum/samples/default-results-5.6.txt
+1
View File
@@ -7,6 +7,7 @@ ERRORS DIFFS ROWS SKIPPED TABLE
0 0 461 0 mysql.help_keyword 0 0 461 0 mysql.help_keyword
0 0 1045 0 mysql.help_relation 0 0 1045 0 mysql.help_relation
0 0 324 0 mysql.help_topic 0 0 324 0 mysql.help_topic
0 0 0 0 mysql.ndb_binlog_index
0 0 0 0 mysql.plugin 0 0 0 0 mysql.plugin
0 0 0 0 mysql.proc 0 0 0 0 mysql.proc
0 0 0 0 mysql.procs_priv 0 0 0 0 mysql.procs_priv
t/pt-table-checksum/samples/static-chunk-size-results-5.6.txt
+1
View File
@@ -7,6 +7,7 @@ ERRORS DIFFS ROWS CHUNKS SKIPPED TABLE
0 0 461 1 0 mysql.help_keyword 0 0 461 1 0 mysql.help_keyword
0 0 1045 1 0 mysql.help_relation 0 0 1045 1 0 mysql.help_relation
0 0 324 1 0 mysql.help_topic 0 0 324 1 0 mysql.help_topic
0 0 0 1 0 mysql.ndb_binlog_index
0 0 0 1 0 mysql.plugin 0 0 0 1 0 mysql.plugin
0 0 0 1 0 mysql.proc 0 0 0 1 0 mysql.proc
0 0 0 1 0 mysql.procs_priv 0 0 0 1 0 mysql.procs_priv