Merge pull request #14866 from vespa-engine/toregge/remove-partition-from-spi

Remove partitions from SPI.

9 files changed, 16 insertions, 53 deletions

diff --git a/searchcore/src/apps/proton/downpersistence.cpp b/searchcore/src/apps/proton/downpersistence.cpp
index 999cf6696ea..bd111cef675 100644
--- a/searchcore/src/apps/proton/downpersistence.cpp
+++ b/searchcore/src/apps/proton/downpersistence.cpp
@@ -27,16 +27,8 @@ DownPersistence::initialize()
     return Result();
 }
 
-PartitionStateListResult
-DownPersistence::getPartitionStates() const
-{
-    PartitionStateList list(1);
-    list[0] = PartitionState(PartitionState::DOWN, _downReason);
-    return PartitionStateListResult(list);
-}
-
 BucketIdListResult
-DownPersistence::listBuckets(BucketSpace, PartitionId) const
+DownPersistence::listBuckets(BucketSpace) const
 {
     return BucketIdListResult(errorResult.getErrorCode(), errorResult.getErrorMessage());
 }
@@ -145,11 +137,4 @@ DownPersistence::join(const Bucket&, const Bucket&, const Bucket&, Context&)
     return errorResult;
 }
 
-
-Result
-DownPersistence::move(const Bucket&, PartitionId, Context&)
-{
-    return errorResult;
-}
-
 }
diff --git a/searchcore/src/apps/proton/downpersistence.h b/searchcore/src/apps/proton/downpersistence.h
index d8b48172880..d9195af67cb 100644
--- a/searchcore/src/apps/proton/downpersistence.h
+++ b/searchcore/src/apps/proton/downpersistence.h
@@ -27,8 +27,7 @@ public:
     ~DownPersistence() override;
 
     Result initialize() override;
-    PartitionStateListResult getPartitionStates() const override;
-    BucketIdListResult listBuckets(BucketSpace bucketSpace, PartitionId) const override;
+    BucketIdListResult listBuckets(BucketSpace bucketSpace) const override;
     Result setClusterState(BucketSpace, const ClusterState&) override;
     Result setActiveState(const Bucket&, BucketInfo::ActiveState) override;
     BucketInfoResult getBucketInfo(const Bucket&) const override;
@@ -50,7 +49,6 @@ public:
     BucketIdListResult getModifiedBuckets(BucketSpace bucketSpace) const override;
     Result split(const Bucket& source, const Bucket& target1, const Bucket& target2, Context&) override;
     Result join(const Bucket& source1, const Bucket& source2, const Bucket& target, Context&) override;
-    Result move(const Bucket&, PartitionId target, Context&) override;
 };
 
 }
diff --git a/searchcore/src/apps/vespa-feed-bm/spi_bm_feed_handler.cpp b/searchcore/src/apps/vespa-feed-bm/spi_bm_feed_handler.cpp
index 926e8825642..8f471705a90 100644
--- a/searchcore/src/apps/vespa-feed-bm/spi_bm_feed_handler.cpp
+++ b/searchcore/src/apps/vespa-feed-bm/spi_bm_feed_handler.cpp
@@ -94,7 +94,7 @@ void
 SpiBmFeedHandler::put(const document::Bucket& bucket, std::unique_ptr<Document> document, uint64_t timestamp, PendingTracker& tracker)
 {
     get_bucket_info_loop(tracker);
-    Bucket spi_bucket(bucket, PartitionId(0));
+    Bucket spi_bucket(bucket);
     _provider.putAsync(spi_bucket, Timestamp(timestamp), std::move(document), context, std::make_unique<MyOperationComplete>(_errors, spi_bucket, tracker));
 }
 
@@ -102,7 +102,7 @@ void
 SpiBmFeedHandler::update(const document::Bucket& bucket, std::unique_ptr<DocumentUpdate> document_update, uint64_t timestamp, PendingTracker& tracker)
 {
     get_bucket_info_loop(tracker);
-    Bucket spi_bucket(bucket, PartitionId(0));
+    Bucket spi_bucket(bucket);
     _provider.updateAsync(spi_bucket, Timestamp(timestamp), std::move(document_update), context, std::make_unique<MyOperationComplete>(_errors, spi_bucket, tracker));
 }
 
@@ -110,7 +110,7 @@ void
 SpiBmFeedHandler::remove(const document::Bucket& bucket, const DocumentId& document_id,  uint64_t timestamp, PendingTracker& tracker)
 {
     get_bucket_info_loop(tracker);
-    Bucket spi_bucket(bucket, PartitionId(0));
+    Bucket spi_bucket(bucket);
     _provider.removeAsync(spi_bucket, Timestamp(timestamp), document_id, context, std::make_unique<MyOperationComplete>(_errors, spi_bucket, tracker));
 }
 
@@ -118,7 +118,7 @@ void
 SpiBmFeedHandler::get(const document::Bucket& bucket, vespalib::stringref field_set_string, const document::DocumentId& document_id, PendingTracker& tracker)
 {
     get_bucket_info_loop(tracker);
-    Bucket spi_bucket(bucket, PartitionId(0));
+    Bucket spi_bucket(bucket);
     auto field_set = _field_set_repo.getFieldSet(field_set_string);
     auto result = _provider.get(spi_bucket, *field_set, document_id, context);
     if (result.hasError()) {
@@ -129,7 +129,7 @@ SpiBmFeedHandler::get(const document::Bucket& bucket, vespalib::stringref field_
 void
 SpiBmFeedHandler::create_bucket(const document::Bucket& bucket)
 {
-    _provider.createBucket(Bucket(bucket, PartitionId(0)), context);
+    _provider.createBucket(Bucket(bucket), context);
 }
 
 void
diff --git a/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp b/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp
index 3adb153863c..4b548197ae1 100644
--- a/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp
+++ b/searchcore/src/tests/proton/documentdb/buckethandler/buckethandler_test.cpp
@@ -20,7 +20,6 @@ using storage::spi::test::makeSpiBucket;
 using vespalib::ThreadStackExecutor;
 using proton::test::BucketStateCalculator;
 
-const PartitionId PART_ID(0);
 const GlobalId GID_1("111111111111");
 const BucketId BUCKET_1(8, GID_1.convertToBucketId().getRawId());
 const Timestamp TIME_1(1u);
@@ -147,7 +146,7 @@ struct Fixture
     }
     void sync() { _exec.sync(); }
     void handleGetBucketInfo(const BucketId &bucket) {
-        _handler.handleGetBucketInfo(makeSpiBucket(bucket, PART_ID), _bucketInfo);
+        _handler.handleGetBucketInfo(makeSpiBucket(bucket), _bucketInfo);
     }
     void
     setNodeUp(bool value)
diff --git a/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp b/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp
index 6351c187b45..0c79aacc050 100644
--- a/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp
+++ b/searchcore/src/tests/proton/persistenceengine/persistenceengine_test.cpp
@@ -332,13 +332,12 @@ document::DocumentUpdate::SP upd1(createUpd(type1, docId1));
 document::DocumentUpdate::SP upd2(createUpd(type2, docId2));
 document::DocumentUpdate::SP upd3(createUpd(type3, docId3));
 document::DocumentUpdate::SP bad_id_upd(createUpd(type1, docId2));
-PartitionId partId(0);
 BucketId bckId1(1);
 BucketId bckId2(2);
 BucketId bckId3(3);
 Bucket bucket0;
-Bucket bucket1(makeSpiBucket(bckId1, partId));
-Bucket bucket2(makeSpiBucket(bckId2, partId));
+Bucket bucket1(makeSpiBucket(bckId1));
+Bucket bucket2(makeSpiBucket(bckId2));
 BucketChecksum checksum1(1);
 BucketChecksum checksum2(2);
 BucketChecksum checksum3(1+2);
@@ -433,7 +432,7 @@ void assertBucketList(const BucketIdListResult &result, const std::vector<Bucket
 
 void assertBucketList(PersistenceProvider &spi, BucketSpace bucketSpace, const std::vector<BucketId> &expBuckets)
 {
-    BucketIdListResult result = spi.listBuckets(bucketSpace, partId);
+    BucketIdListResult result = spi.listBuckets(bucketSpace);
     TEST_DO(assertBucketList(result, expBuckets));
 }
 
@@ -577,7 +576,6 @@ TEST_F("require that remove is NOT rejected if resource limit is reached", Simpl
 TEST_F("require that listBuckets() is routed to handlers and merged", SimpleFixture)
 {
     f.hset.prepareListBuckets();
-    EXPECT_TRUE(f.engine.listBuckets(makeBucketSpace(), PartitionId(1)).getList().empty());
     TEST_DO(assertBucketList(f.engine, makeBucketSpace(), { bckId1, bckId2, bckId3 }));
 }
 
diff --git a/searchcore/src/tests/proton/server/documentretriever_test.cpp b/searchcore/src/tests/proton/server/documentretriever_test.cpp
index 90d76e4540b..314e1adcc14 100644
--- a/searchcore/src/tests/proton/server/documentretriever_test.cpp
+++ b/searchcore/src/tests/proton/server/documentretriever_test.cpp
@@ -387,13 +387,12 @@ TEST_F("require that document retriever can retrieve document meta data", Fixtur
 
 TEST_F("require that document retriever can retrieve bucket meta data", Fixture) {
     DocumentMetaData::Vector result;
-    f._retriever->getBucketMetaData(makeSpiBucket(f.bucket_id, PartitionId(0)), result);
+    f._retriever->getBucketMetaData(makeSpiBucket(f.bucket_id), result);
     ASSERT_EQUAL(1u, result.size());
     EXPECT_EQUAL(f.lid, result[0].lid);
     EXPECT_EQUAL(f.timestamp, result[0].timestamp);
     result.clear();
-    f._retriever->getBucketMetaData(makeSpiBucket(BucketId(f.bucket_id.getId() + 1),
-                                         PartitionId(0)), result);
+    f._retriever->getBucketMetaData(makeSpiBucket(BucketId(f.bucket_id.getId() + 1)), result);
     EXPECT_EQUAL(0u, result.size());
 }
 
diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp
index 1ac313f2718..0eec650cfdb 100644
--- a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp
+++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.cpp
@@ -21,8 +21,6 @@ using storage::spi::BucketIdListResult;
 using storage::spi::BucketInfo;
 using storage::spi::BucketInfoResult;
 using storage::spi::IncludedVersions;
-using storage::spi::PartitionState;
-using storage::spi::PartitionStateList;
 using storage::spi::Result;
 using vespalib::IllegalStateException;
 using vespalib::Sequence;
@@ -242,24 +240,12 @@ PersistenceEngine::initialize()
 }
 
 
-PersistenceEngine::PartitionStateListResult
-PersistenceEngine::getPartitionStates() const
-{
-    PartitionStateList list(1);
-    return PartitionStateListResult(list);
-}
-
-
 BucketIdListResult
-PersistenceEngine::listBuckets(BucketSpace bucketSpace, PartitionId id) const
+PersistenceEngine::listBuckets(BucketSpace bucketSpace) const
 {
     // Runs in SPI thread.
     // No handover to write threads in persistence handlers.
     ReadGuard rguard(_rwMutex);
-    if (id != 0) {
-        BucketIdListResult::List emptyList;
-        return BucketIdListResult(emptyList);
-    }
     HandlerSnapshot snap = getHandlerSnapshot(rguard, bucketSpace);
     BucketIdListResultHandler resultHandler;
     for (; snap.handlers().valid(); snap.handlers().next()) {
diff --git a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.h b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.h
index 9ee42823f9c..b0a712990c3 100644
--- a/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.h
+++ b/searchcore/src/vespa/searchcore/proton/persistenceengine/persistenceengine.h
@@ -30,7 +30,6 @@ private:
     using IterateResult = storage::spi::IterateResult;
     using IteratorId = storage::spi::IteratorId;
     using PartitionId = storage::spi::PartitionId;
-    using PartitionStateListResult = storage::spi::PartitionStateListResult;
     using RemoveResult = storage::spi::RemoveResult;
     using Result = storage::spi::Result;
     using Selection = storage::spi::Selection;
@@ -95,8 +94,7 @@ public:
 
     // Implements PersistenceProvider
     Result initialize() override;
-    PartitionStateListResult getPartitionStates() const override;
-    BucketIdListResult listBuckets(BucketSpace bucketSpace, PartitionId) const override;
+    BucketIdListResult listBuckets(BucketSpace bucketSpace) const override;
     Result setClusterState(BucketSpace bucketSpace, const ClusterState& calc) override;
     Result setActiveState(const Bucket& bucket, BucketInfo::ActiveState newState) override;
     BucketInfoResult getBucketInfo(const Bucket&) const override;
diff --git a/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp b/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp
index eb3c8ce6aa4..6371454115c 100644
--- a/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/clusterstatehandler.cpp
@@ -40,7 +40,7 @@ public:
     {
     }
     bool shouldBeReady(const document::Bucket &bucket) const override {
-        return _calc.shouldBeReady(Bucket(bucket, PartitionId(0)));
+        return _calc.shouldBeReady(Bucket(bucket));
     }
     bool clusterUp() const override { return _clusterUp; }
     bool nodeUp() const override { return _nodeUp; }