[stable20] apply object store copy optimization when 'cross storage' copy is wit…

lib/private/Files/ObjectStore/ObjectStoreStorage.php

@@ -38,6 +38,7 @@
 use OCP\Files\FileInfo;
 use OCP\Files\NotFoundException;
 use OCP\Files\ObjectStore\IObjectStore;
+use OCP\Files\Storage\IStorage;
 
 class ObjectStoreStorage extends \OC\Files\Storage\Common {
 	use CopyDirectory;
@@ -529,6 +530,19 @@ public function getObjectStore(): IObjectStore {
 		return $this->objectStore;
 	}
 
+	public function copyFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, $preserveMtime = false) {
+		if ($sourceStorage->instanceOfStorage(ObjectStoreStorage::class)) {
+			/** @var ObjectStoreStorage $sourceStorage */
+			if ($sourceStorage->getObjectStore()->getStorageId() === $this->getObjectStore()->getStorageId()) {
+				$sourceEntry = $sourceStorage->getCache()->get($sourceInternalPath);
+				$this->copyInner($sourceEntry, $targetInternalPath);
+				return true;
+			}
+		}
+
+		return parent::copyFromStorage($sourceStorage, $sourceInternalPath, $targetInternalPath);
+	}
+
 	public function copy($path1, $path2) {
 		$path1 = $this->normalizePath($path1);
 		$path2 = $this->normalizePath($path2);

lib/private/Files/Storage/Wrapper/Jail.php

@@ -45,7 +45,7 @@ class Jail extends Wrapper {
 	protected $rootPath;
 
 	/**
-	 * @param array $arguments ['storage' => $storage, 'mask' => $root]
+	 * @param array $arguments ['storage' => $storage, 'root' => $root]
 	 *
 	 * $storage: The storage that will be wrapper
 	 * $root: The folder in the wrapped storage that will become the root folder of the wrapped storage

tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php

@@ -22,6 +22,7 @@
 
 use OC\Files\ObjectStore\StorageObjectStore;
 use OC\Files\Storage\Temporary;
+use OC\Files\Storage\Wrapper\Jail;
 use OCP\Files\ObjectStore\IObjectStore;
 use Test\Files\Storage\Storage;
 
@@ -204,4 +205,27 @@ public function testDeleteObjectFailureKeepCache() {
 		$this->assertTrue($cache->inCache('foo'));
 		$this->assertTrue($cache->inCache('foo/test.txt'));
 	}
+
+	public function testCopyBetweenJails() {
+		$this->instance->mkdir('a');
+		$this->instance->mkdir('b');
+		$jailA = new Jail([
+			'storage' => $this->instance,
+			'root' => 'a'
+		]);
+		$jailB = new Jail([
+			'storage' => $this->instance,
+			'root' => 'b'
+		]);
+		$jailA->mkdir('sub');
+		$jailA->file_put_contents('1.txt', '1');
+		$jailA->file_put_contents('sub/2.txt', '2');
+		$jailA->file_put_contents('sub/3.txt', '3');
+
+		$jailB->copyFromStorage($jailA, '', 'target');
+
+		$this->assertEquals('1', $this->instance->file_get_contents('b/target/1.txt'));
+		$this->assertEquals('2', $this->instance->file_get_contents('b/target/sub/2.txt'));
+		$this->assertEquals('3', $this->instance->file_get_contents('b/target/sub/3.txt'));
+	}
 }