From 1273d82e8b93241a78224c761e17d82dedd51047 Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Mon, 10 Oct 2016 09:30:36 +0200 Subject: [PATCH] Cache non existing DB user We always query the database backend. Even if we use a different one (ldap for example). Now we do this everytime we try to get a user object so caching that a user is not in the DB safes some queries on each request then (at least 2 what I found). Signed-off-by: Roeland Jago Douma --- lib/private/User/Database.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/private/User/Database.php b/lib/private/User/Database.php index eba7beffea..28cb330285 100644 --- a/lib/private/User/Database.php +++ b/lib/private/User/Database.php @@ -94,6 +94,9 @@ class Database extends Backend implements IUserBackend { $query = \OC_DB::prepare('INSERT INTO `*PREFIX*users` ( `uid`, `password` ) VALUES( ?, ? )'); $result = $query->execute(array($uid, \OC::$server->getHasher()->hash($password))); + // Clear cache + unset($this->cache[$uid]); + return $result ? true : false; } @@ -234,7 +237,7 @@ class Database extends Backend implements IUserBackend { * @return boolean */ private function loadUser($uid) { - if (empty($this->cache[$uid])) { + if (!isset($this->cache[$uid])) { $query = \OC_DB::prepare('SELECT `uid`, `displayname` FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)'); $result = $query->execute(array($uid)); @@ -243,6 +246,8 @@ class Database extends Backend implements IUserBackend { return false; } + $this->cache[$uid] = false; + while ($row = $result->fetchRow()) { $this->cache[$uid]['uid'] = $row['uid']; $this->cache[$uid]['displayname'] = $row['displayname']; @@ -284,7 +289,7 @@ class Database extends Backend implements IUserBackend { */ public function userExists($uid) { $this->loadUser($uid); - return !empty($this->cache[$uid]); + return $this->cache[$uid] !== false; } /**