From c87b1a50d908f0d99622d4c71534d47af1ab9218 Mon Sep 17 00:00:00 2001 From: Robin Appelman Date: Fri, 19 Feb 2021 15:52:58 +0100 Subject: apply object store copy optimization when 'cross storage' copy is within the same object store Signed-off-by: Robin Appelman --- .../Files/ObjectStore/ObjectStoreStorageTest.php | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'tests') diff --git a/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php b/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php index fa8ec535061..85a68be3daf 100644 --- a/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php +++ b/tests/lib/Files/ObjectStore/ObjectStoreStorageTest.php @@ -22,6 +22,7 @@ namespace Test\Files\ObjectStore; 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 @@ class ObjectStoreStorageTest extends Storage { $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')); + } } -- cgit v1.2.3