diff options
author | Tor Egge <Tor.Egge@oath.com> | 2018-02-09 10:57:08 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@oath.com> | 2018-02-12 13:36:59 +0000 |
commit | dc7c91156f25032114226ff9b915930b10716b65 (patch) | |
tree | 6451ffb48a5a22adbd40ce1d179bb605d41951d3 | |
parent | 48e1509e7c89c8140615010e3231fcab82c7c8a1 (diff) |
Always enable global content bucket space.
4 files changed, 3 insertions, 18 deletions
diff --git a/storage/src/vespa/storage/common/content_bucket_space_repo.cpp b/storage/src/vespa/storage/common/content_bucket_space_repo.cpp index 304c6eddddc..774ddb81578 100644 --- a/storage/src/vespa/storage/common/content_bucket_space_repo.cpp +++ b/storage/src/vespa/storage/common/content_bucket_space_repo.cpp @@ -11,6 +11,7 @@ ContentBucketSpaceRepo::ContentBucketSpaceRepo() : _map() { _map.emplace(document::FixedBucketSpaces::default_space(), std::make_unique<ContentBucketSpace>(document::FixedBucketSpaces::default_space())); + _map.emplace(document::FixedBucketSpaces::global_space(), std::make_unique<ContentBucketSpace>(document::FixedBucketSpaces::global_space())); } ContentBucketSpace & @@ -21,10 +22,6 @@ ContentBucketSpaceRepo::get(BucketSpace bucketSpace) const return *itr->second; } -void ContentBucketSpaceRepo::enableGlobalBucketSpace() { - _map.emplace(document::FixedBucketSpaces::global_space(), std::make_unique<ContentBucketSpace>(document::FixedBucketSpaces::global_space())); -} - ContentBucketSpaceRepo::BucketSpaces ContentBucketSpaceRepo::getBucketSpaces() const { diff --git a/storage/src/vespa/storage/common/content_bucket_space_repo.h b/storage/src/vespa/storage/common/content_bucket_space_repo.h index f0803d76282..0d4ddb86bcf 100644 --- a/storage/src/vespa/storage/common/content_bucket_space_repo.h +++ b/storage/src/vespa/storage/common/content_bucket_space_repo.h @@ -24,8 +24,6 @@ public: BucketSpaceMap::const_iterator begin() const { return _map.begin(); } BucketSpaceMap::const_iterator end() const { return _map.end(); } - void enableGlobalBucketSpace(); - BucketSpaces getBucketSpaces() const; size_t getBucketMemoryUsage() const; diff --git a/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.cpp b/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.cpp index 29c69b59760..888f1e816a1 100644 --- a/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.cpp +++ b/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.cpp @@ -42,18 +42,9 @@ void ServiceLayerComponentRegisterImpl::setDistribution(lib::Distribution::SP distribution) { _bucketSpaceRepo.get(document::FixedBucketSpaces::default_space()).setDistribution(distribution); - if (enableMultipleBucketSpaces()) { - auto global_distr = GlobalBucketSpaceDistributionConverter::convert_to_global(*distribution); - _bucketSpaceRepo.get(document::FixedBucketSpaces::global_space()).setDistribution(global_distr); - } + auto global_distr = GlobalBucketSpaceDistributionConverter::convert_to_global(*distribution); + _bucketSpaceRepo.get(document::FixedBucketSpaces::global_space()).setDistribution(global_distr); StorageComponentRegisterImpl::setDistribution(distribution); } -void ServiceLayerComponentRegisterImpl::setEnableMultipleBucketSpaces(bool enabled) { - StorageComponentRegisterImpl::setEnableMultipleBucketSpaces(enabled); - if (enabled) { - _bucketSpaceRepo.enableGlobalBucketSpace(); - } -} - } // storage diff --git a/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.h b/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.h index fc07f394fff..deb3b2c0767 100644 --- a/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.h +++ b/storage/src/vespa/storage/frameworkimpl/component/servicelayercomponentregisterimpl.h @@ -38,7 +38,6 @@ public: void registerServiceLayerComponent(ServiceLayerManagedComponent&) override; void setDiskCount(uint16_t count); void setDistribution(lib::Distribution::SP distribution) override; - void setEnableMultipleBucketSpaces(bool enabled) override; }; } // storage |