From: Joe Atzberger Date: Fri, 27 Mar 2009 15:34:34 +0000 (-0500) Subject: Introduce sth caching to Letters.pm X-Git-Tag: ontop~267 X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=35c8a5be58ffff4324fbb7ccf19364552563853d;p=koha.git Introduce sth caching to Letters.pm The re-creation of statement handles for the same queries, repeatedly, seriously degrades the performance of notices. This introduces new class-level caching to avoid that problem. Note: initial provisions to do the same with caching of COLUMNS information about tables is also included, but this would probably be most usefully implemented in C4::Context (or a separate more central module). The benefits of caching that info would probably be even greater. Note that this proposed implementation might be obsoleted by ORM integration, where DB structure info would already be cached. Signed-off-by: Galen Charlton --- diff --git a/C4/Letters.pm b/C4/Letters.pm index 188cb3a63d..1a6c9f9c16 100644 --- a/C4/Letters.pm +++ b/C4/Letters.pm @@ -24,6 +24,7 @@ use C4::Members; use C4::Log; use C4::SMS; use Encode; +use Carp; use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS); @@ -466,45 +467,64 @@ sub SendAlerts { =cut -sub parseletter { - my ( $letter, $table, $pk, $pk2 ) = @_; +our %handles = (); +our %columns = (); - # warn "Parseletter : ($letter,$table,$pk)"; - my $dbh = C4::Context->dbh; - my $sth; - if ( $table eq 'biblio' ) { - $sth = $dbh->prepare("select * from biblio where biblionumber=?"); - } elsif ( $table eq 'biblioitems' ) { - $sth = $dbh->prepare("select * from biblioitems where biblionumber=?"); - } elsif ( $table eq 'items' ) { - $sth = $dbh->prepare("select * from items where itemnumber=?"); - } elsif ( $table eq 'reserves' ) { - $sth = $dbh->prepare("select * from reserves where borrowernumber = ? and biblionumber=?"); - } elsif ( $table eq 'borrowers' ) { - $sth = $dbh->prepare("select * from borrowers where borrowernumber=?"); - } elsif ( $table eq 'branches' ) { - $sth = $dbh->prepare("select * from branches where branchcode=?"); - } elsif ( $table eq 'aqbooksellers' ) { - $sth = $dbh->prepare("select * from aqbooksellers where id=?"); +sub parseletter_sth { + my $table = shift; + unless ($table) { + carp "ERROR: parseletter_sth() called without argument (table)"; + return; + } + # check cache first + (defined $handles{$table}) and return $handles{$table}; + my $query = + ($table eq 'biblio' ) ? "SELECT * FROM $table WHERE biblionumber = ?" : + ($table eq 'biblioitems' ) ? "SELECT * FROM $table WHERE biblionumber = ?" : + ($table eq 'items' ) ? "SELECT * FROM $table WHERE itemnumber = ?" : + ($table eq 'reserves' ) ? "SELECT * FROM $table WHERE borrowernumber = ? and biblionumber = ?" : + ($table eq 'borrowers' ) ? "SELECT * FROM $table WHERE borrowernumber = ?" : + ($table eq 'branches' ) ? "SELECT * FROM $table WHERE branchcode = ?" : + ($table eq 'aqbooksellers') ? "SELECT * FROM $table WHERE id = ?" : undef ; + unless ($query) { + warn "ERROR: No parseletter_sth query for table '$table'"; + return; # nothing to get + } + unless ($handles{$table} = C4::Context->dbh->prepare($query)) { + warn "ERROR: Failed to prepare query: '$query'"; + return; } + return $handles{$table}; # now cache is populated for that $table +} +sub parseletter { + my ( $letter, $table, $pk, $pk2 ) = @_; + unless ($letter) { + carp "ERROR: parseletter() 1st argument 'letter' empty"; + return; + } + # warn "Parseletter : ($letter, $table, $pk ...)"; + my $sth = parseletter_sth($table); + unless ($sth) { + warn "parseletter_sth('$table') failed to return a valid sth. No substitution will be done for that table."; + return; + } if ( $pk2 ) { $sth->execute($pk, $pk2); } else { $sth->execute($pk); } - # store the result in an hash my $values = $sth->fetchrow_hashref; # and get all fields from the table - $sth = $dbh->prepare("show columns from $table"); - $sth->execute; - while ( ( my $field ) = $sth->fetchrow_array ) { + my $columns = C4::Context->dbh->prepare("SHOW COLUMNS FROM $table"); + $columns->execute; + while ( ( my $field ) = $columns->fetchrow_array ) { my $replacefield = "<<$table.$field>>"; my $replacedby = $values->{$field} || ''; - $letter->{title} =~ s/$replacefield/$replacedby/g; - $letter->{content} =~ s/$replacefield/$replacedby/g; + ($letter->{title} ) and $letter->{title} =~ s/$replacefield/$replacedby/g; + ($letter->{content}) and $letter->{content} =~ s/$replacefield/$replacedby/g; } }