Attachment 60544 Details for Bug 17941 – Bug 17941 avoid scanning the full cartesian product

[patch] Bug 17941 avoid scanning the full cartesian product

Bug-17941-avoid-scanning-the-full-cartesian-produc.patch (text/plain), 2.31 KB, created by Jonathan Druart on 2017-02-22 11:08:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2017-02-22 11:08:29 UTC

Size: 2.31 KB

patch

obsolete

>From 76c5477194865db03064df4999bb7e2213d9524e Mon Sep 17 00:00:00 2001
>From: Francesco Rivetti <oha@oha.it>
>Date: Tue, 14 Feb 2017 11:13:51 +0100
>Subject: [PATCH] Bug 17941 avoid scanning the full cartesian product
>
>when a item match a borrower, there is no point in checking the
>other borrowers
>
>Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> C4/Circulation.pm | 29 ++++++++++++++---------------
> 1 file changed, 14 insertions(+), 15 deletions(-)
>
>diff --git a/C4/Circulation.pm b/C4/Circulation.pm
>index e2cd626..b6ca23d 100644
>--- a/C4/Circulation.pm
>+++ b/C4/Circulation.pm
>@@ -2677,24 +2677,23 @@ sub CanBookBeRenewed {
>             # can be filled with available items. We can get the union of the sets simply
>             # by pushing all the elements onto an array and removing the duplicates.
>             my @reservable;
>-            foreach my $b (@borrowernumbers) {
>-                my ($borr) = C4::Members::GetMember( borrowernumber => $b);
>-                foreach my $i (@itemnumbers) {
>-                    my $item = GetItem($i);
>-                    if (  !IsItemOnHoldAndFound($i)
>-                        && IsAvailableForItemLevelRequest( $item, $borr )
>-                        && CanItemBeReserved( $b, $i ) )
>-                    {
>-                        push( @reservable, $i );
>+            my %borrowers;
>+            ITEM: foreach my $i (@itemnumbers) {
>+                my $item = GetItem($i);
>+                next if IsItemOnHoldAndFound($i);
>+                for my $b (@borrowernumbers) {
>+                    my $borr = $borrowers{$b}//= C4::Members::GetMember(borrowernumber => $b);
>+                    next unless IsAvailableForItemLevelRequest($item, $borr);
>+                    next unless CanItemBeReserved($b,$i);
>+
>+                    push @reservable, $i;
>+                    if (@reservable >= @borrowernumbers) {
>+                        $resfound = 0;
>+                        last ITEM;
>                     }
>+                    last;
>                 }
>             }
>-
>-            @reservable = uniq(@reservable);
>-
>-            if ( @reservable >= @borrowernumbers ) {
>-                $resfound = 0;
>-            }
>         }
>     }
>     return ( 0, "on_reserve" ) if $resfound;    # '' when no hold was found
>-- 
>2.9.3

Actions: View | Diff | Splinter Review

Attachments on bug 17941: 59740 | 60181 | 60184 | 60185 | 60186 | 60188 | 60189 | 60190 | 60191 | 60192 | 60457 | 60472 | 60473 | 60474 | 60544 | 60545 | 60546