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

PT-2110 - Fixed PTDEBUG output with --ignore-engines option (#555)

Browse Source
This commit is contained in:
Kazuya Yokogawa
2022-11-30 20:51:49 +09:00
committed by GitHub
parent c9bf980ef5
commit bc3056f29d
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/pt-duplicate-key-checker
View File

@@ -3240,10 +3240,10 @@ sub _d {
# ########################################################################### # ###########################################################################
# SchemaIterator package # SchemaIterator package
# This package is a copy without comments from the original. The original # This package is a copy without comments from the original. The original
# with comments and its test file can be found in the Bazaar repository at, # with comments and its test file can be found in the GitHub repository at,
# lib/SchemaIterator.pm # lib/SchemaIterator.pm
# t/lib/SchemaIterator.t # t/lib/SchemaIterator.t
# See https://launchpad.net/percona-toolkit for more information. # See https://github.com/percona/percona-toolkit for more information.
# ########################################################################### # ###########################################################################
{ {
package SchemaIterator; package SchemaIterator;
@@ -3648,7 +3648,7 @@ sub engine_is_allowed {
my $filter = $self->{filters}; my $filter = $self->{filters};
if ( $filter->{'ignore-engines'}->{$engine} ) { if ( $filter->{'ignore-engines'}->{$engine} ) {
PTDEBUG && _d('Engine', $engine, 'is in --ignore-databases list'); PTDEBUG && _d('Engine', $engine, 'is in --ignore-engines list');
return 0; return 0;
} }

6
bin/pt-index-usage
View File

@@ -4022,10 +4022,10 @@ sub _d {
# ########################################################################### # ###########################################################################
# SchemaIterator package # SchemaIterator package
# This package is a copy without comments from the original. The original # This package is a copy without comments from the original. The original
# with comments and its test file can be found in the Bazaar repository at, # with comments and its test file can be found in the GitHub repository at,
# lib/SchemaIterator.pm # lib/SchemaIterator.pm
# t/lib/SchemaIterator.t # t/lib/SchemaIterator.t
# See https://launchpad.net/percona-toolkit for more information. # See https://github.com/percona/percona-toolkit for more information.
# ########################################################################### # ###########################################################################
{ {
package SchemaIterator; package SchemaIterator;
@@ -4430,7 +4430,7 @@ sub engine_is_allowed {
my $filter = $self->{filters}; my $filter = $self->{filters};
if ( $filter->{'ignore-engines'}->{$engine} ) { if ( $filter->{'ignore-engines'}->{$engine} ) {
PTDEBUG && _d('Engine', $engine, 'is in --ignore-databases list'); PTDEBUG && _d('Engine', $engine, 'is in --ignore-engines list');
return 0; return 0;
} }

6
bin/pt-table-checksum
View File

@@ -7567,10 +7567,10 @@ sub _d {
# ########################################################################### # ###########################################################################
# SchemaIterator package # SchemaIterator package
# This package is a copy without comments from the original. The original # This package is a copy without comments from the original. The original
# with comments and its test file can be found in the Bazaar repository at, # with comments and its test file can be found in the GitHub repository at,
# lib/SchemaIterator.pm # lib/SchemaIterator.pm
# t/lib/SchemaIterator.t # t/lib/SchemaIterator.t
# See https://launchpad.net/percona-toolkit for more information. # See https://github.com/percona/percona-toolkit for more information.
# ########################################################################### # ###########################################################################
{ {
package SchemaIterator; package SchemaIterator;
@@ -7975,7 +7975,7 @@ sub engine_is_allowed {
my $filter = $self->{filters}; my $filter = $self->{filters};
if ( $filter->{'ignore-engines'}->{$engine} ) { if ( $filter->{'ignore-engines'}->{$engine} ) {
PTDEBUG && _d('Engine', $engine, 'is in --ignore-databases list'); PTDEBUG && _d('Engine', $engine, 'is in --ignore-engines list');
return 0; return 0;
} }

6
bin/pt-table-sync
View File

@@ -7666,10 +7666,10 @@ sub _d {
# ########################################################################### # ###########################################################################
# SchemaIterator package # SchemaIterator package
# This package is a copy without comments from the original. The original # This package is a copy without comments from the original. The original
# with comments and its test file can be found in the Bazaar repository at, # with comments and its test file can be found in the GitHub repository at,
# lib/SchemaIterator.pm # lib/SchemaIterator.pm
# t/lib/SchemaIterator.t # t/lib/SchemaIterator.t
# See https://launchpad.net/percona-toolkit for more information. # See https://github.com/percona/percona-toolkit for more information.
# ########################################################################### # ###########################################################################
{ {
package SchemaIterator; package SchemaIterator;
@@ -8074,7 +8074,7 @@ sub engine_is_allowed {
my $filter = $self->{filters}; my $filter = $self->{filters};
if ( $filter->{'ignore-engines'}->{$engine} ) { if ( $filter->{'ignore-engines'}->{$engine} ) {
PTDEBUG && _d('Engine', $engine, 'is in --ignore-databases list'); PTDEBUG && _d('Engine', $engine, 'is in --ignore-engines list');
return 0; return 0;
} }

8
lib/SchemaIterator.pm
View File

@@ -462,10 +462,10 @@ sub table_is_allowed {
|slave_master_info |slave_master_info
|slave_relay_log_info |slave_relay_log_info
|slave_worker_info |slave_worker_info
|slow_log |slow_log
)$/x; )$/x;
if ( $filter->{'ignore-tables'}->{'*'}->{$tbl} if ( $filter->{'ignore-tables'}->{'*'}->{$tbl}
|| $filter->{'ignore-tables'}->{$db}->{$tbl}) { || $filter->{'ignore-tables'}->{$db}->{$tbl}) {
PTDEBUG && _d('Table', $tbl, 'is in --ignore-tables list'); PTDEBUG && _d('Table', $tbl, 'is in --ignore-tables list');
return 0; return 0;
@@ -478,7 +478,7 @@ sub table_is_allowed {
} }
if ( $filter->{'tables'} if ( $filter->{'tables'}
&& (!$filter->{'tables'}->{'*'}->{$tbl} && !$filter->{'tables'}->{$db}->{$tbl}) ) { && (!$filter->{'tables'}->{'*'}->{$tbl} && !$filter->{'tables'}->{$db}->{$tbl}) ) {
PTDEBUG && _d('Table', $tbl, 'is not in --tables list, ignoring'); PTDEBUG && _d('Table', $tbl, 'is not in --tables list, ignoring');
return 0; return 0;
} }
@@ -527,7 +527,7 @@ sub engine_is_allowed {
my $filter = $self->{filters}; my $filter = $self->{filters};
if ( $filter->{'ignore-engines'}->{$engine} ) { if ( $filter->{'ignore-engines'}->{$engine} ) {
PTDEBUG && _d('Engine', $engine, 'is in --ignore-databases list'); PTDEBUG && _d('Engine', $engine, 'is in --ignore-engines list');
return 0; return 0;
} }