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

Added schemas/tables to the default ignore list

Browse Source
This commit is contained in:
Carlos Salguero
2016-11-18 13:17:03 -03:00
parent 97e5cc2bf8
commit ca1f592652
5 changed files with 49 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bin/pt-table-checksum
View File

@@ -7614,7 +7614,7 @@ sub database_is_allowed {
my $filter = $self->{filters}; my $filter = $self->{filters};
if ( $db =~ m/information_schema|performance_schema|lost\+found|percona|percona_schema/ ) { if ( $db =~ m/information_schema|performance_schema|lost\+found|percona|percona_schema|test/ ) {
PTDEBUG && _d('Database', $db, 'is a system database, ignoring'); PTDEBUG && _d('Database', $db, 'is a system database, ignoring');
return 0; return 0;
} }
@@ -7657,14 +7657,21 @@ sub table_is_allowed {
return 0 if $db eq 'mysql' && $tbl =~ m/^(?: return 0 if $db eq 'mysql' && $tbl =~ m/^(?:
general_log general_log
|slow_log |gtid_execution
|innodb_index_stats |innodb_index_stats
|innodb_table_stats |innodb_table_stats
|inventory
|plugin
|proc
|slave_master_info |slave_master_info
|slave_relay_log_info |slave_relay_log_info
|slave_worker_info |slave_worker_info
|slow_log
)$/x; )$/x;
return 0 if $db eq 'sys' && $tbl =~ m/^(?:
sys_config
)$/x;
if ( $filter->{'ignore-tables'}->{'*'}->{$tbl} if ( $filter->{'ignore-tables'}->{'*'}->{$tbl}
|| $filter->{'ignore-tables'}->{$db}->{$tbl}) { || $filter->{'ignore-tables'}->{$db}->{$tbl}) {
PTDEBUG && _d('Table', $tbl, 'is in --ignore-tables list'); PTDEBUG && _d('Table', $tbl, 'is in --ignore-tables list');

12
lib/SchemaIterator.pm
View File

@@ -405,7 +405,7 @@ sub database_is_allowed {
my $filter = $self->{filters}; my $filter = $self->{filters};
if ( $db =~ m/information_schema|performance_schema|lost\+found/ ) { if ( $db =~ m/information_schema|performance_schema|lost\+found|percona|percona_schema|test/ ) {
PTDEBUG && _d('Database', $db, 'is a system database, ignoring'); PTDEBUG && _d('Database', $db, 'is a system database, ignoring');
return 0; return 0;
} }
@@ -449,12 +449,20 @@ sub table_is_allowed {
# Always auto-skip these pseudo tables. # Always auto-skip these pseudo tables.
return 0 if $db eq 'mysql' && $tbl =~ m/^(?: return 0 if $db eq 'mysql' && $tbl =~ m/^(?:
general_log general_log
|slow_log |gtid_execution
|innodb_index_stats |innodb_index_stats
|innodb_table_stats |innodb_table_stats
|inventory
|plugin
|proc
|slave_master_info |slave_master_info
|slave_relay_log_info |slave_relay_log_info
|slave_worker_info |slave_worker_info
|slow_log
)$/x;
return 0 if $db eq 'sys' && $tbl =~ m/^(?:
sys_config
)$/x; )$/x;
if ( $filter->{'ignore-tables'}->{'*'}->{$tbl} if ( $filter->{'ignore-tables'}->{'*'}->{$tbl}

23
t/lib/SchemaIterator.t
View File

@@ -9,7 +9,7 @@ BEGIN {
use strict; use strict;
use warnings FATAL => 'all'; use warnings FATAL => 'all';
use English qw(-no_match_vars); use English qw(-no_match_vars);
use Test::More; use Test::More tests => 43;
use SchemaIterator; use SchemaIterator;
use FileIterator; use FileIterator;
@@ -349,7 +349,7 @@ SKIP: {
test_so( test_so(
files => ["$in/dump001.txt"], files => ["$in/dump001.txt"],
result => "test.a test.b test2.a ", result => "",
test_name => "Iterate schema in dump001.txt", test_name => "Iterate schema in dump001.txt",
); );
@@ -362,7 +362,7 @@ test_so(
test_so( test_so(
files => ["$in/dump001.txt", "$in/dump001.txt"], files => ["$in/dump001.txt", "$in/dump001.txt"],
result => "$out/dump001-twice.txt", result => "",
ddl => 1, ddl => 1,
test_name => "Iterate schema in multiple files", test_name => "Iterate schema in multiple files",
); );
@@ -370,7 +370,7 @@ test_so(
test_so( test_so(
files => ["$in/dump001.txt"], files => ["$in/dump001.txt"],
filters => [qw(--databases TEST2)], filters => [qw(--databases TEST2)],
result => "test2.a ", result => "",
test_name => "Filter dump file by --databases", test_name => "Filter dump file by --databases",
); );
@@ -585,9 +585,24 @@ test_so(
test_name => '--ignore-tables (bug 1304062)', test_name => '--ignore-tables (bug 1304062)',
); );
my $si = new SchemaIterator(
dbh => $dbh,
OptionParser => $o,
Quoter => $q,
TableParser => $tp,
);
for my $db (qw( information_schema performance_schema|lost\+found percona percona_schema test )) {
is(
$si->database_is_allowed($db),
0,
"database is allowed: $db",
);
}
# ############################################################################# # #############################################################################
# Done. # Done.
# ############################################################################# # #############################################################################
$sb->wipe_clean($dbh); $sb->wipe_clean($dbh);
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox"); ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
done_testing; done_testing;
exit;

73
t/lib/samples/SchemaIterator/all-dbs-tbls-5.6.txt
View File

@@ -126,38 +126,6 @@ CREATE TABLE `ndb_binlog_index` (
PRIMARY KEY (`epoch`,`orig_server_id`,`orig_epoch`) PRIMARY KEY (`epoch`,`orig_server_id`,`orig_epoch`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
mysql.plugin
CREATE TABLE `plugin` (
`name` varchar(64) NOT NULL DEFAULT '',
`dl` varchar(128) NOT NULL DEFAULT '',
PRIMARY KEY (`name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='MySQL plugins'
mysql.proc
CREATE TABLE `proc` (
`db` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
`name` char(64) NOT NULL DEFAULT '',
`type` enum('FUNCTION','PROCEDURE') NOT NULL,
`specific_name` char(64) NOT NULL DEFAULT '',
`language` enum('SQL') NOT NULL DEFAULT 'SQL',
`sql_data_access` enum('CONTAINS_SQL','NO_SQL','READS_SQL_DATA','MODIFIES_SQL_DATA') NOT NULL DEFAULT 'CONTAINS_SQL',
`is_deterministic` enum('YES','NO') NOT NULL DEFAULT 'NO',
`security_type` enum('INVOKER','DEFINER') NOT NULL DEFAULT 'DEFINER',
`param_list` blob NOT NULL,
`returns` longblob NOT NULL,
`body` longblob NOT NULL,
`definer` char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
`created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
`modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
`sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH') NOT NULL DEFAULT '',
`comment` text CHARACTER SET utf8 COLLATE utf8_bin NOT NULL,
`character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`body_utf8` longblob,
PRIMARY KEY (`db`,`name`,`type`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Stored Procedures'
mysql.procs_priv mysql.procs_priv
CREATE TABLE `procs_priv` ( CREATE TABLE `procs_priv` (
`Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
@@ -300,25 +268,6 @@ CREATE TABLE `user` (
PRIMARY KEY (`Host`,`User`) PRIMARY KEY (`Host`,`User`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Users and global privileges' ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='Users and global privileges'
percona_test.checksums
CREATE TABLE `checksums` (
`db_tbl` varchar(128) NOT NULL,
`checksum` int(10) unsigned NOT NULL,
PRIMARY KEY (`db_tbl`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
percona_test.load_data
CREATE TABLE `load_data` (
`i` int(11) DEFAULT NULL
) ENGINE=InnoDB DEFAULT CHARSET=latin1
percona_test.sentinel
CREATE TABLE `sentinel` (
`id` int(11) NOT NULL,
`ping` varchar(64) NOT NULL DEFAULT '',
PRIMARY KEY (`id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1
sakila.actor sakila.actor
CREATE TABLE `actor` ( CREATE TABLE `actor` (
`actor_id` smallint(5) unsigned NOT NULL AUTO_INCREMENT, `actor_id` smallint(5) unsigned NOT NULL AUTO_INCREMENT,
@@ -431,8 +380,8 @@ CREATE TABLE `film_category` (
`last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, `last_update` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`film_id`,`category_id`), PRIMARY KEY (`film_id`,`category_id`),
KEY `fk_film_category_category` (`category_id`), KEY `fk_film_category_category` (`category_id`),
CONSTRAINT `fk_film_category_film` FOREIGN KEY (`film_id`) REFERENCES `film` (`film_id`) ON UPDATE CASCADE, CONSTRAINT `fk_film_category_category` FOREIGN KEY (`category_id`) REFERENCES `category` (`category_id`) ON UPDATE CASCADE,
CONSTRAINT `fk_film_category_category` FOREIGN KEY (`category_id`) REFERENCES `category` (`category_id`) ON UPDATE CASCADE CONSTRAINT `fk_film_category_film` FOREIGN KEY (`film_id`) REFERENCES `film` (`film_id`) ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8 ) ENGINE=InnoDB DEFAULT CHARSET=utf8
sakila.film_text sakila.film_text
@@ -453,8 +402,8 @@ CREATE TABLE `inventory` (
PRIMARY KEY (`inventory_id`), PRIMARY KEY (`inventory_id`),
KEY `idx_fk_film_id` (`film_id`), KEY `idx_fk_film_id` (`film_id`),
KEY `idx_store_id_film_id` (`store_id`,`film_id`), KEY `idx_store_id_film_id` (`store_id`,`film_id`),
CONSTRAINT `fk_inventory_store` FOREIGN KEY (`store_id`) REFERENCES `store` (`store_id`) ON UPDATE CASCADE, CONSTRAINT `fk_inventory_film` FOREIGN KEY (`film_id`) REFERENCES `film` (`film_id`) ON UPDATE CASCADE,
CONSTRAINT `fk_inventory_film` FOREIGN KEY (`film_id`) REFERENCES `film` (`film_id`) ON UPDATE CASCADE CONSTRAINT `fk_inventory_store` FOREIGN KEY (`store_id`) REFERENCES `store` (`store_id`) ON UPDATE CASCADE
) ENGINE=InnoDB AUTO_INCREMENT=4582 DEFAULT CHARSET=utf8 ) ENGINE=InnoDB AUTO_INCREMENT=4582 DEFAULT CHARSET=utf8
sakila.language sakila.language
@@ -478,8 +427,8 @@ CREATE TABLE `payment` (
KEY `idx_fk_staff_id` (`staff_id`), KEY `idx_fk_staff_id` (`staff_id`),
KEY `idx_fk_customer_id` (`customer_id`), KEY `idx_fk_customer_id` (`customer_id`),
KEY `fk_payment_rental` (`rental_id`), KEY `fk_payment_rental` (`rental_id`),
CONSTRAINT `fk_payment_rental` FOREIGN KEY (`rental_id`) REFERENCES `rental` (`rental_id`) ON DELETE SET NULL ON UPDATE CASCADE,
CONSTRAINT `fk_payment_customer` FOREIGN KEY (`customer_id`) REFERENCES `customer` (`customer_id`) ON UPDATE CASCADE, CONSTRAINT `fk_payment_customer` FOREIGN KEY (`customer_id`) REFERENCES `customer` (`customer_id`) ON UPDATE CASCADE,
CONSTRAINT `fk_payment_rental` FOREIGN KEY (`rental_id`) REFERENCES `rental` (`rental_id`) ON DELETE SET NULL ON UPDATE CASCADE,
CONSTRAINT `fk_payment_staff` FOREIGN KEY (`staff_id`) REFERENCES `staff` (`staff_id`) ON UPDATE CASCADE CONSTRAINT `fk_payment_staff` FOREIGN KEY (`staff_id`) REFERENCES `staff` (`staff_id`) ON UPDATE CASCADE
) ENGINE=InnoDB AUTO_INCREMENT=16050 DEFAULT CHARSET=utf8 ) ENGINE=InnoDB AUTO_INCREMENT=16050 DEFAULT CHARSET=utf8
@@ -497,9 +446,9 @@ CREATE TABLE `rental` (
KEY `idx_fk_inventory_id` (`inventory_id`), KEY `idx_fk_inventory_id` (`inventory_id`),
KEY `idx_fk_customer_id` (`customer_id`), KEY `idx_fk_customer_id` (`customer_id`),
KEY `idx_fk_staff_id` (`staff_id`), KEY `idx_fk_staff_id` (`staff_id`),
CONSTRAINT `fk_rental_staff` FOREIGN KEY (`staff_id`) REFERENCES `staff` (`staff_id`) ON UPDATE CASCADE, CONSTRAINT `fk_rental_customer` FOREIGN KEY (`customer_id`) REFERENCES `customer` (`customer_id`) ON UPDATE CASCADE,
CONSTRAINT `fk_rental_inventory` FOREIGN KEY (`inventory_id`) REFERENCES `inventory` (`inventory_id`) ON UPDATE CASCADE, CONSTRAINT `fk_rental_inventory` FOREIGN KEY (`inventory_id`) REFERENCES `inventory` (`inventory_id`) ON UPDATE CASCADE,
CONSTRAINT `fk_rental_customer` FOREIGN KEY (`customer_id`) REFERENCES `customer` (`customer_id`) ON UPDATE CASCADE CONSTRAINT `fk_rental_staff` FOREIGN KEY (`staff_id`) REFERENCES `staff` (`staff_id`) ON UPDATE CASCADE
) ENGINE=InnoDB AUTO_INCREMENT=16050 DEFAULT CHARSET=utf8 ) ENGINE=InnoDB AUTO_INCREMENT=16050 DEFAULT CHARSET=utf8
sakila.staff sakila.staff
@@ -518,8 +467,8 @@ CREATE TABLE `staff` (
PRIMARY KEY (`staff_id`), PRIMARY KEY (`staff_id`),
KEY `idx_fk_store_id` (`store_id`), KEY `idx_fk_store_id` (`store_id`),
KEY `idx_fk_address_id` (`address_id`), KEY `idx_fk_address_id` (`address_id`),
CONSTRAINT `fk_staff_store` FOREIGN KEY (`store_id`) REFERENCES `store` (`store_id`) ON UPDATE CASCADE, CONSTRAINT `fk_staff_address` FOREIGN KEY (`address_id`) REFERENCES `address` (`address_id`) ON UPDATE CASCADE,
CONSTRAINT `fk_staff_address` FOREIGN KEY (`address_id`) REFERENCES `address` (`address_id`) ON UPDATE CASCADE CONSTRAINT `fk_staff_store` FOREIGN KEY (`store_id`) REFERENCES `store` (`store_id`) ON UPDATE CASCADE
) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8
sakila.store sakila.store
@@ -531,7 +480,7 @@ CREATE TABLE `store` (
PRIMARY KEY (`store_id`), PRIMARY KEY (`store_id`),
UNIQUE KEY `idx_unique_manager` (`manager_staff_id`), UNIQUE KEY `idx_unique_manager` (`manager_staff_id`),
KEY `idx_fk_address_id` (`address_id`), KEY `idx_fk_address_id` (`address_id`),
CONSTRAINT `fk_store_staff` FOREIGN KEY (`manager_staff_id`) REFERENCES `staff` (`staff_id`) ON UPDATE CASCADE, CONSTRAINT `fk_store_address` FOREIGN KEY (`address_id`) REFERENCES `address` (`address_id`) ON UPDATE CASCADE,
CONSTRAINT `fk_store_address` FOREIGN KEY (`address_id`) REFERENCES `address` (`address_id`) ON UPDATE CASCADE CONSTRAINT `fk_store_staff` FOREIGN KEY (`manager_staff_id`) REFERENCES `staff` (`staff_id`) ON UPDATE CASCADE
) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8 ) ENGINE=InnoDB AUTO_INCREMENT=3 DEFAULT CHARSET=utf8

32
t/lib/samples/SchemaIterator/all-dbs.txt
View File

@@ -148,38 +148,6 @@ CREATE TABLE `ndb_binlog_index` (
PRIMARY KEY (`epoch`) PRIMARY KEY (`epoch`)
) ENGINE=MyISAM DEFAULT CHARSET=latin1; ) ENGINE=MyISAM DEFAULT CHARSET=latin1;
mysql.plugin
CREATE TABLE `plugin` (
`name` char(64) COLLATE utf8_bin NOT NULL DEFAULT '',
`dl` char(128) COLLATE utf8_bin NOT NULL DEFAULT '',
PRIMARY KEY (`name`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_bin COMMENT='MySQL plugins';
mysql.proc
CREATE TABLE `proc` (
`db` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
`name` char(64) NOT NULL DEFAULT '',
`type` enum('FUNCTION','PROCEDURE') NOT NULL,
`specific_name` char(64) NOT NULL DEFAULT '',
`language` enum('SQL') NOT NULL DEFAULT 'SQL',
`sql_data_access` enum('CONTAINS_SQL','NO_SQL','READS_SQL_DATA','MODIFIES_SQL_DATA') NOT NULL DEFAULT 'CONTAINS_SQL',
`is_deterministic` enum('YES','NO') NOT NULL DEFAULT 'NO',
`security_type` enum('INVOKER','DEFINER') NOT NULL DEFAULT 'DEFINER',
`param_list` blob NOT NULL,
`returns` longblob NOT NULL,
`body` longblob NOT NULL,
`definer` char(77) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
`created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
`modified` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
`sql_mode` set('REAL_AS_FLOAT','PIPES_AS_CONCAT','ANSI_QUOTES','IGNORE_SPACE','NOT_USED','ONLY_FULL_GROUP_BY','NO_UNSIGNED_SUBTRACTION','NO_DIR_IN_CREATE','POSTGRESQL','ORACLE','MSSQL','DB2','MAXDB','NO_KEY_OPTIONS','NO_TABLE_OPTIONS','NO_FIELD_OPTIONS','MYSQL323','MYSQL40','ANSI','NO_AUTO_VALUE_ON_ZERO','NO_BACKSLASH_ESCAPES','STRICT_TRANS_TABLES','STRICT_ALL_TABLES','NO_ZERO_IN_DATE','NO_ZERO_DATE','INVALID_DATES','ERROR_FOR_DIVISION_BY_ZERO','TRADITIONAL','NO_AUTO_CREATE_USER','HIGH_NOT_PRECEDENCE','NO_ENGINE_SUBSTITUTION','PAD_CHAR_TO_FULL_LENGTH') NOT NULL DEFAULT '',
`comment` char(64) CHARACTER SET utf8 COLLATE utf8_bin NOT NULL DEFAULT '',
`character_set_client` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`collation_connection` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`db_collation` char(32) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT NULL,
`body_utf8` longblob,
PRIMARY KEY (`db`,`name`,`type`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Stored Procedures';
mysql.procs_priv mysql.procs_priv
CREATE TABLE `procs_priv` ( CREATE TABLE `procs_priv` (
`Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '', `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',