mirror of
https://github.com/MariaDB/server.git
synced 2025-01-17 20:42:30 +01:00
1370500c0d
- dynamic configuration support - safe process - cleanups - create new suite for fedarated BitKeeper/deleted/.del-basic.test: Rename: mysql-test/ndb/basic.test -> BitKeeper/deleted/.del-basic.test BitKeeper/deleted/.del-basic_log.result: Rename: mysql-test/ndb/basic_log.result -> BitKeeper/deleted/.del-basic_log.result mysql-test/suite/federated/federated_transactions.result: Rename: mysql-test/r/federated_transactions.result -> mysql-test/suite/federated/federated_transactions.result BitKeeper/deleted/.del-have_bug25714.require: Rename: mysql-test/r/have_bug25714.require -> BitKeeper/deleted/.del-have_bug25714.require BitKeeper/deleted/.del-kill_master.sh: Rename: mysql-test/misc/kill_master.sh -> BitKeeper/deleted/.del-kill_master.sh BitKeeper/deleted/.del-ndb_config_4_node.ini~d8e572e9b68f933a: Rename: mysql-test/ndb/ndb_config_4_node.ini -> BitKeeper/deleted/.del-ndb_config_4_node.ini~d8e572e9b68f933a BitKeeper/deleted/.del-restart.result: Rename: mysql-test/ndb/restart.result -> BitKeeper/deleted/.del-restart.result mysql-test/suite/federated/federated_cleanup.inc: Rename: mysql-test/include/federated_cleanup.inc -> mysql-test/suite/federated/federated_cleanup.inc mysql-test/suite/rpl/t/rpl_rotate_logs-slave.opt: Rename: mysql-test/suite/rpl/t/rpl_rotate_logs.slave-mi -> mysql-test/suite/rpl/t/rpl_rotate_logs-slave.opt BitKeeper/deleted/.del-install_test_db.sh: Rename: mysql-test/install_test_db.sh -> BitKeeper/deleted/.del-install_test_db.sh BitKeeper/deleted/.del-ndb_config_1_node.ini~7ec640ed25570e16: Rename: mysql-test/ndb/ndb_config_1_node.ini -> BitKeeper/deleted/.del-ndb_config_1_node.ini~7ec640ed25570e16 BitKeeper/deleted/.del-mtr_timer.pl: Rename: mysql-test/lib/mtr_timer.pl -> BitKeeper/deleted/.del-mtr_timer.pl BitKeeper/deleted/.del-create-test-result: Rename: mysql-test/create-test-result -> BitKeeper/deleted/.del-create-test-result BitKeeper/deleted/.del-fix-result: Rename: mysql-test/fix-result -> BitKeeper/deleted/.del-fix-result BitKeeper/deleted/.del-mysql-test-run-shell.sh: Rename: mysql-test/mysql-test-run-shell.sh -> BitKeeper/deleted/.del-mysql-test-run-shell.sh BitKeeper/deleted/.del-mysql-test_V1.9.pl: Rename: mysql-test/misc/mysql-test_V1.9.pl -> BitKeeper/deleted/.del-mysql-test_V1.9.pl BitKeeper/deleted/.del-resolve-stack: Rename: mysql-test/resolve-stack -> BitKeeper/deleted/.del-resolve-stack BitKeeper/deleted/.del-restart_log.result: Rename: mysql-test/ndb/restart_log.result -> BitKeeper/deleted/.del-restart_log.result mysql-test/suite/rpl/t/rpl_000015-slave.opt: Rename: mysql-test/suite/rpl/t/rpl_000015.slave-mi -> mysql-test/suite/rpl/t/rpl_000015-slave.opt BitKeeper/deleted/.del-ndb_config_2_node.ini: Rename: mysql-test/ndb/ndb_config_2_node.ini -> BitKeeper/deleted/.del-ndb_config_2_node.ini BitKeeper/deleted/.del-ndbcluster.sh: Rename: mysql-test/ndb/ndbcluster.sh -> BitKeeper/deleted/.del-ndbcluster.sh BitKeeper/deleted/.del-basic.result: Rename: mysql-test/ndb/basic.result -> BitKeeper/deleted/.del-basic.result BitKeeper/deleted/.del-restart.test: Rename: mysql-test/ndb/restart.test -> BitKeeper/deleted/.del-restart.test BitKeeper/deleted/.del-have_bug25714.inc: Rename: mysql-test/include/have_bug25714.inc -> BitKeeper/deleted/.del-have_bug25714.inc BitKeeper/deleted/.del-mtr_diff.pl: Rename: mysql-test/lib/mtr_diff.pl -> BitKeeper/deleted/.del-mtr_diff.pl mysql-test/suite/federated/federated_transactions-slave.opt: Rename: mysql-test/t/federated_transactions-slave.opt -> mysql-test/suite/federated/federated_transactions-slave.opt BitKeeper/deleted/.del-Makefile.am~343467da4d0f211b: Rename: mysql-test/ndb/Makefile.am -> BitKeeper/deleted/.del-Makefile.am~343467da4d0f211b BitKeeper/deleted/.del-mtr_im.pl~9762b0336c28949: Rename: mysql-test/lib/mtr_im.pl -> BitKeeper/deleted/.del-mtr_im.pl~9762b0336c28949 mysql-test/suite/federated/federated_innodb-slave.opt: Rename: mysql-test/t/federated_innodb-slave.opt -> mysql-test/suite/federated/federated_innodb-slave.opt client/mysqltest.c: Use current files path first when looking for include file configure.in: Remove mysql-test/nbd mysql-test/Makefile.am: Cleanup mysql-test/Makefile.am mysql-test/extra/binlog_tests/blackhole.test: Use new paths mysql-test/extra/binlog_tests/ctype_ucs_binlog.test: Use new paths mysql-test/mysql-test-run.pl: Dynamic configuration support Safe process mysql-test/extra/binlog_tests/mix_innodb_myisam_side_effects.test: Use new paths mysql-test/extra/rpl_tests/rpl_EE_err.test: Use new paths mysql-test/extra/rpl_tests/rpl_loaddata.test: Use new paths mysql-test/extra/rpl_tests/rpl_log.test: Use new paths mysql-test/extra/rpl_tests/rpl_row_001.test: Use new paths mysql-test/extra/rpl_tests/rpl_row_charset.test: Use new paths mysql-test/extra/rpl_tests/rpl_stm_000001.test: Use new paths mysql-test/extra/rpl_tests/rpl_stm_charset.test: Use new paths mysql-test/include/have_blackhole.inc: Use new paths mysql-test/include/have_ndbapi_examples.inc: Use new paths mysql-test/include/loaddata_autocom.inc: Use new paths mysql-test/include/mix1.inc: Use new paths mysql-test/include/ndb_backup.inc: Use new paths mysql-test/include/ndb_restore_master.inc: Use new paths mysql-test/include/ndb_restore_slave_eoption.inc: Use new paths mysql-test/include/testdb_only.inc: Use new paths mysql-test/lib/My/Config.pm: dynamic configuration safe process cleanups mysql-test/lib/mtr_cases.pm: dynamic configuration safe process cleanups mysql-test/lib/mtr_io.pl: dynamic configuration safe process cleanups mysql-test/lib/mtr_misc.pl: dynamic configuration safe process cleanups mysql-test/lib/mtr_process.pl: dynamic configuration safe process cleanups mysql-test/lib/mtr_report.pl: dynamic configuration safe process cleanups mysql-test/lib/mtr_stress.pl: dynamic configuration safe process cleanups mysql-test/r/backup.result: Use new paths mysql-test/r/ctype_big5.result: Use new paths mysql-test/r/gis.result: Use new paths mysql-test/r/loaddata.result: Use new paths mysql-test/r/loaddata_autocom_innodb.result: Use new paths mysql-test/r/mysqlbinlog.result: Use new paths mysql-test/r/mysqlbinlog_base64.result: Use new paths mysql-test/r/outfile.result: Use new paths mysql-test/r/partition_error.result: Use new paths mysql-test/r/partition_not_windows.result: Use new paths mysql-test/r/partition_symlink.result: Use new paths mysql-test/r/query_cache.result: Use new paths mysql-test/r/sp.result: Use new paths mysql-test/r/symlink.result: Use new paths mysql-test/r/system_mysql_db.result: Use new paths mysql-test/r/trigger.result: Use new paths mysql-test/r/type_blob.result: Use new paths mysql-test/r/view.result: Use new paths mysql-test/r/warnings.result: Use new paths mysql-test/suite/binlog/r/binlog_killed_simulate.result: Use new paths mysql-test/suite/binlog/r/binlog_row_mix_innodb_myisam.result: Use new paths mysql-test/suite/binlog/r/binlog_stm_blackhole.result: Use new paths mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result: Use new paths mysql-test/suite/binlog/t/binlog_killed.test: Use new paths mysql-test/suite/binlog/t/binlog_killed_simulate.test: Use new paths mysql-test/suite/binlog/t/binlog_row_mix_innodb_myisam.test: Use new paths mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam.test: Use new paths mysql-test/suite/federated/federated.inc: Use new paths mysql-test/suite/federated/federated.result: Use new paths mysql-test/suite/federated/federated.test: Use new paths mysql-test/suite/federated/federated_archive.result: Use new paths mysql-test/suite/federated/federated_archive.test: Use new paths mysql-test/suite/federated/federated_bug_13118.result: Use new paths mysql-test/suite/federated/federated_bug_13118.test: Use new paths mysql-test/suite/federated/federated_bug_25714.result: Use new paths mysql-test/suite/federated/federated_bug_25714.test: Use new paths mysql-test/suite/federated/federated_innodb.result: Use new paths mysql-test/suite/federated/federated_innodb.test: Use new paths mysql-test/suite/federated/federated_server.result: Use new paths mysql-test/suite/federated/federated_server.test: Use new paths mysql-test/suite/federated/federated_transactions.test: Use new paths mysql-test/suite/federated/have_federated_db.inc: Use new paths mysql-test/suite/ndb/r/loaddata_autocom_ndb.result: Use new paths mysql-test/suite/ndb/r/ndb_config.result: Use new paths mysql-test/suite/ndb/r/ndb_dd_backuprestore.result: Use new paths mysql-test/suite/ndb/r/ndb_load.result: Use new paths mysql-test/suite/ndb/r/ndb_loaddatalocal.result: Use new paths mysql-test/suite/ndb/r/ndb_replace.result: Use new paths mysql-test/suite/ndb/r/ndb_restore.result: Use new paths mysql-test/suite/ndb/r/ndb_restore_partition.result: Use new paths mysql-test/suite/ndb/r/ndb_restore_print.result: Use new paths mysql-test/suite/ndb/r/ndb_trigger.result: Use new paths mysql-test/suite/ndb/t/ndb_alter_table.test: Use new paths mysql-test/suite/ndb/t/ndb_config.test: Use new paths mysql-test/suite/ndb/t/ndb_load.test: Use new paths mysql-test/suite/ndb/t/ndb_loaddatalocal.test: Use new paths mysql-test/suite/ndb/t/ndb_replace.test: Use new paths mysql-test/suite/ndb/t/ndb_restore.test: Use new paths mysql-test/suite/ndb/t/ndb_single_user.test: Use new paths mysql-test/suite/ndb/t/ndb_trigger.test: Use new paths mysql-test/suite/ndb/t/ndbapi.test: Use new paths mysql-test/suite/rpl/include/rpl_mixed_dml.inc: Use new paths mysql-test/suite/rpl/r/rpl_LD_INFILE.result: Use new paths mysql-test/suite/rpl/r/rpl_flushlog_loop.result: Use new paths mysql-test/suite/rpl/r/rpl_innodb.result: Use new paths mysql-test/suite/rpl/r/rpl_innodb_mixed_dml.result: Use new paths mysql-test/suite/rpl/r/rpl_load_table_from_master.result: Use new paths mysql-test/suite/rpl/r/rpl_loaddata.result: Use new paths mysql-test/suite/rpl/r/rpl_loaddata_charset.result: Use new paths mysql-test/suite/rpl/r/rpl_loaddata_fatal.result: Use new paths mysql-test/suite/rpl/r/rpl_loaddata_m.result: Use new paths mysql-test/suite/rpl/r/rpl_loaddata_s.result: Use new paths mysql-test/suite/rpl/r/rpl_loaddata_simple.result: Use new paths mysql-test/suite/rpl/r/rpl_loaddatalocal.result: Use new paths mysql-test/suite/rpl/r/rpl_loadfile.result: Use new paths mysql-test/suite/rpl/r/rpl_misc_functions.result: Use new paths mysql-test/suite/rpl/r/rpl_replicate_do.result: Use new paths mysql-test/suite/rpl/r/rpl_rewrt_db.result: Use new paths mysql-test/suite/rpl/r/rpl_row_001.result: Use new paths mysql-test/suite/rpl/r/rpl_row_loaddata_m.result: Use new paths mysql-test/suite/rpl/r/rpl_row_log.result: Use new paths mysql-test/suite/rpl/r/rpl_row_log_innodb.result: Use new paths mysql-test/suite/rpl/r/rpl_row_stop_middle_update.result: Use new paths mysql-test/suite/rpl/r/rpl_stm_000001.result: Use new paths mysql-test/suite/rpl/r/rpl_stm_log.result: Use new paths mysql-test/suite/rpl/r/rpl_timezone.result: Use new paths mysql-test/suite/rpl/t/disabled.def: Use new paths mysql-test/suite/rpl/t/rpl000017-slave.sh: Use new paths mysql-test/suite/rpl/t/rpl_LD_INFILE.test: Use new paths mysql-test/suite/rpl/t/rpl_drop_db.test: Use new paths mysql-test/suite/rpl/t/rpl_flushlog_loop-master.opt: Use new paths mysql-test/suite/rpl/t/rpl_flushlog_loop-slave.opt: Use new paths mysql-test/suite/rpl/t/rpl_flushlog_loop.test: Use new paths mysql-test/suite/rpl/t/rpl_innodb.test: Use new paths mysql-test/suite/rpl/t/rpl_innodb_bug30919.test: Use new paths mysql-test/suite/rpl/t/rpl_load_from_master.test: Use new paths mysql-test/suite/rpl/t/rpl_load_table_from_master.test: Use new paths mysql-test/suite/rpl/t/rpl_loaddata_charset.test: Use new paths mysql-test/suite/rpl/t/rpl_loaddata_fatal.test: Use new paths mysql-test/suite/rpl/t/rpl_loaddata_m.test: Use new paths mysql-test/suite/rpl/t/rpl_loaddata_s.test: Use new paths mysql-test/suite/rpl/t/rpl_loaddata_simple.test: Use new paths mysql-test/suite/rpl/t/rpl_loaddatalocal.test: Use new paths mysql-test/suite/rpl/t/rpl_loadfile.test: Use new paths mysql-test/suite/rpl/t/rpl_misc_functions.test: Use new paths mysql-test/suite/rpl/t/rpl_replicate_do.test: Use new paths mysql-test/suite/rpl/t/rpl_rewrt_db.test: Use new paths mysql-test/suite/rpl/t/rpl_rotate_logs-master.opt: Use new paths mysql-test/suite/rpl/t/rpl_rotate_logs.test: Use new paths mysql-test/suite/rpl/t/rpl_row_charset_innodb.test: Use new paths mysql-test/suite/rpl/t/rpl_row_mysqlbinlog.test: Use new paths mysql-test/suite/rpl/t/rpl_row_stop_middle_update.test: Use new paths mysql-test/suite/rpl/t/rpl_timezone.test: Use new paths mysql-test/suite/rpl/t/rpl_trigger.test: Use new paths mysql-test/suite/rpl_ndb/r/rpl_ndb_dd_advance.result: Use new paths mysql-test/suite/rpl_ndb/r/rpl_ndb_innodb_trans.result: Use new paths mysql-test/suite/rpl_ndb/r/rpl_ndb_log.result: Use new paths mysql-test/suite/rpl_ndb/r/rpl_ndb_multi.result: Use new paths mysql-test/suite/rpl_ndb/r/rpl_ndb_row_001.result: Use new paths mysql-test/suite/rpl_ndb/r/rpl_ndb_sync.result: Use new paths mysql-test/suite/rpl_ndb/t/rpl_ndb_bank.test: Use new paths mysql-test/suite/rpl_ndb/t/rpl_ndb_dd_advance.test: Use new paths mysql-test/suite/rpl_ndb/t/rpl_ndb_innodb_trans.test: Use new paths mysql-test/suite/rpl_ndb/t/rpl_ndb_load.test: Use new paths mysql-test/suite/rpl_ndb/t/rpl_ndb_sync.test: Use new paths mysql-test/suite/rpl_ndb/t/rpl_ndbapi_multi.test: Use new paths mysql-test/t/backup.test: Use new paths mysql-test/t/bootstrap.test: Use new paths mysql-test/t/crash_commit_before.test: Use new paths mysql-test/t/create_not_windows.test: Use new paths mysql-test/t/csv.test: Use new paths mysql-test/t/ctype_big5.test: Use new paths mysql-test/t/disabled.def: Use new paths mysql-test/t/distinct.test: Use new paths mysql-test/t/gis.test: Use new paths mysql-test/t/grant_cache_no_prot.test: Use new paths mysql-test/t/grant_cache_ps_prot.test: Use new paths mysql-test/t/information_schema_chmod.test: Use new paths mysql-test/t/loaddata.test: Use new paths mysql-test/t/log_state.test: Use new paths mysql-test/t/myisam-system.test: Use new paths mysql-test/t/mysql_upgrade.test: Use new paths mysql-test/t/mysqlbinlog-cp932.test: Use new paths mysql-test/t/mysqlbinlog.test: Use new paths mysql-test/t/mysqlbinlog2.test: Use new paths mysql-test/t/mysqlbinlog_base64.test: Use new paths mysql-test/t/mysqldump.test: Use new paths mysql-test/t/outfile.test: Use new paths mysql-test/t/partition.test: Use new paths mysql-test/t/partition_error.test: Use new paths mysql-test/t/partition_federated.test: Use new paths mysql-test/t/partition_mgm.test: Use new paths mysql-test/t/partition_not_windows.test: Use new paths mysql-test/t/partition_symlink.test: Use new paths mysql-test/t/query_cache.test: Use new paths mysql-test/t/repair.test: Use new paths mysql-test/t/show_check.test: Use new paths mysql-test/t/sp-destruct.test: Use new paths mysql-test/t/sp.test: Use new paths mysql-test/t/symlink.test: Use new paths mysql-test/t/system_mysql_db.test: Use new paths mysql-test/t/system_mysql_db_fix30020.test: Use new paths mysql-test/t/system_mysql_db_fix40123.test: Use new paths mysql-test/t/system_mysql_db_fix50030.test: Use new paths mysql-test/t/system_mysql_db_fix50117.test: Use new paths mysql-test/t/trigger-compat.test: Use new paths mysql-test/t/trigger-grant.test: Use new paths mysql-test/t/trigger.test: Use new paths mysql-test/t/type_blob.test: Use new paths mysql-test/t/type_varchar.test: Use new paths mysql-test/t/upgrade.test: Use new paths mysql-test/t/user_var-binlog.test: Use new paths mysql-test/t/varbinary.test: Use new paths mysql-test/t/view.test: Use new paths mysql-test/t/warnings.test: Use new paths mysql-test/lib/My/ConfigFactory.pm: Initial version mysql-test/lib/My/Find.pm: Initial version mysql-test/lib/My/SafeProcess.pm: Initial version mysql-test/std_data/ndb_config_config.ini: Add "old" style config.ini for ndb mysql-test/suite/federated/disabled.def: Move disabled federated to it's new suite mysql-test/suite/federated/my.cnf: Add config for federated mysql-test/suite/ndb/my.cnf: Add config for ndb mysql-test/suite/rpl/my.cnf: Add config for rpl mysql-test/suite/rpl/rpl_1slave_base.cnf: Add base config for rpl mysql-test/suite/rpl/t/rpl_000015-master.opt: Use new paths mysql-test/suite/rpl_ndb/my.cnf: Add config for rpl_ndb mysql-test/lib/My/File/Path.pm: Initial version mysql-test/lib/My/SafeProcess/Base.pm: Initial version mysql-test/lib/My/SafeProcess/safe_kill_win.cc: Initial version mysql-test/lib/My/SafeProcess/safe_process.pl: Initial version mysql-test/lib/My/SafeProcess/safe_process_win.cc: Initial version mysql-test/lib/t/Base.t: Initial version mysql-test/lib/t/Find.t: Initial version mysql-test/lib/t/SafeProcess.t: Initial version mysql-test/lib/t/SafeProcessStress.pl: Initial version mysql-test/lib/t/copytree.t: Initial version mysql-test/lib/t/dummyd.pl: Initial version mysql-test/lib/t/rmtree.t: Initial version mysql-test/lib/t/testMyConfig.t: Initial version mysql-test/lib/t/testMyConfigFactory.t: Initial version mysql-test/lib/t/test_child.pl: Initial version mysql-test/include/default_my.cnf: Add default config file used when no suite specific file is found mysql-test/include/default_mysqld.cnf: New BitKeeper file ``mysql-test/include/default_mysqld.cnf'' mysql-test/include/default_ndbd.cnf: Add default settings for all ndbds mysql-test/lib/mtr_settings.pl: Initial version
470 lines
8.6 KiB
Perl
470 lines
8.6 KiB
Perl
# -*- cperl -*-
|
|
|
|
package My::Config::Option;
|
|
|
|
use strict;
|
|
use warnings;
|
|
use Carp;
|
|
|
|
|
|
sub new {
|
|
my ($class, $option_name, $option_value)= @_;
|
|
my $self= bless { name => $option_name,
|
|
value => $option_value
|
|
}, $class;
|
|
return $self;
|
|
}
|
|
|
|
|
|
sub name {
|
|
my ($self)= @_;
|
|
return $self->{name};
|
|
}
|
|
|
|
|
|
sub value {
|
|
my ($self)= @_;
|
|
return $self->{value};
|
|
}
|
|
|
|
|
|
package My::Config::Group;
|
|
|
|
use strict;
|
|
use warnings;
|
|
use Carp;
|
|
|
|
sub new {
|
|
my ($class, $group_name)= @_;
|
|
my $self= bless { name => $group_name,
|
|
options => [],
|
|
options_by_name => {},
|
|
}, $class;
|
|
return $self;
|
|
}
|
|
|
|
|
|
sub insert {
|
|
my ($self, $option_name, $value, $if_not_exist)= @_;
|
|
my $option= $self->option($option_name);
|
|
if (defined($option) and !$if_not_exist) {
|
|
$option->{value}= $value;
|
|
}
|
|
else {
|
|
my $option= My::Config::Option->new($option_name, $value);
|
|
# Insert option in list
|
|
push(@{$self->{options}}, $option);
|
|
# Insert option in hash
|
|
$self->{options_by_name}->{$option_name}= $option;
|
|
}
|
|
return $option;
|
|
}
|
|
|
|
sub remove {
|
|
my ($self, $option_name)= @_;
|
|
|
|
# Check that option exists
|
|
my $option= $self->option($option_name);
|
|
|
|
return undef unless defined $option;
|
|
|
|
# Remove from the hash
|
|
delete($self->{options_by_name}->{$option_name}) or croak;
|
|
|
|
# Remove from the array
|
|
@{$self->{options}}= grep { $_->name ne $option_name } @{$self->{options}};
|
|
|
|
return $option;
|
|
}
|
|
|
|
|
|
sub options {
|
|
my ($self)= @_;
|
|
return @{$self->{options}};
|
|
}
|
|
|
|
|
|
sub name {
|
|
my ($self)= @_;
|
|
return $self->{name};
|
|
}
|
|
|
|
sub suffix {
|
|
my ($self)= @_;
|
|
# Everything in name from the last .
|
|
my @parts= split(/\./, $self->{name});
|
|
my $suffix= pop(@parts);
|
|
return ".$suffix";
|
|
}
|
|
|
|
sub after {
|
|
my ($self, $prefix)= @_;
|
|
die unless defined $prefix;
|
|
|
|
# everything after $prefix
|
|
my $name= $self->{name};
|
|
if ($name =~ /^\Q$prefix\E(.*)$/)
|
|
{
|
|
return $1;
|
|
}
|
|
die "Failed to extract the value after '$prefix' in $name";
|
|
}
|
|
|
|
|
|
sub split {
|
|
my ($self)= @_;
|
|
# Return an array with name parts
|
|
return split(/\./, $self->{name});
|
|
}
|
|
|
|
#
|
|
# Return a specific option in the group
|
|
#
|
|
sub option {
|
|
my ($self, $option_name)= @_;
|
|
|
|
return $self->{options_by_name}->{$option_name};
|
|
}
|
|
|
|
|
|
#
|
|
# Return value for an option in the group, fail if it does not exist
|
|
#
|
|
sub value {
|
|
my ($self, $option_name)= @_;
|
|
my $option= $self->option($option_name);
|
|
|
|
croak "No option named '$option_name' in group '$self->{name}'"
|
|
if ! defined($option);
|
|
|
|
return $option->value();
|
|
}
|
|
|
|
|
|
#
|
|
# Return value for an option if it exist
|
|
#
|
|
sub if_exist {
|
|
my ($self, $option_name)= @_;
|
|
my $option= $self->option($option_name);
|
|
|
|
return undef if ! defined($option);
|
|
|
|
return $option->value();
|
|
}
|
|
|
|
|
|
package My::Config;
|
|
|
|
use strict;
|
|
use warnings;
|
|
use Carp;
|
|
use IO::File;
|
|
use File::Basename;
|
|
|
|
#
|
|
# Constructor for My::Config
|
|
# - represents a my.cnf config file
|
|
#
|
|
# Array of arrays
|
|
#
|
|
sub new {
|
|
my ($class, $path)= @_;
|
|
my $group_name= undef;
|
|
|
|
my $self= bless { groups => [] }, $class;
|
|
my $F= IO::File->new($path, "<")
|
|
or croak "Could not open '$path': $!";
|
|
|
|
while ( my $line= <$F> ) {
|
|
chomp($line);
|
|
|
|
# [group]
|
|
if ( $line =~ /^\[(.*)\]/ ) {
|
|
# New group found
|
|
$group_name= $1;
|
|
#print "group: $group_name\n";
|
|
|
|
$self->insert($group_name, undef, undef);
|
|
}
|
|
|
|
# Magic #! comments
|
|
elsif ( $line =~ /^#\!/) {
|
|
my $magic= $line;
|
|
croak "Found magic comment '$magic' outside of group"
|
|
unless $group_name;
|
|
|
|
#print "$magic\n";
|
|
$self->insert($group_name, $magic, undef);
|
|
}
|
|
|
|
# Comments
|
|
elsif ( $line =~ /^#/ || $line =~ /^;/) {
|
|
# Skip comment
|
|
next;
|
|
}
|
|
|
|
# Empty lines
|
|
elsif ( $line =~ /^$/ ) {
|
|
# Skip empty lines
|
|
next;
|
|
}
|
|
|
|
# !include <filename>
|
|
elsif ( $line =~ /^\!include\s*(.*?)\s*$/ ) {
|
|
my $include_file_name= dirname($path)."/".$1;
|
|
|
|
# Check that the file exists relative to path of first config file
|
|
if (! -f $include_file_name){
|
|
# Try to include file relativ to current dir
|
|
$include_file_name= $1;
|
|
}
|
|
croak "The include file '$include_file_name' does not exist"
|
|
unless -f $include_file_name;
|
|
|
|
$self->append(My::Config->new($include_file_name));
|
|
}
|
|
|
|
# <option>
|
|
elsif ( $line =~ /^([\@\w-]+)\s*$/ ) {
|
|
my $option= $1;
|
|
|
|
croak "Found option '$option' outside of group"
|
|
unless $group_name;
|
|
|
|
#print "$option\n";
|
|
$self->insert($group_name, $option, undef);
|
|
}
|
|
|
|
# <option>=<value>
|
|
elsif ( $line =~ /^([\@\w-]+)\s*=\s*(.*?)\s*$/ ) {
|
|
my $option= $1;
|
|
my $value= $2;
|
|
|
|
croak "Found option '$option=$value' outside of group"
|
|
unless $group_name;
|
|
|
|
#print "$option=$value\n";
|
|
$self->insert($group_name, $option, $value);
|
|
} else {
|
|
croak "Unexpected line '$line' found in '$path'";
|
|
}
|
|
|
|
}
|
|
undef $F; # Close the file
|
|
|
|
return $self;
|
|
}
|
|
|
|
#
|
|
# Insert a new group if it does not already exist
|
|
# and add option if defined
|
|
#
|
|
sub insert {
|
|
my ($self, $group_name, $option, $value, $if_not_exist)= @_;
|
|
my $group;
|
|
|
|
# Create empty array for the group if it doesn't exist
|
|
if ( !$self->group_exists($group_name) ) {
|
|
$group= $self->_group_insert($group_name);
|
|
}
|
|
else {
|
|
$group= $self->group($group_name);
|
|
}
|
|
|
|
if ( defined $option ) {
|
|
#print "option: $option, value: $value\n";
|
|
|
|
# Add the option to the group
|
|
$group->insert($option, $value, $if_not_exist);
|
|
}
|
|
return $group;
|
|
}
|
|
|
|
#
|
|
# Remove a option, given group and option name
|
|
#
|
|
sub remove {
|
|
my ($self, $group_name, $option_name)= @_;
|
|
my $group= $self->group($group_name);
|
|
|
|
croak "group '$group_name' does not exist"
|
|
unless defined($group);
|
|
|
|
$group->remove($option_name) or
|
|
croak "option '$option_name' does not exist";
|
|
}
|
|
|
|
|
|
|
|
#
|
|
# Check if group with given name exists in config
|
|
#
|
|
sub group_exists {
|
|
my ($self, $group_name)= @_;
|
|
|
|
foreach my $group ($self->groups()) {
|
|
return 1 if $group->{name} eq $group_name;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
#
|
|
# Insert a new group into config
|
|
#
|
|
sub _group_insert {
|
|
my ($self, $group_name)= @_;
|
|
caller eq __PACKAGE__ or croak;
|
|
|
|
# Check that group does not already exist
|
|
croak "Group already exists" if $self->group_exists($group_name);
|
|
|
|
my $group= My::Config::Group->new($group_name);
|
|
push(@{$self->{groups}}, $group);
|
|
return $group;
|
|
}
|
|
|
|
|
|
#
|
|
# Append a configuration to current config
|
|
#
|
|
sub append {
|
|
my ($self, $from)= @_;
|
|
|
|
foreach my $group ($from->groups()) {
|
|
foreach my $option ($group->options()) {
|
|
$self->insert($group->name(), $option->name(), $option->value());
|
|
}
|
|
|
|
}
|
|
}
|
|
|
|
|
|
#
|
|
# Return a list with all the groups in config
|
|
#
|
|
sub groups {
|
|
my ($self)= @_;
|
|
return ( @{$self->{groups}} );
|
|
}
|
|
|
|
|
|
#
|
|
# Return a list of all the groups in config
|
|
# starting with the given string
|
|
#
|
|
sub like {
|
|
my ($self, $prefix)= @_;
|
|
return ( grep ( $_->{name} =~ /^$prefix/, $self->groups()) );
|
|
}
|
|
|
|
|
|
#
|
|
# Return the first group in config
|
|
# starting with the given string
|
|
#
|
|
sub first_like {
|
|
my ($self, $prefix)= @_;
|
|
return ($self->like($prefix))[0];
|
|
}
|
|
|
|
|
|
#
|
|
# Return a specific group in the config
|
|
#
|
|
sub group {
|
|
my ($self, $group_name)= @_;
|
|
|
|
foreach my $group ( $self->groups() ) {
|
|
return $group if $group->{name} eq $group_name;
|
|
}
|
|
return undef;
|
|
}
|
|
|
|
|
|
#
|
|
# Return a list of all options in a specific group in the config
|
|
#
|
|
sub options_in_group {
|
|
my ($self, $group_name)= @_;
|
|
|
|
my $group= $self->group($group_name);
|
|
return () unless defined $group;
|
|
return $group->options();
|
|
}
|
|
|
|
|
|
#
|
|
# Return a value given group and option name
|
|
#
|
|
sub value {
|
|
my ($self, $group_name, $option_name)= @_;
|
|
my $group= $self->group($group_name);
|
|
|
|
croak "group '$group_name' does not exist"
|
|
unless defined($group);
|
|
|
|
my $option= $group->option($option_name);
|
|
croak "option '$option_name' does not exist"
|
|
unless defined($option);
|
|
|
|
return $option->value();
|
|
}
|
|
|
|
|
|
#
|
|
# Check if an option exists
|
|
#
|
|
sub exists {
|
|
my ($self, $group_name, $option_name)= @_;
|
|
my $group= $self->group($group_name);
|
|
|
|
croak "group '$group_name' does not exist"
|
|
unless defined($group);
|
|
|
|
my $option= $group->option($option_name);
|
|
return defined($option);
|
|
}
|
|
|
|
|
|
# Overload "to string"-operator with 'stringify'
|
|
use overload
|
|
'""' => \&stringify;
|
|
|
|
#
|
|
# Return the config as a string in my.cnf file format
|
|
#
|
|
sub stringify {
|
|
my ($self)= @_;
|
|
my $res;
|
|
|
|
foreach my $group ($self->groups()) {
|
|
$res .= "[$group->{name}]\n";
|
|
|
|
foreach my $option ($group->options()) {
|
|
$res .= $option->name();
|
|
my $value= $option->value();
|
|
if (defined $value) {
|
|
$res .= "=$value";
|
|
}
|
|
$res .= "\n";
|
|
}
|
|
$res .= "\n";
|
|
}
|
|
return $res;
|
|
}
|
|
|
|
|
|
#
|
|
# Save the config to named file
|
|
#
|
|
sub save {
|
|
my ($self, $path)= @_;
|
|
my $F= IO::File->new($path, ">")
|
|
or croak "Could not open '$path': $!";
|
|
print $F $self;
|
|
undef $F; # Close the file
|
|
}
|
|
|
|
1;
|