From ce6c9e7201683013d9bfec9a8fb522d95252f565 Mon Sep 17 00:00:00 2001 From: Geir Storli Date: Tue, 18 Sep 2018 14:34:08 +0000 Subject: Rename proton summary executor -> shared executor. --- .../src/vespa/searchcore/proton/server/documentdb.cpp | 6 +++--- searchcore/src/vespa/searchcore/proton/server/documentdb.h | 2 +- .../searchcore/proton/server/documentsubdbcollection.cpp | 4 ++-- .../searchcore/proton/server/documentsubdbcollection.h | 2 +- searchcore/src/vespa/searchcore/proton/server/proton.cpp | 14 +++++++------- searchcore/src/vespa/searchcore/proton/server/proton.h | 2 +- .../vespa/searchcore/proton/server/storeonlydocsubdb.cpp | 8 ++++---- .../src/vespa/searchcore/proton/server/storeonlydocsubdb.h | 6 +++--- 8 files changed, 22 insertions(+), 22 deletions(-) (limited to 'searchcore/src') diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp index 72cd9ce82ba..c974f812acc 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.cpp @@ -83,7 +83,7 @@ DocumentDB::DocumentDB(const vespalib::string &baseDir, const ProtonConfig &protonCfg, IDocumentDBOwner &owner, vespalib::ThreadExecutor &warmupExecutor, - vespalib::ThreadStackExecutorBase &summaryExecutor, + vespalib::ThreadStackExecutorBase &sharedExecutor, search::transactionlog::Writer &tlsDirectWriter, MetricsWireService &metricsWireService, const FileHeaderContext &fileHeaderContext, @@ -130,9 +130,9 @@ DocumentDB::DocumentDB(const vespalib::string &baseDir, _writeFilter(), _feedHandler(_writeService, tlsSpec, docTypeName, _state, *this, _writeFilter, *this, tlsDirectWriter), _subDBs(*this, *this, _feedHandler, _docTypeName, _writeService, warmupExecutor, - summaryExecutor, fileHeaderContext, metricsWireService, getMetricsCollection(), + sharedExecutor, fileHeaderContext, metricsWireService, getMetricsCollection(), queryLimiter, clock, _configMutex, _baseDir, protonCfg, hwInfo), - _maintenanceController(_writeService.master(), summaryExecutor, _docTypeName), + _maintenanceController(_writeService.master(), sharedExecutor, _docTypeName), _visibility(_feedHandler, _writeService, _feedView), _lidSpaceCompactionHandlers(), _jobTrackers(), diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdb.h b/searchcore/src/vespa/searchcore/proton/server/documentdb.h index 5c04c4057ae..996b365cb48 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdb.h +++ b/searchcore/src/vespa/searchcore/proton/server/documentdb.h @@ -250,7 +250,7 @@ public: const ProtonConfig &protonCfg, IDocumentDBOwner &owner, vespalib::ThreadExecutor &warmupExecutor, - vespalib::ThreadStackExecutorBase &summaryExecutor, + vespalib::ThreadStackExecutorBase &sharedExecutor, search::transactionlog::Writer &tlsDirectWriter, MetricsWireService &metricsWireService, const search::common::FileHeaderContext &fileHeaderContext, diff --git a/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.cpp b/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.cpp index 001b0573e0b..b67d09480ec 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.cpp @@ -37,7 +37,7 @@ DocumentSubDBCollection::DocumentSubDBCollection( const DocTypeName &docTypeName, searchcorespi::index::IThreadingService &writeService, vespalib::ThreadExecutor &warmupExecutor, - vespalib::ThreadStackExecutorBase &summaryExecutor, + vespalib::ThreadStackExecutorBase &sharedExecutor, const search::common::FileHeaderContext &fileHeaderContext, MetricsWireService &metricsWireService, DocumentDBMetricsCollection &metrics, @@ -73,7 +73,7 @@ DocumentSubDBCollection::DocumentSubDBCollection( getSerialNum, fileHeaderContext, writeService, - summaryExecutor, + sharedExecutor, _bucketDB, *_bucketDBHandler, metrics, diff --git a/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.h b/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.h index ea07e391f69..ebc418497dc 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.h +++ b/searchcore/src/vespa/searchcore/proton/server/documentsubdbcollection.h @@ -82,7 +82,7 @@ public: const DocTypeName &docTypeName, searchcorespi::index::IThreadingService &writeService, vespalib::ThreadExecutor &warmupExecutor, - vespalib::ThreadStackExecutorBase &summaryExecutor, + vespalib::ThreadStackExecutorBase &sharedExecutor, const search::common::FileHeaderContext &fileHeaderContext, MetricsWireService &metricsWireService, DocumentDBMetricsCollection &metrics, diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.cpp b/searchcore/src/vespa/searchcore/proton/server/proton.cpp index 070a3172fe0..9da7f385389 100644 --- a/searchcore/src/vespa/searchcore/proton/server/proton.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/proton.cpp @@ -194,7 +194,7 @@ Proton::Proton(const config::ConfigUri & configUri, _protonConfigurer(_executor, *this, _protonDiskLayout), _protonConfigFetcher(configUri, _protonConfigurer, subscribeTimeout), _warmupExecutor(), - _summaryExecutor(), + _sharedExecutor(), _queryLimiter(), _clock(0.010), _threadPool(128 * 1024), @@ -288,8 +288,8 @@ Proton::init(const BootstrapConfig::SP & configSnapshot) vespalib::string fileConfigId; _warmupExecutor = std::make_unique(4, 128*1024); - const size_t summaryThreads = deriveCompactionCompressionThreads(protonConfig, hwInfo.cpu()); - _summaryExecutor = std::make_unique(summaryThreads, 128*1024, summaryThreads*16); + const size_t sharedThreads = deriveCompactionCompressionThreads(protonConfig, hwInfo.cpu()); + _sharedExecutor = std::make_unique(sharedThreads, 128*1024, sharedThreads*16); InitializeThreads initializeThreads; if (protonConfig.initialize.threads > 0) { initializeThreads = std::make_shared(protonConfig.initialize.threads, 128 * 1024); @@ -422,8 +422,8 @@ Proton::~Proton() if (_warmupExecutor) { _warmupExecutor->sync(); } - if (_summaryExecutor) { - _summaryExecutor->sync(); + if (_sharedExecutor) { + _sharedExecutor->sync(); } LOG(debug, "Shutting down fs4 interface"); if (_metricsEngine && _fs4Server) { @@ -440,7 +440,7 @@ Proton::~Proton() _persistenceEngine.reset(); _tls.reset(); _warmupExecutor.reset(); - _summaryExecutor.reset(); + _sharedExecutor.reset(); _clock.stop(); LOG(debug, "Explicit destructor done"); } @@ -526,7 +526,7 @@ Proton::addDocumentDB(const document::DocumentType &docType, } auto ret = std::make_shared(config.basedir + "/documents", documentDBConfig, config.tlsspec, _queryLimiter, _clock, docTypeName, bucketSpace, config, *this, - *_warmupExecutor, *_summaryExecutor, *_tls->getTransLogServer(), + *_warmupExecutor, *_sharedExecutor, *_tls->getTransLogServer(), *_metricsEngine, _fileHeaderContext, std::move(config_store), initializeThreads, bootstrapConfig->getHwInfo()); try { diff --git a/searchcore/src/vespa/searchcore/proton/server/proton.h b/searchcore/src/vespa/searchcore/proton/server/proton.h index 6e07ddcecdb..7dd4630360a 100644 --- a/searchcore/src/vespa/searchcore/proton/server/proton.h +++ b/searchcore/src/vespa/searchcore/proton/server/proton.h @@ -116,7 +116,7 @@ private: ProtonConfigurer _protonConfigurer; ProtonConfigFetcher _protonConfigFetcher; std::unique_ptr _warmupExecutor; - std::unique_ptr _summaryExecutor; + std::unique_ptr _sharedExecutor; matching::QueryLimiter _queryLimiter; vespalib::Clock _clock; FastOS_ThreadPool _threadPool; diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp index acdda10a7ef..02afaddd830 100644 --- a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.cpp @@ -81,7 +81,7 @@ StoreOnlyDocSubDB::Context::Context(IDocumentSubDBOwner &owner, const IGetSerialNum &getSerialNum, const search::common::FileHeaderContext &fileHeaderContext, searchcorespi::index::IThreadingService &writeService, - vespalib::ThreadStackExecutorBase &summaryExecutor, + vespalib::ThreadStackExecutorBase &sharedExecutor, std::shared_ptr bucketDB, bucketdb::IBucketDBHandlerInitializer & bucketDBHandlerInitializer, DocumentDBMetricsCollection &metrics, @@ -92,7 +92,7 @@ StoreOnlyDocSubDB::Context::Context(IDocumentSubDBOwner &owner, _getSerialNum(getSerialNum), _fileHeaderContext(fileHeaderContext), _writeService(writeService), - _summaryExecutor(summaryExecutor), + _sharedExecutor(sharedExecutor), _bucketDB(bucketDB), _bucketDBHandlerInitializer(bucketDBHandlerInitializer), _metrics(metrics), @@ -118,7 +118,7 @@ StoreOnlyDocSubDB::StoreOnlyDocSubDB(const Config &cfg, const Context &ctx) _rSummaryMgr(), _summaryAdapter(), _writeService(ctx._writeService), - _summaryExecutor(ctx._summaryExecutor), + _sharedExecutor(ctx._sharedExecutor), _metrics(ctx._metrics), _iSearchView(), _iFeedView(), @@ -238,7 +238,7 @@ createSummaryManagerInitializer(const search::LogDocumentStore::Config & storeCf GrowStrategy grow = _attributeGrow; vespalib::string baseDir(_baseDir + "/summary"); return std::make_shared - (grow, baseDir, getSubDbName(), _docTypeName, _summaryExecutor, + (grow, baseDir, getSubDbName(), _docTypeName, _sharedExecutor, storeCfg, tuneFile, _fileHeaderContext, _tlSyncer, bucketizer, result); } diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h index 9b30ce4d65e..4a21537f134 100644 --- a/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h +++ b/searchcore/src/vespa/searchcore/proton/server/storeonlydocsubdb.h @@ -110,7 +110,7 @@ public: const IGetSerialNum &_getSerialNum; const search::common::FileHeaderContext &_fileHeaderContext; searchcorespi::index::IThreadingService &_writeService; - vespalib::ThreadStackExecutorBase &_summaryExecutor; + vespalib::ThreadStackExecutorBase &_sharedExecutor; std::shared_ptr _bucketDB; bucketdb::IBucketDBHandlerInitializer &_bucketDBHandlerInitializer; DocumentDBMetricsCollection &_metrics; @@ -122,7 +122,7 @@ public: const IGetSerialNum &getSerialNum, const search::common::FileHeaderContext &fileHeaderContext, searchcorespi::index::IThreadingService &writeService, - vespalib::ThreadStackExecutorBase &summaryExecutor, + vespalib::ThreadStackExecutorBase &sharedExecutor, std::shared_ptr bucketDB, bucketdb::IBucketDBHandlerInitializer & bucketDBHandlerInitializer, @@ -153,7 +153,7 @@ private: ISummaryAdapter::SP _summaryAdapter; protected: searchcorespi::index::IThreadingService &_writeService; - vespalib::ThreadStackExecutorBase &_summaryExecutor; + vespalib::ThreadStackExecutorBase &_sharedExecutor; DocumentDBMetricsCollection &_metrics; vespalib::VarHolder _iSearchView; vespalib::VarHolder _iFeedView; -- cgit v1.2.3