Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 16229: Add the unsafe flag to set_in_cache

Browse source 
Could be useful later.

Signed-off-by: Jacek Ablewicz <abl@biblos.pk.edu.pl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@unc.edu.ar>

Signed-off-by: Brendan Gallagher <bredan@bywatersolutions.com>
This commit is contained in:
Jonathan Druart 2016-04-08 12:54:44 +01:00 committed by Brendan Gallagher
parent 33ad907a82
commit 22c907230a
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Koha/Cache.pm
View file

@ -267,6 +267,7 @@ sub set_in_cache {
$new_options->{cache} = $_cache if defined $_cache; $new_options->{cache} = $_cache if defined $_cache;
$options = $new_options; $options = $new_options;
} }
my $unsafe = $options->{unsafe} || 0;
# the key mustn't contain whitespace (or control characters) for memcache # the key mustn't contain whitespace (or control characters) for memcache
# but shouldn't be any harm in applying it globally. # but shouldn't be any harm in applying it globally.
@ -281,7 +282,9 @@ sub set_in_cache {
$expiry //= $self->{timeout}; $expiry //= $self->{timeout};
my $set_sub = $self->{ref($self->{$cache}) . "_set"}; my $set_sub = $self->{ref($self->{$cache}) . "_set"};
$value = clone $value; # Deep copy if it's not a scalar and unsafe is not passed
$value = clone( $value ) if ref($value) and not $unsafe;
# Set in L1 cache # Set in L1 cache
$L1_cache{ $key } = $value; $L1_cache{ $key } = $value;

9
t/Cache.t
View file

@ -17,7 +17,7 @@
use Modern::Perl; use Modern::Perl;
use Test::More tests => 39; use Test::More tests => 40;
my $destructorcount = 0; my $destructorcount = 0;
@ -196,8 +196,15 @@ SKIP: {
$item_from_cache = $cache->get_from_cache('test_deep_copy_hash'); $item_from_cache = $cache->get_from_cache('test_deep_copy_hash');
%$item_from_cache = ( another => 'hashref' ); %$item_from_cache = ( another => 'hashref' );
is_deeply( $cache->get_from_cache('test_deep_copy_hash'), { a => 'hashref' }, 'A hash will be deep copied'); is_deeply( $cache->get_from_cache('test_deep_copy_hash'), { a => 'hashref' }, 'A hash will be deep copied');
%item = ( a_modified => 'hashref' ); %item = ( a_modified => 'hashref' );
is_deeply( $cache->get_from_cache('test_deep_copy_hash'), { a => 'hashref' }, 'A hash will be deep copied when set in cache'); is_deeply( $cache->get_from_cache('test_deep_copy_hash'), { a => 'hashref' }, 'A hash will be deep copied when set in cache');
%item = ( a => 'hashref' );
$cache->set_in_cache('test_deep_copy_hash', \%item, { unsafe => 1});
%item = ( a_modified => 'hashref' );
is_deeply( $cache->get_from_cache('test_deep_copy_hash'), { a_modified => 'hashref' }, 'A hash will not be deep copied when set in cache if the unsafe flag is set');
$item_from_cache = $cache->get_from_cache('test_deep_copy_hash', { unsafe => 1}); $item_from_cache = $cache->get_from_cache('test_deep_copy_hash', { unsafe => 1});
%$item_from_cache = ( another => 'hashref' ); %$item_from_cache = ( another => 'hashref' );
is_deeply( $cache->get_from_cache('test_deep_copy_hash'), { another => 'hashref' }, 'A hash will not be deep copied if the unsafe flag is set'); is_deeply( $cache->get_from_cache('test_deep_copy_hash'), { another => 'hashref' }, 'A hash will not be deep copied if the unsafe flag is set');