Merge pull request #38591 from nextcloud/fix/caching/avoid-haskey-get

fix(caching): Avoid checking existence before fetching
nextcloud · Jun 12, 2023 · 83faba5 · 83faba5
2 parents e390a35 + b8c61b3
commit 83faba5
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/apps/files_external/lib/Lib/Storage/Swift.php b/apps/files_external/lib/Lib/Storage/Swift.php
@@ -126,9 +126,10 @@ private function normalizePath(string $path) {
 	 * @throws \OCP\Files\StorageNotAvailableException
 	 */
 	private function fetchObject(string $path) {
-		if ($this->objectCache->hasKey($path)) {
+		$cached = $this->objectCache->get($path);
+		if ($cached !== null) {
 			// might be "false" if object did not exist from last check
-			return $this->objectCache->get($path);
+			return $cached;
 		}
 		try {
 			$object = $this->getContainer()->getObject($path);

diff --git a/apps/files_sharing/lib/External/Storage.php b/apps/files_sharing/lib/External/Storage.php
@@ -265,8 +265,9 @@ protected function testRemote(): bool {
 
 	private function testRemoteUrl(string $url): bool {
 		$cache = $this->memcacheFactory->createDistributed('files_sharing_remote_url');
-		if ($cache->hasKey($url)) {
-			return (bool)$cache->get($url);
+		$cached = $cache->get($url);
+		if ($cached !== null) {
+			return (bool)$cached;
 		}
 
 		$client = $this->httpClient->newClient();

diff --git a/apps/files_sharing/lib/SharedMount.php b/apps/files_sharing/lib/SharedMount.php
@@ -117,8 +117,9 @@ private function verifyMountPoint(
 		$this->eventDispatcher->dispatchTyped($event);
 		$parent = $event->getParent();
 
-		if ($folderExistCache->hasKey($parent)) {
-			$parentExists = $folderExistCache->get($parent);
+		$cached = $folderExistCache->get($parent);
+		if ($cached) {
+			$parentExists = $cached;
 		} else {
 			$parentExists = $this->recipientView->is_dir($parent);
 			$folderExistCache->set($parent, $parentExists);

diff --git a/lib/private/Accounts/AccountManager.php b/lib/private/Accounts/AccountManager.php
@@ -795,8 +795,9 @@ private function parseAccountData(IUser $user, $data): Account {
 	}
 
 	public function getAccount(IUser $user): IAccount {
-		if ($this->internalCache->hasKey($user->getUID())) {
-			return $this->internalCache->get($user->getUID());
+		$cached = $this->internalCache->get($user->getUID());
+		if ($cached !== null) {
+			return $cached;
 		}
 		$account = $this->parseAccountData($user, $this->getUser($user));
 		$this->internalCache->set($user->getUID(), $account);