summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorByron Jones <bjones@mozilla.com>2012-09-05 09:12:21 +0200
committerByron Jones <bjones@mozilla.com>2012-09-05 09:12:21 +0200
commit48fca3365960025500d0528facc9633283569c4e (patch)
tree2debeafe62cae97ad8e0fc53720260e7a23ba3e0
parenteb23e4609733a7eeb8b0fe20cfd60635b0d73cd8 (diff)
downloadbugzilla-48fca3365960025500d0528facc9633283569c4e.tar.gz
bugzilla-48fca3365960025500d0528facc9633283569c4e.tar.xz
Bug 749540: Avoid database deadlocks when deleting recent searches
-rw-r--r--Bugzilla/Search/Recent.pm13
1 files changed, 7 insertions, 6 deletions
diff --git a/Bugzilla/Search/Recent.pm b/Bugzilla/Search/Recent.pm
index 5f04b180b..125850e85 100644
--- a/Bugzilla/Search/Recent.pm
+++ b/Bugzilla/Search/Recent.pm
@@ -65,12 +65,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;