Skip to content

[stable33] perf(share): Remove useless order by id #60345

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

Open
backportbot wants to merge 3 commits into
base: stable33
Choose a base branch
from
+15 −9
Open

[stable33] perf(share): Remove useless order by id #60345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7741f8
perf(share): Remove useless order by id
CarlSchwan Apr 20, 2026
52f62ef
fix: use correct variable for order by
CarlSchwan Apr 21, 2026
d098916
test: adjust tests to unsorted share listing
icewind1991 May 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
21 changes: 12 additions & 9 deletions lib/private/Share20/DefaultShareProvider.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,8 +381,7 @@ public function getChildren(IShare $parent): array {
], IQueryBuilder::PARAM_INT_ARRAY)
)
)
->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)))
->orderBy('id');
->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)));

$cursor = $qb->executeQuery();
while ($data = $cursor->fetch()) {
Expand Down Expand Up @@ -666,8 +665,6 @@ private function getSharesInFolderInternal(?string $userId, Folder $node, ?bool
)
);

$qb->orderBy('id');

$shares = [];

$chunks = array_chunk($childMountRootIds, 1000);
Expand Down Expand Up @@ -725,7 +722,9 @@ public function getSharesBy($userId, $shareType, $node, $reshares, $limit, $offs
}

$qb->setFirstResult($offset);
$qb->orderBy('id');
if ($offset !== 0 || $limit !== -1) {
$qb->orderBy('id');
}

$cursor = $qb->executeQuery();
$shares = [];
Expand Down Expand Up @@ -794,7 +793,6 @@ public function getSharesByPath(Node $path) {
->andWhere($qb->expr()->eq('file_source', $qb->createNamedParameter($path->getId())))
->andWhere($qb->expr()->in('share_type', $qb->createNamedParameter([IShare::TYPE_USER, IShare::TYPE_GROUP, IShare::TYPE_LINK], IQueryBuilder::PARAM_INT_ARRAY)))
->andWhere($qb->expr()->in('item_type', $qb->createNamedParameter(['file', 'folder'], IQueryBuilder::PARAM_STR_ARRAY)))
->orderBy('id', 'ASC')
->executeQuery();

$shares = [];
Expand Down Expand Up @@ -887,8 +885,10 @@ private function _getSharedWith(
->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'));

// Order by id
$qb->orderBy('s.id');
if ($offset !== 0 || $limit !== -1) {
// Order by id
$qb->orderBy('s.id');
}

// Set limit and offset
if ($limit !== -1) {
Expand Down Expand Up @@ -957,9 +957,12 @@ private function _getSharedWith(
->from('share', 's')
->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'))
->orderBy('s.id')
->setFirstResult(0);

if ($offset !== 0 || $limit !== -1) {
$qb->orderBy('s.id');
}

if ($limit !== -1) {
$qb->setMaxResults($limit - count($shares));
}
Expand Down
3 changes: 3 additions & 0 deletions tests/lib/Share20/DefaultShareProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,7 @@ public function testGetChildren(): void {
$share->method('getId')->willReturn($id);

$children = $this->provider->getChildren($share);
usort($children, fn (IShare $a, IShare $b) => $a->getId() <=> $b->getId());

$this->assertCount(2, $children);

Expand Down Expand Up @@ -2640,6 +2641,7 @@ public function testGetSharesInFolder(): void {
$this->assertSame(IShare::TYPE_USER, $file_shares[0]->getShareType());

$folder_shares = $result[$folder2->getId()];
usort($folder_shares, fn (IShare $a, IShare $b) => $a->getId() <=> $b->getId());
$this->assertCount(2, $folder_shares);
$this->assertSame($folder2->getId(), $folder_shares[0]->getNodeId());
$this->assertSame($folder2->getId(), $folder_shares[1]->getNodeId());
Expand Down Expand Up @@ -3100,6 +3102,7 @@ public function testGetSharesByPath(): void {
->willReturn(1);

$shares = $this->provider->getSharesByPath($node);
usort($shares, fn (IShare $a, IShare $b) => $a->getId() <=> $b->getId());
$this->assertCount(3, $shares);

$this->assertEquals($id1, $shares[0]->getId());
Expand Down
Loading