From 9b274039cdb9182dffc3866184d9b530f8fb8859 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Wed, 5 Sep 2012 15:08:56 +0800
Subject: Bug 749540: Avoid database deadlocks when deleting recent searches
 r=dkl, a=LpSolit

---
 Bugzilla/Search/Recent.pm | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'Bugzilla/Search')

diff --git a/Bugzilla/Search/Recent.pm b/Bugzilla/Search/Recent.pm
index 00b71a91d..f1dd092b2 100644
--- a/Bugzilla/Search/Recent.pm
+++ b/Bugzilla/Search/Recent.pm
@@ -54,12 +54,13 @@ sub create {
     my $user_id = $search->user_id;
 
     # Enforce there only being SAVE_NUM_SEARCHES per user.
-    my $min_id = $dbh->selectrow_array(
-        'SELECT id FROM profile_search WHERE user_id = ? ORDER BY id DESC '
-        . $dbh->sql_limit(1, SAVE_NUM_SEARCHES), undef, $user_id);
-    if ($min_id) {
-        $dbh->do('DELETE FROM profile_search WHERE user_id = ? AND id <= ?',
-                 undef, ($user_id, $min_id));
+    my @ids = @{ $dbh->selectcol_arrayref(
+        "SELECT id FROM profile_search WHERE user_id = ? ORDER BY id",
+        undef, $user_id) };
+    if (scalar(@ids) > SAVE_NUM_SEARCHES) {
+        splice(@ids, - SAVE_NUM_SEARCHES);
+        $dbh->do(
+            "DELETE FROM profile_search WHERE id IN (" . join(',', @ids) . ")");
     }
     $dbh->bz_commit_transaction();
     return $search;
-- 
cgit v1.2.3-24-g4f1b