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

Fix query time diff formatting in pt-upgrade.

Browse Source
This commit is contained in:
Daniel Nichter
2013-03-14 09:20:54 -06:00
parent e27660f6a6
commit 84ab975438
4 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bin/pt-upgrade
View File

@@ -5934,10 +5934,12 @@ sub _print_diffs {
my $diffno = 1; my $diffno = 1;
foreach my $diff ( @$diffs ) { foreach my $diff ( @$diffs ) {
my $query = $diff->[0];
my $diff_vals = $diff->[1];
print "\n-- $diffno.\n"; print "\n-- $diffno.\n";
my $formatted_diff = $formatter->($diff->[1]); my $formatted_diff_vals = $formatter->($diff_vals);
print $formatted_diff || '?'; print $formatted_diff_vals || '?';
print "\n" . ($diff->[0] || '?') . "\n"; print "\n" . ($query || '?') . "\n";
$diffno++; $diffno++;
} }
@@ -6012,11 +6014,11 @@ sub _format_rows {
sub _format_query_times { sub _format_query_times {
my ($query_times) = @_; my ($query_times) = @_;
return unless $query_times; return unless $query_times;
my $fmt = "\n%s vs. %s seconds (%s%% increase)\n"; my $fmt = "\n%s vs. %s seconds (%sx increase)\n";
my $diff = sprintf $fmt, my $diff = sprintf $fmt,
($query_times->[0] || '?'),
($query_times->[1] || '?'), ($query_times->[1] || '?'),
($query_times->[2] || '?'), ($query_times->[2] || '?');
($query_times->[3] || '?');
return $diff; return $diff;
} }

14
lib/UpgradeResults.pm
View File

@@ -451,10 +451,12 @@ sub _print_diffs {
my $diffno = 1; my $diffno = 1;
foreach my $diff ( @$diffs ) { foreach my $diff ( @$diffs ) {
my $query = $diff->[0];
my $diff_vals = $diff->[1];
print "\n-- $diffno.\n"; print "\n-- $diffno.\n";
my $formatted_diff = $formatter->($diff->[1]); my $formatted_diff_vals = $formatter->($diff_vals);
print $formatted_diff || '?'; print $formatted_diff_vals || '?';
print "\n" . ($diff->[0] || '?') . "\n"; print "\n" . ($query || '?') . "\n";
$diffno++; $diffno++;
} }
@@ -531,11 +533,11 @@ sub _format_rows {
sub _format_query_times { sub _format_query_times {
my ($query_times) = @_; my ($query_times) = @_;
return unless $query_times; return unless $query_times;
my $fmt = "\n%s vs. %s seconds (%s%% increase)\n"; my $fmt = "\n%s vs. %s seconds (%sx increase)\n";
my $diff = sprintf $fmt, my $diff = sprintf $fmt,
($query_times->[0] || '?'),
($query_times->[1] || '?'), ($query_times->[1] || '?'),
($query_times->[2] || '?'), ($query_times->[2] || '?');
($query_times->[3] || '?');
return $diff; return $diff;
} }

1
t/lib/UpgradeResults.t
View File

@@ -28,7 +28,6 @@ my $r = new UpgradeResults(
$output = UpgradeResults::_format_query_times( $output = UpgradeResults::_format_query_times(
[ [
'INSERT INTO t (id, username) VALUES (NULL, \'long_username\')',
'0.000812', '0.000812',
'0.039595', '0.039595',
'48.8' '48.8'

2
t/lib/samples/UpgradeResults/format_query_times001
View File

@@ -1,2 +1,2 @@
0.000812 vs. 0.039595 seconds (48.8% increase) 0.000812 vs. 0.039595 seconds (48.8x increase)