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

simplify and speed up search in groups #32197

Closed
wants to merge 3 commits into from
Closed

simplify and speed up search in groups #32197

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cda42c4
simplify and speed up search in groups
blizzz Apr 27, 2022
938f14a
fixup! simplify and speed up search in groups
blizzz Apr 27, 2022
7b77327
rm dead code
blizzz Apr 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 4 additions & 44 deletions lib/private/Group/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,18 +338,6 @@ private function getUserIdGroupIds(string $uid): array {
return $this->cachedUserGroups[$uid];
}

/**
* get an array of groupid and displayName for a user
*
* @param IUser $user
* @return array ['displayName' => displayname]
*/
public function getUserGroupNames(IUser $user) {
return array_map(function ($group) {
return ['displayName' => $group->getDisplayName()];
}, $this->getUserGroups($user));
}

/**
* get a list of all display names in a group
*
Expand All @@ -365,39 +353,11 @@ public function displayNamesInGroup($gid, $search = '', $limit = -1, $offset = 0
return [];
}

$search = trim($search);
$groupUsers = [];

if (!empty($search)) {
// only user backends have the capability to do a complex search for users
$searchOffset = 0;
$searchLimit = $limit * 100;
if ($limit === -1) {
$searchLimit = 500;
}

do {
$filteredUsers = $this->userManager->searchDisplayName($search, $searchLimit, $searchOffset);
foreach ($filteredUsers as $filteredUser) {
if ($group->inGroup($filteredUser)) {
$groupUsers[] = $filteredUser;
}
}
$searchOffset += $searchLimit;
} while (count($groupUsers) < $searchLimit + $offset && count($filteredUsers) >= $searchLimit);

if ($limit === -1) {
$groupUsers = array_slice($groupUsers, $offset);
} else {
$groupUsers = array_slice($groupUsers, $offset, $limit);
}
} else {
$groupUsers = $group->searchUsers('', $limit, $offset);
}

$users = $group->searchDisplayName(trim($search), $limit === -1 ? null : $limit, $offset);
/** @var IUser $user */
$matchingUsers = [];
foreach ($groupUsers as $groupUser) {
$matchingUsers[(string) $groupUser->getUID()] = $groupUser->getDisplayName();
foreach ($users as $user) {
$matchingUsers[$user->getUID()] = $user->getDisplayName();
}
return $matchingUsers;
}
Expand Down