upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-04-15 22:11:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 27

Merge pull request #54721 from nextcloud/bucket-mapper-fixes

Browse source 
fix: make bucket mapper work with new multi-object-store config
This commit is contained in:
Andy Scherzinger 2025-08-28 19:33:47 +02:00 committed by GitHub
commit f2de5c79cd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 10 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lib/private/Files/ObjectStore/Mapper.php
View file

@ -7,7 +7,6 @@
*/
namespace OC\Files\ObjectStore;
use OCP\IConfig;
use OCP\IUser;
/**
@ -18,33 +17,17 @@ use OCP\IUser;
* Map a user to a bucket.
*/
class Mapper {
/** @var IUser */
private $user;
/** @var IConfig */
private $config;
/**
* Mapper constructor.
*
* @param IUser $user
* @param IConfig $config
*/
public function __construct(IUser $user, IConfig $config) {
$this->user = $user;
$this->config = $config;
public function __construct(
private readonly IUser $user,
private readonly array $config,
) {
}
/**
* @param int $numBuckets
* @return string
*/
public function getBucket($numBuckets = 64) {
public function getBucket(int $numBuckets = 64): string {
// Get the bucket config and shift if provided.
// Allow us to prevent writing in old filled buckets
$config = $this->config->getSystemValue('objectstore_multibucket');
$minBucket = is_array($config) && isset($config['arguments']['min_bucket'])
? (int)$config['arguments']['min_bucket']
$minBucket = isset($this->config['arguments']['min_bucket'])
? (int)$this->config['arguments']['min_bucket']
: 0;
$hash = md5($this->user->getUID());

2
lib/private/Files/ObjectStore/PrimaryObjectStoreConfig.php
View file

@ -196,7 +196,7 @@ class PrimaryObjectStoreConfig {
if (!isset($config['arguments']['bucket'])) {
$config['arguments']['bucket'] = '';
}
$mapper = new Mapper($user, $this->config);
$mapper = new Mapper($user, $config);
$numBuckets = $config['arguments']['num_buckets'] ?? 64;
$bucket = $config['arguments']['bucket'] . $mapper->getBucket($numBuckets);

17
tests/lib/Files/ObjectStore/MapperTest.php
View file

@ -9,25 +9,16 @@
namespace Test\Files\ObjectStore;
use OC\Files\ObjectStore\Mapper;
use OCP\IConfig;
use OCP\IUser;
class MapperTest extends \Test\TestCase {
/** @var IUser|\PHPUnit\Framework\MockObject\MockObject */
private $user;
/** @var IConfig|\PHPUnit\Framework\MockObject\MockObject */
private $config;
/** @var Mapper */
private $mapper;
protected function setUp(): void {
parent::setUp();
$this->user = $this->createMock(IUser::class);
$this->config = $this->createMock(IConfig::class);
$this->mapper = new Mapper($this->user, $this->config);
}
public static function dataGetBucket(): array {
@ -49,16 +40,12 @@ class MapperTest extends \Test\TestCase {
*/
#[\PHPUnit\Framework\Attributes\DataProvider('dataGetBucket')]
public function testGetBucket($username, $numBuckets, $bucketShift, $expectedBucket): void {
$mapper = new Mapper($this->user, ['arguments' => ['min_bucket' => $bucketShift]]);
$this->user->expects($this->once())
->method('getUID')
->willReturn($username);
$this->config->expects($this->once())
->method('getSystemValue')
->with('objectstore_multibucket')
->willReturn(['arguments' => ['min_bucket' => $bucketShift]]);
$result = $this->mapper->getBucket($numBuckets);
$result = $mapper->getBucket($numBuckets);
$this->assertEquals($expectedBucket, $result);
}
}