feat: Implement custom Updater for object store storage

lib/composer/composer/autoload_classmap.php

@@ -1649,6 +1649,7 @@
     'OC\\Files\\ObjectStore\\Mapper' => $baseDir . '/lib/private/Files/ObjectStore/Mapper.php',
     'OC\\Files\\ObjectStore\\ObjectStoreScanner' => $baseDir . '/lib/private/Files/ObjectStore/ObjectStoreScanner.php',
     'OC\\Files\\ObjectStore\\ObjectStoreStorage' => $baseDir . '/lib/private/Files/ObjectStore/ObjectStoreStorage.php',
+    'OC\\Files\\ObjectStore\\ObjectStoreUpdater' => $baseDir . '/lib/private/Files/ObjectStore/ObjectStoreUpdater.php',
     'OC\\Files\\ObjectStore\\PrimaryObjectStoreConfig' => $baseDir . '/lib/private/Files/ObjectStore/PrimaryObjectStoreConfig.php',
     'OC\\Files\\ObjectStore\\S3' => $baseDir . '/lib/private/Files/ObjectStore/S3.php',
     'OC\\Files\\ObjectStore\\S3ConfigTrait' => $baseDir . '/lib/private/Files/ObjectStore/S3ConfigTrait.php',

lib/composer/composer/autoload_static.php

@@ -1690,6 +1690,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OC\\Files\\ObjectStore\\Mapper' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/Mapper.php',
         'OC\\Files\\ObjectStore\\ObjectStoreScanner' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/ObjectStoreScanner.php',
         'OC\\Files\\ObjectStore\\ObjectStoreStorage' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/ObjectStoreStorage.php',
+        'OC\\Files\\ObjectStore\\ObjectStoreUpdater' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/ObjectStoreUpdater.php',
         'OC\\Files\\ObjectStore\\PrimaryObjectStoreConfig' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/PrimaryObjectStoreConfig.php',
         'OC\\Files\\ObjectStore\\S3' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/S3.php',
         'OC\\Files\\ObjectStore\\S3ConfigTrait' => __DIR__ . '/../../..' . '/lib/private/Files/ObjectStore/S3ConfigTrait.php',

lib/private/Files/Cache/Updater.php

@@ -272,7 +272,7 @@ private function updateStorageMTimeOnly($internalPath) {
 	 *
 	 * @param string $internalPath
 	 */
-	private function correctParentStorageMtime($internalPath) {
+	public function correctParentStorageMtime($internalPath) {
 		$parentId = $this->cache->getParentId($internalPath);
 		$parent = dirname($internalPath);
 		if ($parentId != -1) {

lib/private/Files/ObjectStore/ObjectStoreStorage.php

@@ -14,6 +14,7 @@
 use Icewind\Streams\IteratorDirectory;
 use OC\Files\Cache\Cache;
 use OC\Files\Cache\CacheEntry;
+use OC\Files\Cache\Updater;
 use OC\Files\Storage\PolyFill\CopyDirectory;
 use OCP\Files\Cache\ICache;
 use OCP\Files\Cache\ICacheEntry;
@@ -152,7 +153,23 @@
 			return false;
 		}
 
-		return $this->rmObjects($entry);
+		$result = $this->rmObjects($entry);
+		if ($result) {
+			$this->removeFromCache($entry);
+		}
+		return $result;
+	}
+
+	/**
+	 * Remove an item from cache and propagate the change to the parent folders.
+	 *
+	 * Similar logic to the `Updater` but done in-storage because we have the correct info to avoid expensive
+	 * folder size calculations.
+	 */
+	private function removeFromCache(ICacheEntry $entry): void {
+		$this->cache->remove($entry->getId());
+		$this->getUpdater()->correctParentStorageMtime($entry->getPath());
+		$this->propagator->propagateChange($entry->getPath(), time(), -$entry->getSize());
 	}
 
 	private function rmObjects(ICacheEntry $entry): bool {
@@ -179,15 +196,21 @@
 	public function unlink(string $path): bool {
 		$path = $this->normalizePath($path);
 		$entry = $this->getCache()->get($path);
+		$result = false;
 
 		if ($entry instanceof ICacheEntry) {
 			if ($entry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) {
-				return $this->rmObjects($entry);
+				$result = $this->rmObjects($entry);
 			} else {
-				return $this->rmObject($entry);
+				$result = $this->rmObject($entry);
 			}
 		}
-		return false;
+
+		if ($result) {
+			$this->removeFromCache($entry);
+		}
+
+		return $result;
 	}
 
 	public function rmObject(ICacheEntry $entry): bool {
@@ -464,6 +487,7 @@
 		}
 		// update stat with new data
 		$mTime = time();
+		$oldSize = $stat['size'] ?? 0;
 		$stat['size'] = (int)$size;
 		$stat['mtime'] = $mTime;
 		$stat['storage_mtime'] = $mTime;
@@ -561,6 +585,9 @@
 			}
 		}
 
+		$this->getUpdater()->correctParentStorageMtime($path);
+		$this->propagator->propagateChange($path, $mTime, $stat['size'] - $oldSize);
+
 		return $size;
 	}
 
@@ -814,4 +841,18 @@
 	public function setPreserveCacheOnDelete(bool $preserve) {
 		$this->preserveCacheItemsOnDelete = $preserve;
 	}
+
+	public function getUpdater(?IStorage $storage = null): Updater {
+		if (!$storage) {
+			$storage = $this;
+		}
+		if (!$storage->instanceOfStorage(self::class)) {
+			throw new \InvalidArgumentException('Storage is not of the correct class');
+		}
+		/** @var self $storage */
+		if (!isset($storage->updater)) {
+			$storage->updater = new ObjectStoreUpdater($storage);
+		}
+		return $storage->updater;
+	}
 }

lib/private/Files/ObjectStore/ObjectStoreUpdater.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OC\Files\ObjectStore;
+
+use OC\Files\Cache\Updater;
+
+/**
+ * Custom Updater class for `ObjectStoreStorage`.
+ * This wrapper will do nothing when the `update` method is called.
+ * This is to skip heavy cache operations, as they are already done in `ObjectStoreStorage`.
+ */
+class ObjectStoreUpdater extends Updater {
+	public function update($path, $time = null, ?int $sizeDifference = null) {
+		// Noop
+	}
+
+	public function remove($path) {
+		// Noop
+	}
+}

lib/public/Files/Cache/IUpdater.php

@@ -28,6 +28,7 @@ public function getPropagator();
 	 *
 	 * @param string $path the path of the file to propagate the changes for
 	 * @param int|null $time the timestamp to set as mtime for the parent folders, if left out the current time is used
+	 * @return void
 	 * @since 9.0.0
 	 */
 	public function propagate($path, $time = null);
@@ -37,6 +38,7 @@ public function propagate($path, $time = null);
 	 *
 	 * @param string $path
 	 * @param int $time
+	 * @return void
 	 * @since 9.0.0
 	 */
 	public function update($path, $time = null, ?int $sizeDifference = null);
@@ -45,6 +47,7 @@ public function update($path, $time = null, ?int $sizeDifference = null);
 	 * Remove $path from the cache and update the size, etag and mtime of the parent folders
 	 *
 	 * @param string $path
+	 * @return void
 	 * @since 9.0.0
 	 */
 	public function remove($path);
@@ -55,6 +58,7 @@ public function remove($path);
 	 * @param IStorage $sourceStorage
 	 * @param string $source
 	 * @param string $target
+	 * @return void
 	 * @since 9.0.0
 	 */
 	public function renameFromStorage(IStorage $sourceStorage, $source, $target);