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

Fix bug 968596: rename NibbleIterator::chunk_size() to limit() and update ptc and pt-osc.

Browse Source
This commit is contained in:
Daniel Nichter
2013-02-28 19:26:04 -07:00
parent 15341b4e0e
commit 5a34a0817e
4 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5279,9 +5279,9 @@ sub one_nibble {
return $self->{one_nibble}; return $self->{one_nibble};
} }
sub chunk_size { sub limit {
my ($self) = @_; my ($self) = @_;
return $self->{limit} + 1; return $self->{limit};
} }
sub set_chunk_size { sub set_chunk_size {
@@ -8594,7 +8594,7 @@ sub main {
my $expl = explain_statement( my $expl = explain_statement(
tbl => $tbl, tbl => $tbl,
sth => $sth->{explain_upper_boundary}, sth => $sth->{explain_upper_boundary},
vals => [ @{$boundary->{lower}}, $nibble_iter->chunk_size() ], vals => [ @{$boundary->{lower}}, $nibble_iter->limit() ],
); );
if (lc($expl->{key} || '') ne lc($nibble_iter->nibble_index() || '')) { if (lc($expl->{key} || '') ne lc($nibble_iter->nibble_index() || '')) {
my $msg my $msg
@@ -8609,7 +8609,7 @@ sub main {
. $sth->{upper_boundary}->{Statement} . $sth->{upper_boundary}->{Statement}
. " with values " . " with values "
. join(", ", map { defined $_ ? $_ : "NULL" } . join(", ", map { defined $_ ? $_ : "NULL" }
(@{$boundary->{lower}}, $nibble_iter->chunk_size())) (@{$boundary->{lower}}, $nibble_iter->limit()))
. "\n"; . "\n";
die $msg; die $msg;
} }

6
bin/pt-table-checksum
View File

@@ -6055,9 +6055,9 @@ sub one_nibble {
return $self->{one_nibble}; return $self->{one_nibble};
} }
sub chunk_size { sub limit {
my ($self) = @_; my ($self) = @_;
return $self->{limit} + 1; return $self->{limit};
} }
sub set_chunk_size { sub set_chunk_size {
@@ -9533,7 +9533,7 @@ sub main {
my $expl = explain_statement( my $expl = explain_statement(
tbl => $tbl, tbl => $tbl,
sth => $sth->{explain_upper_boundary}, sth => $sth->{explain_upper_boundary},
vals => [ @{$boundary->{lower}}, $nibble_iter->chunk_size() ], vals => [ @{$boundary->{lower}}, $nibble_iter->limit() ],
); );
if ( lc($expl->{key} || '') if ( lc($expl->{key} || '')
ne lc($nibble_iter->nibble_index() || '') ) { ne lc($nibble_iter->nibble_index() || '') ) {

4
lib/NibbleIterator.pm
View File

@@ -405,9 +405,9 @@ sub one_nibble {
return $self->{one_nibble}; return $self->{one_nibble};
} }
sub chunk_size { sub limit {
my ($self) = @_; my ($self) = @_;
return $self->{limit} + 1; return $self->{limit};
} }
sub set_chunk_size { sub set_chunk_size {

6
t/lib/NibbleIterator.t
View File

@@ -206,9 +206,9 @@ ok(
); );
is( is(
$ni->chunk_size(), $ni->limit(),
5, 4,
"chunk_size()" "limit()"
); );
# ############################################################################ # ############################################################################