diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-10-07 11:35:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-07 11:35:40 +0200 |
| commit | 34f6e1132f3d792e7f597f902dc7f75e47856007 (patch) | |
| tree | 0b5e146ab7149cf2facd1473ec866fb970c3198b | |
| parent | aae9aed70d9d500d3db6a6bfa3bb3405c4301410 (diff) | |
| parent | 80982cbec6855fb8db753fe09a6fd2e05dceceb1 (diff) | |
Merge pull request #10894 from vespa-engine/vekterli/remove-yet-unused-member-variable
Remove currently unused member variable
3 files changed, 4 insertions, 9 deletions
diff --git a/storage/src/vespa/storage/distributor/distributor.cpp b/storage/src/vespa/storage/distributor/distributor.cpp index 4adbdd32669..ab6776717aa 100644 --- a/storage/src/vespa/storage/distributor/distributor.cpp +++ b/storage/src/vespa/storage/distributor/distributor.cpp @@ -77,8 +77,7 @@ Distributor::Distributor(DistributorComponentRegister& compReg, _distributorStatusDelegate(compReg, *this, *this), _bucketDBStatusDelegate(compReg, *this, _bucketDBUpdater), _idealStateManager(*this, *_bucketSpaceRepo, *_readOnlyBucketSpaceRepo, compReg, manageActiveBucketCopies), - _externalOperationHandler(*this, *_bucketSpaceRepo, *_readOnlyBucketSpaceRepo, - _idealStateManager, compReg, use_btree_database), + _externalOperationHandler(*this, *_bucketSpaceRepo, *_readOnlyBucketSpaceRepo, _idealStateManager, compReg), _threadPool(threadPool), _initializingIsUp(true), _doneInitializeHandler(doneInitHandler), diff --git a/storage/src/vespa/storage/distributor/externaloperationhandler.cpp b/storage/src/vespa/storage/distributor/externaloperationhandler.cpp index 221c516a56e..6b476ae37c5 100644 --- a/storage/src/vespa/storage/distributor/externaloperationhandler.cpp +++ b/storage/src/vespa/storage/distributor/externaloperationhandler.cpp @@ -30,14 +30,12 @@ ExternalOperationHandler::ExternalOperationHandler(Distributor& owner, DistributorBucketSpaceRepo& bucketSpaceRepo, DistributorBucketSpaceRepo& readOnlyBucketSpaceRepo, const MaintenanceOperationGenerator& gen, - DistributorComponentRegister& compReg, - bool enable_concurrent_gets) + DistributorComponentRegister& compReg) : DistributorComponent(owner, bucketSpaceRepo, readOnlyBucketSpaceRepo, compReg, "External operation handler"), _operationGenerator(gen), _rejectFeedBeforeTimeReached(), // At epoch _non_main_thread_ops_mutex(), - _non_main_thread_ops_owner(owner, getClock()), - _enable_concurrent_gets(enable_concurrent_gets) + _non_main_thread_ops_owner(owner, getClock()) { } diff --git a/storage/src/vespa/storage/distributor/externaloperationhandler.h b/storage/src/vespa/storage/distributor/externaloperationhandler.h index 9db078af198..b64b4bc90cd 100644 --- a/storage/src/vespa/storage/distributor/externaloperationhandler.h +++ b/storage/src/vespa/storage/distributor/externaloperationhandler.h @@ -40,8 +40,7 @@ public: DistributorBucketSpaceRepo& bucketSpaceRepo, DistributorBucketSpaceRepo& readOnlyBucketSpaceRepo, const MaintenanceOperationGenerator&, - DistributorComponentRegister& compReg, - bool enable_concurrent_gets); + DistributorComponentRegister& compReg); ~ExternalOperationHandler() override; @@ -59,7 +58,6 @@ private: TimePoint _rejectFeedBeforeTimeReached; mutable std::mutex _non_main_thread_ops_mutex; OperationOwner _non_main_thread_ops_owner; - bool _enable_concurrent_gets; template <typename Func> void bounce_or_invoke_read_only_op(api::StorageCommand& cmd, |