From a6deb3e9f6c929dd3914ab035a306d6fa3d93a47 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 7 Feb 2024 12:51:38 +0100
Subject: [PATCH] perf(sharing): Move item_type validation to PHP

We do not support anything but file and folder and are not aware of
an app doing that, so the assumption is that it can help to move
to an index covering share_type + share_with, instead of
share_type + item_type and afterwards a second time on share_with

Signed-off-by: Joas Schilling <coding@schilljs.com>
---
 lib/Share/RoomShareProvider.php | 38 +++++++++++++++++----------------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/lib/Share/RoomShareProvider.php b/lib/Share/RoomShareProvider.php
index 3c4eb13bce3..83ea5d463ac 100644
--- a/lib/Share/RoomShareProvider.php
+++ b/lib/Share/RoomShareProvider.php
@@ -739,15 +739,17 @@ private function resolveSharesForRecipient(array $shares, string $userId): array
 			$query = $qb->select('*')
 				->from('share')
 				->where($qb->expr()->in('parent', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
-				->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)))
-				->andWhere($qb->expr()->orX(
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-					$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-				));
+				->andWhere($qb->expr()->eq('share_with', $qb->createNamedParameter($userId)));
 
 			$stmt = $query->executeQuery();
 
 			while ($data = $stmt->fetch()) {
+				if ($data['item_type'] !== 'file' && $data['item_type'] !== 'folder') {
+					continue;
+				}
+				if ($data['share_type'] !== self::SHARE_TYPE_USERROOM) {
+					continue;
+				}
 				$shareMap[$data['parent']]->setPermissions((int)$data['permissions']);
 				$shareMap[$data['parent']]->setTarget($data['file_target']);
 			}
@@ -819,12 +821,12 @@ public function getSharedWith($userId, $shareType, $node, $limit, $offset): arra
 			)
 				->selectAlias('st.id', 'storage_string_id')
 				->from('share', 's')
-				->orderBy('s.id', 'ASC')
 				->leftJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'))
 				->leftJoin('f', 'storages', 'st', $qb->expr()->eq('f.storage', 'st.numeric_id'));
 
 			if ($limit !== -1) {
-				$qb->setMaxResults($limit);
+				$qb->orderBy('s.id', 'ASC')
+					->setMaxResults($limit);
 			}
 
 			// Filter by node if provided
@@ -836,11 +838,7 @@ public function getSharedWith($userId, $shareType, $node, $limit, $offset): arra
 				->andWhere($qb->expr()->in('s.share_with', $qb->createNamedParameter(
 					$rooms,
 					IQueryBuilder::PARAM_STR_ARRAY
-				)))
-				->andWhere($qb->expr()->orX(
-					$qb->expr()->eq('s.item_type', $qb->createNamedParameter('file')),
-					$qb->expr()->eq('s.item_type', $qb->createNamedParameter('folder'))
-				));
+				)));
 
 			$cursor = $qb->executeQuery();
 			while ($data = $cursor->fetch()) {
@@ -864,6 +862,10 @@ public function getSharedWith($userId, $shareType, $node, $limit, $offset): arra
 	}
 
 	private function isAccessibleResult(array $data): bool {
+		if ($data['item_type'] !== 'file' && $data['item_type'] !== 'folder') {
+			return false;
+		}
+
 		// exclude shares leading to deleted file entries
 		if ($data['fileid'] === null || $data['path'] === null) {
 			return false;
@@ -972,18 +974,18 @@ public function getAccessList($nodes, $currentAccess): array {
 			$types[] = self::SHARE_TYPE_USERROOM;
 		}
 
-		$qb->select('id', 'parent', 'share_type', 'share_with', 'file_source', 'file_target', 'permissions')
+		$qb->select('id', 'parent', 'share_type', 'share_with', 'file_source', 'file_target', 'permissions', 'item_type')
 			->from('share')
 			->where($qb->expr()->in('share_type', $qb->createNamedParameter($types, IQueryBuilder::PARAM_INT_ARRAY)))
-			->andWhere($qb->expr()->in('file_source', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)))
-			->andWhere($qb->expr()->orX(
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('file')),
-				$qb->expr()->eq('item_type', $qb->createNamedParameter('folder'))
-			));
+			->andWhere($qb->expr()->in('file_source', $qb->createNamedParameter($ids, IQueryBuilder::PARAM_INT_ARRAY)));
 		$cursor = $qb->executeQuery();
 
 		$users = [];
 		while ($row = $cursor->fetch()) {
+			if ($row['item_type'] !== 'file' && $row['item_type'] !== 'folder') {
+				continue;
+			}
+
 			$type = (int)$row['share_type'];
 			if ($type === IShare::TYPE_ROOM) {
 				$roomToken = $row['share_with'];