Merge branch '3.0' into PT-63

2025-09-10 05:00:45 +00:00 · 2017-03-30 11:08:12 -03:00
parent cd23d7b163 4ff8e664ae
commit e4f1625d30
31 changed files with 176 additions and 32 deletions
--- a/bin/pt-align
+++ b/bin/pt-align
@@ -680,7 +680,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-archiver
+++ b/bin/pt-archiver
@@ -1409,7 +1409,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-config-diff
+++ b/bin/pt-config-diff
@@ -1407,7 +1407,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-deadlock-logger
+++ b/bin/pt-deadlock-logger
@@ -757,7 +757,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-diskstats
+++ b/bin/pt-diskstats
@@ -753,7 +753,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-duplicate-key-checker
+++ b/bin/pt-duplicate-key-checker
@@ -1744,7 +1744,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-fifo-split
+++ b/bin/pt-fifo-split
@@ -681,7 +681,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-find
+++ b/bin/pt-find
@@ -1173,7 +1173,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-fingerprint
+++ b/bin/pt-fingerprint
@@ -682,7 +682,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-fk-error-logger
+++ b/bin/pt-fk-error-logger
@@ -752,7 +752,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-heartbeat
+++ b/bin/pt-heartbeat
@@ -1518,7 +1518,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-index-usage
+++ b/bin/pt-index-usage
@@ -1334,7 +1334,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-kill
+++ b/bin/pt-kill
@@ -762,7 +762,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-online-schema-change
+++ b/bin/pt-online-schema-change
@@ -770,7 +770,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-query-digest
+++ b/bin/pt-query-digest
@@ -2002,7 +2002,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-show-grants
+++ b/bin/pt-show-grants
@@ -683,7 +683,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-slave-delay
+++ b/bin/pt-slave-delay
@@ -755,7 +755,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-slave-find
+++ b/bin/pt-slave-find
@@ -690,7 +690,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-slave-restart
+++ b/bin/pt-slave-restart
@@ -907,7 +907,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-table-checksum
+++ b/bin/pt-table-checksum
@@ -2431,7 +2431,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-table-sync
+++ b/bin/pt-table-sync
@@ -770,7 +770,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-table-usage
+++ b/bin/pt-table-usage
@@ -1775,7 +1775,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-upgrade
+++ b/bin/pt-upgrade
@@ -1999,7 +1999,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-variable-advisor
+++ b/bin/pt-variable-advisor
@@ -759,7 +759,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/bin/pt-visual-explain
+++ b/bin/pt-visual-explain
@@ -1356,7 +1356,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/lib/OptionParser.pm
+++ b/lib/OptionParser.pm
@@ -841,7 +841,11 @@ sub _validate_type {
      if (!$opt->{attributes}->{repeatable}) {
          $opt->{value} = $self->{DSNParser}->parse($val, $prev, $defaults);
      } else {
-          push @{$opt->{value}}, $self->{DSNParser}->parse($val, $prev, $defaults);
+          my $values = [];
+          for my $dsn_string (@$val) {
+              push @$values, $self->{DSNParser}->parse($dsn_string, $prev, $defaults);
+          }
+          $opt->{value} = $values;
      }
   }
   elsif ( $val && $opt->{type} eq 'z' ) {  # type size
--- a/sandbox/servers/5.7/data.tar.gz
+++ b/sandbox/servers/5.7/data.tar.gz
--- a/sandbox/servers/5.7/system_idb_tables.sql
+++ b/sandbox/servers/5.7/system_idb_tables.sql
@@ -586,10 +586,9 @@ CREATE TABLE `time_zone_transition_type` (
 -- Table structure for table `user`
 --

-DROP TABLE IF EXISTS `user`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `user` (
+CREATE TABLE IF NOT EXISTS `user` (
  `Host` char(60) COLLATE utf8_bin NOT NULL DEFAULT '',
  `User` char(32) COLLATE utf8_bin NOT NULL DEFAULT '',
  `Select_priv` enum('N','Y') CHARACTER SET utf8 NOT NULL DEFAULT 'N',
--- a/sandbox/servers/mariadb/10.0/my.sandbox.cnf
+++ b/sandbox/servers/mariadb/10.0/my.sandbox.cnf
@@ -26,4 +26,4 @@ log-error                  = /tmp/PORT/data/mysqld.log
 innodb_lock_wait_timeout   = 3
 general_log
 general_log_file           = genlog
-performance_schema         = on
+performance_schema         = ON
--- a/sandbox/servers/mariadb/10.1/my.sandbox.cnf
+++ b/sandbox/servers/mariadb/10.1/my.sandbox.cnf
@@ -26,4 +26,4 @@ log-error                  = /tmp/PORT/data/mysqld.log
 innodb_lock_wait_timeout   = 3
 general_log
 general_log_file           = genlog
-performance_schema         = on
+performance_schema         = ON
--- a/t/lib/OptionParser.t
+++ b/t/lib/OptionParser.t
@@ -15,7 +15,7 @@ use OptionParser;
 use DSNParser;
 use PerconaTest;

-use Test::More tests => 161;
+use Test::More tests => 162;
 my $o  = new OptionParser(
   description  => 'OptionParser.t parses command line options.',
   usage        => "$PROGRAM_NAME <options>",
@@ -1736,7 +1736,7 @@ is_deeply(
   {
      A => undef,
      D => 'test',
-      F => undef,
+      F =>undef,
      P => '12346',
      S => undef,
      h => '127.1',
@@ -1746,6 +1746,47 @@ is_deeply(
   'Copies DSN values correctly (issue 460)'
 );

+# Test DSN can be repeatable
+$o = new OptionParser(
+   description  => 'OptionParser.t parses command line options.',
+   usage        => "$PROGRAM_NAME <options>"
+);
+# Hack DSNParser into OptionParser.  This is just for testing.
+$o->{DSNParser} = $dp;
+$o->_parse_specs(
+   { spec  => 'rep=d',   desc  => 'source', attributes => { repeatable => 1},  },
+);
+@ARGV = (
+   '--rep', 'h=127.1,P=12345,D=test,u=bob,p=foo', '--rep', 'h=127.1,P=12346',
+);
+$o->get_opts();
+my $ddest_dsn = $o->get('rep');
+is_deeply(
+   $ddest_dsn,
+    [
+     {
+       A => undef,
+       u => 'bob',
+       D => 'test',
+       h => '127.1',
+       P => '12345',
+       S => undef,
+       p => 'foo',
+       F => undef
+     },
+     {
+       p => undef,
+       F => undef,
+       u => undef,
+       D => undef,
+       A => undef,
+       P => '12346',
+       S => undef,
+       h => '127.1'
+     }
+    ],
+   'DSN type can be repeatable'
+);
 # #############################################################################
 # Issue 248: Add --user, --pass, --host, etc to all tools
 # #############################################################################