perf: Replace getById call with getFirstNodeById

CarlSchwan · CarlSchwan · commit 89315ebadbb2 · 2026-02-05T12:15:11.000+01:00
Avoid looking at all the mounts

Signed-off-by: Carl Schwan &lt;carlschwan@kde.org&gt;
diff --git a/apps/comments/lib/Activity/Listener.php b/apps/comments/lib/Activity/Listener.php
@@ -12,7 +12,6 @@
 use OCP\Comments\CommentsEvent;
 use OCP\Files\Config\IMountProviderCollection;
 use OCP\Files\IRootFolder;
-use OCP\Files\Node;
 use OCP\IUser;
 use OCP\IUserSession;
 use OCP\Share\IShareHelper;
@@ -47,10 +46,8 @@ public function commentEvent(CommentsEvent $event): void {
 		foreach ($mounts as $mount) {
 			$owner = $mount->getUser()->getUID();
 			$ownerFolder = $this->rootFolder->getUserFolder($owner);
-			$nodes = $ownerFolder->getById((int)$event->getComment()->getObjectId());
-			if (!empty($nodes)) {
-				/** @var Node $node */
-				$node = array_shift($nodes);
+			$node = $ownerFolder->getFirstNodeById((int)$event->getComment()->getObjectId());
+			if ($node !== null) {
 				$al = $this->shareHelper->getPathsForAccessList($node);
 				$users += $al['users'];
 			}
diff --git a/apps/comments/lib/Controller/NotificationsController.php b/apps/comments/lib/Controller/NotificationsController.php
@@ -70,11 +70,11 @@ public function view(string $id): RedirectResponse|NotFoundResponse {
 				return new NotFoundResponse();
 			}
 			$userFolder = $this->rootFolder->getUserFolder($currentUser->getUID());
-			$files = $userFolder->getById((int)$comment->getObjectId());
+			$file = $userFolder->getFirstNodeById((int)$comment->getObjectId());
 
 			$this->markProcessed($comment, $currentUser);
 
-			if (empty($files)) {
+			if ($file === null) {
 				return new NotFoundResponse();
 			}
 
diff --git a/apps/comments/lib/Listener/CommentsEntityEventListener.php b/apps/comments/lib/Listener/CommentsEntityEventListener.php
@@ -32,8 +32,8 @@ public function handle(Event $event): void {
 		}
 
 		$event->addEntityCollection('files', function ($name): bool {
-			$nodes = $this->rootFolder->getUserFolder($this->userId)->getById((int)$name);
-			return !empty($nodes);
+			$node = $this->rootFolder->getUserFolder($this->userId)->getFirstNodeById((int)$name);
+			return $node !== null;
 		});
 	}
 }
diff --git a/apps/comments/lib/Notification/Notifier.php b/apps/comments/lib/Notification/Notifier.php
@@ -84,11 +84,10 @@ public function prepare(INotification $notification, string $languageCode): INot
 					throw new UnknownNotificationException('Unsupported comment object');
 				}
 				$userFolder = $this->rootFolder->getUserFolder($notification->getUser());
-				$nodes = $userFolder->getById((int)$parameters[1]);
-				if (empty($nodes)) {
+				$node = $userFolder->getFirstNodeById((int)$parameters[1]);
+				if ($node === null) {
 					throw new AlreadyProcessedException();
 				}
-				$node = $nodes[0];
 
 				$path = rtrim($node->getPath(), '/');
 				if (str_starts_with($path, '/' . $notification->getUser() . '/files/')) {
diff --git a/apps/comments/lib/Search/CommentsSearchProvider.php b/apps/comments/lib/Search/CommentsSearchProvider.php
@@ -116,11 +116,11 @@ public function search(IUser $user, ISearchQuery $query): SearchResult {
 	 * @throws NotFoundException
 	 */
 	protected function getFileForComment(Folder $userFolder, IComment $comment): Node {
-		$nodes = $userFolder->getById((int)$comment->getObjectId());
-		if (empty($nodes)) {
+		$node = $userFolder->getFirstNodeById((int)$comment->getObjectId());
+		if ($node === null) {
 			throw new NotFoundException('File not found');
 		}
 
-		return array_shift($nodes);
+		return $node;
 	}
 }
diff --git a/apps/comments/tests/Unit/Activity/ListenerTest.php b/apps/comments/tests/Unit/Activity/ListenerTest.php
@@ -92,12 +92,11 @@ public function testCommentEvent(): void {
 			->willReturn($userMountCache);
 
 		$node = $this->createMock(Node::class);
-		$nodes = [ $node ];
 
 		$ownerFolder = $this->createMock(Folder::class);
 		$ownerFolder->expects($this->any())
-			->method('getById')
-			->willReturn($nodes);
+			->method('getFirstNodeById')
+			->willReturn($node);
 
 		$this->rootFolder->expects($this->any())
 			->method('getUserFolder')
diff --git a/apps/comments/tests/Unit/Controller/NotificationsTest.php b/apps/comments/tests/Unit/Controller/NotificationsTest.php
@@ -107,8 +107,8 @@ public function testViewSuccess(): void {
 			->willReturn($folder);
 
 		$folder->expects($this->once())
-			->method('getById')
-			->willReturn([$file]);
+			->method('getFirstNodeById')
+			->willReturn($file);
 
 		$this->session->expects($this->once())
 			->method('getUser')
@@ -183,8 +183,8 @@ public function testViewNoFile(): void {
 			->willReturn($folder);
 
 		$folder->expects($this->once())
-			->method('getById')
-			->willReturn([]);
+			->method('getFirstNodeById')
+			->willReturn(null);
 
 		$user = $this->createMock(IUser::class);
 
diff --git a/apps/comments/tests/Unit/Notification/NotifierTest.php b/apps/comments/tests/Unit/Notification/NotifierTest.php
@@ -86,9 +86,9 @@ public function testPrepareSuccess(): void {
 			->with('you')
 			->willReturn($userFolder);
 		$userFolder->expects($this->once())
-			->method('getById')
+			->method('getFirstNodeById')
 			->with('678')
-			->willReturn([$node]);
+			->willReturn($node);
 
 		$this->notification->expects($this->exactly(2))
 			->method('getUser')
@@ -202,9 +202,9 @@ public function testPrepareSuccessDeletedUser(): void {
 			->with('you')
 			->willReturn($userFolder);
 		$userFolder->expects($this->once())
-			->method('getById')
+			->method('getFirstNodeById')
 			->with('678')
-			->willReturn([$node]);
+			->willReturn($node);
 
 		$this->notification->expects($this->exactly(2))
 			->method('getUser')
@@ -301,7 +301,7 @@ public function testPrepareDifferentApp(): void {
 
 		$this->folder
 			->expects($this->never())
-			->method('getById');
+			->method('getFirstNodeById');
 
 		$this->notification
 			->expects($this->once())
@@ -338,7 +338,7 @@ public function testPrepareNotFound(): void {
 
 		$this->folder
 			->expects($this->never())
-			->method('getById');
+			->method('getFirstNodeById');
 
 		$this->notification
 			->expects($this->once())
@@ -378,7 +378,7 @@ public function testPrepareDifferentSubject(): void {
 
 		$this->folder
 			->expects($this->never())
-			->method('getById');
+			->method('getFirstNodeById');
 
 		$this->notification
 			->expects($this->once())
@@ -435,7 +435,7 @@ public function testPrepareNotFiles(): void {
 
 		$this->folder
 			->expects($this->never())
-			->method('getById');
+			->method('getFirstNodeById');
 
 		$this->notification
 			->expects($this->once())
@@ -497,9 +497,9 @@ public function testPrepareUnresolvableFileID(): void {
 			->with('you')
 			->willReturn($userFolder);
 		$userFolder->expects($this->once())
-			->method('getById')
+			->method('getFirstNodeById')
 			->with('678')
-			->willReturn([]);
+			->willReturn(null);
 
 		$this->notification->expects($this->once())
 			->method('getUser')
diff --git a/apps/dav/lib/DAV/ViewOnlyPlugin.php b/apps/dav/lib/DAV/ViewOnlyPlugin.php
@@ -69,9 +69,8 @@ public function checkViewOnly(RequestInterface $request): bool {
 				// The version source file is relative to the owner storage.
 				// But we need the node from the current user perspective.
 				if ($node->getOwner()->getUID() !== $currentUserId) {
-					$nodes = $this->userFolder->getById($node->getId());
-					$node = array_pop($nodes);
-					if (!$node) {
+					$node = $this->userFolder->getFirstNodeById($node->getId());
+					if ($node === null) {
 						throw new NotFoundException('Version file not accessible by current user');
 					}
 				}
diff --git a/apps/dav/tests/unit/DAV/ViewOnlyPluginTest.php b/apps/dav/tests/unit/DAV/ViewOnlyPluginTest.php
@@ -122,8 +122,8 @@ public function testCanGet(bool $isVersion, ?bool $attrEnabled, bool $expectCanD
 				->method('getUID')
 				->willReturn('bob');
 			$this->userFolder->expects($this->once())
-				->method('getById')
-				->willReturn([$nodeInfo]);
+				->method('getFirstNodeById')
+				->willReturn($nodeInfo);
 			$this->userFolder->expects($this->once())
 				->method('getOwner')
 				->willReturn($owner);
diff --git a/apps/files/lib/Collaboration/Resources/ResourceProvider.php b/apps/files/lib/Collaboration/Resources/ResourceProvider.php
@@ -20,6 +20,7 @@
 class ResourceProvider implements IProvider {
 	public const RESOURCE_TYPE = 'file';
 
+	/** @var array<int, Node> $nodes */
 	protected array $nodes = [];
 
 	public function __construct(
@@ -86,9 +87,9 @@ public function canAccessResource(IResource $resource, ?IUser $user = null): boo
 		}
 
 		$userFolder = $this->rootFolder->getUserFolder($user->getUID());
-		$node = $userFolder->getById((int)$resource->getId());
+		$node = $userFolder->getFirstNodeById((int)$resource->getId());
 
-		if ($node) {
+		if ($node !== null) {
 			$this->nodes[(int)$resource->getId()] = $node;
 			return true;
 		}
diff --git a/apps/sharebymail/lib/ShareByMailProvider.php b/apps/sharebymail/lib/ShareByMailProvider.php
@@ -164,8 +164,11 @@ protected function createShareActivity(IShare $share, string $type = 'share'): v
 		if ($share->getShareOwner() !== $share->getSharedBy()) {
 			$ownerFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
 			$fileId = $share->getNode()->getId();
-			$nodes = $ownerFolder->getById($fileId);
-			$ownerPath = $nodes[0]->getPath();
+			$node = $ownerFolder->getFirstNodeById($fileId);
+			if ($node === null) {
+				throw new \LogicException("Unable to find node $fileId asociated with the share");
+			}
+			$ownerPath = $node->getPath();
 			$this->publishActivity(
 				$type === 'share' ? Activity::SUBJECT_SHARED_EMAIL_BY : Activity::SUBJECT_UNSHARED_EMAIL_BY,
 				[$ownerFolder->getRelativePath($ownerPath), $share->getSharedWith(), $share->getSharedBy()],

Original file line number	Diff line number	Diff line change
`@@ -70,11 +70,11 @@ public function view(string $id): RedirectResponse\|NotFoundResponse {`
`70`	`70`	`return new NotFoundResponse();`
`71`	`71`	`}`
`72`	`72`	`$userFolder = $this->rootFolder->getUserFolder($currentUser->getUID());`
`73`		`- $files = $userFolder->getById((int)$comment->getObjectId());`
	`73`	`+ $file = $userFolder->getFirstNodeById((int)$comment->getObjectId());`
`74`	`74`
`75`	`75`	`$this->markProcessed($comment, $currentUser);`
`76`	`76`
`77`		`- if (empty($files)) {`
	`77`	`+ if ($file === null) {`
`78`	`78`	`return new NotFoundResponse();`
`79`	`79`	`}`
`80`	`80`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,8 @@ public function handle(Event $event): void {`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`$event->addEntityCollection('files', function ($name): bool {`
`35`		`- $nodes = $this->rootFolder->getUserFolder($this->userId)->getById((int)$name);`
`36`		`- return !empty($nodes);`
	`35`	`+ $node = $this->rootFolder->getUserFolder($this->userId)->getFirstNodeById((int)$name);`
	`36`	`+ return $node !== null;`
`37`	`37`	`});`
`38`	`38`	`}`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -84,11 +84,10 @@ public function prepare(INotification $notification, string $languageCode): INot`
`84`	`84`	`throw new UnknownNotificationException('Unsupported comment object');`
`85`	`85`	`}`
`86`	`86`	`$userFolder = $this->rootFolder->getUserFolder($notification->getUser());`
`87`		`- $nodes = $userFolder->getById((int)$parameters[1]);`
`88`		`- if (empty($nodes)) {`
	`87`	`+ $node = $userFolder->getFirstNodeById((int)$parameters[1]);`
	`88`	`+ if ($node === null) {`
`89`	`89`	`throw new AlreadyProcessedException();`
`90`	`90`	`}`
`91`		`- $node = $nodes[0];`
`92`	`91`
`93`	`92`	`$path = rtrim($node->getPath(), '/');`
`94`	`93`	`if (str_starts_with($path, '/' . $notification->getUser() . '/files/')) {`
Original file line number	Diff line number	Diff line change
`@@ -116,11 +116,11 @@ public function search(IUser $user, ISearchQuery $query): SearchResult {`
`116`	`116`	`* @throws NotFoundException`
`117`	`117`	`*/`
`118`	`118`	`protected function getFileForComment(Folder $userFolder, IComment $comment): Node {`
`119`		`- $nodes = $userFolder->getById((int)$comment->getObjectId());`
`120`		`- if (empty($nodes)) {`
	`119`	`+ $node = $userFolder->getFirstNodeById((int)$comment->getObjectId());`
	`120`	`+ if ($node === null) {`
`121`	`121`	`throw new NotFoundException('File not found');`
`122`	`122`	`}`
`123`	`123`
`124`		`- return array_shift($nodes);`
	`124`	`+ return $node;`
`125`	`125`	`}`
`126`	`126`	`}`
Original file line number	Diff line number	Diff line change
`@@ -69,9 +69,8 @@ public function checkViewOnly(RequestInterface $request): bool {`
`69`	`69`	`// The version source file is relative to the owner storage.`
`70`	`70`	`// But we need the node from the current user perspective.`
`71`	`71`	`if ($node->getOwner()->getUID() !== $currentUserId) {`
`72`		`- $nodes = $this->userFolder->getById($node->getId());`
`73`		`- $node = array_pop($nodes);`
`74`		`- if (!$node) {`
	`72`	`+ $node = $this->userFolder->getFirstNodeById($node->getId());`
	`73`	`+ if ($node === null) {`
`75`	`74`	`throw new NotFoundException('Version file not accessible by current user');`
`76`	`75`	`}`
`77`	`76`	`}`