perf: Enhance objects using constant sql queries count to get rid of N+1 queries (code review)

Signed-off-by: Kostiantyn Miakshyn <molodchick@gmail.com>

Author: Koc

lib/Db/RowSleeveMapper.php

@@ -105,33 +105,6 @@ public function deleteAllForTable(int $tableId): int {
 		return $qb->executeStatement();
 	}
 
-	/**
-	 * @param int[] $tableIds
-	 * @return array<int, int>
-	 */
-	public function countRowsForTables(array $tableIds): array {
-		if (empty($tableIds)) {
-			return [];
-		}
-
-		$counts = array_fill_keys($tableIds, 0);
-		foreach (array_chunk($tableIds, 1000 - 1) as $tableIdsChunk) {
-			$qb = $this->db->getQueryBuilder();
-			$qb->select('table_id', $qb->func()->count('*', 'counter'))
-				->from($this->table)
-				->where($qb->expr()->in('table_id', $qb->createNamedParameter($tableIdsChunk, IQueryBuilder::PARAM_INT_ARRAY)))
-				->groupBy('table_id');
-
-			$result = $qb->executeQuery();
-			while ($row = $result->fetch()) {
-				$counts[(int)$row['table_id']] = (int)$row['counter'];
-			}
-			$result->closeCursor();
-		}
-
-		return $counts;
-	}
-
 	/**
 	 * @param int[] $tableIds
 	 * @return array<int, int>

lib/Db/ShareMapper.php

@@ -119,22 +119,17 @@ public function findAllSharesFor(string $nodeType, array $receivers, string $use
 	/**
 	 * @param string $nodeType
 	 * @param int $nodeId
-	 * @param string $sender
 	 * @param array<string> $excluded receiver types to exclude from results
 	 * @return Share[]
 	 * @throws Exception
 	 */
-	public function findAllSharesForNode(string $nodeType, int $nodeId, string $sender = '', array $excluded = []): array {
+	public function findAllSharesForNode(string $nodeType, int $nodeId, array $excluded = []): array {
 		$qb = $this->db->getQueryBuilder();
 		$qb->select('*')
 			->from($this->table)
 			->andWhere($qb->expr()->eq('node_type', $qb->createNamedParameter($nodeType, IQueryBuilder::PARAM_STR)))
 			->andWhere($qb->expr()->eq('node_id', $qb->createNamedParameter($nodeId, IQueryBuilder::PARAM_INT)));
 
-		if ($sender !== '') {
-			$qb->andWhere($qb->expr()->eq('sender', $qb->createNamedParameter($sender, IQueryBuilder::PARAM_STR)));
-		}
-
 		if (!empty($excluded)) {
 			$qb->andWhere($qb->expr()->notIn('receiver_type', $qb->createNamedParameter($excluded, IQueryBuilder::PARAM_STR_ARRAY)));
 		}

lib/Service/ShareService.php

@@ -79,12 +79,10 @@ public function __construct(
 	 * @throws InternalError
 	 * @return Share[]
 	 */
-	public function findAll(string $nodeType, int $nodeId, ?string $userId = null, bool $enhanceShares = true): array {
-		$userId = $this->permissionsService->preCheckUserId($userId);
-
+	public function findAll(string $nodeType, int $nodeId, bool $enhanceShares = true): array {
 		try {
 			$excluded = !$this->circleHelper->isCirclesEnabled() ? [ShareReceiverType::CIRCLE] : [];
-			$shares = $this->mapper->findAllSharesForNode($nodeType, $nodeId, $userId, $excluded);
+			$shares = $this->mapper->findAllSharesForNode($nodeType, $nodeId, $excluded);
 
 			return $enhanceShares ? $this->addReceiverDisplayNames($shares) : $shares;
 		} catch (Exception $e) {
@@ -920,7 +918,7 @@ public function deleteAllForContext(Context $context): void {
 	 * @return Share[]
 	 */
 	public function changeSenderForNode(string $nodeType, int $nodeId, string $newOwnerUserId, ?string $userId = null): array {
-		$sharesForTable = $this->findAll($nodeType, $nodeId, $userId, false);
+		$sharesForTable = $this->findAll($nodeType, $nodeId, false);
 		$newShares = [];
 
 		foreach ($sharesForTable as $share) {
@@ -982,7 +980,7 @@ public function transferSharesForContext(int $contextId, string $newOwnerId, str
 	 */
 	public function findSharedWithUserIds(int $elementId, string $elementType): array {
 		try {
-			$shares = $this->mapper->findAllSharesForNode($elementType, $elementId, '');
+			$shares = $this->mapper->findAllSharesForNode($elementType, $elementId);
 			$sharedWithUserIds = [];
 
 			foreach ($shares as $share) {