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

Merge pull request #21068 from nextcloud/backport/20776/stable19 

[stable19] Improve group queries
This commit is contained in:
Morris Jobke 2020-05-26 10:38:17 +02:00 committed by GitHub
parent 9c63433cde 444b28adf6
commit 3bf0285840
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/private/Group/Database.php
View File

@ -118,7 +118,10 @@ class Database extends ABackend implements
} }
// Add to cache // Add to cache
$this->groupCache[$gid] = $gid; $this->groupCache[$gid] = [
'gid' => $gid,
'displayname' => $gid
];
return $result === 1; return $result === 1;
} }
@ -244,15 +247,19 @@ class Database extends ABackend implements
// No magic! // No magic!
$qb = $this->dbConn->getQueryBuilder(); $qb = $this->dbConn->getQueryBuilder();
$cursor = $qb->select('gid') $cursor = $qb->select('gu.gid', 'g.displayname')
->from('group_user') ->from('group_user', 'gu')
->leftJoin('gu', 'groups', 'g', $qb->expr()->eq('gu.gid', 'g.gid'))
->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid))) ->where($qb->expr()->eq('uid', $qb->createNamedParameter($uid)))
->execute(); ->execute();
$groups = []; $groups = [];
while ($row = $cursor->fetch()) { while ($row = $cursor->fetch()) {
$groups[] = $row['gid']; $groups[] = $row['gid'];
$this->groupCache[$row['gid']] = $row['gid']; $this->groupCache[$row['gid']] = [
'gid' => $row['gid'],
'displayname' => $row['displayname'],
];
} }
$cursor->closeCursor(); $cursor->closeCursor();
@ -309,7 +316,7 @@ class Database extends ABackend implements
} }
$qb = $this->dbConn->getQueryBuilder(); $qb = $this->dbConn->getQueryBuilder();
$cursor = $qb->select('gid') $cursor = $qb->select('gid', 'displayname')
->from('groups') ->from('groups')
->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid))) ->where($qb->expr()->eq('gid', $qb->createNamedParameter($gid)))
->execute(); ->execute();
@ -317,7 +324,10 @@ class Database extends ABackend implements
$cursor->closeCursor(); $cursor->closeCursor();
if ($result !== false) { if ($result !== false) {
$this->groupCache[$gid] = $gid; $this->groupCache[$gid] = [
'gid' => $gid,
'displayname' => $result['displayname'],
];
return true; return true;
} }
return false; return false;
@ -430,6 +440,10 @@ class Database extends ABackend implements
} }
public function getDisplayName(string $gid): string { public function getDisplayName(string $gid): string {
if (isset($this->groupCache[$gid])) {
return $this->groupCache[$gid]['displayname'];
}
$this->fixDI(); $this->fixDI();
$query = $this->dbConn->getQueryBuilder(); $query = $this->dbConn->getQueryBuilder();