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

Merge fix-pt-osc-empty-table-bug-1020997

Browse Source
This commit is contained in:
Daniel Nichter
2012-07-26 16:49:40 -06:00
parent 56f1067908 2290827eee
commit a07dc3c146
3 changed files with 29 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4755,6 +4755,11 @@ sub next {
return; return;
} }
} }
if ( !$self->{one_nibble} && !$self->{first_lower} ) {
PTDEBUG && _d('No first lower boundary, table must be empty');
$self->{no_more_boundaries} = 1;
return;
}
} }
NIBBLE: NIBBLE:
@@ -6502,13 +6507,21 @@ sub main {
my $tbl = $args{tbl}; my $tbl = $args{tbl};
my $nibble_iter = $args{NibbleIterator}; my $nibble_iter = $args{NibbleIterator};
my $statements = $nibble_iter->statements(); my $statements = $nibble_iter->statements();
my $boundary = $nibble_iter->boundaries();
if ( $o->get('dry-run') ) { if ( $o->get('dry-run') ) {
print "Not copying rows because this is a dry run.\n"; print "Not copying rows because this is a dry run.\n";
} }
else { else {
print "Copying approximately ", $nibble_iter->row_estimate(), if ( !$nibble_iter->one_nibble() && !$boundary->{first_lower} ) {
" rows...\n"; # https://bugs.launchpad.net/percona-toolkit/+bug/1020997
print "$tbl->{name} is empty, no rows to copy.\n";
return;
}
else {
print "Copying approximately ", $nibble_iter->row_estimate(),
" rows...\n";
}
} }
if ( $o->get('print') ) { if ( $o->get('print') ) {

5
lib/NibbleIterator.pm
View File

@@ -286,6 +286,11 @@ sub next {
return; return;
} }
} }
if ( !$self->{one_nibble} && !$self->{first_lower} ) {
PTDEBUG && _d('No first lower boundary, table must be empty');
$self->{no_more_boundaries} = 1;
return;
}
} }
# If there's another nibble, fetch the rows within it. # If there's another nibble, fetch the rows within it.

18
t/lib/NibbleIterator.t
View File

@@ -249,7 +249,7 @@ is_deeply(
\@rows, \@rows,
$all_rows, $all_rows,
'1 nibble' '1 nibble'
) or print Dumper(\@rows); ) or diag(Dumper(\@rows));
# ############################################################################ # ############################################################################
# single row table # single row table
@@ -274,7 +274,7 @@ is_deeply(
\@rows, \@rows,
[['d']], [['d']],
'single row table' 'single row table'
) or print Dumper(\@rows); ) or diag(Dumper(\@rows));
# ############################################################################ # ############################################################################
# empty table # empty table
@@ -294,7 +294,7 @@ is_deeply(
\@rows, \@rows,
[], [],
'empty table' 'empty table'
) or print Dumper(\@rows); ) or diag(Dumper(\@rows));
# ############################################################################ # ############################################################################
# Callbacks # Callbacks
@@ -397,35 +397,35 @@ is_deeply(
$row, $row,
[25, 'da79784d'], [25, 'da79784d'],
"SELECT chunk checksum 1 FROM sakila.country" "SELECT chunk checksum 1 FROM sakila.country"
) or print STDERR Dumper($row); ) or diag(Dumper($row));
$row = $ni->next(); $row = $ni->next();
is_deeply( is_deeply(
$row, $row,
[25, 'e860c4f9'], [25, 'e860c4f9'],
"SELECT chunk checksum 2 FROM sakila.country" "SELECT chunk checksum 2 FROM sakila.country"
) or print STDERR Dumper($row); ) or diag(Dumper($row));
$row = $ni->next(); $row = $ni->next();
is_deeply( is_deeply(
$row, $row,
[25, 'eb651f58'], [25, 'eb651f58'],
"SELECT chunk checksum 3 FROM sakila.country" "SELECT chunk checksum 3 FROM sakila.country"
) or print STDERR Dumper($row); ) or diag(Dumper($row));
$row = $ni->next(); $row = $ni->next();
is_deeply( is_deeply(
$row, $row,
[25, '2d87d588'], [25, '2d87d588'],
"SELECT chunk checksum 4 FROM sakila.country" "SELECT chunk checksum 4 FROM sakila.country"
) or print STDERR Dumper($row); ) or diag(Dumper($row));
$row = $ni->next(); $row = $ni->next();
is_deeply( is_deeply(
$row, $row,
[9, 'beb4a180'], [9, 'beb4a180'],
"SELECT chunk checksum 5 FROM sakila.country" "SELECT chunk checksum 5 FROM sakila.country"
) or print STDERR Dumper($row); ) or diag(Dumper($row));
# ######################################################################### # #########################################################################
@@ -552,7 +552,7 @@ is_deeply(
[ 'z' ], # last nibble [ 'z' ], # last nibble
], ],
"Change chunk size while nibbling" "Change chunk size while nibbling"
) or print STDERR Dumper(\@rows); ) or diag(Dumper(\@rows));
# ############################################################################ # ############################################################################
# Nibble one row at a time. # Nibble one row at a time.