Merge pull request #54438 from nextcloud/perf/caldav/cache-empty-shares-when-preloading

perf(caldav): also cache empty share arrays

Author: st3iny

apps/dav/lib/DAV/Sharing/Backend.php

@@ -131,8 +131,9 @@ public function deleteAllSharesByUser(string $principaluri): void {
 	 * @return list<array{href: string, commonName: string, status: int, readOnly: bool, '{http://owncloud.org/ns}principal': string, '{http://owncloud.org/ns}group-share': bool}>
 	 */
 	public function getShares(int $resourceId): array {
+		/** @var list<array{href: string, commonName: string, status: int, readOnly: bool, '{http://owncloud.org/ns}principal': string, '{http://owncloud.org/ns}group-share': bool}>|null $cached */
 		$cached = $this->shareCache->get((string)$resourceId);
-		if ($cached) {
+		if (is_array($cached)) {
 			return $cached;
 		}
 
@@ -176,6 +177,23 @@ public function preloadShares(array $resourceIds): void {
 			];
 			$this->shareCache->set((string)$resourceId, $sharesByResource[$resourceId]);
 		}
+
+		// Also remember resources with no shares to prevent superfluous (empty) queries later on
+		foreach ($resourceIds as $resourceId) {
+			$hasShares = false;
+			foreach ($rows as $row) {
+				if ((int)$row['resourceid'] === $resourceId) {
+					$hasShares = true;
+					break;
+				}
+			}
+
+			if ($hasShares) {
+				continue;
+			}
+
+			$this->shareCache->set((string)$resourceId, []);
+		}
 	}
 
 	/**