diff options
author | Geir Storli <geirst@verizonmedia.com> | 2021-03-22 16:11:50 +0000 |
---|---|---|
committer | Geir Storli <geirst@verizonmedia.com> | 2021-03-22 16:11:50 +0000 |
commit | fc2e817ddeb3a1fb21e18547c9e272fc28c308c7 (patch) | |
tree | 0c35d7621d9aeb5a34c803b798741bf49609161b /storage/src | |
parent | c0a479e4ae5a46b566e3fc7b1ac4c16da5e9f8d5 (diff) |
Remove functions from DistributorStripeComponent that are part of DistributorOperationContext interface.
Diffstat (limited to 'storage/src')
-rw-r--r-- | storage/src/tests/distributor/operationtargetresolvertest.cpp | 4 | ||||
-rw-r--r-- | storage/src/vespa/storage/distributor/distributor_stripe_component.h | 6 |
2 files changed, 2 insertions, 8 deletions
diff --git a/storage/src/tests/distributor/operationtargetresolvertest.cpp b/storage/src/tests/distributor/operationtargetresolvertest.cpp index a19708d6a27..aea251e81de 100644 --- a/storage/src/tests/distributor/operationtargetresolvertest.cpp +++ b/storage/src/tests/distributor/operationtargetresolvertest.cpp @@ -116,7 +116,7 @@ OperationTargetResolverTest::getInstances(const BucketId& id, bool stripToRedundancy) { lib::IdealNodeCalculatorImpl idealNodeCalc; - auto &bucketSpaceRepo(distributor_component().getBucketSpaceRepo()); + auto &bucketSpaceRepo(operation_context().bucket_space_repo()); auto &distributorBucketSpace(bucketSpaceRepo.get(makeBucketSpace())); idealNodeCalc.setDistribution(distributorBucketSpace.getDistribution()); idealNodeCalc.setClusterState(distributorBucketSpace.getClusterState()); @@ -145,7 +145,7 @@ TEST_F(OperationTargetResolverTest, simple) { TEST_F(OperationTargetResolverTest, multiple_nodes) { setupDistributor(1, 2, "storage:2 distributor:1"); - auto &bucketSpaceRepo(distributor_component().getBucketSpaceRepo()); + auto &bucketSpaceRepo(operation_context().bucket_space_repo()); auto &distributorBucketSpace(bucketSpaceRepo.get(makeBucketSpace())); for (int i = 0; i < 100; ++i) { addNodesToBucketDB(BucketId(16, i), "0=0,1=0"); diff --git a/storage/src/vespa/storage/distributor/distributor_stripe_component.h b/storage/src/vespa/storage/distributor/distributor_stripe_component.h index ae54eacf9fd..8ed1ec4f0b8 100644 --- a/storage/src/vespa/storage/distributor/distributor_stripe_component.h +++ b/storage/src/vespa/storage/distributor/distributor_stripe_component.h @@ -71,12 +71,6 @@ public: return _distributor; } - DistributorBucketSpaceRepo &getBucketSpaceRepo() { return _bucketSpaceRepo; } - const DistributorBucketSpaceRepo &getBucketSpaceRepo() const { return _bucketSpaceRepo; } - - DistributorBucketSpaceRepo& getReadOnlyBucketSpaceRepo() { return _readOnlyBucketSpaceRepo; } - const DistributorBucketSpaceRepo& getReadOnlyBucketSpaceRepo() const { return _readOnlyBucketSpaceRepo; } - /** * Finds a bucket that has the same direct parent as the given bucket * (i.e. split one bit less), but different bit in the most used bit. |