Temporarily cache objectstore stat metadata for duration of storage->getMetadata

lib/private/Files/ObjectStore/ObjectStoreStorage.php

@@ -33,6 +33,10 @@
 
 class ObjectStoreStorage extends \OC\Files\Storage\Common {
 
+	/**
+	 * @var \OC\Files\ObjectStore\StatCache $statCache
+	 */
+	private $statCache;
 	/**
 	 * @var array
 	 */
@@ -66,6 +70,10 @@ public function __construct($params) {
 		if (isset($params['objectPrefix'])) {
 			$this->objectPrefix = $params['objectPrefix'];
 		}
+
+		// Initialize stat cache
+		$this->statCache = new StatCache();
+
 		//initialize cache with root directory in cache
 		if (!$this->is_dir('/')) {
 			$this->mkdir('/');
@@ -205,8 +213,17 @@ public function unlink($path) {
 
 	public function stat($path) {
 		$path = $this->normalizePath($path);
-		$cacheEntry = $this->getCache()->get($path);
+
+		// Try to get from stat cache if possible
+		$cacheEntry = $this->statCache->get($path);
+		if (!$cacheEntry) {
+			// No stat, fetch from filecache
+			$cacheEntry = $this->getCache()->get($path);
+		}
+
 		if ($cacheEntry instanceof CacheEntry) {
+			// Try to put filecache entry in stat cache if possible
+			$this->statCache->put($path, $cacheEntry);
 			return $cacheEntry->getData();
 		} else {
 			return false;
@@ -489,4 +506,15 @@ public function restoreVersion($internalPath, $versionId) {
 		}
 		return parent::restoreVersion($internalPath, $versionId);
 	}
+
+	/**
+	 * @inheritdoc
+	 */
+	public function getMetaData($path) {
+		$this->statCache->enable($path);
+		$data = parent::getMetaData($path);
+		$this->statCache->disable($path);
+
+		return $data;
+	}
 }

lib/private/Files/ObjectStore/StatCache.php

@@ -0,0 +1,65 @@
+<?php
+/**
+ * @author Piotr Mrowczynski <[email protected]>
+ *
+ * @copyright Copyright (c) 2018, ownCloud GmbH
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License, version 3,
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+
+namespace OC\Files\ObjectStore;
+
+use OC\Files\Cache\CacheEntry;
+
+class StatCache {
+
+	/**
+	 * @var \OC\Files\Cache\CacheEntry[] $cache
+	 */
+	private $cache;
+
+	/**
+	 * @var string[] $statCacheEnabled
+	 */
+	private $statCacheEnabled;
+
+	public function __construct() {
+	}
+
+	public function enable($path) {
+		$this->statCacheEnabled[$path] = true;
+	}
+
+	public function disable($path) {
+		unset($this->statCacheEnabled[$path]);
+	}
+
+	public function put($path, CacheEntry $cache) {
+		if ($this->isEnabled($path)) {
+			$this->cache[$path] = $cache;
+		}
+	}
+
+	public function get($path) {
+		if ($this->isEnabled($path) && isset($this->cache[$path])) {
+			return $this->cache[$path];
+		}
+		return false;
+	}
+
+	private function isEnabled($path) {
+		return isset($this->statCacheEnabled[$path]);
+	}
+}