fix: make bucket mapper work with new multi-object-store config

Signed-off-by: Robin Appelman <[email protected]>

Author: icewind1991

lib/private/Files/ObjectStore/Mapper.php

@@ -22,7 +22,6 @@
  */
 namespace OC\Files\ObjectStore;
 
-use OCP\IConfig;
 use OCP\IUser;
 
 /**
@@ -33,33 +32,17 @@
  * 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 IUser $user,
+		private 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());

lib/private/Files/ObjectStore/PrimaryObjectStoreConfig.php

@@ -196,7 +196,7 @@ public function getBucketForUser(IUser $user, array $config): string {
 			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);
 

tests/lib/Files/ObjectStore/MapperTest.php

@@ -22,25 +22,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 function dataGetBucket() {
@@ -62,16 +53,12 @@ public function dataGetBucket() {
 	 * @param string $expectedBucket
 	 */
 	public function testGetBucket($username, $numBuckets, $bucketShift, $expectedBucket) {
+		$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);
 	}
 }