From e158b6e614b4b6a1d4d4a03eeb68e590ddd46ed6 Mon Sep 17 00:00:00 2001
From: Tor Egge <Tor.Egge@oath.com>
Date: Thu, 5 Oct 2017 13:12:39 +0000
Subject: Add BucketSpace parameter to listBuckets() and getModifiedBuckets()
 SPI methods.

---
 memfilepersistence/src/tests/spi/memfiletestutils.cpp                 | 3 ++-
 .../src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp   | 4 ++--
 .../src/vespa/memfilepersistence/spi/memfilepersistenceprovider.h     | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'memfilepersistence')

diff --git a/memfilepersistence/src/tests/spi/memfiletestutils.cpp b/memfilepersistence/src/tests/spi/memfiletestutils.cpp
index f8e182c1bcb..71a3e6a0999 100644
--- a/memfilepersistence/src/tests/spi/memfiletestutils.cpp
+++ b/memfilepersistence/src/tests/spi/memfiletestutils.cpp
@@ -14,6 +14,7 @@
 
 using document::DocumentType;
 using storage::spi::test::makeBucket;
+using storage::spi::test::makeBucketSpace;
 
 namespace storage {
 namespace memfile {
@@ -114,7 +115,7 @@ std::string
 MemFileTestUtils::getModifiedBuckets()
 {
     spi::BucketIdListResult result(
-            getPersistenceProvider().getModifiedBuckets());
+            getPersistenceProvider().getModifiedBuckets(makeBucketSpace()));
     const spi::BucketIdListResult::List& list(result.getList());
     std::ostringstream ss;
     for (size_t i = 0; i < list.size(); ++i) {
diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp
index 09d1e46dc27..e75df3fc29f 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp
+++ b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp
@@ -411,7 +411,7 @@ MemFilePersistenceProvider::getPartitionStates() const
 }
 
 spi::BucketIdListResult
-MemFilePersistenceProvider::listBuckets(spi::PartitionId partition) const
+MemFilePersistenceProvider::listBuckets(BucketSpace, spi::PartitionId partition) const
 {
     spi::BucketIdListResult::List buckets;
     _fileScanner->buildBucketList(buckets, partition, 0, 1);
@@ -419,7 +419,7 @@ MemFilePersistenceProvider::listBuckets(spi::PartitionId partition) const
 }
 
 spi::BucketIdListResult
-MemFilePersistenceProvider::getModifiedBuckets() const
+MemFilePersistenceProvider::getModifiedBuckets(BucketSpace) const
 {
     document::BucketId::List modified;
     _env->swapModifiedBuckets(modified); // Atomic op
diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.h b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.h
index 28af44c504e..f706fabc20c 100644
--- a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.h
+++ b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.h
@@ -41,8 +41,8 @@ public:
     ~MemFilePersistenceProvider();
 
     spi::PartitionStateListResult getPartitionStates() const override;
-    spi::BucketIdListResult listBuckets(spi::PartitionId) const override;
-    spi::BucketIdListResult getModifiedBuckets() const override;
+    spi::BucketIdListResult listBuckets(BucketSpace bucketSpace, spi::PartitionId) const override;
+    spi::BucketIdListResult getModifiedBuckets(BucketSpace bucketSpace) const override;
     spi::BucketInfoResult getBucketInfo(const spi::Bucket&) const override;
     spi::Result put(const spi::Bucket&, spi::Timestamp,
                     const spi::DocumentSP&, spi::Context&) override;
-- 
cgit v1.2.3