Rename mergeInto() to MergeIntoBucketDatabases() and remove argument,

to remove limitation of a single bucket database.

4 files changed, 8 insertions, 10 deletions

diff --git a/storage/src/tests/distributor/bucketdbupdatertest.cpp b/storage/src/tests/distributor/bucketdbupdatertest.cpp
index 4900baf1e14..363065be65c 100644
--- a/storage/src/tests/distributor/bucketdbupdatertest.cpp
+++ b/storage/src/tests/distributor/bucketdbupdatertest.cpp
@@ -1812,7 +1812,7 @@ BucketDBUpdaterTest::mergeBucketLists(
                         beforeTime));
 
         parseInputData(existingData, beforeTime, *state, includeBucketInfo);
-        state->mergeInto(getBucketDBUpdater().getDistributorComponent().getBucketDatabase());
+        state->mergeIntoBucketDatabases();
     }
 
     BucketDumper dumper_tmp(true);
@@ -1831,8 +1831,7 @@ BucketDBUpdaterTest::mergeBucketLists(
                         afterTime));
 
         parseInputData(newData, afterTime, *state, includeBucketInfo);
-        state->mergeInto(getBucketDBUpdater().getDistributorComponent()
-                .getBucketDatabase());
+        state->mergeIntoBucketDatabases();
     }
 
     BucketDumper dumper(includeBucketInfo);
diff --git a/storage/src/vespa/storage/distributor/bucketdbupdater.cpp b/storage/src/vespa/storage/distributor/bucketdbupdater.cpp
index 82d49d68f12..50431bda37e 100644
--- a/storage/src/vespa/storage/distributor/bucketdbupdater.cpp
+++ b/storage/src/vespa/storage/distributor/bucketdbupdater.cpp
@@ -488,7 +488,7 @@ BucketDBUpdater::isPendingClusterStateCompleted() const
 void
 BucketDBUpdater::processCompletedPendingClusterState()
 {
-    _pendingClusterState->mergeInto(_bucketSpaceComponent.getBucketDatabase());
+    _pendingClusterState->mergeIntoBucketDatabases();
 
     if (_pendingClusterState->getCommand().get()) {
         enableCurrentClusterStateInDistributor();
diff --git a/storage/src/vespa/storage/distributor/pendingclusterstate.cpp b/storage/src/vespa/storage/distributor/pendingclusterstate.cpp
index 980a490efb9..256d0fd407f 100644
--- a/storage/src/vespa/storage/distributor/pendingclusterstate.cpp
+++ b/storage/src/vespa/storage/distributor/pendingclusterstate.cpp
@@ -3,6 +3,7 @@
 #include "pendingclusterstate.h"
 #include "pending_bucket_space_db_transition.h"
 #include "bucketdbupdater.h"
+#include "distributor_bucket_space_repo.h"
 #include <vespa/storageframework/defaultimplementation/clock/realclock.h>
 #include <vespa/storage/common/bucketoperationlogger.h>
 #include <vespa/vespalib/util/xmlstream.hpp>
@@ -408,9 +409,9 @@ PendingClusterState::requestNodesToString() const
 }
 
 void
-PendingClusterState::mergeInto(BucketDatabase& db)
+PendingClusterState::mergeIntoBucketDatabases()
 {
-    _pendingTransition->mergeInto(db);
+    _pendingTransition->mergeInto(_bucketSpaceRepo.get(BucketSpace::placeHolder()).getBucketDatabase());
 }
 
 void
diff --git a/storage/src/vespa/storage/distributor/pendingclusterstate.h b/storage/src/vespa/storage/distributor/pendingclusterstate.h
index 5cbcaa25c4e..62b4f8c2b5a 100644
--- a/storage/src/vespa/storage/distributor/pendingclusterstate.h
+++ b/storage/src/vespa/storage/distributor/pendingclusterstate.h
@@ -12,8 +12,6 @@
 #include <unordered_set>
 #include <deque>
 
-namespace storage { class BucketDatabase; }
-
 namespace storage::distributor {
 
 class DistributorMessageSender;
@@ -126,9 +124,9 @@ public:
     std::unordered_set<uint16_t> getOutdatedNodeSet() const;
 
     /**
-     * Merges all the results with the given bucket database.
+     * Merges all the results with the corresponding bucket databases.
      */
-    void mergeInto(BucketDatabase& db);
+    void mergeIntoBucketDatabases();
     // Get pending transition for a specific bucket space. Only used by unit test.
     PendingBucketSpaceDbTransition &getPendingBucketSpaceDbTransition(document::BucketSpace bucketSpace);