diff options
author | Tor Brede Vekterli <vekterli@yahoo-inc.com> | 2017-10-05 16:45:32 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-05 16:45:32 +0200 |
commit | 12a8ab9b1ff344ec7103b667491adb614d8288a5 (patch) | |
tree | 410c6ca7c19d33cb1d03b62d9db12ba8fa4571f8 /storage | |
parent | ae0b0962ce1fb23bd5cca58ddfeb3596bf1453f4 (diff) | |
parent | e158b6e614b4b6a1d4d4a03eeb68e590ddd46ed6 (diff) |
Merge pull request #3663 from vespa-engine/toregge/add-bucketspace-parameter-to-spi-methods
Add BucketSpace parameter to listBuckets() and getModifiedBuckets() SPI methods.
Diffstat (limited to 'storage')
6 files changed, 12 insertions, 12 deletions
diff --git a/storage/src/tests/persistence/common/persistenceproviderwrapper.cpp b/storage/src/tests/persistence/common/persistenceproviderwrapper.cpp index 52263b4c2b5..c804354b0ee 100644 --- a/storage/src/tests/persistence/common/persistenceproviderwrapper.cpp +++ b/storage/src/tests/persistence/common/persistenceproviderwrapper.cpp @@ -66,11 +66,11 @@ PersistenceProviderWrapper::getPartitionStates() const } spi::BucketIdListResult -PersistenceProviderWrapper::listBuckets(spi::PartitionId partitionId) const +PersistenceProviderWrapper::listBuckets(BucketSpace bucketSpace, spi::PartitionId partitionId) const { - LOG_SPI("listBuckets(" << uint16_t(partitionId) << ")"); + LOG_SPI("listBuckets(" << bucketSpace.getId() << ", " << uint16_t(partitionId) << ")"); CHECK_ERROR(spi::BucketIdListResult, FAIL_LIST_BUCKETS); - return _spi.listBuckets(partitionId); + return _spi.listBuckets(bucketSpace, partitionId); } spi::Result diff --git a/storage/src/tests/persistence/common/persistenceproviderwrapper.h b/storage/src/tests/persistence/common/persistenceproviderwrapper.h index 955a23327f9..1f0dc93c44c 100644 --- a/storage/src/tests/persistence/common/persistenceproviderwrapper.h +++ b/storage/src/tests/persistence/common/persistenceproviderwrapper.h @@ -87,7 +87,7 @@ public: spi::Result createBucket(const spi::Bucket&, spi::Context&) override; spi::PartitionStateListResult getPartitionStates() const override; - spi::BucketIdListResult listBuckets(spi::PartitionId) const override; + spi::BucketIdListResult listBuckets(BucketSpace bucketSpace, spi::PartitionId) const override; spi::BucketInfoResult getBucketInfo(const spi::Bucket&) const override; spi::Result put(const spi::Bucket&, spi::Timestamp, const spi::DocumentSP&, spi::Context&) override; spi::RemoveResult remove(const spi::Bucket&, spi::Timestamp, const spi::DocumentId&, spi::Context&) override; diff --git a/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.cpp b/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.cpp index 7735204c92b..d0002841bbd 100644 --- a/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.cpp +++ b/storage/src/vespa/storage/persistence/filestorage/modifiedbucketchecker.cpp @@ -120,7 +120,7 @@ ModifiedBucketChecker::onInternalReply( bool ModifiedBucketChecker::requestModifiedBucketsFromProvider() { - spi::BucketIdListResult result(_provider.getModifiedBuckets()); + spi::BucketIdListResult result(_provider.getModifiedBuckets(document::BucketSpace::placeHolder())); if (result.hasError()) { LOG(debug, "getModifiedBuckets() failed: %s", result.toString().c_str()); diff --git a/storage/src/vespa/storage/persistence/persistencethread.cpp b/storage/src/vespa/storage/persistence/persistencethread.cpp index ff0bb378676..0ab512cd63f 100644 --- a/storage/src/vespa/storage/persistence/persistencethread.cpp +++ b/storage/src/vespa/storage/persistence/persistencethread.cpp @@ -463,7 +463,7 @@ PersistenceThread::handleReadBucketList(ReadBucketList& cmd) _env._metrics.readBucketList, _env._component.getClock())); - spi::BucketIdListResult result(_spi.listBuckets(cmd.getPartition())); + spi::BucketIdListResult result(_spi.listBuckets(document::BucketSpace::placeHolder(), cmd.getPartition())); if (checkForError(result, *tracker)) { ReadBucketListReply::SP reply(new ReadBucketListReply(cmd)); result.getList().swap(reply->getBuckets()); diff --git a/storage/src/vespa/storage/persistence/provider_error_wrapper.cpp b/storage/src/vespa/storage/persistence/provider_error_wrapper.cpp index 80873829064..15b0a469b35 100644 --- a/storage/src/vespa/storage/persistence/provider_error_wrapper.cpp +++ b/storage/src/vespa/storage/persistence/provider_error_wrapper.cpp @@ -49,9 +49,9 @@ ProviderErrorWrapper::getPartitionStates() const } spi::BucketIdListResult -ProviderErrorWrapper::listBuckets(spi::PartitionId partitionId) const +ProviderErrorWrapper::listBuckets(BucketSpace bucketSpace, spi::PartitionId partitionId) const { - return checkResult(_impl.listBuckets(partitionId)); + return checkResult(_impl.listBuckets(bucketSpace, partitionId)); } spi::Result @@ -164,9 +164,9 @@ ProviderErrorWrapper::deleteBucket(const spi::Bucket& bucket, } spi::BucketIdListResult -ProviderErrorWrapper::getModifiedBuckets() const +ProviderErrorWrapper::getModifiedBuckets(BucketSpace bucketSpace) const { - return checkResult(_impl.getModifiedBuckets()); + return checkResult(_impl.getModifiedBuckets(bucketSpace)); } spi::Result diff --git a/storage/src/vespa/storage/persistence/provider_error_wrapper.h b/storage/src/vespa/storage/persistence/provider_error_wrapper.h index 84adf37cbc3..122837e75ed 100644 --- a/storage/src/vespa/storage/persistence/provider_error_wrapper.h +++ b/storage/src/vespa/storage/persistence/provider_error_wrapper.h @@ -43,7 +43,7 @@ public: spi::Result initialize() override; spi::PartitionStateListResult getPartitionStates() const override; - spi::BucketIdListResult listBuckets(spi::PartitionId) const override; + spi::BucketIdListResult listBuckets(BucketSpace bucketSpace, spi::PartitionId) const override; spi::Result setClusterState(const spi::ClusterState&) override; spi::Result setActiveState(const spi::Bucket& bucket, spi::BucketInfo::ActiveState newState) override; spi::BucketInfoResult getBucketInfo(const spi::Bucket&) const override; @@ -59,7 +59,7 @@ public: spi::Result destroyIterator(spi::IteratorId, spi::Context&) override; spi::Result createBucket(const spi::Bucket&, spi::Context&) override; spi::Result deleteBucket(const spi::Bucket&, spi::Context&) override; - spi::BucketIdListResult getModifiedBuckets() const override; + spi::BucketIdListResult getModifiedBuckets(BucketSpace bucketSpace) const override; spi::Result maintain(const spi::Bucket& bucket, spi::MaintenanceLevel level) override; spi::Result split(const spi::Bucket& source, const spi::Bucket& target1, const spi::Bucket& target2, spi::Context&) override; spi::Result join(const spi::Bucket& source1, const spi::Bucket& source2, const spi::Bucket& target, spi::Context&) override; |