[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch master updated. 59a81f5e9bfca5d1aba0a985cb9c72e826806ada

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  59a81f5e9bfca5d1aba0a985cb9c72e826806ada (commit)
       via  b37a259ae51f6d8b0db097270c5e0f5ce8af91ba (commit)
      from  351a8276712ddeb5c6f2d4cec1fe386fd6f5d841 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 59a81f5e9bfca5d1aba0a985cb9c72e826806ada
Author: Bill Erickson <berick at esilibrary.com>
Date:   Mon Dec 30 13:49:01 2013 -0500

    Vandelay: increase queued item creation timeout
    
    Allow up to 10 minutes to create each queued vandelay record to avoid
    timeouts in item creation caused by pathologicaly long-running record
    match set queries.
    
    Signed-off-by: Bill Erickson <berick at esilibrary.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm
index 0bb52d6..26eddad 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Vandelay.pm
@@ -181,7 +181,7 @@ sub _add_bib_rec {
     $rec->purpose( $purpose ) if ($purpose);
     $rec->bib_source($bib_source);
 
-    return $e->create_vandelay_queued_bib_record( $rec );
+    return $e->create_vandelay_queued_bib_record( $rec, {timeout => 600} );
 }
 
 sub add_record_to_authority_queue {
@@ -225,7 +225,7 @@ sub _add_auth_rec {
     $rec->queue( $queue );
     $rec->purpose( $purpose ) if ($purpose);
 
-    return $e->create_vandelay_queued_authority_record( $rec );
+    return $e->create_vandelay_queued_authority_record( $rec, {timeout => 600} );
 }
 
 sub process_spool {

commit b37a259ae51f6d8b0db097270c5e0f5ce8af91ba
Author: Mike Rylander <mrylander at gmail.com>
Date:   Thu Sep 12 13:26:21 2013 -0400

    Keep standard INNER joins above possible OUTERs
    
    We always join metabib.record_attr, and we always use an INNER join
    to the core table, so keep that join first.  Likewise with the join
    to biblio.record_entry.  Dynamic joins may be OUTER, though, and while
    join reordering in Postgres is smart, let's not give it the chance to
    fail.
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
index 3a7f367..7d0aae0 100644
--- a/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
+++ b/Open-ILS/src/perlmods/lib/OpenILS/Application/Storage/Driver/Pg/QueryParser.pm
@@ -802,9 +802,9 @@ SELECT  $key AS id,
         $rank AS rank, 
         FIRST(mrd.attrs->'date1') AS tie_break
   FROM  metabib.metarecord_source_map m
-        $$flat_plan{from}
         $mra_join
         $bre_join
+        $$flat_plan{from}
   WHERE 1=1
         $flat_where
   GROUP BY 1

-----------------------------------------------------------------------

Summary of changes:
 .../Application/Storage/Driver/Pg/QueryParser.pm   |    2 +-
 .../perlmods/lib/OpenILS/Application/Vandelay.pm   |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
Evergreen ILS