X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FReplicated.pm;h=ae81b7392fbf7d70faaaa3c074538367aac3e764;hb=47980c14e4d90e05474cfcdb3723ea53914d077b;hp=afd8d5c25db6f88cdf2097eb70857be9d31b22c5;hpb=6d766626a066b757058d023830f93cf39bb9c302;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Storage/DBI/Replicated.pm b/lib/DBIx/Class/Storage/DBI/Replicated.pm index afd8d5c..ae81b73 100644 --- a/lib/DBIx/Class/Storage/DBI/Replicated.pm +++ b/lib/DBIx/Class/Storage/DBI/Replicated.pm @@ -15,7 +15,9 @@ use DBIx::Class::Storage::DBI::Replicated::Types qw/BalancerClassNamePart DBICSc use MooseX::Types::Moose qw/ClassName HashRef Object/; use Scalar::Util 'reftype'; use Hash::Merge; -use List::Util qw/min max/; +use List::Util qw/min max reduce/; +use Try::Tiny; +use namespace::clean; use namespace::clean -except => 'meta'; @@ -37,7 +39,7 @@ that the Pool object should get. $schema->storage_type( ['::DBI::Replicated', {balancer=>'::Random'}] ); $schema->connection(...); -Next, you need to add in the Replicants. Basically this is an array of +Next, you need to add in the Replicants. Basically this is an array of arrayrefs, where each arrayref is database connect information. Think of these arguments as what you'd pass to the 'normal' $schema->connect method. @@ -58,7 +60,7 @@ attribute 'force_pool'. For example: my $RS = $schema->resultset('Source')->search(undef, {force_pool=>'master'}); Now $RS will force everything (both reads and writes) to use whatever was setup -as the master storage. 'master' is hardcoded to always point to the Master, +as the master storage. 'master' is hardcoded to always point to the Master, but you can also use any Replicant name. Please see: L and the replicants attribute for more. @@ -123,7 +125,7 @@ has 'schema' => ( =head2 pool_type -Contains the classname which will instantiate the L object. Defaults +Contains the classname which will instantiate the L object. Defaults to: L. =cut @@ -205,7 +207,7 @@ has 'pool' => ( =head2 balancer -Is a or derived class. This +Is a or derived class. This is a class that takes a pool () =cut @@ -235,7 +237,7 @@ has 'master' => ( =head1 ATTRIBUTES IMPLEMENTING THE DBIx::Storage::DBI INTERFACE -The following methods are delegated all the methods required for the +The following methods are delegated all the methods required for the L interface. =head2 read_handler @@ -252,7 +254,7 @@ has 'read_handler' => ( select select_single columns_info_for - _dbh_columns_info_for + _dbh_columns_info_for _select /], ); @@ -308,7 +310,6 @@ has 'write_handler' => ( is_datatype_numeric _supports_insert_returning _count_select - _subq_count_select _subq_update_delete svp_rollback svp_begin @@ -343,7 +344,6 @@ has 'write_handler' => ( _dbh_commit _execute_array _placeholders_supported - _verify_pid savepoints _sqlt_minimum_version _sql_maker_opts @@ -367,16 +367,22 @@ has 'write_handler' => ( _dbh_sth _dbh_execute _prefetch_insert_auto_nextvals - /, - - # TODO these need to be spread out to ALL servers not just the master - qw/ - _get_server_version - _server_info _server_info_hash /], ); +my @unimplemented = qw( + _arm_global_destructor + _preserve_foreign_dbh + _verify_pid + _verify_tid +); + +for my $method (@unimplemented) { + __PACKAGE__->meta->add_method($method, sub { + croak "$method must not be called on ".(blessed shift).' objects'; + }); +} has _master_connect_info_opts => (is => 'rw', isa => HashRef, default => sub { {} }); @@ -462,7 +468,7 @@ bits get put into the correct places. =cut sub BUILDARGS { - my ($class, $schema, $storage_type_args, @args) = @_; + my ($class, $schema, $storage_type_args, @args) = @_; return { schema=>$schema, @@ -615,7 +621,7 @@ Example: my $reliably = sub { my $name = shift @_; $schema->resultset('User')->create({name=>$name}); - my $user_rs = $schema->resultset('User')->find({name=>$name}); + my $user_rs = $schema->resultset('User')->find({name=>$name}); return $user_rs; }; @@ -646,7 +652,7 @@ sub execute_reliably { my @result; my $want_array = wantarray; - eval { + try { if($want_array) { @result = $coderef->(@args); } elsif(defined $want_array) { @@ -654,19 +660,14 @@ sub execute_reliably { } else { $coderef->(@args); } + } catch { + $self->throw_exception("coderef returned an error: $_"); + } finally { + ##Reset to the original state + $self->read_handler($current); }; - ##Reset to the original state - $self->read_handler($current); - - ##Exception testing has to come last, otherwise you might leave the - ##read_handler set to master. - - if($@) { - $self->throw_exception("coderef returned an error: $@"); - } else { - return $want_array ? @result : $result[0]; - } + return $want_array ? @result : $result[0]; } =head2 set_reliable_storage @@ -918,7 +919,7 @@ sub lag_behind_master { my $self = shift; return max map $_->lag_behind_master, $self->replicants; -} +} =head2 is_replicating @@ -966,7 +967,7 @@ sub _determine_driver { sub _driver_determined { my $self = shift; - + if (@_) { $_->_driver_determined(@_) for $self->all_storages; } @@ -976,19 +977,19 @@ sub _driver_determined { sub _init { my $self = shift; - + $_->_init for $self->all_storages; } sub _run_connection_actions { my $self = shift; - + $_->_run_connection_actions for $self->all_storages; } sub _do_connection_actions { my $self = shift; - + if (@_) { $_->_do_connection_actions(@_) for $self->all_storages; } @@ -1016,6 +1017,36 @@ sub _ping { return min map $_->_ping, $self->all_storages; } +my $numify_ver = sub { + my $ver = shift; + my @numparts = split /\D+/, $ver; + my $format = '%d.' . (join '', ('%05d') x (@numparts - 1)); + + return sprintf $format, @numparts; +}; + +sub _server_info { + my $self = shift; + + if (not $self->_server_info_hash) { + my $min_version_info = ( + reduce { $a->[0] < $b->[0] ? $a : $b } + map [ $numify_ver->($_->{dbms_version}), $_ ], + map $_->_server_info, $self->all_storages + )->[1]; + + $self->_server_info_hash($min_version_info); # on master + } + + return $self->_server_info_hash; +} + +sub _get_server_version { + my $self = shift; + + return $self->_server_info->{dbms_version}; +} + =head1 GOTCHAS Due to the fact that replicants can lag behind a master, you must take care to