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

sprintf rudundancy warnings

Browse Source
This commit is contained in:
frank-cizmich
2016-02-05 13:35:44 -03:00
parent baddc014e1
commit 56b44a7522
16 changed files with 83 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/pt-diskstats
View File

@@ -1306,8 +1306,8 @@ sub shorten {
}
return sprintf(
$num =~ m/\./ || $n
? "%.${p}f%s"
: '%d',
? '%1$.'.$p.'f%2$s'
: '%1$d',
$num, $units[$n]);
}

4
bin/pt-fk-error-logger
View File

@@ -2328,8 +2328,8 @@ sub shorten {
}
return sprintf(
$num =~ m/\./ || $n
? "%.${p}f%s"
: '%d',
? '%1$.'.$p.'f%2$s'
: '%1$d',
$num, $units[$n]);
}

4
bin/pt-heartbeat
View File

@@ -3967,8 +3967,8 @@ sub shorten {
}
return sprintf(
$num =~ m/\./ || $n
? "%.${p}f%s"
: '%d',
? '%1$.'.$p.'f%2$s'
: '%1$d',
$num, $units[$n]);
}

9
bin/pt-index-usage
View File

@@ -3530,8 +3530,8 @@ sub shorten {
}
return sprintf(
$num =~ m/\./ || $n
? "%.${p}f%s"
: '%d',
? '%1$.'.$p.'f%2$s'
: '%1$d',
$num, $units[$n]);
}
@@ -4918,11 +4918,10 @@ sub new {
last_reported => $args{start},
fraction => 0, # How complete the job is
callback => sub {
my ($fraction, $elapsed, $remaining, $eta) = @_;
my ($fraction, $elapsed, $remaining) = @_;
printf STDERR "$name: %3d%% %s remain\n",
$fraction * 100,
Transformers::secs_to_time($remaining),
Transformers::ts($eta);
Transformers::secs_to_time($remaining);
},
%args,
};

4
bin/pt-kill
View File

@@ -2589,8 +2589,8 @@ sub shorten {
}
return sprintf(
$num =~ m/\./ || $n
? "%.${p}f%s"
: '%d',
? '%1$.'.$p.'f%2$s'
: '%1$d',
$num, $units[$n]);
}

9
bin/pt-online-schema-change
View File

@@ -3591,11 +3591,10 @@ sub new {
last_reported => $args{start},
fraction => 0, # How complete the job is
callback => sub {
my ($fraction, $elapsed, $remaining, $eta) = @_;
my ($fraction, $elapsed, $remaining) = @_;
printf STDERR "$name: %3d%% %s remain\n",
$fraction * 100,
Transformers::secs_to_time($remaining),
Transformers::ts($eta);
Transformers::secs_to_time($remaining);
},
%args,
};
@@ -6124,8 +6123,8 @@ sub shorten {
}
return sprintf(
$num =~ m/\./ || $n
? "%.${p}f%s"
: '%d',
? '%1$.'.$p.'f%2$s'
: '%1$d',
$num, $units[$n]);
}

21
bin/pt-query-digest
View File

@@ -2555,8 +2555,8 @@ sub shorten {
}
return sprintf(
$num =~ m/\./ || $n
? "%.${p}f%s"
: '%d',
? '%1$.'.$p.'f%2$s'
: '%1$d',
$num, $units[$n]);
}
@@ -6674,9 +6674,9 @@ sub BUILDARGS {
report_all => $o->get('report-all'),
report_histogram => $o->get('report-histogram'),
},
num_format => "# %-${label_width}s %3s %7s %7s %7s %7s %7s %7s %7s",
bool_format => "# %-${label_width}s %3d%% yes, %3d%% no",
string_format => "# %-${label_width}s %s",
num_format => '# %1$-'.$label_width.'s %2$3s %3$7s %4$7s %5$7s %6$7s %7$7s %8$7s %9$7s',
bool_format => '# %1$-'.$label_width.'s %2$3d%% yes, %3$3d%% no',
string_format => '# %1$-'.$label_width.'s %2$s',
hidden_attrib => { # Don't sort/print these attribs in the reports.
arg => 1, # They're usually handled specially, or not
fingerprint => 1, # printed at all.
@@ -7139,7 +7139,11 @@ sub event_report {
$val->{checksum},
$val->{pos_in_log},
);
$line .= ('_' x (LINE_LENGTH - length($line) + $self->label_width() - 12));
my $underscores = LINE_LENGTH - length($line) + $self->label_width() - 12;
if ( $underscores < 0 ) {
$underscores = 0;
}
$line .= ('_' x $underscores);
push @result, $line;
if ( $val->{reason} ) {
@@ -11112,11 +11116,10 @@ sub new {
last_reported => $args{start},
fraction => 0, # How complete the job is
callback => sub {
my ($fraction, $elapsed, $remaining, $eta) = @_;
my ($fraction, $elapsed, $remaining) = @_;
printf STDERR "$name: %3d%% %s remain\n",
$fraction * 100,
Transformers::secs_to_time($remaining),
Transformers::ts($eta);
Transformers::secs_to_time($remaining);
},
%args,
};

4
bin/pt-slave-delay
View File

@@ -2582,8 +2582,8 @@ sub shorten {
}
return sprintf(
$num =~ m/\./ || $n
? "%.${p}f%s"
: '%d',
? '%1$.'.$p.'f%2$s'
: '%1$d',
$num, $units[$n]);
}

4
bin/pt-slave-find
View File

@@ -3455,8 +3455,8 @@ sub shorten {
}
return sprintf(
$num =~ m/\./ || $n
? "%.${p}f%s"
: '%d',
? '%1$.'.$p.'f%2$s'
: '%1$d',
$num, $units[$n]);
}

9
bin/pt-table-checksum
View File

@@ -7930,8 +7930,8 @@ sub shorten {
}
return sprintf(
$num =~ m/\./ || $n
? "%.${p}f%s"
: '%d',
? '%1$.'.$p.'f%2$s'
: '%1$d',
$num, $units[$n]);
}
@@ -8179,11 +8179,10 @@ sub new {
last_reported => $args{start},
fraction => 0, # How complete the job is
callback => sub {
my ($fraction, $elapsed, $remaining, $eta) = @_;
my ($fraction, $elapsed, $remaining) = @_;
printf STDERR "$name: %3d%% %s remain\n",
$fraction * 100,
Transformers::secs_to_time($remaining),
Transformers::ts($eta);
Transformers::secs_to_time($remaining);
},
%args,
};

4
bin/pt-table-sync
View File

@@ -8093,8 +8093,8 @@ sub shorten {
}
return sprintf(
$num =~ m/\./ || $n
? "%.${p}f%s"
: '%d',
? '%1$.'.$p.'f%2$s'
: '%1$d',
$num, $units[$n]);
}

50
bin/pt-table-usage
View File

@@ -2443,24 +2443,26 @@ use Time::Local qw(timegm timelocal);
use Digest::MD5 qw(md5_hex);
use B qw();
require Exporter;
our @ISA = qw(Exporter);
our %EXPORT_TAGS = ();
our @EXPORT = ();
our @EXPORT_OK = qw(
micro_t
percentage_of
secs_to_time
time_to_secs
shorten
ts
parse_timestamp
unix_timestamp
any_unix_timestamp
make_checksum
crc32
encode_json
);
BEGIN {
require Exporter;
our @ISA = qw(Exporter);
our %EXPORT_TAGS = ();
our @EXPORT = ();
our @EXPORT_OK = qw(
micro_t
percentage_of
secs_to_time
time_to_secs
shorten
ts
parse_timestamp
unix_timestamp
any_unix_timestamp
make_checksum
crc32
encode_json
);
}
our $mysql_ts = qr/(\d\d)(\d\d)(\d\d) +(\d+):(\d+):(\d+)(\.\d+)?/;
our $proper_ts = qr/(\d\d\d\d)-(\d\d)-(\d\d)[T ](\d\d):(\d\d):(\d\d)(\.\d+)?/;
@@ -2562,8 +2564,8 @@ sub shorten {
}
return sprintf(
$num =~ m/\./ || $n
? "%.${p}f%s"
: '%d',
? '%1$.'.$p.'f%2$s'
: '%1$d',
$num, $units[$n]);
}
@@ -2592,6 +2594,9 @@ sub parse_timestamp {
. (defined $f ? '%09.6f' : '%02d'),
$y + 2000, $m, $d, $h, $i, (defined $f ? $s + $f : $s);
}
elsif ( $val =~ m/^$proper_ts$/ ) {
return $val;
}
return $val;
}
@@ -6209,11 +6214,10 @@ sub new {
last_reported => $args{start},
fraction => 0, # How complete the job is
callback => sub {
my ($fraction, $elapsed, $remaining, $eta) = @_;
my ($fraction, $elapsed, $remaining) = @_;
printf STDERR "$name: %3d%% %s remain\n",
$fraction * 100,
Transformers::secs_to_time($remaining),
Transformers::ts($eta);
Transformers::secs_to_time($remaining);
},
%args,
};

9
bin/pt-upgrade
View File

@@ -2799,8 +2799,8 @@ sub shorten {
}
return sprintf(
$num =~ m/\./ || $n
? "%.${p}f%s"
: '%d',
? '%1$.'.$p.'f%2$s'
: '%1$d',
$num, $units[$n]);
}
@@ -9123,11 +9123,10 @@ sub new {
last_reported => $args{start},
fraction => 0, # How complete the job is
callback => sub {
my ($fraction, $elapsed, $remaining, $eta) = @_;
my ($fraction, $elapsed, $remaining) = @_;
printf STDERR "$name: %3d%% %s remain\n",
$fraction * 100,
Transformers::secs_to_time($remaining),
Transformers::ts($eta);
Transformers::secs_to_time($remaining);
},
%args,
};

5
lib/Progress.pm
View File

@@ -71,11 +71,10 @@ sub new {
last_reported => $args{start},
fraction => 0, # How complete the job is
callback => sub {
my ($fraction, $elapsed, $remaining, $eta) = @_;
my ($fraction, $elapsed, $remaining) = @_;
printf STDERR "$name: %3d%% %s remain\n",
$fraction * 100,
Transformers::secs_to_time($remaining),
Transformers::ts($eta);
Transformers::secs_to_time($remaining);
},
%args,
};

12
lib/QueryReportFormatter.pm
View File

@@ -123,9 +123,9 @@ sub BUILDARGS {
report_all => $o->get('report-all'),
report_histogram => $o->get('report-histogram'),
},
num_format => "# %-${label_width}s %3s %7s %7s %7s %7s %7s %7s %7s",
bool_format => "# %-${label_width}s %3d%% yes, %3d%% no",
string_format => "# %-${label_width}s %s",
num_format => '# %1$-'.$label_width.'s %2$3s %3$7s %4$7s %5$7s %6$7s %7$7s %8$7s %9$7s',
bool_format => '# %1$-'.$label_width.'s %2$3d%% yes, %3$3d%% no',
string_format => '# %1$-'.$label_width.'s %2$s',
hidden_attrib => { # Don't sort/print these attribs in the reports.
arg => 1, # They're usually handled specially, or not
fingerprint => 1, # printed at all.
@@ -673,7 +673,11 @@ sub event_report {
$val->{checksum},
$val->{pos_in_log},
);
$line .= ('_' x (LINE_LENGTH - length($line) + $self->label_width() - 12));
my $underscores = LINE_LENGTH - length($line) + $self->label_width() - 12;
if ( $underscores < 0 ) {
$underscores = 0;
}
$line .= ('_' x $underscores);
push @result, $line;
# Second line: reason why this class is being reported.

6
lib/Transformers.pm
View File

@@ -159,10 +159,12 @@ sub shorten {
$num /= $d;
++$n;
}
# Added indexes 1$, 2$ to sprintf format to avoid 'redundant' warning
# https://bugs.launchpad.net/percona-toolkit/+bug/1480719
return sprintf(
$num =~ m/\./ || $n
? "%.${p}f%s"
: '%d',
? '%1$.'.$p.'f%2$s'
: '%1$d',
$num, $units[$n]);
}