From 2a949b1cf65bb3f506cef14ec7682cb61ff56be1 Mon Sep 17 00:00:00 2001 From: Tor Egge Date: Tue, 30 Jan 2018 15:34:01 +0000 Subject: Reduce use of document::BucketSpace::placeHolder(). --- document/src/vespa/document/test/make_bucket_space.cpp | 2 +- .../vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp | 2 +- .../src/vespa/searchcore/proton/server/proton_configurer.cpp | 2 +- storage/src/tests/common/teststorageapp.h | 3 ++- storage/src/vespa/storage/bucketmover/bucketmover.cpp | 7 +++---- storage/src/vespa/storage/bucketmover/move.cpp | 3 ++- .../src/vespa/storage/distributor/maintenance/maintenancescanner.h | 2 +- storage/src/vespa/storage/distributor/pendingclusterstate.cpp | 3 ++- .../storage/persistence/filestorage/modifiedbucketchecker.cpp | 2 +- 9 files changed, 14 insertions(+), 12 deletions(-) diff --git a/document/src/vespa/document/test/make_bucket_space.cpp b/document/src/vespa/document/test/make_bucket_space.cpp index dae0399e75d..bafda79ee66 100644 --- a/document/src/vespa/document/test/make_bucket_space.cpp +++ b/document/src/vespa/document/test/make_bucket_space.cpp @@ -6,7 +6,7 @@ namespace document::test { BucketSpace makeBucketSpace() { - return BucketSpace::placeHolder(); + return BucketSpace(1); } BucketSpace makeBucketSpace(const vespalib::string &docTypeName) diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp index 67ad346048c..658e0d21765 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp @@ -212,7 +212,7 @@ private: void MemFilePersistenceProvider::handleBucketCorruption(const FileSpecification& file) const { - spi::Bucket fixBucket(document::Bucket(document::BucketSpace::placeHolder(), + spi::Bucket fixBucket(document::Bucket(spi::FixedBucketSpaces::default_space(), file.getBucketId()), spi::PartitionId(file.getDirectory().getIndex())); diff --git a/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp b/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp index b8e283d9095..828cc909ac6 100644 --- a/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp @@ -34,7 +34,7 @@ getBucketSpace(const BootstrapConfig &bootstrapConfig, const DocTypeName &name) ost << "Could not map from document type name '" << name.getName() << "' to bucket space name"; throw vespalib::IllegalStateException(ost.str(), VESPA_STRLOC); } - return document::BucketSpace::placeHolder(); + return storage::spi::FixedBucketSpaces::default_space(); } } diff --git a/storage/src/tests/common/teststorageapp.h b/storage/src/tests/common/teststorageapp.h index 46744ecb3c6..64572b8ef8d 100644 --- a/storage/src/tests/common/teststorageapp.h +++ b/storage/src/tests/common/teststorageapp.h @@ -27,6 +27,7 @@ #include #include #include +#include #include namespace storage { @@ -125,7 +126,7 @@ public: uint16_t getPartition(const document::BucketId&); StorBucketDatabase& getStorageBucketDatabase() override { - return _compReg.getBucketSpaceRepo().get(document::BucketSpace::placeHolder()).bucketDatabase(); + return _compReg.getBucketSpaceRepo().get(spi::FixedBucketSpaces::default_space()).bucketDatabase(); } private: diff --git a/storage/src/vespa/storage/bucketmover/bucketmover.cpp b/storage/src/vespa/storage/bucketmover/bucketmover.cpp index bc9a8b0c428..94db4ee9f32 100644 --- a/storage/src/vespa/storage/bucketmover/bucketmover.cpp +++ b/storage/src/vespa/storage/bucketmover/bucketmover.cpp @@ -9,13 +9,12 @@ #include #include #include +#include #include #include LOG_SETUP(".bucketmover"); -using document::BucketSpace; - namespace storage::bucketmover { BucketMover::BucketMover(const config::ConfigUri & configUri, @@ -116,7 +115,7 @@ BucketMover::startNewRun() // If so, we have to spawn off an individual Run per space, as it encompasses // both a (disk) distribution and a bucket database. _currentRun = std::make_unique( - _component.getBucketSpaceRepo().get(document::BucketSpace::placeHolder()), + _component.getBucketSpaceRepo().get(spi::FixedBucketSpaces::default_space()), *_component.getStateUpdater().getReportedNodeState(), _component.getIndex(), _component.getClock()); @@ -364,7 +363,7 @@ BucketMover::storageDistributionChanged() } lib::Distribution::DiskDistribution BucketMover::currentDiskDistribution() const { - auto distribution = _component.getBucketSpaceRepo().get(document::BucketSpace::placeHolder()).getDistribution(); + auto distribution = _component.getBucketSpaceRepo().get(spi::FixedBucketSpaces::default_space()).getDistribution(); return distribution->getDiskDistribution(); } diff --git a/storage/src/vespa/storage/bucketmover/move.cpp b/storage/src/vespa/storage/bucketmover/move.cpp index b91329fad36..28ab48223e8 100644 --- a/storage/src/vespa/storage/bucketmover/move.cpp +++ b/storage/src/vespa/storage/bucketmover/move.cpp @@ -1,6 +1,7 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "move.h" +#include #include namespace storage { @@ -9,7 +10,7 @@ namespace bucketmover { Move::Move() : _sourceDisk(0), _targetDisk(0), - _bucket(document::BucketSpace::placeHolder(), document::BucketId(0)), + _bucket(), _totalDocSize(0), _priority(255) { diff --git a/storage/src/vespa/storage/distributor/maintenance/maintenancescanner.h b/storage/src/vespa/storage/distributor/maintenance/maintenancescanner.h index c1d76b57c7c..f329133f2c4 100644 --- a/storage/src/vespa/storage/distributor/maintenance/maintenancescanner.h +++ b/storage/src/vespa/storage/distributor/maintenance/maintenancescanner.h @@ -28,7 +28,7 @@ public: } private: - ScanResult(bool done) : _done(done), _bucketSpace(document::BucketSpace::placeHolder()), _entry() {} + ScanResult(bool done) : _done(done), _bucketSpace(document::BucketSpace::invalid()), _entry() {} ScanResult(document::BucketSpace bucketSpace, const BucketDatabase::Entry& e) : _done(false), _bucketSpace(bucketSpace), _entry(e) {} }; diff --git a/storage/src/vespa/storage/distributor/pendingclusterstate.cpp b/storage/src/vespa/storage/distributor/pendingclusterstate.cpp index 71684db5527..19257192022 100644 --- a/storage/src/vespa/storage/distributor/pendingclusterstate.cpp +++ b/storage/src/vespa/storage/distributor/pendingclusterstate.cpp @@ -7,6 +7,7 @@ #include "distributor_bucket_space.h" #include #include +#include #include #include @@ -92,7 +93,7 @@ PendingClusterState::initializeBucketSpaceTransitions(bool distributionChanged, void PendingClusterState::logConstructionInformation() const { - const auto &distributorBucketSpace(_bucketSpaceRepo.get(BucketSpace::placeHolder())); + const auto &distributorBucketSpace(_bucketSpaceRepo.get(spi::FixedBucketSpaces::default_space())); const auto &distribution(distributorBucketSpace.getDistribution()); LOG(debug, "New PendingClusterState constructed with previous cluster " diff --git a/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.cpp b/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.cpp index 1834c93209d..3db3ec5dfcd 100644 --- a/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.cpp +++ b/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.cpp @@ -21,7 +21,7 @@ CyclicBucketSpaceIterator(const ContentBucketSpaceRepo::BucketSpaces &bucketSpac } ModifiedBucketChecker::BucketIdListResult::BucketIdListResult() - : _bucketSpace(document::BucketSpace::placeHolder()), + : _bucketSpace(document::BucketSpace::invalid()), _buckets() { } -- cgit v1.2.3