upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-02-20 00:12:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 38

Merge pull request #47986 from cfiehe/fix_move_on_same_bucket

Browse source 
perf(ObjectStoreStorage): Improve (slow) move on same object bucket
This commit is contained in:
Stephan Orbaugh 2024-09-17 16:35:19 +02:00 committed by GitHub
commit f25acfb799
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 183 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/private/Files/ObjectStore/ObjectStoreStorage.php
View file

@ -593,6 +593,11 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common implements IChunkedFil
public function moveFromStorage(IStorage $sourceStorage, $sourceInternalPath, $targetInternalPath, ?ICacheEntry $sourceCacheEntry = null): bool {
$sourceCache = $sourceStorage->getCache();
if ($sourceStorage->instanceOfStorage(ObjectStoreStorage::class) && $sourceStorage->getObjectStore()->getStorageId() === $this->getObjectStore()->getStorageId()) {
$this->getCache()->moveFromCache($sourceCache, $sourceInternalPath, $targetInternalPath);
// Do not import any data when source and target bucket are identical.
return true;
}
if (!$sourceCacheEntry) {
$sourceCacheEntry = $sourceCache->get($sourceInternalPath);
}

39
tests/lib/Files/ObjectStore/ObjectStoreStoragesDifferentBucketTest.php Normal file
View file

@ -0,0 +1,39 @@
<?php
/**
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace Test\Files\ObjectStore;
use Test\Files\Storage\StoragesTest;
/**
* @group DB
*/
class ObjectStoreStoragesDifferentBucketTest extends StoragesTest {
/**
* @var \OCP\Files\ObjectStore\IObjectStore
*/
private $objectStore1;
/**
* @var \OCP\Files\ObjectStore\IObjectStore
*/
private $objectStore2;
protected function setUp(): void {
parent::setUp();
$baseStorage1 = new Temporary();
$this->objectStore1 = new StorageObjectStore($baseStorage1);
$config['objectstore'] = $this->objectStore1;
$this->storage1 = new ObjectStoreStorageOverwrite($config);
$baseStorage2 = new Temporary();
$this->objectStore2 = new StorageObjectStore($baseStorage2);
$config['objectstore'] = $this->objectStore2;
$this->storage2 = new ObjectStoreStorageOverwrite($config);
}
}

31
tests/lib/Files/ObjectStore/ObjectStoreStoragesSameBucketTest.php Normal file
View file

@ -0,0 +1,31 @@
<?php
/**
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace Test\Files\ObjectStore;
use Test\Files\Storage\StoragesTest;
/**
* @group DB
*/
class ObjectStoreStoragesSameBucketTest extends StoragesTest {
/**
* @var \OCP\Files\ObjectStore\IObjectStore
*/
private $objectStore;
protected function setUp(): void {
parent::setUp();
$baseStorage = new Temporary();
$this->objectStore = new StorageObjectStore($baseStorage);
$config['objectstore'] = $this->objectStore;
// storage1 and storage2 share the same object store.
$this->storage1 = new ObjectStoreStorageOverwrite($config);
$this->storage2 = new ObjectStoreStorageOverwrite($config);
}
}

108
tests/lib/Files/Storage/StoragesTest.php Normal file
View file

@ -0,0 +1,108 @@
<?php
/**
* SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-FileCopyrightText: 2016 ownCloud, Inc.
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
namespace Test\Files\Storage;
use Test\TestCase;
abstract class StoragesTest extends TestCase {
/**
* @var \OC\Files\Storage\Storage
*/
protected $storage1;
/**
* @var \OC\Files\Storage\Storage
*/
protected $storage2;
protected function tearDown(): void {
if (is_null($this->storage1) && is_null($this->storage2)) {
return;
}
$this->storage1->getCache()->clear();
$this->storage2->getCache()->clear();
parent::tearDown();
}
public function testMoveFileFromStorage() {
$source = 'source.txt';
$target = 'target.txt';
$storage2->file_put_contents($source, 'foo');
$storage1->moveFromStorage($storage2, $source, $target);
$this->assertTrue($storage1->file_exists($target), $target.' was not created');
$this->assertFalse($storage2->file_exists($source), $source.' still exists');
$this->assertEquals('foo', $storage1->file_get_contents($target));
}
public function testMoveDirectoryFromStorage() {
$storage2->mkdir('source');
$storage2->file_put_contents('source/test1.txt', 'foo');
$storage2->file_put_contents('source/test2.txt', 'qwerty');
$storage2->mkdir('source/subfolder');
$storage2->file_put_contents('source/subfolder/test.txt', 'bar');
$storage1->moveFromStorage($storage2, 'source', 'target');
$this->assertTrue($storage1->file_exists('target'));
$this->assertTrue($storage1->file_exists('target/test1.txt'));
$this->assertTrue($storage1->file_exists('target/test2.txt'));
$this->assertTrue($storage1->file_exists('target/subfolder'));
$this->assertTrue($storage1->file_exists('target/subfolder/test.txt'));
$this->assertFalse($storage2->file_exists('source'));
$this->assertFalse($storage2->file_exists('source/test1.txt'));
$this->assertFalse($storage2->file_exists('source/test2.txt'));
$this->assertFalse($storage2->file_exists('source/subfolder'));
$this->assertFalse($storage2->file_exists('source/subfolder/test.txt'));
$this->assertEquals('foo', $storage1->file_get_contents('target/test1.txt'));
$this->assertEquals('qwerty', $storage1->file_get_contents('target/test2.txt'));
$this->assertEquals('bar', $storage1->file_get_contents('target/subfolder/test.txt'));
}
public function testCopyFileFromStorage() {
$source = 'source.txt';
$target = 'target.txt';
$storage2->file_put_contents($source, 'foo');
$storage1->copyFromStorage($storage2, $source, $target);
$this->assertTrue($storage1->file_exists($target), $target.' was not created');
$this->assertTrue($storage2->file_exists($source), $source.' was deleted');
$this->assertEquals('foo', $storage1->file_get_contents($target));
}
public function testCopyDirectoryFromStorage() {
$storage2->mkdir('source');
$storage2->file_put_contents('source/test1.txt', 'foo');
$storage2->file_put_contents('source/test2.txt', 'qwerty');
$storage2->mkdir('source/subfolder');
$storage2->file_put_contents('source/subfolder/test.txt', 'bar');
$storage1->copyFromStorage($storage2, 'source', 'target');
$this->assertTrue($storage1->file_exists('target'));
$this->assertTrue($storage1->file_exists('target/test1.txt'));
$this->assertTrue($storage1->file_exists('target/test2.txt'));
$this->assertTrue($storage1->file_exists('target/subfolder'));
$this->assertTrue($storage1->file_exists('target/subfolder/test.txt'));
$this->assertTrue($storage2->file_exists('source'));
$this->assertTrue($storage2->file_exists('source/test1.txt'));
$this->assertTrue($storage2->file_exists('source/test2.txt'));
$this->assertTrue($storage2->file_exists('source/subfolder'));
$this->assertTrue($storage2->file_exists('source/subfolder/test.txt'));
$this->assertEquals('foo', $storage1->file_get_contents('target/test1.txt'));
$this->assertEquals('qwerty', $storage1->file_get_contents('target/test2.txt'));
$this->assertEquals('bar', $storage1->file_get_contents('target/subfolder/test.txt'));
}
}