From 9d9acf24de482bdd5d0b700ba75631b246e5699b Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Mon, 4 Mar 2013 23:19:55 +0100 Subject: [PATCH] Cache: more efficient detection for existing entries during upgrade --- lib/files/cache/upgrade.php | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/lib/files/cache/upgrade.php b/lib/files/cache/upgrade.php index 4d98abb2f8d..811d82d7437 100644 --- a/lib/files/cache/upgrade.php +++ b/lib/files/cache/upgrade.php @@ -82,15 +82,9 @@ class Upgrade { * @return bool */ function inCache($storage, $pathHash, $id) { - $query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?'); - $result = $query->execute(array($storage, $pathHash)); - if ($result->fetchRow()) { - return true; - } else { - $query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE `fileid` = ?'); - $result = $query->execute(array($id)); - return (bool)$result->fetchRow(); - } + $query = \OC_DB::prepare('SELECT `fileid` FROM `*PREFIX*filecache` WHERE (`storage` = ? AND `path_hash` = ?) OR `fileid` = ?'); + $result = $query->execute(array($storage, $pathHash, $id)); + return (bool)$result->fetchRow(); } /** -- 2.39.5