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

Merge fix-zero-bool-bug-820104.

Browse Source
This commit is contained in:
Daniel Nichter
2012-06-11 20:52:35 -04:00
parent c4f45818f7 18073bd7a2
commit ec9773d1ce
3 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
bin/pt-query-digest
View File

@@ -6444,7 +6444,7 @@ sub header {
next unless exists $results->{globals}->{$attrib}; next unless exists $results->{globals}->{$attrib};
my $store = $results->{globals}->{$attrib}; my $store = $results->{globals}->{$attrib};
if ( $store->{sum} > 0 || $args{zero_bool} ) { if ( $store->{sum} > 0 ) {
push @result, push @result,
sprintf $self->{bool_format}, sprintf $self->{bool_format},
$self->make_label($attrib), $self->bool_percents($store); $self->make_label($attrib), $self->bool_percents($store);
@@ -6731,7 +6731,7 @@ sub event_report {
my $vals = $store->{$attrib}; my $vals = $store->{$attrib};
next unless scalar %$vals; next unless scalar %$vals;
if ( $vals->{sum} > 0 || $args{zero_bool} ) { if ( $vals->{sum} > 0 ) {
push @result, push @result,
sprintf $self->{bool_format}, sprintf $self->{bool_format},
$self->make_label($attrib), $self->bool_percents($vals); $self->make_label($attrib), $self->bool_percents($vals);
@@ -15520,12 +15520,6 @@ default: yes
Zero out the Rows_XXX properties for administrator command events. Zero out the Rows_XXX properties for administrator command events.
=item --[no]zero-bool
default: yes
Print 0% boolean values in report.
=back =back
=head1 DSN OPTIONS =head1 DSN OPTIONS

6
lib/QueryReportFormatter.pm
View File

@@ -204,7 +204,6 @@ sub files {
# * orderby scalar: attrib items ordered by # * orderby scalar: attrib items ordered by
# Optional arguments: # Optional arguments:
# * select arrayref: attribs to print, mostly for testing # * select arrayref: attribs to print, mostly for testing
# * zero_bool bool: print zero bool values (0%)
# Print a report about the global statistics in the EventAggregator. # Print a report about the global statistics in the EventAggregator.
# Formerly called "global_report()." # Formerly called "global_report()."
sub header { sub header {
@@ -296,7 +295,7 @@ sub header {
next unless exists $results->{globals}->{$attrib}; next unless exists $results->{globals}->{$attrib};
my $store = $results->{globals}->{$attrib}; my $store = $results->{globals}->{$attrib};
if ( $store->{sum} > 0 || $args{zero_bool} ) { if ( $store->{sum} > 0 ) {
push @result, push @result,
sprintf $self->{bool_format}, sprintf $self->{bool_format},
$self->make_label($attrib), $self->bool_percents($store); $self->make_label($attrib), $self->bool_percents($store);
@@ -485,7 +484,6 @@ sub query_report {
# * select arrayref: attribs to print, mostly for testing # * select arrayref: attribs to print, mostly for testing
# * reason scalar: why this item is being reported (top|outlier) # * reason scalar: why this item is being reported (top|outlier)
# * rank scalar: item rank among the worst # * rank scalar: item rank among the worst
# * zero_bool bool: print zero bool values (0%)
# Print a report about the statistics in the EventAggregator. # Print a report about the statistics in the EventAggregator.
# Called by query_report(). # Called by query_report().
sub event_report { sub event_report {
@@ -648,7 +646,7 @@ sub event_report {
my $vals = $store->{$attrib}; my $vals = $store->{$attrib};
next unless scalar %$vals; next unless scalar %$vals;
if ( $vals->{sum} > 0 || $args{zero_bool} ) { if ( $vals->{sum} > 0 ) {
push @result, push @result,
sprintf $self->{bool_format}, sprintf $self->{bool_format},
$self->make_label($attrib), $self->bool_percents($vals); $self->make_label($attrib), $self->bool_percents($vals);

1
t/lib/QueryReportFormatter.t
View File

@@ -536,7 +536,6 @@ $result = $qrf->header(
ea => $ea, ea => $ea,
# select => [ $ea->get_attributes() ], # select => [ $ea->get_attributes() ],
orderby => 'Query_time', orderby => 'Query_time',
zero_bool => 0,
); );
ok( ok(