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

Fix for 1028710: floor() fails on floor(log(1000)/log(10))

Browse Source
This commit is contained in:
Brian Fraser fraserb@gmail.com
2012-08-06 11:37:51 -03:00
parent f8c375a249
commit d77a3a19f6
6 changed files with 28 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/pt-query-digest
View File

@@ -6876,7 +6876,7 @@ sub distro_sparkline {
$min = 0 if $min == $max;
my @range_min;
my $d = floor(($max-$min) / 4);
my $d = floor((($max+0.00001)-$min) / 4);
for my $x ( 1..4 ) {
push @range_min, $min + ($d * $x);
}

7
bin/pt-table-sync
View File

@@ -3946,7 +3946,7 @@ sub _chunk_char {
}
my $n_chunks = $args{rows_in_range} / $args{chunk_size};
my $interval = floor($n_values / $n_chunks) || 1;
my $interval = floor(($n_values+0.00001) / $n_chunks) || 1;
my $range_func = sub {
my ( $self, $dbh, $start, $interval, $max ) = @_;
@@ -4440,7 +4440,7 @@ sub base_count {
return $symbols->[0] if $n == 0;
my $highest_power = floor(log($n)/log($base));
my $highest_power = floor(log($n+0.00001)/log($base));
if ( $highest_power == 0 ){
return $symbols->[$n];
}
@@ -4452,11 +4452,10 @@ sub base_count {
my @base_multiples;
foreach my $base_power ( reverse @base_powers ) {
my $multiples = floor($n / $base_power);
my $multiples = floor(($n+0.00001) / $base_power);
push @base_multiples, $multiples;
$n -= $multiples * $base_power;
}
return join('', map { $symbols->[$_] } @base_multiples);
}

7
bin/pt-upgrade
View File

@@ -5366,7 +5366,7 @@ sub _chunk_char {
}
my $n_chunks = $args{rows_in_range} / $args{chunk_size};
my $interval = floor($n_values / $n_chunks) || 1;
my $interval = floor(($n_values+0.00001) / $n_chunks) || 1;
my $range_func = sub {
my ( $self, $dbh, $start, $interval, $max ) = @_;
@@ -5860,7 +5860,7 @@ sub base_count {
return $symbols->[0] if $n == 0;
my $highest_power = floor(log($n)/log($base));
my $highest_power = floor(log($n+0.00001)/log($base));
if ( $highest_power == 0 ){
return $symbols->[$n];
}
@@ -5872,11 +5872,10 @@ sub base_count {
my @base_multiples;
foreach my $base_power ( reverse @base_powers ) {
my $multiples = floor($n / $base_power);
my $multiples = floor(($n+0.00001) / $base_power);
push @base_multiples, $multiples;
$n -= $multiples * $base_power;
}
return join('', map { $symbols->[$_] } @base_multiples);
}

2
lib/QueryReportFormatter.pm
View File

@@ -811,7 +811,7 @@ sub distro_sparkline {
# Divide the range by 4 because there are 4 char codes: _.-^
$min = 0 if $min == $max;
my @range_min;
my $d = floor(($max-$min) / 4);
my $d = floor((($max+0.00001)-$min) / 4);
for my $x ( 1..4 ) {
push @range_min, $min + ($d * $x);
}

7
lib/TableChunker.pm
View File

@@ -665,7 +665,7 @@ sub _chunk_char {
# 2 chars to express enough vals for 1 chunk, then we'll increment through
# the map 2 chars at a time, like [a, b], [c, d], etc.
my $n_chunks = $args{rows_in_range} / $args{chunk_size};
my $interval = floor($n_values / $n_chunks) || 1;
my $interval = floor(($n_values+0.00001) / $n_chunks) || 1;
my $range_func = sub {
my ( $self, $dbh, $start, $interval, $max ) = @_;
@@ -1382,7 +1382,7 @@ sub base_count {
# zeroth symbol in any other base.
return $symbols->[0] if $n == 0;
my $highest_power = floor(log($n)/log($base));
my $highest_power = floor(log($n+0.00001)/log($base));
if ( $highest_power == 0 ){
return $symbols->[$n];
}
@@ -1394,11 +1394,10 @@ sub base_count {
my @base_multiples;
foreach my $base_power ( reverse @base_powers ) {
my $multiples = floor($n / $base_power);
my $multiples = floor(($n+0.00001) / $base_power);
push @base_multiples, $multiples;
$n -= $multiples * $base_power;
}
return join('', map { $symbols->[$_] } @base_multiples);
}

17
t/lib/TableChunker.t
View File

@@ -1358,6 +1358,23 @@ is_deeply(
"Caclulate chunks for `key` col (bug 967451)"
);
# #############################################################################
# base_count fails on n = 1000, base = 10
# https://bugs.launchpad.net/percona-toolkit/+bug/1028710
# #############################################################################
my $res = TableChunker->base_count(
count_to => 1000,
base => 10,
symbols => ["a".."z"],
);
is(
$res,
"baaa",
"base_count's floor()s account for floating point arithmetics",
);
# #############################################################################
# Done.
# #############################################################################