gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 32060: Improve performance of columns_to_str 

To test:
1) Ensure the following tests pass
  t/db_dependent/Koha/Item.t
  t/db_dependent/Koha/Bibio.t
2) Go to a biblio (preferably as serial) with many items and
   click "New" -> "New item" and note down the response time.
3) Apply the patch
4) Ensure tests in 1) still pass
5) Repeat step 2), the response time should be substantially
   improved

Sponsored-by: Gothenburg University Library

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
David Gustafsson 2022-11-01 15:30:01 +01:00 committed by Tomas Cohen Arazi
parent 5b3ecbe068
commit b6ae2c1ee3
No known key found for this signature in database
GPG Key ID: 0A272EA1B2F3C15F
3 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
C4/Biblio.pm
View File

@ -1833,10 +1833,16 @@ sub UpsertMarcControlField {
sub GetFrameworkCode {
my ($biblionumber) = @_;
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare("SELECT frameworkcode FROM biblio WHERE biblionumber=?");
$sth->execute($biblionumber);
my ($frameworkcode) = $sth->fetchrow;
my $cache = Koha::Cache::Memory::Lite->get_instance();
my $cache_key = "FrameworkCode-$biblionumber";
my $frameworkcode = $cache->get_from_cache($cache_key);
unless (defined $frameworkcode) {
my $dbh = C4::Context->dbh;
my $sth = $dbh->prepare("SELECT frameworkcode FROM biblio WHERE biblionumber=?");
$sth->execute($biblionumber);
($frameworkcode) = $sth->fetchrow;
$cache->set_in_cache($cache_key, $frameworkcode);
}
return $frameworkcode;
}
@ -2558,6 +2564,9 @@ sub _koha_modify_biblio {
$biblio->{'abstract'}, $biblio->{'biblionumber'}
) if $biblio->{'biblionumber'};
my $cache = Koha::Cache::Memory::Lite->get_instance();
$cache->clear_from_cache("FrameworkCode-" . $biblio->{biblionumber});
if ( $dbh->errstr || !$biblio->{'biblionumber'} ) {
$error .= "ERROR in _koha_modify_biblio $query" . $dbh->errstr;
warn $error;

18
Koha/Item.pm
View File

@ -1049,16 +1049,14 @@ This is meant to be used for display purpose only.
sub columns_to_str {
my ( $self ) = @_;
my $frameworkcode = C4::Biblio::GetFrameworkCode($self->biblionumber);
my $tagslib = C4::Biblio::GetMarcStructure( 1, $frameworkcode, { unsafe => 1 } );
my $mss = C4::Biblio::GetMarcSubfieldStructure( $frameworkcode, { unsafe => 1 } );
my $frameworkcode = $self->biblio->frameworkcode;
my $tagslib = C4::Biblio::GetMarcStructure(1, $frameworkcode);
my ( $itemtagfield, $itemtagsubfield) = C4::Biblio::GetMarcFromKohaField( "items.itemnumber" );
my $columns_info = $self->_result->result_source->columns_info;
my $mss = C4::Biblio::GetMarcSubfieldStructure( $frameworkcode, { unsafe => 1 } );
my $values = {};
for my $column ( keys %$columns_info ) {
for my $column ( @{$self->_columns}) {
next if $column eq 'more_subfields_xml';
@ -2097,10 +2095,8 @@ or staff client strings.
sub strings_map {
my ( $self, $params ) = @_;
my $columns_info = $self->_result->result_source->columns_info;
my $frameworkcode = $self->biblio->frameworkcode;
my $tagslib = C4::Biblio::GetMarcStructure( 1, $frameworkcode );
my $frameworkcode = C4::Biblio::GetFrameworkCode($self->biblionumber);
my $tagslib = C4::Biblio::GetMarcStructure( 1, $frameworkcode, { unsafe => 1 } );
my $mss = C4::Biblio::GetMarcSubfieldStructure( $frameworkcode, { unsafe => 1 } );
my ( $itemtagfield, $itemtagsubfield ) = C4::Biblio::GetMarcFromKohaField("items.itemnumber");
@ -2115,7 +2111,7 @@ sub strings_map {
# Handle not null and default values for integers and dates
my $strings = {};
foreach my $col ( keys %{$columns_info} ) {
foreach my $col ( @{$self->_columns} ) {
# By now, we are done with known columns, now check the framework for mappings
my $field = $self->_result->result_source->name . '.' . $col;

23
t/db_dependent/Biblio.t
View File

@ -17,7 +17,7 @@
use Modern::Perl;
use Test::More tests => 17;
use Test::More tests => 18;
use Test::MockModule;
use Test::Warn;
use List::MoreUtils qw( uniq );
@ -920,6 +920,27 @@ subtest 'record_schema test' => sub {
};
subtest 'GetFrameworkCode' => sub {
plan tests => 4;
my $biblio = $builder->build_sample_biblio({ frameworkcode => 'OBP' });
is(GetFrameworkCode($biblio->biblionumber), 'OBP', 'GetFrameworkCode returns correct frameworkcode');
my $cache = Koha::Cache::Memory::Lite->get_instance();
my $cache_key = "FrameworkCode-" . $biblio->biblionumber;
my $frameworkcode = $cache->get_from_cache($cache_key);
is($frameworkcode, 'OBP', 'Cache has been set in GetFrameworkCode');
# Set new value directly in cache to make sure it's actually being used
$cache->set_in_cache($cache_key, 'OD');
is(GetFrameworkCode($biblio->biblionumber), 'OD', 'GetFrameworkCode returns correct frameworkcode, using cache');
# Test cache invalidation
ModBiblio($biblio->metadata->record, $biblio->biblionumber, 'OGR');
is(GetFrameworkCode($biblio->biblionumber), 'OGR', 'GetFrameworkCode returns correct frameworkcode after setting a new one though ModBiblio');
};
# Cleanup
Koha::Caches->get_instance->clear_from_cache( "MarcSubfieldStructure-" );