« Return to Thread: r11782 - in mb_server/trunk: . lib lib/MusicBrainz/Server lib/MusicBrainz/Server/Controller lib/MusicBrainz/Server/Data lib/MusicBrainz/Server/Model t
r11782 - in mb_server/trunk: . lib lib/MusicBrainz/Server lib/MusicBrainz/Server/Control
by root-97
::
Rate this Message:
Reply (Restricted by the Administrator) | Reply to Author | View in Thread
Author: luks
Date: 2009-06-27 17:18:32 +0000 (Sat, 27 Jun 2009)
New Revision: 11782
Modified:
mb_server/trunk/HACKING
mb_server/trunk/Makefile.PL
mb_server/trunk/lib/DBDefs.pm.default
mb_server/trunk/lib/MusicBrainz/Server/CacheWrapper.pm
mb_server/trunk/lib/MusicBrainz/Server/Controller/Root.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/Artist.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/ArtistCredit.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/ArtistType.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/CoreEntityCache.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/Country.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/Entity.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/EntityCache.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/EntityCacheBase.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/Gender.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/Label.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/LabelType.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/Language.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/MediumFormat.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/ReleasePackaging.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/ReleaseStatus.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/Script.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/WorkType.pm
mb_server/trunk/lib/MusicBrainz/Server/Model/Feeds.pm
mb_server/trunk/lib/MusicBrainz/Server/Test.pm
mb_server/trunk/t/context.t
mb_server/trunk/t/controller_artist.t
mb_server/trunk/t/controller_label.t
mb_server/trunk/t/controller_recording.t
mb_server/trunk/t/controller_release_group.t
mb_server/trunk/t/controller_search.t
mb_server/trunk/t/controller_tracklist.t
mb_server/trunk/t/controller_work.t
mb_server/trunk/t/data_artist.t
mb_server/trunk/t/data_artistalias.t
mb_server/trunk/t/data_artistcredit.t
mb_server/trunk/t/data_artisttype.t
mb_server/trunk/t/data_coreentitycache.t
mb_server/trunk/t/data_country.t
mb_server/trunk/t/data_editor.t
mb_server/trunk/t/data_entitycache.t
mb_server/trunk/t/data_gender.t
mb_server/trunk/t/data_label.t
mb_server/trunk/t/data_labelalias.t
mb_server/trunk/t/data_labeltype.t
mb_server/trunk/t/data_language.t
mb_server/trunk/t/data_medium.t
mb_server/trunk/t/data_mediumformat.t
mb_server/trunk/t/data_recording.t
mb_server/trunk/t/data_relationship.t
mb_server/trunk/t/data_release.t
mb_server/trunk/t/data_releasegroup.t
mb_server/trunk/t/data_releasegrouptype.t
mb_server/trunk/t/data_releaselabel.t
mb_server/trunk/t/data_releasepackaging.t
mb_server/trunk/t/data_releasestatus.t
mb_server/trunk/t/data_script.t
mb_server/trunk/t/data_track.t
mb_server/trunk/t/data_tracklist.t
mb_server/trunk/t/data_url.t
mb_server/trunk/t/data_utils.t
mb_server/trunk/t/data_work.t
mb_server/trunk/t/data_worktype.t
mb_server/trunk/t/edit_artist_create.t
mb_server/trunk/t/edit_label_create.t
mb_server/trunk/t/entity_wikidoc.t
mb_server/trunk/t/sql_artist.t
mb_server/trunk/t/sql_artistcredit.t
mb_server/trunk/t/sql_tracklist.t
Log:
Add entity caching
Modified: mb_server/trunk/HACKING
===================================================================
--- mb_server/trunk/HACKING 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/HACKING 2009-06-27 17:18:32 UTC (rev 11782)
@@ -14,3 +14,25 @@
$ prove -l t/entity_artist.t
$ prove -l t/entity*.t
+
+Cache
+-----
+
+Keys:
+
+ * at:INT -- artist type by ID
+ * ac:INT -- artist credit by ID
+ * artist:INT -- artist by ID
+ * artist:UUID -- artist ID by MBID (you need to do another lookup by ID)
+ * g:INT -- gender by ID
+ * c:INT -- country by ID
+ * label:INT -- label by ID
+ * label:UUID -- label by MBID (you need to do another lookup by ID)
+ * lng:INT -- language by ID
+ * lt:INT -- label type by ID
+ * mf:INT -- medium format by ID
+ * rgt:INT -- release group type by ID
+ * rs:INT -- release status by ID
+ * rp:INT -- release packaging by ID
+ * scr:INT -- script by ID
+ * wt:INT -- work type by ID
Modified: mb_server/trunk/Makefile.PL
===================================================================
--- mb_server/trunk/Makefile.PL 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/Makefile.PL 2009-06-27 17:18:32 UTC (rev 11782)
@@ -7,7 +7,7 @@
requires 'Algorithm::Diff' => '1.1902';
requires 'Cache' => '2.04';
requires 'Cache::Memcached' => '1.24';
-requires 'Cache::Memcached::libmemcached' => '0.02009';
+requires 'Cache::Memcached::Fast' => '0.15';
requires 'Catalyst::Action::RenderView' => '0.08';
requires 'Catalyst::Component::ACCEPT_CONTEXT' => '0.05';
requires 'Catalyst::Model::Factory';
Modified: mb_server/trunk/lib/DBDefs.pm.default
===================================================================
--- mb_server/trunk/lib/DBDefs.pm.default 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/DBDefs.pm.default 2009-06-27 17:18:32 UTC (rev 11782)
@@ -162,13 +162,13 @@
memory => {
class => 'Cache::Memory',
wrapped => 1,
- keys => [],
+ keys => [qw( at g c lng lt mf rgt rs rp scr wt )],
options => {
default_expires => '1 hour',
},
},
external => {
- class => 'Cache::Memcached::libmemcached',
+ class => 'Cache::Memcached::Fast',
options => {
servers => [ '127.0.0.1:11211' ],
},
Modified: mb_server/trunk/lib/MusicBrainz/Server/CacheWrapper.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/CacheWrapper.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/CacheWrapper.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -2,32 +2,56 @@
use Moose;
use Moose::Util::TypeConstraints;
+use Storable;
has '_orig' => (
is => 'ro',
isa => duck_type(['get', 'set']),
- handles => ['get', 'set']
+ handles => { 'delete' => 'remove' }
);
+sub get
+{
+ my ($self, $key) = @_;
+ my $data = $self->_orig->get($key);
+ return ${Storable::thaw($data)} if defined $data;
+ return undef;
+}
+
sub get_multi
{
my ($self, @keys) = @_;
my %result;
foreach my $key (@keys) {
my $data = $self->_orig->get($key);
- $result{$key} = $data if defined $data;
+ $result{$key} = ${Storable::thaw($data)} if defined $data;
}
return \%result;
}
+sub set
+{
+ my ($self, $key, $data) = @_;
+ $self->_orig->set($key, Storable::freeze(\$data));
+}
+
sub set_multi
{
my ($self, @items) = @_;
foreach my $item (@items) {
- $self->_orig->set($item->[0], $item->[1]);
+ my $data = $item->[1];
+ $self->_orig->set($item->[0], Storable::freeze(\$data));
}
}
+sub delete_multi
+{
+ my ($self, @keys) = @_;
+ foreach my $key (@keys) {
+ $self->_orig->remove($key);
+ }
+}
+
__PACKAGE__->meta->make_immutable;
no Moose;
1;
Modified: mb_server/trunk/lib/MusicBrainz/Server/Controller/Root.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Controller/Root.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Controller/Root.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -47,7 +47,8 @@
# Load the blog for the sidebar
#
- $c->stash->{blog} = $c->model('Feeds')->get_cached('musicbrainz', 'http://blog.musicbrainz.org/?feed=rss2');
+ $c->stash->{blog} = $c->model('Feeds')->get($c, 'musicbrainz',
+ 'http://blog.musicbrainz.org/?feed=rss2');
$c->stash->{template} = 'main/index.tt';
}
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Artist.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Artist.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Artist.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -16,6 +16,7 @@
with 'MusicBrainz::Server::Data::AnnotationRole' => { type => 'artist' };
with 'MusicBrainz::Server::Data::AliasRole' => { type => 'artist' };
with 'MusicBrainz::Server::Data::Role::Name' => { name_table => 'artist_name' };
+with 'MusicBrainz::Server::Data::CoreEntityCache' => { prefix => 'artist' };
with 'MusicBrainz::Server::Data::Editable' => { table => 'artist' };
sub _table
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/ArtistCredit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/ArtistCredit.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/ArtistCredit.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -9,6 +9,7 @@
use MusicBrainz::Server::Data::Utils qw( placeholders load_subobjects );
extends 'MusicBrainz::Server::Data::Entity';
+with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'ac' };
sub get_by_ids
{
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/ArtistType.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/ArtistType.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/ArtistType.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,6 +5,7 @@
use MusicBrainz::Server::Data::Utils qw( load_subobjects );
extends 'MusicBrainz::Server::Data::Entity';
+with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'at' };
sub _table
{
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/CoreEntityCache.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/CoreEntityCache.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/CoreEntityCache.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -1,41 +1,55 @@
package MusicBrainz::Server::Data::CoreEntityCache;
-use Moose::Role;
-with 'MusicBrainz::Server::Data::EntityCacheBase';
+use MooseX::Role::Parameterized;
-sub _add_to_cache
-{
- my ($self, $cache, %data) = @_;
- my @tmp;
- foreach my $id (keys %data) {
- my $obj = $data{$id};
- my $key = $self->_id_cache_prefix . ':' . $id;
- push @tmp, [$key, $obj];
- $key = $self->_id_cache_prefix . ':' . $obj->gid;
- push @tmp, [$key, $obj];
- }
- $cache->set_multi(@tmp);
-}
+parameter 'prefix' => (
+ isa => 'Str',
+ required => 1,
+);
-around 'get_by_gid' => sub
-{
- my ($orig, $self, $gid) = @_;
- my $key = $self->_id_cache_prefix . ':' . $gid;
- my $cache = $self->c->cache($self->_id_cache_prefix);
- my $id = $cache->get($key);
- my $obj;
- if (defined($id)) {
- $obj = $self->get_by_id($id);
- }
- else {
- $obj = $self->$orig($gid);
- if (defined($obj)) {
- $cache->set($key, $obj->id);
- $key = $self->_id_cache_prefix . ':' . $obj->id;
- $cache->set($key, $obj);
+role {
+
+ my $params = shift;
+
+ with 'MusicBrainz::Server::Data::EntityCacheBase';
+
+ method '_id_cache_prefix' => sub { $params->{prefix} };
+
+ method '_add_to_cache' => sub
+ {
+ my ($self, $cache, %data) = @_;
+ my @tmp;
+ foreach my $id (keys %data) {
+ my $obj = $data{$id};
+ my $key = $self->_id_cache_prefix . ':' . $id;
+ push @tmp, [$key, $obj];
+ $key = $self->_id_cache_prefix . ':' . $obj->gid;
+ push @tmp, [$key, $id];
}
- }
- return $obj;
+ $cache->set_multi(@tmp);
+ };
+
+ around 'get_by_gid' => sub
+ {
+ my ($orig, $self, $gid) = @_;
+ my $key = $self->_id_cache_prefix . ':' . $gid;
+ my $cache = $self->c->cache($self->_id_cache_prefix);
+ my $id = $cache->get($key);
+ my $obj;
+ if (defined($id)) {
+ $obj = $self->get_by_id($id);
+ }
+ else {
+ $obj = $self->$orig($gid);
+ if (defined($obj)) {
+ $cache->set($key, $obj->id);
+ $key = $self->_id_cache_prefix . ':' . $obj->id;
+ $cache->set($key, $obj);
+ }
+ }
+ return $obj;
+ };
+
};
1;
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Country.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Country.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Country.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,6 +5,7 @@
use MusicBrainz::Server::Data::Utils qw( load_subobjects );
extends 'MusicBrainz::Server::Data::Entity';
+with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'c' };
sub _table
{
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Entity.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Entity.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Entity.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -4,6 +4,7 @@
use List::MoreUtils qw( uniq );
use MusicBrainz::Server::Data::Utils qw( placeholders );
use UNIVERSAL::require;
+use Carp qw( confess );
has 'c' => (
is => 'rw',
@@ -100,6 +101,10 @@
return $self->_get_by_keys($self->_id_column, uniq(@ids));
}
+sub insert { confess "Not implemented" }
+sub update { confess "Not implemented" }
+sub delete { confess "Not implemented" }
+
__PACKAGE__->meta->make_immutable;
no Moose;
1;
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/EntityCache.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/EntityCache.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/EntityCache.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -1,19 +1,33 @@
package MusicBrainz::Server::Data::EntityCache;
-use Moose::Role;
-with 'MusicBrainz::Server::Data::EntityCacheBase';
+use MooseX::Role::Parameterized;
-sub _add_to_cache
-{
- my ($self, $cache, %data) = @_;
- my @tmp;
- foreach my $id (keys %data) {
- my $key = $self->_id_cache_prefix . ':' . $id;
- push @tmp, [$key, $data{$id}];
- }
- $cache->set_multi(@tmp);
-}
+parameter 'prefix' => (
+ isa => 'Str',
+ required => 1,
+);
+role {
+
+ my $params = shift;
+
+ with 'MusicBrainz::Server::Data::EntityCacheBase';
+
+ method '_id_cache_prefix' => sub { $params->{prefix} };
+
+ method '_add_to_cache' => sub
+ {
+ my ($self, $cache, %data) = @_;
+ my @tmp;
+ foreach my $id (keys %data) {
+ my $key = $self->_id_cache_prefix . ':' . $id;
+ push @tmp, [$key, $data{$id}];
+ }
+ $cache->set_multi(@tmp);
+ };
+
+};
+
1;
=head1 COPYRIGHT
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/EntityCacheBase.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/EntityCacheBase.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/EntityCacheBase.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -1,10 +1,8 @@
package MusicBrainz::Server::Data::EntityCacheBase;
use Moose::Role;
+use List::MoreUtils qw( uniq );
-requires '_id_cache_prefix';
-requires '_add_to_cache';
-
around 'get_by_ids' => sub
{
my ($orig, $self, @ids) = @_;
@@ -29,6 +27,22 @@
return \%result;
};
+after 'update' => sub
+{
+ my ($self, $id) = @_;
+ my $key = $self->_id_cache_prefix . ':' . $id;
+ my $cache = $self->c->cache($self->_id_cache_prefix);
+ $cache->delete($key);
+};
+
+after 'delete' => sub
+{
+ my ($self, @ids) = @_;
+ my @keys = map { $self->_id_cache_prefix . ':' . $_ } uniq(@ids);
+ my $cache = $self->c->cache($self->_id_cache_prefix);
+ $cache->delete_multi(@keys);
+};
+
1;
=head1 COPYRIGHT
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Gender.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Gender.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Gender.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -9,6 +9,7 @@
);
extends 'MusicBrainz::Server::Data::Entity';
+with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'g' };
sub _table
{
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Label.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Label.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Label.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -14,6 +14,7 @@
with 'MusicBrainz::Server::Data::AnnotationRole' => { type => 'label' };
with 'MusicBrainz::Server::Data::AliasRole' => { type => 'label' };
with 'MusicBrainz::Server::Data::Role::Name' => { name_table => 'label_name' };
+with 'MusicBrainz::Server::Data::CoreEntityCache' => { prefix => 'label' };
with 'MusicBrainz::Server::Data::Editable' => { table => 'label' };
sub _table
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/LabelType.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/LabelType.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/LabelType.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,6 +5,7 @@
use MusicBrainz::Server::Data::Utils qw( load_subobjects );
extends 'MusicBrainz::Server::Data::Entity';
+with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'lt' };
sub _table
{
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Language.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Language.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Language.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,6 +6,7 @@
use MusicBrainz::Server::Data::Utils qw( load_subobjects );
extends 'MusicBrainz::Server::Data::Entity';
+with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'lng' };
sub _table
{
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/MediumFormat.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/MediumFormat.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/MediumFormat.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,6 +5,7 @@
use MusicBrainz::Server::Data::Utils qw( load_subobjects );
extends 'MusicBrainz::Server::Data::Entity';
+with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'mf' };
sub _table
{
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/ReleasePackaging.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/ReleasePackaging.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/ReleasePackaging.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,6 +5,7 @@
use MusicBrainz::Server::Data::Utils qw( load_subobjects );
extends 'MusicBrainz::Server::Data::Entity';
+with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'rp' };
sub _table
{
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/ReleaseStatus.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/ReleaseStatus.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/ReleaseStatus.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,6 +5,7 @@
use MusicBrainz::Server::Data::Utils qw( load_subobjects );
extends 'MusicBrainz::Server::Data::Entity';
+with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'rs' };
sub _table
{
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Script.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Script.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Script.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,6 +6,7 @@
use MusicBrainz::Server::Data::Utils qw( load_subobjects );
extends 'MusicBrainz::Server::Data::Entity';
+with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'scr' };
sub _table
{
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/WorkType.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/WorkType.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/WorkType.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,6 +5,7 @@
use MusicBrainz::Server::Data::Utils qw( load_subobjects );
extends 'MusicBrainz::Server::Data::Entity';
+with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'wt' };
sub _table
{
Modified: mb_server/trunk/lib/MusicBrainz/Server/Model/Feeds.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Model/Feeds.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Model/Feeds.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -8,12 +8,12 @@
use LWP::UserAgent;
use Encode qw( encode );
-sub get_cached
+sub get
{
- my ($self, $feed_id, $uri) = @_;
+ my ($self, $c, $feed_id, $uri) = @_;
# Check cache first
- my $feed = MusicBrainz::Server::Cache->get("feed-id-${feed_id}");
+ my $feed = $c->cache("feed")->get("feed:${feed_id}");
if (!$feed)
{
# Loading is a bit complicated, but we have to ensure we fetch the
@@ -42,7 +42,7 @@
$feed = { entries => \@entries };
- MusicBrainz::Server::Cache->set("feed-id-${feed_id}", $feed);
+ $c->cache("feed")->set("feed:${feed_id}", $feed);
}
}
Modified: mb_server/trunk/lib/MusicBrainz/Server/Test.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Test.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Test.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -2,11 +2,27 @@
use DBDefs;
use MusicBrainz;
+use MusicBrainz::Server::CacheManager;
+use MusicBrainz::Server::Context;
use MusicBrainz::Server::Database;
use Sql;
MusicBrainz::Server::Database->profile("test");
+sub create_test_context
+{
+ my $cache_manager = MusicBrainz::Server::CacheManager->new(
+ profiles => {
+ null => {
+ class => 'Cache::Null',
+ wrapped => 1,
+ },
+ },
+ default_profile => 'null',
+ );
+ return MusicBrainz::Server::Context->new(cache_manager => $cache_manager);
+}
+
sub prepare_test_database
{
my ($class, $c) = @_;
Modified: mb_server/trunk/t/context.t
===================================================================
--- mb_server/trunk/t/context.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/context.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -2,17 +2,18 @@
use warnings;
use Test::More tests => 5;
use MusicBrainz::Server::CacheManager;
+use Storable;
use_ok 'MusicBrainz::Server::Context';
{
package TestCache1;
use Moose;
- sub get { '1' }
+ sub get { Storable::freeze(\'1') }
sub set {}
1;
package TestCache2;
use Moose;
- sub get { '2' }
+ sub get { Storable::freeze(\'2') }
sub set {}
1;
}
Modified: mb_server/trunk/t/controller_artist.t
===================================================================
--- mb_server/trunk/t/controller_artist.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/controller_artist.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,7 +5,7 @@
BEGIN {
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
- my $c = MusicBrainz::Server::Context->new();
+ my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
MusicBrainz::Server::Test->prepare_test_server();
}
Modified: mb_server/trunk/t/controller_label.t
===================================================================
--- mb_server/trunk/t/controller_label.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/controller_label.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,7 +5,7 @@
BEGIN {
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
- my $c = MusicBrainz::Server::Context->new();
+ my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
MusicBrainz::Server::Test->prepare_test_server();
}
Modified: mb_server/trunk/t/controller_recording.t
===================================================================
--- mb_server/trunk/t/controller_recording.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/controller_recording.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,7 +5,7 @@
BEGIN {
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
- my $c = MusicBrainz::Server::Context->new();
+ my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
MusicBrainz::Server::Test->prepare_test_server();
}
Modified: mb_server/trunk/t/controller_release_group.t
===================================================================
--- mb_server/trunk/t/controller_release_group.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/controller_release_group.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,7 +5,7 @@
BEGIN {
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
- my $c = MusicBrainz::Server::Context->new();
+ my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
MusicBrainz::Server::Test->prepare_test_server();
}
Modified: mb_server/trunk/t/controller_search.t
===================================================================
--- mb_server/trunk/t/controller_search.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/controller_search.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,7 +5,7 @@
BEGIN {
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
- my $c = MusicBrainz::Server::Context->new();
+ my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
MusicBrainz::Server::Test->prepare_test_server();
}
Modified: mb_server/trunk/t/controller_tracklist.t
===================================================================
--- mb_server/trunk/t/controller_tracklist.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/controller_tracklist.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,7 +5,7 @@
BEGIN {
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
- my $c = MusicBrainz::Server::Context->new();
+ my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
MusicBrainz::Server::Test->prepare_test_server();
}
Modified: mb_server/trunk/t/controller_work.t
===================================================================
--- mb_server/trunk/t/controller_work.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/controller_work.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,7 +5,7 @@
BEGIN {
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
- my $c = MusicBrainz::Server::Context->new();
+ my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
MusicBrainz::Server::Test->prepare_test_server();
use_ok 'Catalyst::Test', 'MusicBrainz::Server';
Modified: mb_server/trunk/t/data_artist.t
===================================================================
--- mb_server/trunk/t/data_artist.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_artist.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -9,7 +9,7 @@
use MusicBrainz::Server::Test;
use Sql;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $sql = Sql->new($c->mb->dbh);
Modified: mb_server/trunk/t/data_artistalias.t
===================================================================
--- mb_server/trunk/t/data_artistalias.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_artistalias.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -9,7 +9,7 @@
use MusicBrainz::Server::Test;
use Sql;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $sql = Sql->new($c->dbh);
Modified: mb_server/trunk/t/data_artistcredit.t
===================================================================
--- mb_server/trunk/t/data_artistcredit.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_artistcredit.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $artist_credit_data = MusicBrainz::Server::Data::ArtistCredit->new(c => $c);
Modified: mb_server/trunk/t/data_artisttype.t
===================================================================
--- mb_server/trunk/t/data_artisttype.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_artisttype.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $at_data = MusicBrainz::Server::Data::ArtistType->new(c => $c);
Modified: mb_server/trunk/t/data_coreentitycache.t
===================================================================
--- mb_server/trunk/t/data_coreentitycache.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_coreentitycache.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -28,8 +28,7 @@
package MyCachedEntityData;
use Moose;
extends 'MyEntityData';
- with 'MusicBrainz::Server::Data::CoreEntityCache';
- sub _id_cache_prefix { 'prefix' }
+ with 'MusicBrainz::Server::Data::CoreEntityCache' => { prefix => 'prefix' };
package MockCache;
use Moose;
@@ -75,8 +74,8 @@
is ( $entity_data->get_by_id_called, 0 );
is ( $c->cache->_orig->get_called, 1 );
is ( $c->cache->_orig->set_called, 2 );
-is ( $c->cache->_orig->data->{'prefix:1'}->id, 1 );
-is ( $c->cache->_orig->data->{'prefix:abc'}, '1' );
+ok ( $c->cache->_orig->data->{'prefix:1'} =~ '1' );
+ok ( $c->cache->_orig->data->{'prefix:abc'} =~ '1' );
$entity_data->get_by_gid_called(0);
$entity_data->get_by_id_called(0);
Modified: mb_server/trunk/t/data_country.t
===================================================================
--- mb_server/trunk/t/data_country.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_country.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $country_data = MusicBrainz::Server::Data::Country->new(c => $c);
Modified: mb_server/trunk/t/data_editor.t
===================================================================
--- mb_server/trunk/t/data_editor.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_editor.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -8,7 +8,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $editor_data = MusicBrainz::Server::Data::Editor->new(c => $c);
Modified: mb_server/trunk/t/data_entitycache.t
===================================================================
--- mb_server/trunk/t/data_entitycache.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_entitycache.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -16,9 +16,8 @@
package MyCachedEntityData;
use Moose;
extends 'MyEntityData';
- with 'MusicBrainz::Server::Data::EntityCache';
+ with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'prefix' };
has 'get_called' => ( is => 'rw', isa => 'Bool', default => 0 );
- sub _id_cache_prefix { 'prefix' }
package MockCache;
use Moose;
@@ -63,7 +62,7 @@
is ( $entity_data->get_called, 1 );
is ( $c->cache->_orig->get_called, 1 );
is ( $c->cache->_orig->set_called, 1 );
-is ( $c->cache->_orig->data->{'prefix:1'}, 'data' );
+ok ( $c->cache->_orig->data->{'prefix:1'} =~ 'data' );
$entity_data->get_called(0);
$c->cache->_orig->get_called(0);
@@ -81,4 +80,4 @@
is ( $entity_data->get_called, 1 );
is ( $c->cache->_orig->get_called, 1 );
is ( $c->cache->_orig->set_called, 1 );
-is ( $c->cache->_orig->data->{'prefix:1'}, 'data' );
+ok ( $c->cache->_orig->data->{'prefix:1'} =~ 'data' );
Modified: mb_server/trunk/t/data_gender.t
===================================================================
--- mb_server/trunk/t/data_gender.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_gender.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -7,7 +7,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $gender_data = MusicBrainz::Server::Data::Gender->new(c => $c);
Modified: mb_server/trunk/t/data_label.t
===================================================================
--- mb_server/trunk/t/data_label.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_label.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -8,7 +8,7 @@
use MusicBrainz::Server::Test;
use Sql;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $label_data = MusicBrainz::Server::Data::Label->new(c => $c);
Modified: mb_server/trunk/t/data_labelalias.t
===================================================================
--- mb_server/trunk/t/data_labelalias.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_labelalias.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -8,7 +8,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $label_data = MusicBrainz::Server::Data::Label->new(c => $c);
Modified: mb_server/trunk/t/data_labeltype.t
===================================================================
--- mb_server/trunk/t/data_labeltype.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_labeltype.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $lt_data = MusicBrainz::Server::Data::LabelType->new(c => $c);
Modified: mb_server/trunk/t/data_language.t
===================================================================
--- mb_server/trunk/t/data_language.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_language.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $language_data = MusicBrainz::Server::Data::Language->new(c => $c);
Modified: mb_server/trunk/t/data_medium.t
===================================================================
--- mb_server/trunk/t/data_medium.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_medium.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $medium_data = MusicBrainz::Server::Data::Medium->new(c => $c);
Modified: mb_server/trunk/t/data_mediumformat.t
===================================================================
--- mb_server/trunk/t/data_mediumformat.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_mediumformat.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $mf_data = MusicBrainz::Server::Data::MediumFormat->new(c => $c);
Modified: mb_server/trunk/t/data_recording.t
===================================================================
--- mb_server/trunk/t/data_recording.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_recording.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -7,7 +7,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $rec_data = MusicBrainz::Server::Data::Recording->new(c => $c);
Modified: mb_server/trunk/t/data_relationship.t
===================================================================
--- mb_server/trunk/t/data_relationship.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_relationship.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -7,7 +7,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $rel_data = MusicBrainz::Server::Data::Relationship->new(c => $c);
Modified: mb_server/trunk/t/data_release.t
===================================================================
--- mb_server/trunk/t/data_release.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_release.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -8,7 +8,7 @@
use MusicBrainz::Server::Test;
use Sql;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $release_data = MusicBrainz::Server::Data::Release->new(c => $c);
Modified: mb_server/trunk/t/data_releasegroup.t
===================================================================
--- mb_server/trunk/t/data_releasegroup.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_releasegroup.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -9,7 +9,7 @@
use MusicBrainz::Server::Test;
use Sql;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $rg_data = MusicBrainz::Server::Data::ReleaseGroup->new(c => $c);
Modified: mb_server/trunk/t/data_releasegrouptype.t
===================================================================
--- mb_server/trunk/t/data_releasegrouptype.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_releasegrouptype.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $rgt_data = MusicBrainz::Server::Data::ReleaseGroupType->new(c => $c);
Modified: mb_server/trunk/t/data_releaselabel.t
===================================================================
--- mb_server/trunk/t/data_releaselabel.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_releaselabel.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $rl_data = MusicBrainz::Server::Data::ReleaseLabel->new(c => $c);
Modified: mb_server/trunk/t/data_releasepackaging.t
===================================================================
--- mb_server/trunk/t/data_releasepackaging.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_releasepackaging.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $lt_data = MusicBrainz::Server::Data::ReleasePackaging->new(c => $c);
Modified: mb_server/trunk/t/data_releasestatus.t
===================================================================
--- mb_server/trunk/t/data_releasestatus.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_releasestatus.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $lt_data = MusicBrainz::Server::Data::ReleaseStatus->new(c => $c);
Modified: mb_server/trunk/t/data_script.t
===================================================================
--- mb_server/trunk/t/data_script.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_script.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $script_data = MusicBrainz::Server::Data::Script->new(c => $c);
Modified: mb_server/trunk/t/data_track.t
===================================================================
--- mb_server/trunk/t/data_track.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_track.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $track_data = MusicBrainz::Server::Data::Track->new(c => $c);
Modified: mb_server/trunk/t/data_tracklist.t
===================================================================
--- mb_server/trunk/t/data_tracklist.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_tracklist.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -7,7 +7,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $tracklist_data = MusicBrainz::Server::Data::Tracklist->new(c => $c);
Modified: mb_server/trunk/t/data_url.t
===================================================================
--- mb_server/trunk/t/data_url.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_url.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $url_data = MusicBrainz::Server::Data::URL->new(c => $c);
Modified: mb_server/trunk/t/data_utils.t
===================================================================
--- mb_server/trunk/t/data_utils.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_utils.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $date = MusicBrainz::Server::Data::Utils::partial_date_from_row(
Modified: mb_server/trunk/t/data_work.t
===================================================================
--- mb_server/trunk/t/data_work.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_work.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -8,7 +8,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $work_data = MusicBrainz::Server::Data::Work->new(c => $c);
Modified: mb_server/trunk/t/data_worktype.t
===================================================================
--- mb_server/trunk/t/data_worktype.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_worktype.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $wt_data = MusicBrainz::Server::Data::WorkType->new(c => $c);
Modified: mb_server/trunk/t/edit_artist_create.t
===================================================================
--- mb_server/trunk/t/edit_artist_create.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/edit_artist_create.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -14,7 +14,7 @@
use MusicBrainz::Server::Test;
use Sql;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $artist_data = MusicBrainz::Server::Data::Artist->new(c => $c);
Modified: mb_server/trunk/t/edit_label_create.t
===================================================================
--- mb_server/trunk/t/edit_label_create.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/edit_label_create.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -15,7 +15,7 @@
use Sql;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $edit_data = MusicBrainz::Server::Data::Edit->new(c => $c);
Modified: mb_server/trunk/t/entity_wikidoc.t
===================================================================
--- mb_server/trunk/t/entity_wikidoc.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/entity_wikidoc.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -3,9 +3,9 @@
use Test::More tests => 7;
use_ok 'MusicBrainz::Server::Entity::WikiDoc';
-use MusicBrainz::Server::Context;
+use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
my $wikidoc = MusicBrainz::Server::Entity::WikiDoc->new(result => 1,
status => 'Index not available',
Modified: mb_server/trunk/t/sql_artist.t
===================================================================
--- mb_server/trunk/t/sql_artist.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/sql_artist.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Test;
use Sql;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $sql = Sql->new($c->mb->{dbh});
Modified: mb_server/trunk/t/sql_artistcredit.t
===================================================================
--- mb_server/trunk/t/sql_artistcredit.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/sql_artistcredit.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Test;
use Sql;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $sql = Sql->new($c->mb->{dbh});
Modified: mb_server/trunk/t/sql_tracklist.t
===================================================================
--- mb_server/trunk/t/sql_tracklist.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/sql_tracklist.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Test;
use Sql;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $sql = Sql->new($c->mb->{dbh});
_______________________________________________
MusicBrainz-commits mailing list
MusicBrainz-commits@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits
Date: 2009-06-27 17:18:32 +0000 (Sat, 27 Jun 2009)
New Revision: 11782
Modified:
mb_server/trunk/HACKING
mb_server/trunk/Makefile.PL
mb_server/trunk/lib/DBDefs.pm.default
mb_server/trunk/lib/MusicBrainz/Server/CacheWrapper.pm
mb_server/trunk/lib/MusicBrainz/Server/Controller/Root.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/Artist.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/ArtistCredit.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/ArtistType.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/CoreEntityCache.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/Country.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/Entity.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/EntityCache.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/EntityCacheBase.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/Gender.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/Label.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/LabelType.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/Language.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/MediumFormat.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/ReleasePackaging.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/ReleaseStatus.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/Script.pm
mb_server/trunk/lib/MusicBrainz/Server/Data/WorkType.pm
mb_server/trunk/lib/MusicBrainz/Server/Model/Feeds.pm
mb_server/trunk/lib/MusicBrainz/Server/Test.pm
mb_server/trunk/t/context.t
mb_server/trunk/t/controller_artist.t
mb_server/trunk/t/controller_label.t
mb_server/trunk/t/controller_recording.t
mb_server/trunk/t/controller_release_group.t
mb_server/trunk/t/controller_search.t
mb_server/trunk/t/controller_tracklist.t
mb_server/trunk/t/controller_work.t
mb_server/trunk/t/data_artist.t
mb_server/trunk/t/data_artistalias.t
mb_server/trunk/t/data_artistcredit.t
mb_server/trunk/t/data_artisttype.t
mb_server/trunk/t/data_coreentitycache.t
mb_server/trunk/t/data_country.t
mb_server/trunk/t/data_editor.t
mb_server/trunk/t/data_entitycache.t
mb_server/trunk/t/data_gender.t
mb_server/trunk/t/data_label.t
mb_server/trunk/t/data_labelalias.t
mb_server/trunk/t/data_labeltype.t
mb_server/trunk/t/data_language.t
mb_server/trunk/t/data_medium.t
mb_server/trunk/t/data_mediumformat.t
mb_server/trunk/t/data_recording.t
mb_server/trunk/t/data_relationship.t
mb_server/trunk/t/data_release.t
mb_server/trunk/t/data_releasegroup.t
mb_server/trunk/t/data_releasegrouptype.t
mb_server/trunk/t/data_releaselabel.t
mb_server/trunk/t/data_releasepackaging.t
mb_server/trunk/t/data_releasestatus.t
mb_server/trunk/t/data_script.t
mb_server/trunk/t/data_track.t
mb_server/trunk/t/data_tracklist.t
mb_server/trunk/t/data_url.t
mb_server/trunk/t/data_utils.t
mb_server/trunk/t/data_work.t
mb_server/trunk/t/data_worktype.t
mb_server/trunk/t/edit_artist_create.t
mb_server/trunk/t/edit_label_create.t
mb_server/trunk/t/entity_wikidoc.t
mb_server/trunk/t/sql_artist.t
mb_server/trunk/t/sql_artistcredit.t
mb_server/trunk/t/sql_tracklist.t
Log:
Add entity caching
Modified: mb_server/trunk/HACKING
===================================================================
--- mb_server/trunk/HACKING 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/HACKING 2009-06-27 17:18:32 UTC (rev 11782)
@@ -14,3 +14,25 @@
$ prove -l t/entity_artist.t
$ prove -l t/entity*.t
+
+Cache
+-----
+
+Keys:
+
+ * at:INT -- artist type by ID
+ * ac:INT -- artist credit by ID
+ * artist:INT -- artist by ID
+ * artist:UUID -- artist ID by MBID (you need to do another lookup by ID)
+ * g:INT -- gender by ID
+ * c:INT -- country by ID
+ * label:INT -- label by ID
+ * label:UUID -- label by MBID (you need to do another lookup by ID)
+ * lng:INT -- language by ID
+ * lt:INT -- label type by ID
+ * mf:INT -- medium format by ID
+ * rgt:INT -- release group type by ID
+ * rs:INT -- release status by ID
+ * rp:INT -- release packaging by ID
+ * scr:INT -- script by ID
+ * wt:INT -- work type by ID
Modified: mb_server/trunk/Makefile.PL
===================================================================
--- mb_server/trunk/Makefile.PL 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/Makefile.PL 2009-06-27 17:18:32 UTC (rev 11782)
@@ -7,7 +7,7 @@
requires 'Algorithm::Diff' => '1.1902';
requires 'Cache' => '2.04';
requires 'Cache::Memcached' => '1.24';
-requires 'Cache::Memcached::libmemcached' => '0.02009';
+requires 'Cache::Memcached::Fast' => '0.15';
requires 'Catalyst::Action::RenderView' => '0.08';
requires 'Catalyst::Component::ACCEPT_CONTEXT' => '0.05';
requires 'Catalyst::Model::Factory';
Modified: mb_server/trunk/lib/DBDefs.pm.default
===================================================================
--- mb_server/trunk/lib/DBDefs.pm.default 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/DBDefs.pm.default 2009-06-27 17:18:32 UTC (rev 11782)
@@ -162,13 +162,13 @@
memory => {
class => 'Cache::Memory',
wrapped => 1,
- keys => [],
+ keys => [qw( at g c lng lt mf rgt rs rp scr wt )],
options => {
default_expires => '1 hour',
},
},
external => {
- class => 'Cache::Memcached::libmemcached',
+ class => 'Cache::Memcached::Fast',
options => {
servers => [ '127.0.0.1:11211' ],
},
Modified: mb_server/trunk/lib/MusicBrainz/Server/CacheWrapper.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/CacheWrapper.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/CacheWrapper.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -2,32 +2,56 @@
use Moose;
use Moose::Util::TypeConstraints;
+use Storable;
has '_orig' => (
is => 'ro',
isa => duck_type(['get', 'set']),
- handles => ['get', 'set']
+ handles => { 'delete' => 'remove' }
);
+sub get
+{
+ my ($self, $key) = @_;
+ my $data = $self->_orig->get($key);
+ return ${Storable::thaw($data)} if defined $data;
+ return undef;
+}
+
sub get_multi
{
my ($self, @keys) = @_;
my %result;
foreach my $key (@keys) {
my $data = $self->_orig->get($key);
- $result{$key} = $data if defined $data;
+ $result{$key} = ${Storable::thaw($data)} if defined $data;
}
return \%result;
}
+sub set
+{
+ my ($self, $key, $data) = @_;
+ $self->_orig->set($key, Storable::freeze(\$data));
+}
+
sub set_multi
{
my ($self, @items) = @_;
foreach my $item (@items) {
- $self->_orig->set($item->[0], $item->[1]);
+ my $data = $item->[1];
+ $self->_orig->set($item->[0], Storable::freeze(\$data));
}
}
+sub delete_multi
+{
+ my ($self, @keys) = @_;
+ foreach my $key (@keys) {
+ $self->_orig->remove($key);
+ }
+}
+
__PACKAGE__->meta->make_immutable;
no Moose;
1;
Modified: mb_server/trunk/lib/MusicBrainz/Server/Controller/Root.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Controller/Root.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Controller/Root.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -47,7 +47,8 @@
# Load the blog for the sidebar
#
- $c->stash->{blog} = $c->model('Feeds')->get_cached('musicbrainz', 'http://blog.musicbrainz.org/?feed=rss2');
+ $c->stash->{blog} = $c->model('Feeds')->get($c, 'musicbrainz',
+ 'http://blog.musicbrainz.org/?feed=rss2');
$c->stash->{template} = 'main/index.tt';
}
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Artist.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Artist.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Artist.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -16,6 +16,7 @@
with 'MusicBrainz::Server::Data::AnnotationRole' => { type => 'artist' };
with 'MusicBrainz::Server::Data::AliasRole' => { type => 'artist' };
with 'MusicBrainz::Server::Data::Role::Name' => { name_table => 'artist_name' };
+with 'MusicBrainz::Server::Data::CoreEntityCache' => { prefix => 'artist' };
with 'MusicBrainz::Server::Data::Editable' => { table => 'artist' };
sub _table
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/ArtistCredit.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/ArtistCredit.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/ArtistCredit.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -9,6 +9,7 @@
use MusicBrainz::Server::Data::Utils qw( placeholders load_subobjects );
extends 'MusicBrainz::Server::Data::Entity';
+with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'ac' };
sub get_by_ids
{
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/ArtistType.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/ArtistType.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/ArtistType.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,6 +5,7 @@
use MusicBrainz::Server::Data::Utils qw( load_subobjects );
extends 'MusicBrainz::Server::Data::Entity';
+with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'at' };
sub _table
{
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/CoreEntityCache.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/CoreEntityCache.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/CoreEntityCache.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -1,41 +1,55 @@
package MusicBrainz::Server::Data::CoreEntityCache;
-use Moose::Role;
-with 'MusicBrainz::Server::Data::EntityCacheBase';
+use MooseX::Role::Parameterized;
-sub _add_to_cache
-{
- my ($self, $cache, %data) = @_;
- my @tmp;
- foreach my $id (keys %data) {
- my $obj = $data{$id};
- my $key = $self->_id_cache_prefix . ':' . $id;
- push @tmp, [$key, $obj];
- $key = $self->_id_cache_prefix . ':' . $obj->gid;
- push @tmp, [$key, $obj];
- }
- $cache->set_multi(@tmp);
-}
+parameter 'prefix' => (
+ isa => 'Str',
+ required => 1,
+);
-around 'get_by_gid' => sub
-{
- my ($orig, $self, $gid) = @_;
- my $key = $self->_id_cache_prefix . ':' . $gid;
- my $cache = $self->c->cache($self->_id_cache_prefix);
- my $id = $cache->get($key);
- my $obj;
- if (defined($id)) {
- $obj = $self->get_by_id($id);
- }
- else {
- $obj = $self->$orig($gid);
- if (defined($obj)) {
- $cache->set($key, $obj->id);
- $key = $self->_id_cache_prefix . ':' . $obj->id;
- $cache->set($key, $obj);
+role {
+
+ my $params = shift;
+
+ with 'MusicBrainz::Server::Data::EntityCacheBase';
+
+ method '_id_cache_prefix' => sub { $params->{prefix} };
+
+ method '_add_to_cache' => sub
+ {
+ my ($self, $cache, %data) = @_;
+ my @tmp;
+ foreach my $id (keys %data) {
+ my $obj = $data{$id};
+ my $key = $self->_id_cache_prefix . ':' . $id;
+ push @tmp, [$key, $obj];
+ $key = $self->_id_cache_prefix . ':' . $obj->gid;
+ push @tmp, [$key, $id];
}
- }
- return $obj;
+ $cache->set_multi(@tmp);
+ };
+
+ around 'get_by_gid' => sub
+ {
+ my ($orig, $self, $gid) = @_;
+ my $key = $self->_id_cache_prefix . ':' . $gid;
+ my $cache = $self->c->cache($self->_id_cache_prefix);
+ my $id = $cache->get($key);
+ my $obj;
+ if (defined($id)) {
+ $obj = $self->get_by_id($id);
+ }
+ else {
+ $obj = $self->$orig($gid);
+ if (defined($obj)) {
+ $cache->set($key, $obj->id);
+ $key = $self->_id_cache_prefix . ':' . $obj->id;
+ $cache->set($key, $obj);
+ }
+ }
+ return $obj;
+ };
+
};
1;
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Country.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Country.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Country.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,6 +5,7 @@
use MusicBrainz::Server::Data::Utils qw( load_subobjects );
extends 'MusicBrainz::Server::Data::Entity';
+with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'c' };
sub _table
{
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Entity.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Entity.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Entity.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -4,6 +4,7 @@
use List::MoreUtils qw( uniq );
use MusicBrainz::Server::Data::Utils qw( placeholders );
use UNIVERSAL::require;
+use Carp qw( confess );
has 'c' => (
is => 'rw',
@@ -100,6 +101,10 @@
return $self->_get_by_keys($self->_id_column, uniq(@ids));
}
+sub insert { confess "Not implemented" }
+sub update { confess "Not implemented" }
+sub delete { confess "Not implemented" }
+
__PACKAGE__->meta->make_immutable;
no Moose;
1;
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/EntityCache.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/EntityCache.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/EntityCache.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -1,19 +1,33 @@
package MusicBrainz::Server::Data::EntityCache;
-use Moose::Role;
-with 'MusicBrainz::Server::Data::EntityCacheBase';
+use MooseX::Role::Parameterized;
-sub _add_to_cache
-{
- my ($self, $cache, %data) = @_;
- my @tmp;
- foreach my $id (keys %data) {
- my $key = $self->_id_cache_prefix . ':' . $id;
- push @tmp, [$key, $data{$id}];
- }
- $cache->set_multi(@tmp);
-}
+parameter 'prefix' => (
+ isa => 'Str',
+ required => 1,
+);
+role {
+
+ my $params = shift;
+
+ with 'MusicBrainz::Server::Data::EntityCacheBase';
+
+ method '_id_cache_prefix' => sub { $params->{prefix} };
+
+ method '_add_to_cache' => sub
+ {
+ my ($self, $cache, %data) = @_;
+ my @tmp;
+ foreach my $id (keys %data) {
+ my $key = $self->_id_cache_prefix . ':' . $id;
+ push @tmp, [$key, $data{$id}];
+ }
+ $cache->set_multi(@tmp);
+ };
+
+};
+
1;
=head1 COPYRIGHT
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/EntityCacheBase.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/EntityCacheBase.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/EntityCacheBase.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -1,10 +1,8 @@
package MusicBrainz::Server::Data::EntityCacheBase;
use Moose::Role;
+use List::MoreUtils qw( uniq );
-requires '_id_cache_prefix';
-requires '_add_to_cache';
-
around 'get_by_ids' => sub
{
my ($orig, $self, @ids) = @_;
@@ -29,6 +27,22 @@
return \%result;
};
+after 'update' => sub
+{
+ my ($self, $id) = @_;
+ my $key = $self->_id_cache_prefix . ':' . $id;
+ my $cache = $self->c->cache($self->_id_cache_prefix);
+ $cache->delete($key);
+};
+
+after 'delete' => sub
+{
+ my ($self, @ids) = @_;
+ my @keys = map { $self->_id_cache_prefix . ':' . $_ } uniq(@ids);
+ my $cache = $self->c->cache($self->_id_cache_prefix);
+ $cache->delete_multi(@keys);
+};
+
1;
=head1 COPYRIGHT
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Gender.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Gender.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Gender.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -9,6 +9,7 @@
);
extends 'MusicBrainz::Server::Data::Entity';
+with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'g' };
sub _table
{
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Label.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Label.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Label.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -14,6 +14,7 @@
with 'MusicBrainz::Server::Data::AnnotationRole' => { type => 'label' };
with 'MusicBrainz::Server::Data::AliasRole' => { type => 'label' };
with 'MusicBrainz::Server::Data::Role::Name' => { name_table => 'label_name' };
+with 'MusicBrainz::Server::Data::CoreEntityCache' => { prefix => 'label' };
with 'MusicBrainz::Server::Data::Editable' => { table => 'label' };
sub _table
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/LabelType.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/LabelType.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/LabelType.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,6 +5,7 @@
use MusicBrainz::Server::Data::Utils qw( load_subobjects );
extends 'MusicBrainz::Server::Data::Entity';
+with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'lt' };
sub _table
{
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Language.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Language.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Language.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,6 +6,7 @@
use MusicBrainz::Server::Data::Utils qw( load_subobjects );
extends 'MusicBrainz::Server::Data::Entity';
+with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'lng' };
sub _table
{
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/MediumFormat.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/MediumFormat.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/MediumFormat.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,6 +5,7 @@
use MusicBrainz::Server::Data::Utils qw( load_subobjects );
extends 'MusicBrainz::Server::Data::Entity';
+with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'mf' };
sub _table
{
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/ReleasePackaging.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/ReleasePackaging.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/ReleasePackaging.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,6 +5,7 @@
use MusicBrainz::Server::Data::Utils qw( load_subobjects );
extends 'MusicBrainz::Server::Data::Entity';
+with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'rp' };
sub _table
{
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/ReleaseStatus.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/ReleaseStatus.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/ReleaseStatus.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,6 +5,7 @@
use MusicBrainz::Server::Data::Utils qw( load_subobjects );
extends 'MusicBrainz::Server::Data::Entity';
+with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'rs' };
sub _table
{
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/Script.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/Script.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/Script.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,6 +6,7 @@
use MusicBrainz::Server::Data::Utils qw( load_subobjects );
extends 'MusicBrainz::Server::Data::Entity';
+with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'scr' };
sub _table
{
Modified: mb_server/trunk/lib/MusicBrainz/Server/Data/WorkType.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Data/WorkType.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Data/WorkType.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,6 +5,7 @@
use MusicBrainz::Server::Data::Utils qw( load_subobjects );
extends 'MusicBrainz::Server::Data::Entity';
+with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'wt' };
sub _table
{
Modified: mb_server/trunk/lib/MusicBrainz/Server/Model/Feeds.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Model/Feeds.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Model/Feeds.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -8,12 +8,12 @@
use LWP::UserAgent;
use Encode qw( encode );
-sub get_cached
+sub get
{
- my ($self, $feed_id, $uri) = @_;
+ my ($self, $c, $feed_id, $uri) = @_;
# Check cache first
- my $feed = MusicBrainz::Server::Cache->get("feed-id-${feed_id}");
+ my $feed = $c->cache("feed")->get("feed:${feed_id}");
if (!$feed)
{
# Loading is a bit complicated, but we have to ensure we fetch the
@@ -42,7 +42,7 @@
$feed = { entries => \@entries };
- MusicBrainz::Server::Cache->set("feed-id-${feed_id}", $feed);
+ $c->cache("feed")->set("feed:${feed_id}", $feed);
}
}
Modified: mb_server/trunk/lib/MusicBrainz/Server/Test.pm
===================================================================
--- mb_server/trunk/lib/MusicBrainz/Server/Test.pm 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/lib/MusicBrainz/Server/Test.pm 2009-06-27 17:18:32 UTC (rev 11782)
@@ -2,11 +2,27 @@
use DBDefs;
use MusicBrainz;
+use MusicBrainz::Server::CacheManager;
+use MusicBrainz::Server::Context;
use MusicBrainz::Server::Database;
use Sql;
MusicBrainz::Server::Database->profile("test");
+sub create_test_context
+{
+ my $cache_manager = MusicBrainz::Server::CacheManager->new(
+ profiles => {
+ null => {
+ class => 'Cache::Null',
+ wrapped => 1,
+ },
+ },
+ default_profile => 'null',
+ );
+ return MusicBrainz::Server::Context->new(cache_manager => $cache_manager);
+}
+
sub prepare_test_database
{
my ($class, $c) = @_;
Modified: mb_server/trunk/t/context.t
===================================================================
--- mb_server/trunk/t/context.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/context.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -2,17 +2,18 @@
use warnings;
use Test::More tests => 5;
use MusicBrainz::Server::CacheManager;
+use Storable;
use_ok 'MusicBrainz::Server::Context';
{
package TestCache1;
use Moose;
- sub get { '1' }
+ sub get { Storable::freeze(\'1') }
sub set {}
1;
package TestCache2;
use Moose;
- sub get { '2' }
+ sub get { Storable::freeze(\'2') }
sub set {}
1;
}
Modified: mb_server/trunk/t/controller_artist.t
===================================================================
--- mb_server/trunk/t/controller_artist.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/controller_artist.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,7 +5,7 @@
BEGIN {
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
- my $c = MusicBrainz::Server::Context->new();
+ my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
MusicBrainz::Server::Test->prepare_test_server();
}
Modified: mb_server/trunk/t/controller_label.t
===================================================================
--- mb_server/trunk/t/controller_label.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/controller_label.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,7 +5,7 @@
BEGIN {
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
- my $c = MusicBrainz::Server::Context->new();
+ my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
MusicBrainz::Server::Test->prepare_test_server();
}
Modified: mb_server/trunk/t/controller_recording.t
===================================================================
--- mb_server/trunk/t/controller_recording.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/controller_recording.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,7 +5,7 @@
BEGIN {
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
- my $c = MusicBrainz::Server::Context->new();
+ my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
MusicBrainz::Server::Test->prepare_test_server();
}
Modified: mb_server/trunk/t/controller_release_group.t
===================================================================
--- mb_server/trunk/t/controller_release_group.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/controller_release_group.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,7 +5,7 @@
BEGIN {
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
- my $c = MusicBrainz::Server::Context->new();
+ my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
MusicBrainz::Server::Test->prepare_test_server();
}
Modified: mb_server/trunk/t/controller_search.t
===================================================================
--- mb_server/trunk/t/controller_search.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/controller_search.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,7 +5,7 @@
BEGIN {
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
- my $c = MusicBrainz::Server::Context->new();
+ my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
MusicBrainz::Server::Test->prepare_test_server();
}
Modified: mb_server/trunk/t/controller_tracklist.t
===================================================================
--- mb_server/trunk/t/controller_tracklist.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/controller_tracklist.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,7 +5,7 @@
BEGIN {
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
- my $c = MusicBrainz::Server::Context->new();
+ my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
MusicBrainz::Server::Test->prepare_test_server();
}
Modified: mb_server/trunk/t/controller_work.t
===================================================================
--- mb_server/trunk/t/controller_work.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/controller_work.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -5,7 +5,7 @@
BEGIN {
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
- my $c = MusicBrainz::Server::Context->new();
+ my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
MusicBrainz::Server::Test->prepare_test_server();
use_ok 'Catalyst::Test', 'MusicBrainz::Server';
Modified: mb_server/trunk/t/data_artist.t
===================================================================
--- mb_server/trunk/t/data_artist.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_artist.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -9,7 +9,7 @@
use MusicBrainz::Server::Test;
use Sql;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $sql = Sql->new($c->mb->dbh);
Modified: mb_server/trunk/t/data_artistalias.t
===================================================================
--- mb_server/trunk/t/data_artistalias.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_artistalias.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -9,7 +9,7 @@
use MusicBrainz::Server::Test;
use Sql;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $sql = Sql->new($c->dbh);
Modified: mb_server/trunk/t/data_artistcredit.t
===================================================================
--- mb_server/trunk/t/data_artistcredit.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_artistcredit.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $artist_credit_data = MusicBrainz::Server::Data::ArtistCredit->new(c => $c);
Modified: mb_server/trunk/t/data_artisttype.t
===================================================================
--- mb_server/trunk/t/data_artisttype.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_artisttype.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $at_data = MusicBrainz::Server::Data::ArtistType->new(c => $c);
Modified: mb_server/trunk/t/data_coreentitycache.t
===================================================================
--- mb_server/trunk/t/data_coreentitycache.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_coreentitycache.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -28,8 +28,7 @@
package MyCachedEntityData;
use Moose;
extends 'MyEntityData';
- with 'MusicBrainz::Server::Data::CoreEntityCache';
- sub _id_cache_prefix { 'prefix' }
+ with 'MusicBrainz::Server::Data::CoreEntityCache' => { prefix => 'prefix' };
package MockCache;
use Moose;
@@ -75,8 +74,8 @@
is ( $entity_data->get_by_id_called, 0 );
is ( $c->cache->_orig->get_called, 1 );
is ( $c->cache->_orig->set_called, 2 );
-is ( $c->cache->_orig->data->{'prefix:1'}->id, 1 );
-is ( $c->cache->_orig->data->{'prefix:abc'}, '1' );
+ok ( $c->cache->_orig->data->{'prefix:1'} =~ '1' );
+ok ( $c->cache->_orig->data->{'prefix:abc'} =~ '1' );
$entity_data->get_by_gid_called(0);
$entity_data->get_by_id_called(0);
Modified: mb_server/trunk/t/data_country.t
===================================================================
--- mb_server/trunk/t/data_country.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_country.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $country_data = MusicBrainz::Server::Data::Country->new(c => $c);
Modified: mb_server/trunk/t/data_editor.t
===================================================================
--- mb_server/trunk/t/data_editor.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_editor.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -8,7 +8,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $editor_data = MusicBrainz::Server::Data::Editor->new(c => $c);
Modified: mb_server/trunk/t/data_entitycache.t
===================================================================
--- mb_server/trunk/t/data_entitycache.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_entitycache.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -16,9 +16,8 @@
package MyCachedEntityData;
use Moose;
extends 'MyEntityData';
- with 'MusicBrainz::Server::Data::EntityCache';
+ with 'MusicBrainz::Server::Data::EntityCache' => { prefix => 'prefix' };
has 'get_called' => ( is => 'rw', isa => 'Bool', default => 0 );
- sub _id_cache_prefix { 'prefix' }
package MockCache;
use Moose;
@@ -63,7 +62,7 @@
is ( $entity_data->get_called, 1 );
is ( $c->cache->_orig->get_called, 1 );
is ( $c->cache->_orig->set_called, 1 );
-is ( $c->cache->_orig->data->{'prefix:1'}, 'data' );
+ok ( $c->cache->_orig->data->{'prefix:1'} =~ 'data' );
$entity_data->get_called(0);
$c->cache->_orig->get_called(0);
@@ -81,4 +80,4 @@
is ( $entity_data->get_called, 1 );
is ( $c->cache->_orig->get_called, 1 );
is ( $c->cache->_orig->set_called, 1 );
-is ( $c->cache->_orig->data->{'prefix:1'}, 'data' );
+ok ( $c->cache->_orig->data->{'prefix:1'} =~ 'data' );
Modified: mb_server/trunk/t/data_gender.t
===================================================================
--- mb_server/trunk/t/data_gender.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_gender.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -7,7 +7,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $gender_data = MusicBrainz::Server::Data::Gender->new(c => $c);
Modified: mb_server/trunk/t/data_label.t
===================================================================
--- mb_server/trunk/t/data_label.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_label.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -8,7 +8,7 @@
use MusicBrainz::Server::Test;
use Sql;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $label_data = MusicBrainz::Server::Data::Label->new(c => $c);
Modified: mb_server/trunk/t/data_labelalias.t
===================================================================
--- mb_server/trunk/t/data_labelalias.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_labelalias.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -8,7 +8,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $label_data = MusicBrainz::Server::Data::Label->new(c => $c);
Modified: mb_server/trunk/t/data_labeltype.t
===================================================================
--- mb_server/trunk/t/data_labeltype.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_labeltype.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $lt_data = MusicBrainz::Server::Data::LabelType->new(c => $c);
Modified: mb_server/trunk/t/data_language.t
===================================================================
--- mb_server/trunk/t/data_language.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_language.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $language_data = MusicBrainz::Server::Data::Language->new(c => $c);
Modified: mb_server/trunk/t/data_medium.t
===================================================================
--- mb_server/trunk/t/data_medium.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_medium.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $medium_data = MusicBrainz::Server::Data::Medium->new(c => $c);
Modified: mb_server/trunk/t/data_mediumformat.t
===================================================================
--- mb_server/trunk/t/data_mediumformat.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_mediumformat.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $mf_data = MusicBrainz::Server::Data::MediumFormat->new(c => $c);
Modified: mb_server/trunk/t/data_recording.t
===================================================================
--- mb_server/trunk/t/data_recording.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_recording.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -7,7 +7,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $rec_data = MusicBrainz::Server::Data::Recording->new(c => $c);
Modified: mb_server/trunk/t/data_relationship.t
===================================================================
--- mb_server/trunk/t/data_relationship.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_relationship.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -7,7 +7,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $rel_data = MusicBrainz::Server::Data::Relationship->new(c => $c);
Modified: mb_server/trunk/t/data_release.t
===================================================================
--- mb_server/trunk/t/data_release.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_release.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -8,7 +8,7 @@
use MusicBrainz::Server::Test;
use Sql;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $release_data = MusicBrainz::Server::Data::Release->new(c => $c);
Modified: mb_server/trunk/t/data_releasegroup.t
===================================================================
--- mb_server/trunk/t/data_releasegroup.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_releasegroup.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -9,7 +9,7 @@
use MusicBrainz::Server::Test;
use Sql;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $rg_data = MusicBrainz::Server::Data::ReleaseGroup->new(c => $c);
Modified: mb_server/trunk/t/data_releasegrouptype.t
===================================================================
--- mb_server/trunk/t/data_releasegrouptype.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_releasegrouptype.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $rgt_data = MusicBrainz::Server::Data::ReleaseGroupType->new(c => $c);
Modified: mb_server/trunk/t/data_releaselabel.t
===================================================================
--- mb_server/trunk/t/data_releaselabel.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_releaselabel.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $rl_data = MusicBrainz::Server::Data::ReleaseLabel->new(c => $c);
Modified: mb_server/trunk/t/data_releasepackaging.t
===================================================================
--- mb_server/trunk/t/data_releasepackaging.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_releasepackaging.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $lt_data = MusicBrainz::Server::Data::ReleasePackaging->new(c => $c);
Modified: mb_server/trunk/t/data_releasestatus.t
===================================================================
--- mb_server/trunk/t/data_releasestatus.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_releasestatus.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $lt_data = MusicBrainz::Server::Data::ReleaseStatus->new(c => $c);
Modified: mb_server/trunk/t/data_script.t
===================================================================
--- mb_server/trunk/t/data_script.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_script.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $script_data = MusicBrainz::Server::Data::Script->new(c => $c);
Modified: mb_server/trunk/t/data_track.t
===================================================================
--- mb_server/trunk/t/data_track.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_track.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $track_data = MusicBrainz::Server::Data::Track->new(c => $c);
Modified: mb_server/trunk/t/data_tracklist.t
===================================================================
--- mb_server/trunk/t/data_tracklist.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_tracklist.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -7,7 +7,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $tracklist_data = MusicBrainz::Server::Data::Tracklist->new(c => $c);
Modified: mb_server/trunk/t/data_url.t
===================================================================
--- mb_server/trunk/t/data_url.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_url.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $url_data = MusicBrainz::Server::Data::URL->new(c => $c);
Modified: mb_server/trunk/t/data_utils.t
===================================================================
--- mb_server/trunk/t/data_utils.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_utils.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $date = MusicBrainz::Server::Data::Utils::partial_date_from_row(
Modified: mb_server/trunk/t/data_work.t
===================================================================
--- mb_server/trunk/t/data_work.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_work.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -8,7 +8,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $work_data = MusicBrainz::Server::Data::Work->new(c => $c);
Modified: mb_server/trunk/t/data_worktype.t
===================================================================
--- mb_server/trunk/t/data_worktype.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/data_worktype.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Context;
use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $wt_data = MusicBrainz::Server::Data::WorkType->new(c => $c);
Modified: mb_server/trunk/t/edit_artist_create.t
===================================================================
--- mb_server/trunk/t/edit_artist_create.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/edit_artist_create.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -14,7 +14,7 @@
use MusicBrainz::Server::Test;
use Sql;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $artist_data = MusicBrainz::Server::Data::Artist->new(c => $c);
Modified: mb_server/trunk/t/edit_label_create.t
===================================================================
--- mb_server/trunk/t/edit_label_create.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/edit_label_create.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -15,7 +15,7 @@
use Sql;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $edit_data = MusicBrainz::Server::Data::Edit->new(c => $c);
Modified: mb_server/trunk/t/entity_wikidoc.t
===================================================================
--- mb_server/trunk/t/entity_wikidoc.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/entity_wikidoc.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -3,9 +3,9 @@
use Test::More tests => 7;
use_ok 'MusicBrainz::Server::Entity::WikiDoc';
-use MusicBrainz::Server::Context;
+use MusicBrainz::Server::Test;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
my $wikidoc = MusicBrainz::Server::Entity::WikiDoc->new(result => 1,
status => 'Index not available',
Modified: mb_server/trunk/t/sql_artist.t
===================================================================
--- mb_server/trunk/t/sql_artist.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/sql_artist.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Test;
use Sql;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $sql = Sql->new($c->mb->{dbh});
Modified: mb_server/trunk/t/sql_artistcredit.t
===================================================================
--- mb_server/trunk/t/sql_artistcredit.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/sql_artistcredit.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Test;
use Sql;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $sql = Sql->new($c->mb->{dbh});
Modified: mb_server/trunk/t/sql_tracklist.t
===================================================================
--- mb_server/trunk/t/sql_tracklist.t 2009-06-27 16:35:05 UTC (rev 11781)
+++ mb_server/trunk/t/sql_tracklist.t 2009-06-27 17:18:32 UTC (rev 11782)
@@ -6,7 +6,7 @@
use MusicBrainz::Server::Test;
use Sql;
-my $c = MusicBrainz::Server::Context->new();
+my $c = MusicBrainz::Server::Test->create_test_context();
MusicBrainz::Server::Test->prepare_test_database($c);
my $sql = Sql->new($c->mb->{dbh});
_______________________________________________
MusicBrainz-commits mailing list
MusicBrainz-commits@...
http://lists.musicbrainz.org/mailman/listinfo/musicbrainz-commits
« Return to Thread: r11782 - in mb_server/trunk: . lib lib/MusicBrainz/Server lib/MusicBrainz/Server/Controller lib/MusicBrainz/Server/Data lib/MusicBrainz/Server/Model t
| Free embeddable forum powered by Nabble | Forum Help |
