Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

drastic ldap speedup (update) #9104

Merged
merged 9 commits into from Oct 17, 2014
Merged

drastic ldap speedup (update) #9104

Changes from 6 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
356e4b6
Update manager.php
macjohnny Jun 19, 2014
18c7c94
Update manager.php
macjohnny Jun 19, 2014
c954168
Update manager.php
macjohnny Jun 19, 2014
14fcd68
Update manager.php
macjohnny Jun 19, 2014
6a3d6d3
Update manager.php
macjohnny Jun 19, 2014
405e89f
Update manager.php
macjohnny Jun 21, 2014
24e397a
clean up function getUserGroupIds
macjohnny Jun 23, 2014
11ccb57
modified caching mechanism in getUserGroupIds
macjohnny Jun 23, 2014
de53bee
adapted tests for a groupId indexed group array
macjohnny Jun 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
45 changes: 37 additions & 8 deletions lib/private/group/manager.php
View file
Open in desktop
Expand Up @@ -47,31 +47,45 @@ class Manager extends PublicEmitter {
*/
private $cachedUserGroups = array();

/**
* @var string[]
*/
private $cachedUserGroupIds = array();


/**
* @param \OC\User\Manager $userManager
*/
public function __construct($userManager) {
$this->userManager = $userManager;
$cachedGroups = & $this->cachedGroups;
$cachedUserGroups = & $this->cachedUserGroups;
$this->listen('\OC\Group', 'postDelete', function ($group) use (&$cachedGroups, &$cachedUserGroups) {
$cachedUserGroupIds = & $this->cachedUserGroupIds;
$this->listen('\OC\Group', 'postDelete', function ($group) use (&$cachedGroups, &$cachedUserGroups, &$cachedUserGroupIds) {
/**
* @var \OC\Group\Group $group
*/
unset($cachedGroups[$group->getGID()]);
$cachedUserGroups = array();
$Position = array_search($group->getGID(), $cachedUserGroupIds);
if($Position !== false)
{
unset($cachedUserGroupIds[$Position]);
}
});
$this->listen('\OC\Group', 'postAddUser', function ($group) use (&$cachedUserGroups) {
$this->listen('\OC\Group', 'postAddUser', function ($group) use (&$cachedUserGroups, &$cachedUserGroupIds) {
/**
* @var \OC\Group\Group $group
*/
$cachedUserGroups = array();
$cachedUserGroupIds = array();
});
$this->listen('\OC\Group', 'postRemoveUser', function ($group) use (&$cachedUserGroups) {
$this->listen('\OC\Group', 'postRemoveUser', function ($group) use (&$cachedUserGroups, &$cachedUserGroupIds) {
/**
* @var \OC\Group\Group $group
*/
$cachedUserGroups = array();
$cachedUserGroupIds = array();
});
}

Expand Down Expand Up @@ -182,17 +196,32 @@ public function getUserGroups($user) {
$this->cachedUserGroups[$uid] = array_values($groups);
return $this->cachedUserGroups[$uid];
}

/**
* get a list of group ids for a user
* @param \OC\User\User $user
* @return array with group names
* @return array with group ids
*/
public function getUserGroupIds($user) {
$groupIds = array();
foreach ($this->backends as $backend) {
$groupIds = array_merge($groupIds, $backend->getUserGroups($user->getUID()));

$userId = $user->getUID();
if (isset($this->cachedUserGroupIds[$userId])) {
return $this->cachedUserGroupIds[$userId];
}
if (isset($this->cachedUserGroups[$userId])) {
foreach($this->cachedUserGroups[$userId] as $group)
{
$groupIds[] = $group->getGID();
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brackets and else in the same line please

else
{
foreach ($this->backends as $backend) {
$groupIds = array_merge($groupIds, $backend->getUserGroups($userId));
}
}
return $groupIds;
$this->cachedUserGroupIds[$userId] = $groupIds;
return $this->cachedUserGroupIds[$userId];
}

/**
Expand Down