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

Fix for 1045317: Added a --statistics option to pt-osc

Browse Source
This commit is contained in:
Brian Fraser
2012-10-30 21:45:52 -03:00
parent 6771202be0
commit cb3fb74082
3 changed files with 454 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
t/pt-online-schema-change/basics.t
View File

@@ -32,9 +32,6 @@ if ( !$master_dbh ) {
elsif ( !$slave_dbh ) {
plan skip_all => 'Cannot connect to sandbox slave';
}
else {
plan tests => 119;
}
my $q = new Quoter();
my $tp = new TableParser(Quoter => $q);
@@ -634,10 +631,46 @@ test_alter_table(
qw(--no-drop-new-table)],
);
# #############################################################################
# --statistics
# #############################################################################
$sb->load_file('master', "$sample/bug_1045317.sql");
($output, $exit) = full_output(
sub { pt_online_schema_change::main(@args, "$dsn,D=bug_1045317,t=bits",
'--dry-run', '--statistics', # We'll never get any statistics with --dry-run
'--alter', "modify column val ENUM('M','E','H') NOT NULL") }
);
like(
$output,
qr/\#\Q No statistics for errors or warnings./,
"--statistics works as expected with --dry-run"
) or diag($output);
($output, $exit) = full_output(
sub { pt_online_schema_change::main(@args, "$dsn,D=bug_1045317,t=bits",
'--execute', '--statistics',
'--alter', "modify column val ENUM('E','H') NOT NULL") }
);
like(
$output,
qr/\#\Q Error Code Count Type\E\s*
\#\Q ========== ===== =========\E\s*
\#\Q 1592 1 Ignorable\E\s*
\#\Q 1265 1 Warning\E\s*/x,
"--statistics works as expected with 1 ignore & 1 warning"
);
$master_dbh->do(q{DROP DATABASE bug_1045317});
# #############################################################################
# Done.
# #############################################################################
$master_dbh->do("UPDATE mysql.proc SET created='2012-06-05 00:00:00', modified='2012-06-05 00:00:00'");
$sb->wipe_clean($master_dbh);
ok($sb->ok(), "Sandbox servers") or BAIL_OUT(__FILE__ . " broke the sandbox");
done_testing;
exit;

6
t/pt-online-schema-change/option_sanity.t
View File

@@ -51,6 +51,12 @@ like(
"--execute FALSE by default"
);
like(
$output,
qr/--statistics\s+FALSE/,
"--statistics is FALSE by default"
);
$output = `$cmd h=127.1,P=12345,u=msandbox,p=msandbox --alter-foreign-keys-method drop_swap --no-drop-new-table`;
like(
$output,