upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Merge pull request #38457 from nextcloud/fix/improve-ldap-offset-search-perf

Browse source 
Use default page size for jumping to desired offset
This commit is contained in:
Arthur Schiwon 2023-06-22 21:46:03 +02:00 committed by GitHub
commit 2e81a1d839
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/user_ldap/lib/Access.php
View file

@ -1993,8 +1993,15 @@ class Access extends LDAPUtility {
// no cookie known from a potential previous search. We need
// to start from 0 to come to the desired page. cookie value
// of '0' is valid, because 389ds
$reOffset = ($offset - $pageSize) < 0 ? 0 : $offset - $pageSize;
$this->search($filter, $base, $attr, $pageSize, $reOffset, true);
$defaultPageSize = (int)$this->connection->ldapPagingSize;
if ($offset < $defaultPageSize) {
/* Make a search with offset as page size and dismiss the result, to init the cookie */
$this->search($filter, $base, $attr, $offset, 0, true);
} else {
/* Make a search for previous page and dismiss the result, to init the cookie */
$reOffset = $offset - $defaultPageSize;
$this->search($filter, $base, $attr, $defaultPageSize, $reOffset, true);
}
if (!$this->hasMoreResults()) {
// when the cookie is reset with != 0 offset, there are no further
// results, so stop.