percona/percona-toolkit
1
0
Fork 0
mirror of https://github.com/percona/percona-toolkit.git synced 2025-09-27 16:12:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplified the new fk algo and renamed a variable

Browse Source
This commit is contained in:
amontecillo
2016-10-12 21:07:16 -07:00
parent f6f7876e17
commit 048defdb50
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10103,12 +10103,12 @@ sub create_new_table {
# Has no _, we add one to make 1 # Has no _, we add one to make 1
# This gives on more salt where the FK names have been previously been altered # This gives on more salt where the FK names have been previously been altered
# https://bugs.launchpad.net/percona-toolkit/+bug/1632522 # https://bugs.launchpad.net/percona-toolkit/+bug/1632522
my %search = ( my %search_dict = (
'CONSTRAINT `__' => 'CONSTRAINT `', 'CONSTRAINT `__' => 'CONSTRAINT `',
'CONSTRAINT `_' => 'CONSTRAINT `__', 'CONSTRAINT `_' => 'CONSTRAINT `__',
'CONSTRAINT `' => 'CONSTRAINT `_' 'CONSTRAINT `' => 'CONSTRAINT `_'
); );
$sql =~ s/((?^:CONSTRAINT `__|CONSTRAINT `_|CONSTRAINT `))/$search{$1}/gm; $sql =~ s/((?^:CONSTRAINT `__|CONSTRAINT `_|CONSTRAINT `))/$search_dict{$1}/gm;
if ( $o->get('default-engine') ) { if ( $o->get('default-engine') ) {
$sql =~ s/\s+ENGINE=\S+//; $sql =~ s/\s+ENGINE=\S+//;
@@ -10485,9 +10485,7 @@ sub rebuild_constraints {
# This will add 2 _ to a self referencing FK thus avoiding a duplicate key constraint # This will add 2 _ to a self referencing FK thus avoiding a duplicate key constraint
# https://bugs.launchpad.net/percona-toolkit/+bug/1632522 # https://bugs.launchpad.net/percona-toolkit/+bug/1632522
my $new_fk; my $new_fk;
if ($fk =~ /^_/) { if ($fk =~ /^__/) {
($new_fk = $fk) =~ s/^_/__/;
} elsif ($fk =~ /^__/) {
($new_fk = $fk) =~ s/^__//; ($new_fk = $fk) =~ s/^__//;
} else { } else {
$new_fk = '_'.$fk; $new_fk = '_'.$fk;