perf: reuse cache info we already have when moving to object store

icewind1991 · icewind1991 · commit 47d281865ebd · 2024-09-19T19:06:06.000+02:00
Signed-off-by: Robin Appelman &lt;robin@icewind.nl&gt;
diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php
@@ -604,8 +604,8 @@ public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $t
 		}
 		if ($sourceCacheEntry->getMimeType() === FileInfo::MIMETYPE_FOLDER) {
 			$this->mkdir($targetInternalPath);
-			foreach ($sourceCache->getFolderContents($sourceInternalPath) as $child) {
-				$this->moveFromStorage($sourceStorage, $child->getPath(), $targetInternalPath . '/' . $child->getName());
+			foreach ($sourceCache->getFolderContentsById($sourceCacheEntry->getId()) as $child) {
+				$this->moveFromStorage($sourceStorage, $child->getPath(), $targetInternalPath . '/' . $child->getName(), $child);
 			}
 			$sourceStorage->rmdir($sourceInternalPath);
 		} else {

Original file line number	Diff line number	Diff line change
`@@ -604,8 +604,8 @@ public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $t`
`604`	`604`	`}`
`605`	`605`	`if ($sourceCacheEntry->getMimeType() === FileInfo::MIMETYPE_FOLDER) {`
`606`	`606`	`$this->mkdir($targetInternalPath);`
`607`		`- foreach ($sourceCache->getFolderContents($sourceInternalPath) as $child) {`
`608`		`- $this->moveFromStorage($sourceStorage, $child->getPath(), $targetInternalPath . '/' . $child->getName());`
	`607`	`+ foreach ($sourceCache->getFolderContentsById($sourceCacheEntry->getId()) as $child) {`
	`608`	`+ $this->moveFromStorage($sourceStorage, $child->getPath(), $targetInternalPath . '/' . $child->getName(), $child);`
`609`	`609`	`}`
`610`	`610`	`$sourceStorage->rmdir($sourceInternalPath);`
`611`	`611`	`} else {`