From: Paul Poulain Date: Wed, 12 Sep 2012 11:46:00 +0000 (+0200) Subject: Revert "Bug 8089: Use Koha::Cache for all caching" X-Git-Tag: v3.10.01~500^2 X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=8449b14dcb66c7f4e76794daee21342a28ad9598;p=srvgit Revert "Bug 8089: Use Koha::Cache for all caching" This reverts commit 215abc8024d93f1b6a10f26427a65bd64d106e52. The 3 patches for bug 8089 have been reverted, because they break jenkins & Koha. A follow-up has been provided, but it does not solve the problem on my test server, it just changes the error message. After a discussion with jared, Dobrica should work on another patch, so the best option is to revert. --- diff --git a/C4/Biblio.pm b/C4/Biblio.pm index 19a23affdf..3a478545b2 100644 --- a/C4/Biblio.pm +++ b/C4/Biblio.pm @@ -139,6 +139,16 @@ BEGIN { ); } +eval { + if (C4::Context->ismemcached) { + require Memoize::Memcached; + import Memoize::Memcached qw(memoize_memcached); + + memoize_memcached( 'GetMarcStructure', + memcached => C4::Context->memcached); + } +}; + =head1 NAME C4::Biblio - cataloging management functions @@ -1047,18 +1057,16 @@ sub GetMarcStructure { my ( $forlibrarian, $frameworkcode ) = @_; my $dbh = C4::Context->dbh; $frameworkcode = "" unless $frameworkcode; - my $cache; if ( defined $marc_structure_cache and exists $marc_structure_cache->{$forlibrarian}->{$frameworkcode} ) { return $marc_structure_cache->{$forlibrarian}->{$frameworkcode}; } - if (Koha::Cache->is_cache_active()) { - $cache = Koha::Cache->new(); - if ($cache) { - my $cached = $cache->get_from_cache("GetMarcStructure:$frameworkcode:$forlibrarian"); - return $cached if $cached; - } - } + + # my $sth = $dbh->prepare( + # "SELECT COUNT(*) FROM marc_tag_structure WHERE frameworkcode=?"); + # $sth->execute($frameworkcode); + # my ($total) = $sth->fetchrow; + # $frameworkcode = "" unless ( $total > 0 ); my $sth = $dbh->prepare( "SELECT tagfield,liblibrarian,libopac,mandatory,repeatable FROM marc_tag_structure @@ -1122,9 +1130,6 @@ sub GetMarcStructure { $marc_structure_cache->{$forlibrarian}->{$frameworkcode} = $res; - if (Koha::Cache->is_cache_active() && defined $cache) { - $cache->set_in_cache("GetMarcStructure:$frameworkcode:$forlibrarian",$res,10000); - } return $res; } diff --git a/C4/Context.pm b/C4/Context.pm index 5e9feae40e..9ce6c74914 100644 --- a/C4/Context.pm +++ b/C4/Context.pm @@ -18,9 +18,7 @@ package C4::Context; use strict; use warnings; -use vars qw($VERSION $AUTOLOAD $context @context_stack); - -use Koha::Cache; +use vars qw($VERSION $AUTOLOAD $context @context_stack $servers $memcached $ismemcached); BEGIN { if ($ENV{'HTTP_USER_AGENT'}) { @@ -81,6 +79,22 @@ BEGIN { } } # else there is no browser to send fatals to! + # Check if there are memcached servers set + $servers = $ENV{'MEMCACHED_SERVERS'}; + if ($servers) { + # Load required libraries and create the memcached object + require Cache::Memcached; + $memcached = Cache::Memcached->new({ + servers => [ $servers ], + debug => 0, + compress_threshold => 10_000, + expire_time => 600, + namespace => $ENV{'MEMCACHED_NAMESPACE'} || 'koha' + }); + # Verify memcached available (set a variable and test the output) + $ismemcached = $memcached->set('ismemcached','1'); + } + $VERSION = '3.07.00.049'; } @@ -234,14 +248,38 @@ Returns undef in case of error. sub read_config_file { # Pass argument naming config file to read my $koha = XMLin(shift, keyattr => ['id'], forcearray => ['listen', 'server', 'serverinfo'], suppressempty => ''); - if (Koha::Cache->is_cache_active()) { - my $cache = Koha::Cache->new(); - $cache->set_in_cache('kohaconf', $koha) if defined $cache; + if ($ismemcached) { + $memcached->set('kohaconf',$koha); } return $koha; # Return value: ref-to-hash holding the configuration } +=head2 ismemcached + +Returns the value of the $ismemcached variable (0/1) + +=cut + +sub ismemcached { + return $ismemcached; +} + +=head2 memcached + +If $ismemcached is true, returns the $memcache variable. +Returns undef otherwise + +=cut + +sub memcached { + if ($ismemcached) { + return $memcached; + } else { + return undef; + } +} + # db_scheme2dbi # Translates the full text name of a database into de appropiate dbi name # @@ -285,8 +323,9 @@ Allocates a new context. Initializes the context from the specified file, which defaults to either the file given by the C<$KOHA_CONF> environment variable, or F. -It saves the koha-conf.xml values in the cache (if configured) and uses -those values until them expire and re-reads them. +It saves the koha-conf.xml values in the declared memcached server(s) +if currently available and uses those values until them expire and +re-reads them. C<&new> does not set this context as the new default context; for that, use C<&set_context>. @@ -323,14 +362,15 @@ sub new { } } - if (Koha::Cache->is_cache_active()) { - # retrieve from cache - my $cache = Koha::Cache->new(); - $self = $cache->get_from_cache('kohaconf') if defined $cache; - $self = { }; - } - if (!keys %$self) { - # not cached yet + if ($ismemcached) { + # retreive from memcached + $self = $memcached->get('kohaconf'); + if (not defined $self) { + # not in memcached yet + $self = read_config_file($conf_fname); + } + } else { + # non-memcached env, read from file $self = read_config_file($conf_fname); } diff --git a/C4/Languages.pm b/C4/Languages.pm index 238123f9b2..d0eed6982e 100644 --- a/C4/Languages.pm +++ b/C4/Languages.pm @@ -23,9 +23,19 @@ use strict; #use warnings; FIXME - Bug 2505 use Carp; use C4::Context; -use Koha::Cache; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS $DEBUG); +eval { + if (C4::Context->ismemcached) { + require Memoize::Memcached; + import Memoize::Memcached qw(memoize_memcached); + + memoize_memcached('getTranslatedLanguages', memcached => C4::Context->memcached); + memoize_memcached('getFrameworkLanguages' , memcached => C4::Context->memcached); + memoize_memcached('getAllLanguages', memcached => C4::Context->memcached); + } +}; + BEGIN { $VERSION = 3.07.00.049; require Exporter; @@ -67,15 +77,6 @@ Returns a reference to an array of hashes: =cut sub getFrameworkLanguages { - - my $cache; - if (Koha::Cache->is_cache_active()) { - $cache = Koha::Cache->new(); - if (defined $cache) { - my $cached = $cache->get_from_cache("getFrameworkLanguages"); - return $cached if $cached; - } - } # get a hash with all language codes, names, and locale names my $all_languages = getAllLanguages(); my @languages; @@ -98,9 +99,6 @@ sub getFrameworkLanguages { } } } - if (Koha::Cache->is_cache_active() && defined $cache) { - $cache->set_in_cache("getFrameworkLanguages",\@languages,10000) - } return \@languages; } @@ -181,17 +179,6 @@ Returns a reference to an array of hashes: =cut sub getAllLanguages { - # retrieve from cache if applicable - my $cache; - if (Koha::Cache->is_cache_active()) { - $cache = Koha::Cache->new(); - if (defined $cache) { - my $cached = $cache->get_from_cache("getAllLanguages"); - if ($cached) { - return $cached; - } - } - } my @languages_loop; my $dbh=C4::Context->dbh; my $current_language = shift || 'en'; @@ -226,9 +213,6 @@ sub getAllLanguages { } push @languages_loop, $language_subtag_registry; } - if (Koha::Cache->is_cache_active() && defined $cache) { - $cache->set_in_cache("getAllLanguages",\@languages_loop,1000); - } return \@languages_loop; } diff --git a/C4/SQLHelper.pm b/C4/SQLHelper.pm index e86d2b71a9..703c28d662 100644 --- a/C4/SQLHelper.pm +++ b/C4/SQLHelper.pm @@ -24,10 +24,26 @@ use List::MoreUtils qw(first_value any); use C4::Context; use C4::Dates qw(format_date_in_iso); use C4::Debug; -use Koha::Cache; require Exporter; use vars qw($VERSION @ISA @EXPORT_OK %EXPORT_TAGS); +eval { + my $servers = C4::Context->config('memcached_servers'); + if ($servers) { + require Memoize::Memcached; + import Memoize::Memcached qw(memoize_memcached); + + my $memcached = { + servers => [$servers], + key_prefix => C4::Context->config('memcached_namespace') || 'koha', + expire_time => 600 + }; # cache for 10 mins + + memoize_memcached( '_get_columns', memcached => $memcached ); + memoize_memcached( 'GetPrimaryKeys', memcached => $memcached ); + } +}; + BEGIN { # set the version for version checking $VERSION = 3.07.00.049; @@ -220,7 +236,7 @@ sub DeleteInTable{ my $result; eval{$result=$sth->execute(@$values)}; warn $@ if ($@ && $debug); - return $result; + return $result; } } @@ -234,22 +250,8 @@ Get the Primary Key field names of the table sub GetPrimaryKeys($) { my $tablename=shift; - my $result; - my $cache; - if (Koha::Cache->is_cache_active()) { - $cache = Koha::Cache->new(); - if (defined $cache) { - $result = $cache->get_from_cache("sqlhelper:GetPrimaryKeys:$tablename"); - } - } - unless (defined $result) { - my $hash_columns=_get_columns($tablename); - $result = grep { $hash_columns->{$_}->{'Key'} =~/PRI/i} keys %$hash_columns; - if (Koha::Cache->is_cache_active() && defined $cache) { - $cache->set_in_cache("sqlhelper:GetPrimaryKeys:$tablename", $result); - } - } - return $result; + my $hash_columns=_get_columns($tablename); + return grep { $hash_columns->{$_}->{'Key'} =~/PRI/i} keys %$hash_columns; } @@ -284,25 +286,12 @@ With sub _get_columns($) { my ($tablename) = @_; - my $cache; - if ( exists( $hashref->{$tablename} ) ) { - return $hashref->{$tablename}; - } - if (Koha::Cache->is_cache_active()) { - $cache = Koha::Cache->new(); - if (defined $cache) { - $hashref->{$tablename} = $cache->get_from_cache("sqlhelper:_get_columns:$tablename"); - } - } - unless ( defined $hashref->{$tablename} ) { + unless ( exists( $hashref->{$tablename} ) ) { my $dbh = C4::Context->dbh; my $sth = $dbh->prepare_cached(qq{SHOW COLUMNS FROM $tablename }); $sth->execute; my $columns = $sth->fetchall_hashref(qw(Field)); $hashref->{$tablename} = $columns; - if (Koha::Cache->is_cache_active() && defined $cache) { - $cache->set_in_cache("sqlhelper:_get_columns:$tablename", $hashref->{$tablename}); - } } return $hashref->{$tablename}; } diff --git a/Koha/Cache.pm b/Koha/Cache.pm index 8850c0691b..740a1335c8 100644 --- a/Koha/Cache.pm +++ b/Koha/Cache.pm @@ -84,7 +84,7 @@ sub new { } sub is_cache_active { - return $ENV{CACHING_SYSTEM} ? '1' : undef; + return $ENV{CACHING_SYSTEM} ? '1' : ''; } sub set_in_cache { diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl index 25a2ffb477..8a2aada943 100755 --- a/reports/guided_reports.pl +++ b/reports/guided_reports.pl @@ -28,7 +28,6 @@ use C4::Output; use C4::Dates; use C4::Debug; use C4::Branch; # XXX subfield_is_koha_internal_p -use Koha::Cache; =head1 NAME @@ -41,7 +40,7 @@ Script to control the guided report creation =cut my $input = new CGI; -my $usecache = Koha::Cache->is_cache_active(); +my $usecache = C4::Context->ismemcached; my $phase = $input->param('phase'); my $flagsrequired; diff --git a/t/Cache.t b/t/Cache.t index 6192d35624..d595dc98c9 100644 --- a/t/Cache.t +++ b/t/Cache.t @@ -13,10 +13,10 @@ BEGIN { } SKIP: { - skip "Memcached not enabled", 7 unless Koha::Cache->is_cache_active(); - my $cache = Koha::Cache->new (); + skip "Cache not enabled", 7 unless (Koha::Cache->is_cache_active() && defined $cache); + # test fetching an item that isnt in the cache is( $cache->get_from_cache("not in here"), undef, "fetching item NOT in cache");