diff options
author | Tor Egge <Tor.Egge@oath.com> | 2017-11-17 12:01:50 +0000 |
---|---|---|
committer | Tor Egge <Tor.Egge@oath.com> | 2017-11-17 12:01:50 +0000 |
commit | 4c3d432733253d69d7c761aa1e0d2a5217c926bf (patch) | |
tree | cb051d32a29210d8c10412ad52384fcc3fa6de91 /storage/src/tests/distributor | |
parent | 0a6d7e453615b3402868097e4a492ea729acd0ea (diff) |
Factor out common lines to defaultDistributorBucketSpace() method.
Diffstat (limited to 'storage/src/tests/distributor')
-rw-r--r-- | storage/src/tests/distributor/bucketdbupdatertest.cpp | 22 |
1 files changed, 7 insertions, 15 deletions
diff --git a/storage/src/tests/distributor/bucketdbupdatertest.cpp b/storage/src/tests/distributor/bucketdbupdatertest.cpp index 54e4c729c07..ec2f79c42e0 100644 --- a/storage/src/tests/distributor/bucketdbupdatertest.cpp +++ b/storage/src/tests/distributor/bucketdbupdatertest.cpp @@ -145,6 +145,8 @@ protected: void adding_diverging_replica_to_existing_trusted_does_not_remove_trusted(); void batch_update_from_distributor_change_does_not_mark_diverging_replicas_as_trusted(); + auto &defaultDistributorBucketSpace() { return getBucketSpaceRepo().get(makeBucketSpace()); } + bool bucketExistsThatHasNode(int bucketCount, uint16_t node) const; ClusterInformation::CSP createClusterInfo(const std::string& clusterState) { @@ -185,9 +187,7 @@ public: } std::vector<uint16_t> nodes; - auto &bucketSpaceRepo(getBucketDBUpdater().getDistributorComponent().getBucketSpaceRepo()); - auto &distributorBucketSpace(bucketSpaceRepo.get(makeBucketSpace())); - distributorBucketSpace.getDistribution().getIdealNodes( + defaultDistributorBucketSpace().getDistribution().getIdealNodes( lib::NodeType::STORAGE, state, document::BucketId(16, i), @@ -248,9 +248,7 @@ public: } std::vector<uint16_t> nodes; - auto &bucketSpaceRepo(getBucketDBUpdater().getDistributorComponent().getBucketSpaceRepo()); - auto &distributorBucketSpace(bucketSpaceRepo.get(makeBucketSpace())); - distributorBucketSpace.getDistribution().getIdealNodes( + defaultDistributorBucketSpace().getDistribution().getIdealNodes( lib::NodeType::STORAGE, state, document::BucketId(id), @@ -587,10 +585,8 @@ BucketDBUpdaterTest::testNormalUsage() CPPUNIT_ASSERT_EQUAL(size_t(3), _sender.commands.size()); // Ensure distribution hash is set correctly - auto &bucketSpaceRepo(getBucketDBUpdater().getDistributorComponent().getBucketSpaceRepo()); - auto &distributorBucketSpace(bucketSpaceRepo.get(makeBucketSpace())); CPPUNIT_ASSERT_EQUAL( - distributorBucketSpace.getDistribution() + defaultDistributorBucketSpace().getDistribution() .getNodeGraph().getDistributionConfigHash(), dynamic_cast<const RequestBucketInfoCommand&>( *_sender.commands[0]).getDistributionHash()); @@ -921,9 +917,7 @@ BucketDBUpdaterTest::testBitChange() int cnt=0; for (int i=0; cnt < 2; i++) { - auto &bucketSpaceRepo(getBucketDBUpdater().getDistributorComponent().getBucketSpaceRepo()); - auto &distributorBucketSpace(bucketSpaceRepo.get(makeBucketSpace())); - lib::Distribution distribution = distributorBucketSpace.getDistribution(); + lib::Distribution distribution = defaultDistributorBucketSpace().getDistribution(); std::vector<uint16_t> distributors; if (distribution.getIdealDistributorNode( lib::ClusterState("redundancy:1 bits:14 storage:1 distributor:2"), @@ -1841,9 +1835,7 @@ BucketDBUpdaterTest::mergeBucketLists( } BucketDumper dumper(includeBucketInfo); - auto &bucketSpaceRepo(getBucketDBUpdater().getDistributorComponent().getBucketSpaceRepo()); - auto &distributorBucketSpace(bucketSpaceRepo.get(makeBucketSpace())); - auto &bucketDb(distributorBucketSpace.getBucketDatabase()); + auto &bucketDb(defaultDistributorBucketSpace().getBucketDatabase()); bucketDb.forEach(dumper); bucketDb.clear(); return dumper.ost.str(); |