Skip to content

perf(sharing): reduce share listing overhead #61872

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

Draft
joshtrichards wants to merge 2 commits into
base: master
Choose a base branch
from
+36 −25
Draft

perf(sharing): reduce share listing overhead #61872

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1739007
perf(sharing): optimize duplicate share filtering and array flattening
joshtrichards Jul 7, 2026
f98c194
perf(files_sharing): avoid repeated array_merge in getSharesFromNode
joshtrichards Jul 7, 2026
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
61 changes: 36 additions & 25 deletions apps/files_sharing/lib/Controller/ShareAPIController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -880,27 +880,30 @@ private function getSharesInDir(Node $folder): array {
$nodes = $folder->getDirectoryListing();

/** @var IShare[] $shares */
$shares = array_reduce($nodes, function ($carry, $node) {
$carry = array_merge($carry, $this->getAllShares($node, true));
return $carry;
}, []);

// filter out duplicate shares
$known = [];
$shares = [];
foreach ($nodes as $node) {
foreach ($this->getAllShares($node, true) as $share) {
$shares[] = $share;
}
}

$formatted = $miniFormatted = [];
$resharingRight = false;
$known = [];
$knownIds = [];

foreach ($shares as $share) {
if (in_array($share->getId(), $known) || $share->getSharedWith() === $this->userId) {
$shareId = $share->getId();

if (isset($knownIds[$shareId]) || $share->getSharedWith() === $this->userId) {
continue;
}

try {
$format = $this->formatShare($share);

$known[] = $share->getId();
$knownIds[$shareId] = true;
$formatted[] = $format;

if ($share->getSharedBy() === $this->userId) {
$miniFormatted[] = $format;
}
Expand Down Expand Up @@ -1058,8 +1061,10 @@ private function getFormattedShares(

$shares = $this->getSharesFromNode($viewer, $node, $reShares);

$known = $formatted = $miniFormatted = [];
$formatted = $miniFormatted = [];
$resharingRight = false;
$knownIds = [];

foreach ($shares as $share) {
try {
$share->getNode();
Expand All @@ -1071,15 +1076,18 @@ private function getFormattedShares(
continue;
}

if (in_array($share->getId(), $known)
$shareId = $share->getId();

if (isset($knownIds[$shareId])
|| ($share->getSharedWith() === $this->userId && $share->getShareType() === IShare::TYPE_USER)) {
continue;
}

$known[] = $share->getId();
try {
/** @var IShare $share */
$format = $this->formatShare($share, $node);

$knownIds[$shareId] = true;
$formatted[] = $format;

// let's also build a list of shares created
Expand Down Expand Up @@ -1826,30 +1834,33 @@ private function getSharesFromNode(string $viewer, $node, bool $reShares): array
IShare::TYPE_DECK,
];

// Should we assume that the (currentUser) viewer is the owner of the node !?
/** @var IShare[] $shares */
$shares = [];

foreach ($providers as $provider) {
if (!$this->shareManager->shareProviderExists($provider)) {
continue;
}

$providerShares
= $this->shareManager->getSharesBy($viewer, $provider, $node, $reShares, -1, 0);
$shares = array_merge($shares, $providerShares);
// Should we assume that the (currentUser) viewer is the owner of the node !?
$providerShares = $this->shareManager->getSharesBy($viewer, $provider, $node, $reShares, -1, 0);
if (!empty($providerShares)) {
array_push($shares, ...$providerShares);
}
}

if ($this->shareManager->outgoingServer2ServerSharesAllowed()) {
$federatedShares = $this->shareManager->getSharesBy(
$this->userId, IShare::TYPE_REMOTE, $node, $reShares, -1, 0
);
$shares = array_merge($shares, $federatedShares);
$providerShares = $this->shareManager->getSharesBy($this->userId, IShare::TYPE_REMOTE, $node, $reShares, -1, 0);
if (!empty($providerShares)) {
array_push($shares, ...$providerShares);
}
}

if ($this->shareManager->outgoingServer2ServerGroupSharesAllowed()) {
$federatedShares = $this->shareManager->getSharesBy(
$this->userId, IShare::TYPE_REMOTE_GROUP, $node, $reShares, -1, 0
);
$shares = array_merge($shares, $federatedShares);
$providerShares = $this->shareManager->getSharesBy($this->userId, IShare::TYPE_REMOTE_GROUP, $node, $reShares, -1, 0);
if (!empty($providerShares)) {
array_push($shares, ...$providerShares);
}
}

return $shares;
Expand Down
Loading