percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2026-02-28 02:07:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

PT-297 removed debug code

Browse Source
This commit is contained in:
Carlos Salguero
2019-09-20 13:50:44 -03:00
parent 10fe056242
commit 9ed892692a
2 changed files with 4 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6697,16 +6697,10 @@ sub index_length {
);
my $sth = $cxn->dbh()->prepare($sql);
PTDEBUG && _d($sth->{Statement}, 'params:', @$vals);
warn "====================================================================================================";
_d($sth->{Statement}, 'params:', @$vals);
warn "====================================================================================================";
$sth->execute(@$vals);
my $row = $sth->fetchrow_hashref();
$sth->finish();
PTDEBUG && _d('Range scan:', Dumper($row));
warn "====================================================================================================";
_d('Range scan:', Dumper($row));
warn "====================================================================================================";
return $row->{key_len}, $row->{key};
}
@@ -6758,15 +6752,15 @@ sub _make_range_query {
foreach my $n ( 0..($n_index_cols - 2) ) {
my $col = $index_cols->[$n];
my $val = $vals->[$n];
#push @where, $q->quote($col) . " = ?";
push @where, $q->quote($col) . " = " . $tbl->{tbl_struct}->{type_for}->{$col} eq 'enum' ? "CAST(? AS UNSIGNED)" : "?";
$val = $tbl->{tbl_struct}->{type_for}->{$col} eq 'enum' ? "CAST(? AS UNSIGNED)" : "?";
push @where, $q->quote($col) . " = " . $val;
}
}
my $col = $index_cols->[$n_index_cols - 1];
my $val = $vals->[-1]; # should only be as many vals as cols
#push @where, $q->quote($col) . " >= ?";
push @where, $q->quote($col) . " >= " . $tbl->{tbl_struct}->{type_for}->{$col} eq 'enum' ? "CAST(? AS UNSIGNED)" : "?";
my $condition = $tbl->{tbl_struct}->{type_for}->{$col} eq 'enum' ? "CAST(? AS UNSIGNED)" : "?";
push @where, $q->quote($col) . " >= " . $condition;
my $sql = "EXPLAIN SELECT /*!40001 SQL_NO_CACHE */ * "
. "FROM $tbl->{name} FORCE INDEX (" . $q->quote($index) . ") "
@@ -12363,30 +12357,6 @@ duplicate rows and this data will be lost.
This options bypasses confirmation in case of using alter-foreign-keys-method = none , which might break foreign key constraints.
=item --force-concat-enums
The NibbleIterator in Percona Toolkit can detect indexes having ENUM fields and
if the items it has are sorted or not. According to MySQL documentation at
L<https://dev.mysql.com/doc/refman/8.0/en/enum.html>:
ENUM values are sorted based on their index numbers, which depend on the order in
which the enumeration members were listed in the column specification.
For example, 'b' sorts before 'a' for ENUM('b', 'a').
The empty string sorts before nonempty strings, and NULL values sort before all other
enumeration values.
To prevent unexpected results when using the ORDER BY clause on an ENUM column,
use one of these techniques:
- Specify the ENUM list in alphabetic order.
- Make sure that the column is sorted lexically rather than by index number by coding
ORDER BY CAST(col AS CHAR) or ORDER BY CONCAT(col).
The NibbleIterator in Percona Toolkit uses CONCAT(col) but, doing that, adds overhead
since MySQL cannot use the column directly and has to calculate the result of CONCAT
for every row.
To make this scenario vissible to the user, if there are indexes having ENUM fields
with usorted items, it is necessary to specify the C<--force-concat-enums> parameter.
=item --help
Show help and exit.

3
t/pt-online-schema-change/alter_active_table.t
View File

@@ -94,7 +94,6 @@ sub check_ids {
my $n_updated = $ids->{updated} ? ($ids->{updated} =~ tr/,//) : 0;
my $n_deleted = $ids->{deleted} ? ($ids->{deleted} =~ tr/,//) : 0;
my $n_inserted = $ids->{inserted} ? ($ids->{inserted} =~ tr/,//) : 0;
warn "n_inser $n_inserted";
# "1,1"=~tr/,// returns 1 but is 2 values
$n_updated++ if $ids->{updated};
@@ -170,7 +169,6 @@ $master_dbh->do("TRUNCATE TABLE t");
$master_dbh->do("LOAD DATA INFILE '$trunk/t/pt-online-schema-change/samples/basic_no_fks.data' INTO TABLE t");
$master_dbh->do("ANALYZE TABLE t");
$sb->wait_for_slaves();
sleep(2);
# Start inserting, updating, and deleting rows at random.
start_query_table(qw(pt_osc t id));
@@ -235,7 +233,6 @@ start_query_table(qw(pt_osc t id));
) },
stderr => 1,
);
diag($output);
# Stop changing the table's data.
stop_query_table();