percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-10-22 02:39:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

QueryReportFormatter: Resolve a hash ordering issue & fix an error introduced by the refactoring which was breaking two tests: checking if --report-histogram rather than --report-all

Browse Source
This commit is contained in:
Brian Fraser fraserb@gmail.com
2013-01-18 09:47:05 -03:00
parent 86f9e302f5
commit e466408c0d
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/pt-query-digest
View File

@@ -7106,9 +7106,9 @@ sub query_report_values {
my $review_vals; my $review_vals;
if ( $qv ) { if ( $qv ) {
$review_vals = $qv->get_review_info($item); $review_vals = $qv->get_review_info($item);
next ITEM if $review_vals->{reviewed_by} && !$self->{options}->{report_histogram}; next ITEM if $review_vals->{reviewed_by} && !$self->{options}->{report_all};
for my $col ( $qv->review_cols() ) { for my $col ( $qv->review_cols() ) {
$item_vals{review_vals}{$col} = $review_vals->{$col}; push @{$item_vals{review_vals}}, [$col, $review_vals->{$col}];
} }
} }
@@ -7176,8 +7176,8 @@ sub query_report {
if ( $vals->{review_vals} ) { if ( $vals->{review_vals} ) {
$report .= "# Review information\n"; $report .= "# Review information\n";
foreach my $col ( keys %{$vals->{review_vals}} ) { foreach my $elem ( @{$vals->{review_vals}} ) {
my $val = $vals->{review_vals}->{$col}; my ($col, $val) = @$elem;
if ( !$val || $val ne '0000-00-00 00:00:00' ) { # issue 202 if ( !$val || $val ne '0000-00-00 00:00:00' ) { # issue 202
$report .= sprintf "# %13s: %-s\n", $col, ($val ? $val : ''); $report .= sprintf "# %13s: %-s\n", $col, ($val ? $val : '');
} }

8
lib/QueryReportFormatter.pm
View File

@@ -363,9 +363,9 @@ sub query_report_values {
my $review_vals; my $review_vals;
if ( $qv ) { if ( $qv ) {
$review_vals = $qv->get_review_info($item); $review_vals = $qv->get_review_info($item);
next ITEM if $review_vals->{reviewed_by} && !$self->{options}->{report_histogram}; next ITEM if $review_vals->{reviewed_by} && !$self->{options}->{report_all};
for my $col ( $qv->review_cols() ) { for my $col ( $qv->review_cols() ) {
$item_vals{review_vals}{$col} = $review_vals->{$col}; push @{$item_vals{review_vals}}, [$col, $review_vals->{$col}];
} }
} }
@@ -452,8 +452,8 @@ sub query_report {
# Print the review information that is already in the table # Print the review information that is already in the table
# before putting anything new into the table. # before putting anything new into the table.
$report .= "# Review information\n"; $report .= "# Review information\n";
foreach my $col ( keys %{$vals->{review_vals}} ) { foreach my $elem ( @{$vals->{review_vals}} ) {
my $val = $vals->{review_vals}->{$col}; my ($col, $val) = @$elem;
if ( !$val || $val ne '0000-00-00 00:00:00' ) { # issue 202 if ( !$val || $val ne '0000-00-00 00:00:00' ) { # issue 202
$report .= sprintf "# %13s: %-s\n", $col, ($val ? $val : ''); $report .= sprintf "# %13s: %-s\n", $col, ($val ? $val : '');
} }