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

[stable25] Reduce number of database queries during WebDAV propfind request #34610

Merged
merged 2 commits into from
Oct 21, 2022
Merged

[stable25] Reduce number of database queries during WebDAV propfind request #34610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6119604
Read notes from share already loaded into memory
starypatyk Oct 7, 2022
52a5d0c
Review comment - remove redundant empty() call
starypatyk Oct 10, 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
26 changes: 11 additions & 15 deletions apps/dav/lib/Connector/Sabre/Node.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,23 +355,19 @@ public function getNoteFromShare($user) {
return '';
}

$types = [
IShare::TYPE_USER,
IShare::TYPE_GROUP,
IShare::TYPE_CIRCLE,
IShare::TYPE_ROOM
];

foreach ($types as $shareType) {
$shares = $this->shareManager->getSharedWith($user, $shareType, $this, -1);
foreach ($shares as $share) {
$note = $share->getNote();
if ($share->getShareOwner() !== $user && !empty($note)) {
return $note;
}
}
// Retrieve note from the share object already loaded into
// memory, to avoid additional database queries.
$storage = $this->getNode()->getStorage();
if (!$storage->instanceOfStorage(\OCA\Files_Sharing\SharedStorage::class)) {
return '';
}
/** @var \OCA\Files_Sharing\SharedStorage $storage */

$share = $storage->getShare();
$note = $share->getNote();
if ($share->getShareOwner() !== $user) {
return $note;
}
return '';
}

Expand Down
7 changes: 7 additions & 0 deletions apps/files_sharing/lib/MountProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,13 @@ private function buildSuperShares(array $allShares, \OCP\IUser $user) {
->setShareType($shares[0]->getShareType())
->setTarget($shares[0]->getTarget());

// Gather notes from all the shares.
// Since these are readly available here, storing them
// enables the DAV FilesPlugin to avoid executing many
// DB queries to retrieve the same information.
$allNotes = implode("\n", array_map(function ($sh) { return $sh->getNote(); }, $shares));
$superShare->setNote($allNotes);

// use most permissive permissions
// this covers the case where there are multiple shares for the same
// file e.g. from different groups and different permissions
Expand Down