diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/private/Files/Mount/ObjectHomeMountProvider.php | 2 | ||||
| -rw-r--r-- | lib/private/Files/ObjectStore/Mapper.php | 17 |
2 files changed, 16 insertions, 3 deletions
diff --git a/lib/private/Files/Mount/ObjectHomeMountProvider.php b/lib/private/Files/Mount/ObjectHomeMountProvider.php index 9b243d7f8f2..b80ff39fea0 100644 --- a/lib/private/Files/Mount/ObjectHomeMountProvider.php +++ b/lib/private/Files/Mount/ObjectHomeMountProvider.php @@ -122,7 +122,7 @@ class ObjectHomeMountProvider implements IHomeMountProvider { if (!isset($config['arguments']['bucket'])) { $config['arguments']['bucket'] = ''; } - $mapper = new \OC\Files\ObjectStore\Mapper($user); + $mapper = new \OC\Files\ObjectStore\Mapper($user, $this->config); $numBuckets = isset($config['arguments']['num_buckets']) ? $config['arguments']['num_buckets'] : 64; $config['arguments']['bucket'] .= $mapper->getBucket($numBuckets); diff --git a/lib/private/Files/ObjectStore/Mapper.php b/lib/private/Files/ObjectStore/Mapper.php index a5186877738..47737b989ac 100644 --- a/lib/private/Files/ObjectStore/Mapper.php +++ b/lib/private/Files/ObjectStore/Mapper.php @@ -23,6 +23,7 @@ namespace OC\Files\ObjectStore; +use OCP\IConfig; use OCP\IUser; /** @@ -36,13 +37,18 @@ class Mapper { /** @var IUser */ private $user; + /** @var IConfig */ + private $config; + /** * Mapper constructor. * * @param IUser $user + * @param IConfig $config */ - public function __construct(IUser $user) { + public function __construct(IUser $user, IConfig $config) { $this->user = $user; + $this->config = $config; } /** @@ -50,8 +56,15 @@ class Mapper { * @return string */ public function getBucket($numBuckets = 64) { + // 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'] + : 0; + $hash = md5($this->user->getUID()); $num = hexdec(substr($hash, 0, 4)); - return (string)($num % $numBuckets); + return (string)(($num % ($numBuckets - $minBucket)) + $minBucket); } } |