Attachment 86880 Details for Bug 17385 – Bug 17385: (QA follow-up) Add caching

[patch] Bug 17385: (QA follow-up) Add caching

Bug-17385-QA-follow-up-Add-caching.patch (text/plain), 2.97 KB, created by Marcel de Rooy on 2019-03-22 09:53:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2019-03-22 09:53:03 UTC

Size: 2.97 KB

patch

obsolete

>From 63a6a4bb4e22948002e73e409b6bb537fd378521 Mon Sep 17 00:00:00 2001
>From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Date: Fri, 22 Mar 2019 08:51:05 +0000
>Subject: [PATCH] Bug 17385: (QA follow-up) Add caching
>Content-Type: text/plain; charset=utf-8
>
>Performance: We should add caching in CustomXSLTExportList.
>
>Note: This resolves the lack of an intranet test in the former patch too.
>
>Test plan:
>Run t/db_dependent/XSLT.t
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>---
> C4/XSLT.pm            |  9 ++++++++-
> t/db_dependent/XSLT.t | 17 ++++++++++++++++-
> 2 files changed, 24 insertions(+), 2 deletions(-)
>
>diff --git a/C4/XSLT.pm b/C4/XSLT.pm
>index cbbfb6cd40..f322c0a402 100644
>--- a/C4/XSLT.pm
>+++ b/C4/XSLT.pm
>@@ -30,6 +30,7 @@ use C4::Biblio;
> use C4::Circulation;
> use C4::Reserves;
> use Koha::AuthorisedValues;
>+use Koha::Caches;
> use Koha::ItemTypes;
> use Koha::XSLT_Handler;
> use Koha::Libraries;
>@@ -379,8 +380,13 @@ sub CustomXSLTExportList {
>     my $opac = shift; # opac (1) vs intranet (0)
>     return [] if $opac && C4::Context->preference('OpacExportOptions') !~ /custom/;
> 
>-    my @tabFiles;
>+    # Check the cache first
>+    my $cache = Koha::Caches->get_instance;
>+    my $key = $opac ? 'CustomXSLTExportListOPAC' : 'CustomXSLTExportListIntra';
>+    my $cached_val = $cache->get_from_cache($key);
>+    return $cached_val if $cached_val;
> 
>+    my @tabFiles;
>     my $dir = C4::Context->config( $opac ? 'opachtdocs' : 'intrahtdocs') .
>                       '/' . C4::Context->preference( $opac ? "opacthemes" : "template") .
>                       '/' . C4::Languages::getlanguage() .
>@@ -414,6 +420,7 @@ sub CustomXSLTExportList {
>             push @tabFiles, \%row;
>         }
>     }
>+    $cache->set_in_cache( $key, [ @tabFiles ] );
>     return \@tabFiles;
> }
> 
>diff --git a/t/db_dependent/XSLT.t b/t/db_dependent/XSLT.t
>index 5f91cdb44b..968f7db8ad 100644
>--- a/t/db_dependent/XSLT.t
>+++ b/t/db_dependent/XSLT.t
>@@ -1,11 +1,13 @@
> use Modern::Perl;
>-use Test::More tests => 1;
>+use Test::More tests => 2;
> 
> use t::lib::Mocks;
> use C4::XSLT;
>+use Koha::Caches;
> use Koha::Database;
> 
> our $schema = Koha::Database->new->schema;
>+our $cache = Koha::Caches->get_instance;
> 
> # Here we go
> $schema->storage->txn_begin;
>@@ -20,4 +22,17 @@ subtest 'CustomXSLTExportList: Check export options' => sub {
>     $list = C4::XSLT::CustomXSLTExportList(1);
>     is( @$list, 0, 'We expect an empty list now' );
> };
>+
>+subtest  'CustomXSLTExportList: Caching' => sub {
>+    plan tests => 1;
>+    t::lib::Mocks::mock_preference('OpacExportOptions', 'custom');
>+    $cache->clear_from_cache('CustomXSLTExportListOPAC');
>+    my $list = C4::XSLT::CustomXSLTExportList(1);
>+    push @$list, { nonsense => 1 };
>+    $cache->set_in_cache( 'CustomXSLTExportListOPAC', $list );
>+    my $n = @$list;
>+    $list = C4::XSLT::CustomXSLTExportList(1);
>+    is( @$list, $n, 'This list comes from the cache and that is fine' );
>+    $cache->clear_from_cache('CustomXSLTExportListOPAC');
>+};
> $schema->storage->txn_rollback;
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 17385: 55961 | 58308 | 64033 | 64034 | 67357 | 67579 | 74660 | 74661 | 79055 | 79056 | 80675 | 81385 | 81386 | 84388 | 84389 | 84390 | 86875 | 86876 | 86877 | 86878 | 86879 | 86880 | 97076 | 97101 | 97102 | 97103 | 97104 | 97105 | 100289 | 100290 | 100291 | 100292 | 100293 | 100663 | 100670 | 100671 | 100672 | 100673 | 100674 | 100675 | 112671 | 112672 | 112673 | 112674 | 112675 | 112676 | 112677 | 112678 | 112679 | 112680 | 112681 | 112682 | 112956 | 112957 | 112958 | 112959 | 130283 | 130284 | 130285 | 130286 | 130287 | 130691 | 130692 | 130693 | 130694 | 130695 | 131492 | 132488 | 132489 | 132490 | 132491 | 132492 | 132493 | 132581 | 133498 | 133499 | 133500 | 133501 | 133502 | 133503 | 133504 | 138031 | 138032 | 138033 | 138034 | 138035 | 138036 | 138037 | 138082 | 138083 | 138084 | 138085 | 138086 | 138087 | 138088 | 138132 | 139277 | 139278 | 139279 | 139280 | 139281 | 139282 | 139283 | 139284 | 141157 | 141158 | 141159 | 141160 | 141161 | 141162 | 141163 | 141164 | 144335 | 144336 | 144380 | 144384 | 151095 | 151096 | 151097 | 151098 | 151099 | 151102 | 151103 | 151104 | 151105 | 151106 | 151377 | 151378 | 151379 | 151380 | 151381 | 154379 | 154380 | 154381 | 154382 | 154383 | 156815 | 156816 | 156817 | 156818 | 156819 | 159142 | 159143 | 159144 | 159145 | 159146 | 159147 | 159148 | 163623 | 170014 | 170015 | 170016 | 170017 | 170018 | 170019 | 170026 | 170027 | 170028 | 170029 | 170030 | 170031 | 170983 | 170984 | 170985 | 170986 | 170987 | 170988