diff options
Diffstat (limited to 'storage/src/tests/distributor/bucketdbupdatertest.cpp')
| -rw-r--r-- | storage/src/tests/distributor/bucketdbupdatertest.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/storage/src/tests/distributor/bucketdbupdatertest.cpp b/storage/src/tests/distributor/bucketdbupdatertest.cpp index e42f024b730..108368fff7f 100644 --- a/storage/src/tests/distributor/bucketdbupdatertest.cpp +++ b/storage/src/tests/distributor/bucketdbupdatertest.cpp @@ -144,8 +144,7 @@ public: api::RequestBucketInfoReply::EntryVector &vec = sreply->getBucketInfo(); for (uint32_t i=0; i<bucketCount + invalidBucketCount; i++) { - if (!getBucketDBUpdater().getDistributorComponent() - .ownsBucketInState(state, makeDocumentBucket(document::BucketId(16, i)))) { + if (!getDistributorBucketSpace().owns_bucket_in_state(state, document::BucketId(16, i))) { continue; } @@ -1779,8 +1778,7 @@ TEST_F(BucketDBUpdaterTest, no_db_resurrection_for_bucket_not_owned_in_current_s uint32_t expectedMsgs = messageCount(2), dummyBucketsToReturn = 1; ASSERT_NO_FATAL_FAILURE(setAndEnableClusterState(stateAfter, expectedMsgs, dummyBucketsToReturn)); } - EXPECT_FALSE(getBucketDBUpdater().getDistributorComponent() - .ownsBucketInCurrentState(makeDocumentBucket(bucket))); + EXPECT_FALSE(getDistributorBucketSpace().owns_bucket_in_current_state(bucket)); ASSERT_NO_FATAL_FAILURE(sendFakeReplyForSingleBucketRequest(*rbi)); @@ -1806,8 +1804,7 @@ TEST_F(BucketDBUpdaterTest, no_db_resurrection_for_bucket_not_owned_in_pending_s lib::ClusterState stateAfter("distributor:3 storage:3"); // Set, but _don't_ enable cluster state. We want it to be pending. setSystemState(stateAfter); - EXPECT_TRUE(getBucketDBUpdater().getDistributorComponent() - .ownsBucketInCurrentState(makeDocumentBucket(bucket))); + EXPECT_TRUE(getDistributorBucketSpace().owns_bucket_in_current_state(bucket)); EXPECT_FALSE(getBucketDBUpdater() .checkOwnershipInPendingState(makeDocumentBucket(bucket)).isOwned()); @@ -2390,8 +2387,7 @@ TEST_F(BucketDBUpdaterTest, non_owned_buckets_moved_to_read_only_db_on_ownership std::unordered_set<Bucket, Bucket::hash> buckets_not_owned_in_pending_state; for_each_bucket(mutable_repo(), [&](const auto& space, const auto& entry) { - if (!getBucketDBUpdater().getDistributorComponent() - .ownsBucketInState(pending_state, makeDocumentBucket(entry.getBucketId()))) { + if (!getDistributorBucketSpace().owns_bucket_in_state(pending_state, entry.getBucketId())) { buckets_not_owned_in_pending_state.insert(Bucket(space, entry.getBucketId())); } }); |