1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revoked changes from MySQL 5.1.55 merge as Sergei's code is more general

Browse Source
This commit is contained in:
Michael Widenius 2011-03-01 15:31:24 +02:00
parent 845afae61e
commit 97d46a0cd3
1 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
mysql-test/lib/My/ConfigFactory.pm
View File

@ -64,16 +64,12 @@ sub fix_pidfile {
sub fix_port { sub fix_port {
my ($self, $config, $group_name, $group)= @_; my ($self, $config, $group_name, $group)= @_;
my $hostname= $group->value('#host'); return $self->{PORT}++;
return $self->{HOSTS}->{$hostname}++;
} }
sub fix_host { sub fix_host {
my ($self)= @_; my ($self)= @_;
# Get next host from HOSTS array 'localhost'
my @hosts= keys(%{$self->{HOSTS}});;
my $host_no= $self->{NEXT_HOST}++ % @hosts;
return $hosts[$host_no];
} }
sub is_unique { sub is_unique {
@ -237,7 +233,7 @@ if (IS_WINDOWS)
sub fix_ndb_mgmd_port { sub fix_ndb_mgmd_port {
my ($self, $config, $group_name, $group)= @_; my ($self, $config, $group_name, $group)= @_;
my $hostname= $group->value('HostName'); my $hostname= $group->value('HostName');
return $self->{HOSTS}->{$hostname}++; return $self->{PORT}++;
} }
@ -436,20 +432,24 @@ sub post_check_embedded_group {
sub resolve_at_variable { sub resolve_at_variable {
my ($self, $config, $group, $option)= @_; my ($self, $config, $group, $option)= @_;
local $_ = $option->value();
my ($res, $after);
# Split the options value on last . while (m/(.*?)\@((?:\w+\.)+)(#?[-\w]+)/g) {
my @parts= split(/\./, $option->value()); my ($before, $group_name, $option_name)= ($1, $2, $3);
my $option_name= pop(@parts); $after = $';
my $group_name= join('.', @parts); chop($group_name);
$group_name =~ s/^\@//; # Remove at
my $from_group= $config->group($group_name) my $from_group= $config->group($group_name)
or croak "There is no group named '$group_name' that ", or croak "There is no group named '$group_name' that ",
"can be used to resolve '$option_name' for test '$self->{testname}'"; "can be used to resolve '$option_name' for test '$self->{testname}'";
my $from= $from_group->value($option_name); my $value= $from_group->value($option_name);
$config->insert($group->name(), $option->name(), $from) $res .= $before.$value;
}
$res .= $after;
$config->insert($group->name(), $option->name(), $res)
} }
@ -461,7 +461,7 @@ sub post_fix_resolve_at_variables {
next unless defined $option->value(); next unless defined $option->value();
$self->resolve_at_variable($config, $group, $option) $self->resolve_at_variable($config, $group, $option)
if ($option->value() =~ /^\@/); if ($option->value() =~ /\@/);
} }
} }
} }
@ -603,25 +603,12 @@ sub new_config {
croak "you must pass '$required'" unless defined $args->{$required}; croak "you must pass '$required'" unless defined $args->{$required};
} }
# Fill in hosts/port hash
my $hosts= {};
my $baseport= $args->{baseport};
$args->{hosts}= [ 'localhost' ] unless exists($args->{hosts});
foreach my $host ( @{$args->{hosts}} ) {
$hosts->{$host}= $baseport;
}
# Open the config template # Open the config template
my $config= My::Config->new($args->{'template_path'}); my $config= My::Config->new($args->{'template_path'});
my $extra_template_path= $args->{'extra_template_path'};
if ($extra_template_path){
$config->append(My::Config->new($extra_template_path));
}
my $self= bless { my $self= bless {
CONFIG => $config, CONFIG => $config,
ARGS => $args, ARGS => $args,
HOSTS => $hosts, PORT => $args->{baseport},
NEXT_HOST => 0,
SERVER_ID => 1, SERVER_ID => 1,
testname => $args->{testname}, testname => $args->{testname},
}, $class; }, $class;