From: Bill Erickson <berickxx@gmail.com>
Date: Tue, 7 Feb 2017 15:27:52 +0000 (-0500)
Subject: LP#1596595 Targeter use child editor for settings
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=129a38be37e524298767e01a991f7e83a3ad25ea;p=Evergreen.git

LP#1596595 Targeter use child editor for settings

Use the CStoreEditor linked to the ::Single (child) targeter object when
possible to fetch org unit setting values.

In cases where settings for many org units have to be retrieved at once,
the settings lookups can take long enough that the in-transaction editor
on the child targeter can timeout.  Using the child's editor directly
for the lookups will prevent this timeout and make the lookups a little
bit faster, since a new connect will not be required for each lookup.

This timeout scenario can occur with settings like
circ.holds.max_org_unit_target_loops and
circ.holds.target_when_closed, when there is wide variety of targetable
copies, because each have to be fetched once per target-able copy circ lib.

A secondary optimization would be a batch org setting lookup that
batches on org unit instead of setting name.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Chris Sharp <csharp@georgialibraries.org>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Utils/HoldTargeter.pm b/Open-ILS/src/perlmods/lib/OpenILS/Utils/HoldTargeter.pm
index 75b8e84b8c..394944f118 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Utils/HoldTargeter.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Utils/HoldTargeter.pm
@@ -256,14 +256,17 @@ sub init {
 }
 
 # Org unit setting fetch+cache
+# $e is the OpenILS::Utils::HoldTargeter::Single editor.  Use it if
+# provided to avoid timeouts on the in-transaction child editor.
 sub get_ou_setting {
-    my ($self, $org_id, $setting) = @_;
+    my ($self, $org_id, $setting, $e) = @_;
     my $c = $self->{ou_setting_cache};
 
+    $e ||= $self->{editor};
     $c->{$org_id} = {} unless $c->{$org_id};
 
     $c->{$org_id}->{$setting} =
-        $U->ou_ancestor_setting_value($org_id, $setting, $self->{editor})
+        $U->ou_ancestor_setting_value($org_id, $setting, $e)
         unless exists $c->{$org_id}->{$setting};
 
     return $c->{$org_id}->{$setting};
@@ -671,7 +674,7 @@ sub compile_weighted_proximity_map {
 
         my $weight = $self->parent->get_ou_setting(
             $copy_hash->{circ_lib},
-            'circ.holds.org_unit_target_weight') || 1;
+            'circ.holds.org_unit_target_weight', $self->editor) || 1;
 
         # Each copy is added to the list once per target weight.
         push(@{$prox_map{$prox}}, $copy_hash) foreach (1 .. $weight);
@@ -695,7 +698,8 @@ sub filter_closed_date_copies {
                 'circ.holds.target_when_closed_if_at_pickup_lib' :
                 'circ.holds.target_when_closed';
 
-            unless ($self->parent->get_ou_setting($clib, $ous)) {
+            unless (
+                $self->parent->get_ou_setting($clib, $ous, $self->editor)) {
                 # Targeting not allowed at this circ lib when its closed
 
                 $self->log_hold("skipping copy ".
@@ -838,7 +842,8 @@ sub attempt_to_find_copy {
 
     my $max_loops = $self->parent->get_ou_setting(
         $self->hold->pickup_lib,
-        'circ.holds.max_org_unit_target_loops'
+        'circ.holds.max_org_unit_target_loops',
+        $self->editor
     );
 
     return $self->target_by_org_loops($max_loops) if $max_loops;
@@ -1122,11 +1127,13 @@ sub process_recalls {
     my $pu_lib = $self->hold->pickup_lib;
 
     my $threshold =
-        $self->parent->get_ou_setting($pu_lib, 'circ.holds.recall_threshold')
+        $self->parent->get_ou_setting(
+            $pu_lib, 'circ.holds.recall_threshold', $self->editor)
         or return 1;
 
     my $interval =
-        $self->parent->get_ou_setting($pu_lib, 'circ.holds.recall_return_interval')
+        $self->parent->get_ou_setting(
+            $pu_lib, 'circ.holds.recall_return_interval', $self->editor)
         or return 1;
 
     # Give me the ID of every checked out copy living at the hold
@@ -1172,7 +1179,8 @@ sub process_recalls {
     );
 
     my $fine_rules =
-        $self->parent->get_ou_setting($pu_lib, 'circ.holds.recall_fine_rules');
+        $self->parent->get_ou_setting(
+            $pu_lib, 'circ.holds.recall_fine_rules', $self->editor);
 
     # If the OU hasn't defined new fine rules for recalls, keep them
     # as they were