Merge pull request #4102 from vespa-engine/toregge/change-distributor-bucket-db-updater-to-handle-multiple-bucket-spaces

Change distributor BucketDBUpdater to handle multiple bucket spaces

2 files changed, 7 insertions, 8 deletions

diff --git a/storage/src/tests/distributor/bucketdbupdatertest.cpp b/storage/src/tests/distributor/bucketdbupdatertest.cpp
index 03a51cf6180..4a3f93d3f45 100644
--- a/storage/src/tests/distributor/bucketdbupdatertest.cpp
+++ b/storage/src/tests/distributor/bucketdbupdatertest.cpp
@@ -151,7 +151,6 @@ protected:
         ClusterInformation::CSP clusterInfo(
                 new SimpleClusterInformation(
                         getBucketDBUpdater().getDistributorComponent().getIndex(),
-                        getBucketDBUpdater().getDistributorComponent().getDistribution(),
                         lib::ClusterState(clusterState),
                         "ui"));
         return clusterInfo;
@@ -880,7 +879,7 @@ BucketDBUpdaterTest::testInitializingWhileRecheck()
     CPPUNIT_ASSERT_EQUAL(size_t(2), _sender.commands.size());
     CPPUNIT_ASSERT_EQUAL(size_t(0), _senderDown.commands.size());
 
-    getBucketDBUpdater().recheckBucketInfo(1, document::BucketId(16, 3));
+    getBucketDBUpdater().recheckBucketInfo(1, makeDocumentBucket(document::BucketId(16, 3)));
 
     for (int i=0; i<2; i++) {
         fakeBucketReply(systemState,
@@ -1010,7 +1009,7 @@ BucketDBUpdaterTest::testRecheckNodeWithFailure()
 
     _sender.clear();
 
-    getBucketDBUpdater().recheckBucketInfo(1, document::BucketId(16, 3));
+    getBucketDBUpdater().recheckBucketInfo(1, makeDocumentBucket(document::BucketId(16, 3)));
 
     CPPUNIT_ASSERT_EQUAL(size_t(1), _sender.commands.size());
 
@@ -1060,7 +1059,7 @@ BucketDBUpdaterTest::testRecheckNode()
 
     _sender.clear();
 
-    getBucketDBUpdater().recheckBucketInfo(1, document::BucketId(16, 3));
+    getBucketDBUpdater().recheckBucketInfo(1, makeDocumentBucket(document::BucketId(16, 3)));
 
     CPPUNIT_ASSERT_EQUAL(size_t(1), _sender.commands.size());
 
@@ -1954,7 +1953,7 @@ BucketDBUpdaterTest::testNoDbResurrectionForBucketNotOwnedInCurrentState()
     }
     _sender.clear();
 
-    getBucketDBUpdater().recheckBucketInfo(0, bucket);
+    getBucketDBUpdater().recheckBucketInfo(0, makeDocumentBucket(bucket));
 
     CPPUNIT_ASSERT_EQUAL(size_t(1), _sender.commands.size());
     std::shared_ptr<api::RequestBucketInfoCommand> rbi(
@@ -1986,7 +1985,7 @@ BucketDBUpdaterTest::testNoDbResurrectionForBucketNotOwnedInPendingState()
     }
     _sender.clear();
 
-    getBucketDBUpdater().recheckBucketInfo(0, bucket);
+    getBucketDBUpdater().recheckBucketInfo(0, makeDocumentBucket(bucket));
 
     CPPUNIT_ASSERT_EQUAL(size_t(1), _sender.commands.size());
     std::shared_ptr<api::RequestBucketInfoCommand> rbi(
@@ -1999,7 +1998,7 @@ BucketDBUpdaterTest::testNoDbResurrectionForBucketNotOwnedInPendingState()
     CPPUNIT_ASSERT(getBucketDBUpdater().getDistributorComponent()
                    .ownsBucketInCurrentState(makeDocumentBucket(bucket)));
     CPPUNIT_ASSERT(!getBucketDBUpdater()
-            .checkOwnershipInPendingState(bucket).isOwned());
+            .checkOwnershipInPendingState(makeDocumentBucket(bucket)).isOwned());
 
     sendFakeReplyForSingleBucketRequest(*rbi);
 
diff --git a/storage/src/tests/distributor/distributortest.cpp b/storage/src/tests/distributor/distributortest.cpp
index cbc78157911..1640af0f871 100644
--- a/storage/src/tests/distributor/distributortest.cpp
+++ b/storage/src/tests/distributor/distributortest.cpp
@@ -556,7 +556,7 @@ Distributor_Test::testNoDbResurrectionForBucketNotOwnedInPendingState()
 
     document::BucketId nonOwnedBucket(16, 3);
     CPPUNIT_ASSERT(!getBucketDBUpdater()
-                   .checkOwnershipInPendingState(nonOwnedBucket).isOwned());
+                   .checkOwnershipInPendingState(makeDocumentBucket(nonOwnedBucket)).isOwned());
     CPPUNIT_ASSERT(!getBucketDBUpdater().getDistributorComponent()
                    .checkOwnershipInPendingAndCurrentState(makeDocumentBucket(nonOwnedBucket))
                    .isOwned());