X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FStorage%2FDBI%2FReplicated.pm;h=70fd834def256bdc1afb5d41054d1d9e49dbb4c9;hb=2131aa2eac548e0b10325b97c10d22a61fffd9c9;hp=37954b40b30a65f7dfb4c783a784f2c403604003;hpb=fabbd5cca97aaef8e605a783c78abc1eaf9bdbae;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Storage/DBI/Replicated.pm b/lib/DBIx/Class/Storage/DBI/Replicated.pm index 37954b4..70fd834 100644 --- a/lib/DBIx/Class/Storage/DBI/Replicated.pm +++ b/lib/DBIx/Class/Storage/DBI/Replicated.pm @@ -15,8 +15,8 @@ use MooseX::Types::Moose qw/ClassName HashRef Object/; use Scalar::Util 'reftype'; use Hash::Merge; use List::Util qw/min max reduce/; +use Context::Preserve 'preserve_context'; use Try::Tiny; -use namespace::clean; use namespace::clean -except => 'meta'; @@ -35,7 +35,7 @@ also define your arguments, such as which balancer you want and any arguments that the Pool object should get. my $schema = Schema::Class->clone; - $schema->storage_type( ['::DBI::Replicated', {balancer=>'::Random'}] ); + $schema->storage_type(['::DBI::Replicated', { balancer_type => '::Random' }]); $schema->connection(...); Next, you need to add in the Replicants. Basically this is an array of @@ -263,7 +263,6 @@ my $method_dispatch = { build_datetime_parser last_insert_id insert - insert_bulk update delete dbh @@ -313,10 +312,10 @@ my $method_dispatch = { _native_data_type _get_dbh sql_maker_class + insert_bulk + _insert_bulk _execute _do_query - _sth - _dbh_sth _dbh_execute /, Class::MOP::Class->initialize('DBIx::Class::Storage::DBIHacks')->get_method_list ], reader => [qw/ @@ -330,8 +329,6 @@ my $method_dispatch = { _arm_global_destructor _verify_pid - source_bind_attributes - get_use_dbms_capability set_use_dbms_capability get_dbms_capability @@ -339,6 +336,11 @@ my $method_dispatch = { _dbh_details _dbh_get_info + _determine_connector_driver + _extract_driver_from_connect_info + _describe_connection + _warn_undetermined_driver + sql_limit_dialect sql_quote_char sql_name_sep @@ -352,9 +354,11 @@ my $method_dispatch = { _max_column_bytesize _is_lob_type _is_binary_lob_type + _is_binary_type _is_text_lob_type - sth + _prepare_sth + _bind_sth_params /,( # the capability framework # not sure if CMOP->initialize does evil things to DBIC::S::DBI, fix if a problem @@ -393,13 +397,13 @@ if (DBIx::Class::_ENV_::DBICTEST) { for my $method (@{$method_dispatch->{unimplemented}}) { __PACKAGE__->meta->add_method($method, sub { my $self = shift; - $self->throw_exception("$method must not be called on ".(blessed $self).' objects'); + $self->throw_exception("$method() must not be called on ".(blessed $self).' objects'); }); } =head2 read_handler -Defines an object that implements the read side of L. +Defines an object that implements the read side of L. =cut @@ -412,7 +416,7 @@ has 'read_handler' => ( =head2 write_handler -Defines an object that implements the write side of L, +Defines an object that implements the write side of L, as well as methods that don't write or read that can be called on only one storage, methods that return a C<$dbh>, and any methods that don't make sense to run on a replicant. @@ -442,6 +446,11 @@ C, C, C and C. around connect_info => sub { my ($next, $self, $info, @extra) = @_; + $self->throw_exception( + 'connect_info can not be retrieved from a replicated storage - ' + . 'accessor must be called on a specific pool instance' + ) unless defined $info; + my $merge = Hash::Merge->new('LEFT_PRECEDENT'); my %opts; @@ -478,24 +487,19 @@ around connect_info => sub { $self->_master_connect_info_opts(\%opts); - my @res; - if (wantarray) { - @res = $self->$next($info, @extra); - } else { - $res[0] = $self->$next($info, @extra); - } - - # Make sure master is blessed into the correct class and apply role to it. - my $master = $self->master; - $master->_determine_driver; - Moose::Meta::Class->initialize(ref $master); + return preserve_context { + $self->$next($info, @extra); + } after => sub { + # Make sure master is blessed into the correct class and apply role to it. + my $master = $self->master; + $master->_determine_driver; + Moose::Meta::Class->initialize(ref $master); - DBIx::Class::Storage::DBI::Replicated::WithDSN->meta->apply($master); + DBIx::Class::Storage::DBI::Replicated::WithDSN->meta->apply($master); - # link pool back to master - $self->pool->master($master); - - wantarray ? @res : $res[0]; + # link pool back to master + $self->pool->master($master); + }; }; =head1 METHODS @@ -584,7 +588,8 @@ sub _build_read_handler { =head2 around: connect_replicants All calls to connect_replicants needs to have an existing $schema tacked onto -top of the args, since L needs it, and any C +top of the args, since L needs it, and any +L options merged with the master, with replicant opts having higher priority. =cut @@ -639,8 +644,8 @@ around connect_replicants => sub { =head2 all_storages -Returns an array of of all the connected storage backends. The first element -in the returned array is the master, and the remainings are each of the +Returns an array of all the connected storage backends. The first element +in the returned array is the master, and the rest are each of the replicants. =cut @@ -676,41 +681,22 @@ inserted something and need to get a resultset including it, etc. =cut sub execute_reliably { - my ($self, $coderef, @args) = @_; + my $self = shift; + my $coderef = shift; unless( ref $coderef eq 'CODE') { $self->throw_exception('Second argument must be a coderef'); } - ##Get copy of master storage - my $master = $self->master; - - ##Get whatever the current read hander is - my $current = $self->read_handler; - - ##Set the read handler to master - $self->read_handler($master); - - ## do whatever the caller needs - my @result; - my $want_array = wantarray; + ## replace the current read handler for the remainder of the scope + local $self->{read_handler} = $self->master; - try { - if($want_array) { - @result = $coderef->(@args); - } elsif(defined $want_array) { - ($result[0]) = ($coderef->(@args)); - } else { - $coderef->(@args); - } + my $args = \@_; + return try { + $coderef->(@$args); } catch { $self->throw_exception("coderef returned an error: $_"); - } finally { - ##Reset to the original state - $self->read_handler($current); }; - - return wantarray ? @result : $result[0]; } =head2 set_reliable_storage @@ -1094,7 +1080,8 @@ sub _get_server_version { Due to the fact that replicants can lag behind a master, you must take care to make sure you use one of the methods to force read queries to a master should you need realtime data integrity. For example, if you insert a row, and then -immediately re-read it from the database (say, by doing $row->discard_changes) +immediately re-read it from the database (say, by doing +L<< $result->discard_changes|DBIx::Class::Row/discard_changes >>) or you insert a row and then immediately build a query that expects that row to be an item, you should force the master to handle reads. Otherwise, due to the lag, there is no certainty your data will be in the expected state. @@ -1106,9 +1093,9 @@ method to force the master to handle all read queries. Otherwise, you can force a single query to use the master with the 'force_pool' attribute: - my $row = $resultset->search(undef, {force_pool=>'master'})->find($pk); + my $result = $resultset->search(undef, {force_pool=>'master'})->find($pk); -This attribute will safely be ignore by non replicated storages, so you can use +This attribute will safely be ignored by non replicated storages, so you can use the same code for both types of systems. Lastly, you can use the L method, which works very much like @@ -1126,18 +1113,16 @@ using the Schema clone method. ## $new_schema will use only the Master storage for all reads/writes while ## the $schema object will use replicated storage. -=head1 AUTHOR - - John Napiorkowski - -Based on code originated by: +=head1 FURTHER QUESTIONS? - Norbert Csongrádi - Peter Siklósi +Check the list of L. -=head1 LICENSE +=head1 COPYRIGHT AND LICENSE -You may distribute this code under the same terms as Perl itself. +This module is free software L +by the L. You can +redistribute it and/or modify it under the same terms as the +L. =cut