mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #9104 from macjohnny/macjohnny-drastic-ldap-speedup 

drastic ldap speedup (update)
This commit is contained in:
blizzz 2014-10-17 12:07:27 +02:00
parent f1a5ebd59d de53bee9b3
commit 688a141586
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/private/group/manager.php
View File

@ -48,6 +48,7 @@ class Manager extends PublicEmitter implements IGroupManager {
*/ */
private $cachedUserGroups = array(); private $cachedUserGroups = array();
/** /**
* @param \OC\User\Manager $userManager * @param \OC\User\Manager $userManager
*/ */
@ -180,18 +181,24 @@ class Manager extends PublicEmitter implements IGroupManager {
$groups[$groupId] = $this->get($groupId); $groups[$groupId] = $this->get($groupId);
} }
} }
$this->cachedUserGroups[$uid] = array_values($groups); $this->cachedUserGroups[$uid] = $groups;
return $this->cachedUserGroups[$uid]; return $this->cachedUserGroups[$uid];
} }
/** /**
* get a list of group ids for a user
* @param \OC\User\User $user * @param \OC\User\User $user
* @return array with group names * @return array with group ids
*/ */
public function getUserGroupIds($user) { public function getUserGroupIds($user) {
$groupIds = array(); $groupIds = array();
foreach ($this->backends as $backend) { $userId = $user->getUID();
$groupIds = array_merge($groupIds, $backend->getUserGroups($user->getUID())); if (isset($this->cachedUserGroups[$userId])) {
return array_keys($this->cachedUserGroups[$userId]);
} else {
foreach ($this->backends as $backend) {
$groupIds = array_merge($groupIds, $backend->getUserGroups($userId));
}
} }
return $groupIds; return $groupIds;
} }

20
tests/lib/group/manager.php
View File

@ -190,7 +190,7 @@ class Manager extends \PHPUnit_Framework_TestCase {
$groups = $manager->search('1'); $groups = $manager->search('1');
$this->assertEquals(1, count($groups)); $this->assertEquals(1, count($groups));
$group1 = $groups[0]; $group1 = reset($groups);
$this->assertEquals('group1', $group1->getGID()); $this->assertEquals('group1', $group1->getGID());
} }
@ -229,8 +229,8 @@ class Manager extends \PHPUnit_Framework_TestCase {
$groups = $manager->search('1'); $groups = $manager->search('1');
$this->assertEquals(2, count($groups)); $this->assertEquals(2, count($groups));
$group1 = $groups[0]; $group1 = reset($groups);
$group12 = $groups[1]; $group12 = next($groups);
$this->assertEquals('group1', $group1->getGID()); $this->assertEquals('group1', $group1->getGID());
$this->assertEquals('group12', $group12->getGID()); $this->assertEquals('group12', $group12->getGID());
} }
@ -270,8 +270,8 @@ class Manager extends \PHPUnit_Framework_TestCase {
$groups = $manager->search('1', 2, 1); $groups = $manager->search('1', 2, 1);
$this->assertEquals(2, count($groups)); $this->assertEquals(2, count($groups));
$group1 = $groups[0]; $group1 = reset($groups);
$group12 = $groups[1]; $group12 = next($groups);
$this->assertEquals('group1', $group1->getGID()); $this->assertEquals('group1', $group1->getGID());
$this->assertEquals('group12', $group12->getGID()); $this->assertEquals('group12', $group12->getGID());
} }
@ -300,7 +300,7 @@ class Manager extends \PHPUnit_Framework_TestCase {
$groups = $manager->getUserGroups(new User('user1', $userBackend)); $groups = $manager->getUserGroups(new User('user1', $userBackend));
$this->assertEquals(1, count($groups)); $this->assertEquals(1, count($groups));
$group1 = $groups[0]; $group1 = reset($groups);
$this->assertEquals('group1', $group1->getGID()); $this->assertEquals('group1', $group1->getGID());
} }
@ -340,8 +340,8 @@ class Manager extends \PHPUnit_Framework_TestCase {
$groups = $manager->getUserGroups(new User('user1', $userBackend)); $groups = $manager->getUserGroups(new User('user1', $userBackend));
$this->assertEquals(2, count($groups)); $this->assertEquals(2, count($groups));
$group1 = $groups[0]; $group1 = reset($groups);
$group2 = $groups[1]; $group2 = next($groups);
$this->assertEquals('group1', $group1->getGID()); $this->assertEquals('group1', $group1->getGID());
$this->assertEquals('group2', $group2->getGID()); $this->assertEquals('group2', $group2->getGID());
} }
@ -727,7 +727,7 @@ class Manager extends \PHPUnit_Framework_TestCase {
// check result // check result
$groups = $manager->getUserGroups($user1); $groups = $manager->getUserGroups($user1);
$this->assertEquals(1, count($groups)); $this->assertEquals(1, count($groups));
$group1 = $groups[0]; $group1 = reset($groups);
$this->assertEquals('group1', $group1->getGID()); $this->assertEquals('group1', $group1->getGID());
} }
@ -768,7 +768,7 @@ class Manager extends \PHPUnit_Framework_TestCase {
$user1 = new User('user1', null); $user1 = new User('user1', null);
$groups = $manager->getUserGroups($user1); $groups = $manager->getUserGroups($user1);
$this->assertEquals(1, count($groups)); $this->assertEquals(1, count($groups));
$group1 = $groups[0]; $group1 = reset($groups);
$this->assertEquals('group1', $group1->getGID()); $this->assertEquals('group1', $group1->getGID());
// remove user // remove user