diff --git a/bin/pt-upgrade b/bin/pt-upgrade index 781aaf31..9bfced94 100755 --- a/bin/pt-upgrade +++ b/bin/pt-upgrade @@ -5934,10 +5934,12 @@ sub _print_diffs { my $diffno = 1; foreach my $diff ( @$diffs ) { + my $query = $diff->[0]; + my $diff_vals = $diff->[1]; print "\n-- $diffno.\n"; - my $formatted_diff = $formatter->($diff->[1]); - print $formatted_diff || '?'; - print "\n" . ($diff->[0] || '?') . "\n"; + my $formatted_diff_vals = $formatter->($diff_vals); + print $formatted_diff_vals || '?'; + print "\n" . ($query || '?') . "\n"; $diffno++; } @@ -6012,11 +6014,11 @@ sub _format_rows { sub _format_query_times { my ($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, + ($query_times->[0] || '?'), ($query_times->[1] || '?'), - ($query_times->[2] || '?'), - ($query_times->[3] || '?'); + ($query_times->[2] || '?'); return $diff; } diff --git a/lib/UpgradeResults.pm b/lib/UpgradeResults.pm index 9d0fcd84..9ba00524 100644 --- a/lib/UpgradeResults.pm +++ b/lib/UpgradeResults.pm @@ -451,10 +451,12 @@ sub _print_diffs { my $diffno = 1; foreach my $diff ( @$diffs ) { + my $query = $diff->[0]; + my $diff_vals = $diff->[1]; print "\n-- $diffno.\n"; - my $formatted_diff = $formatter->($diff->[1]); - print $formatted_diff || '?'; - print "\n" . ($diff->[0] || '?') . "\n"; + my $formatted_diff_vals = $formatter->($diff_vals); + print $formatted_diff_vals || '?'; + print "\n" . ($query || '?') . "\n"; $diffno++; } @@ -531,11 +533,11 @@ sub _format_rows { sub _format_query_times { my ($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, + ($query_times->[0] || '?'), ($query_times->[1] || '?'), - ($query_times->[2] || '?'), - ($query_times->[3] || '?'); + ($query_times->[2] || '?'); return $diff; } diff --git a/t/lib/UpgradeResults.t b/t/lib/UpgradeResults.t index 40bfe16b..e44a1b04 100644 --- a/t/lib/UpgradeResults.t +++ b/t/lib/UpgradeResults.t @@ -28,7 +28,6 @@ my $r = new UpgradeResults( $output = UpgradeResults::_format_query_times( [ - 'INSERT INTO t (id, username) VALUES (NULL, \'long_username\')', '0.000812', '0.039595', '48.8' diff --git a/t/lib/samples/UpgradeResults/format_query_times001 b/t/lib/samples/UpgradeResults/format_query_times001 index 33a1e5ae..cd5ccf07 100644 --- a/t/lib/samples/UpgradeResults/format_query_times001 +++ b/t/lib/samples/UpgradeResults/format_query_times001 @@ -1,2 +1,2 @@ -0.000812 vs. 0.039595 seconds (48.8% increase) +0.000812 vs. 0.039595 seconds (48.8x increase)