mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1981 from nextcloud/multibucket-num-buckets 

Allow setting a maximun number of buckets for multibucket
This commit is contained in:
Lukas Reschke 2016-11-02 22:05:57 +01:00 committed by GitHub
parent b4cf559707 049bcae29e
commit c1feae1684
4 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/private/Files/Mount/ObjectHomeMountProvider.php
View File

@ -121,7 +121,8 @@ class ObjectHomeMountProvider implements IHomeMountProvider {
$config['arguments']['bucket'] = ''; $config['arguments']['bucket'] = '';
} }
$mapper = new \OC\Files\ObjectStore\Mapper($user); $mapper = new \OC\Files\ObjectStore\Mapper($user);
$config['arguments']['bucket'] .= $mapper->getBucket(); $numBuckets = isset($config['arguments']['num_buckets']) ? $config['arguments']['num_buckets'] : 64;
$config['arguments']['bucket'] .= $mapper->getBucket($numBuckets);
$this->config->setUserValue($user->getUID(), 'homeobjectstore', 'bucket', $config['arguments']['bucket']); $this->config->setUserValue($user->getUID(), 'homeobjectstore', 'bucket', $config['arguments']['bucket']);
} else { } else {

6
lib/private/Files/ObjectStore/Mapper.php
View File

@ -44,10 +44,12 @@ class Mapper {
} }
/** /**
* @param int $numBuckets
* @return string * @return string
*/ */
public function getBucket() { public function getBucket($numBuckets = 64) {
$hash = md5($this->user->getUID()); $hash = md5($this->user->getUID());
return substr($hash, 0, 3); $num = hexdec(substr($hash, 0, 4));
return (string)($num % $numBuckets);
} }
} }

8
tests/lib/Files/Mount/ObjectHomeMountProviderTest.php
View File

@ -80,7 +80,7 @@ class ObjectHomeMountProviderTest extends \Test\TestCase {
$this->equalTo('uid'), $this->equalTo('uid'),
$this->equalTo('homeobjectstore'), $this->equalTo('homeobjectstore'),
$this->equalTo('bucket'), $this->equalTo('bucket'),
$this->equalTo('987'), $this->equalTo('49'),
$this->equalTo(null) $this->equalTo(null)
); );
@ -94,7 +94,7 @@ class ObjectHomeMountProviderTest extends \Test\TestCase {
$this->assertArrayHasKey('objectstore', $config['arguments']); $this->assertArrayHasKey('objectstore', $config['arguments']);
$this->assertInstanceOf('Test\Files\Mount\FakeObjectStore', $config['arguments']['objectstore']); $this->assertInstanceOf('Test\Files\Mount\FakeObjectStore', $config['arguments']['objectstore']);
$this->assertArrayHasKey('bucket', $config['arguments']); $this->assertArrayHasKey('bucket', $config['arguments']);
$this->assertEquals('987', $config['arguments']['bucket']); $this->assertEquals('49', $config['arguments']['bucket']);
} }
public function testMultiBucketWithPrefix() { public function testMultiBucketWithPrefix() {
@ -127,7 +127,7 @@ class ObjectHomeMountProviderTest extends \Test\TestCase {
$this->equalTo('uid'), $this->equalTo('uid'),
$this->equalTo('homeobjectstore'), $this->equalTo('homeobjectstore'),
$this->equalTo('bucket'), $this->equalTo('bucket'),
$this->equalTo('myBucketPrefix987'), $this->equalTo('myBucketPrefix49'),
$this->equalTo(null) $this->equalTo(null)
); );
@ -141,7 +141,7 @@ class ObjectHomeMountProviderTest extends \Test\TestCase {
$this->assertArrayHasKey('objectstore', $config['arguments']); $this->assertArrayHasKey('objectstore', $config['arguments']);
$this->assertInstanceOf('Test\Files\Mount\FakeObjectStore', $config['arguments']['objectstore']); $this->assertInstanceOf('Test\Files\Mount\FakeObjectStore', $config['arguments']['objectstore']);
$this->assertArrayHasKey('bucket', $config['arguments']); $this->assertArrayHasKey('bucket', $config['arguments']);
$this->assertEquals('myBucketPrefix987', $config['arguments']['bucket']); $this->assertEquals('myBucketPrefix49', $config['arguments']['bucket']);
} }
public function testMultiBucketBucketAlreadySet() { public function testMultiBucketBucketAlreadySet() {

14
tests/lib/Files/ObjectStore/MapperTest.php
View File

@ -28,24 +28,28 @@ class MapperTest extends \Test\TestCase {
public function dataGetBucket() { public function dataGetBucket() {
return [ return [
['user', substr(md5('user'), 0, 3)], ['user', 64, '17'],
['USER', substr(md5('USER'), 0, 3)], ['USER', 64, '0'],
['bc0e8b52-a66c-1035-90c6-d9663bda9e3f', substr(md5('bc0e8b52-a66c-1035-90c6-d9663bda9e3f'), 0, 3)], ['bc0e8b52-a66c-1035-90c6-d9663bda9e3f', 64, '56'],
['user', 8, '1'],
['user', 2, '1'],
['USER', 2, '0'],
]; ];
} }
/** /**
* @dataProvider dataGetBucket * @dataProvider dataGetBucket
* @param string $username * @param string $username
* @param int $numBuckets
* @param string $expectedBucket * @param string $expectedBucket
*/ */
public function testGetBucket($username, $expectedBucket) { public function testGetBucket($username, $numBuckets, $expectedBucket) {
$user = $this->createMock(IUser::class); $user = $this->createMock(IUser::class);
$user->method('getUID') $user->method('getUID')
->willReturn($username); ->willReturn($username);
$mapper = new Mapper($user); $mapper = new Mapper($user);
$this->assertSame($expectedBucket, $mapper->getBucket()); $this->assertSame($expectedBucket, $mapper->getBucket($numBuckets));
} }
} }