diff options
Diffstat (limited to 'searchcore/src/tests')
9 files changed, 31 insertions, 14 deletions
diff --git a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp index 87853bb414d..5172489ced1 100644 --- a/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp +++ b/searchcore/src/tests/proton/documentdb/configurer/configurer_test.cpp @@ -88,6 +88,7 @@ struct ViewSet { IndexManagerDummyReconfigurer _reconfigurer; DummyFileHeaderContext _fileHeaderContext; + vespalib::ThreadStackExecutor _sharedExecutor; ExecutorThreadingService _writeService; SearchableFeedView::SerialNum serialNum; std::shared_ptr<const DocumentTypeRepo> repo; @@ -117,7 +118,8 @@ struct ViewSet ViewSet::ViewSet() : _reconfigurer(), _fileHeaderContext(), - _writeService(), + _sharedExecutor(1, 0x10000), + _writeService(_sharedExecutor), serialNum(1), repo(createRepo()), _docTypeName(DOC_TYPE), @@ -285,11 +287,13 @@ MyFastAccessFeedView::~MyFastAccessFeedView() = default; struct FastAccessFixture { + vespalib::ThreadStackExecutor _sharedExecutor; ExecutorThreadingService _writeService; MyFastAccessFeedView _view; FastAccessDocSubDBConfigurer _configurer; FastAccessFixture() - : _writeService(), + : _sharedExecutor(1, 0x10000), + _writeService(_sharedExecutor), _view(_writeService), _configurer(_view._feedView, IAttributeWriterFactory::UP(new AttributeWriterFactory), "test") { diff --git a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp index 32cf0584768..cbf82fd7e11 100644 --- a/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp +++ b/searchcore/src/tests/proton/documentdb/document_subdbs/document_subdbs_test.cpp @@ -292,8 +292,8 @@ struct MyConfigSnapshot template <typename Traits> struct FixtureBase { - ExecutorThreadingService _writeService; ThreadStackExecutor _summaryExecutor; + ExecutorThreadingService _writeService; typename Traits::Config _cfg; std::shared_ptr<BucketDBOwner> _bucketDB; BucketDBHandler _bucketDBHandler; @@ -304,8 +304,8 @@ struct FixtureBase typename Traits::SubDB _subDb; IFeedView::SP _tmpFeedView; FixtureBase() - : _writeService(), - _summaryExecutor(1, 64 * 1024), + : _summaryExecutor(1, 64 * 1024), + _writeService(_summaryExecutor), _cfg(), _bucketDB(std::make_shared<BucketDBOwner>()), _bucketDBHandler(*_bucketDB), diff --git a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp index caee69b311e..39fc93d5725 100644 --- a/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp +++ b/searchcore/src/tests/proton/documentdb/feedhandler/feedhandler_test.cpp @@ -456,6 +456,7 @@ struct FeedHandlerFixture DummyFileHeaderContext _fileHeaderContext; TransLogServer tls; vespalib::string tlsSpec; + vespalib::ThreadStackExecutor sharedExecutor; ExecutorThreadingService writeService; SchemaContext schema; MyOwner owner; @@ -471,7 +472,8 @@ struct FeedHandlerFixture : _fileHeaderContext(), tls("mytls", 9016, "mytlsdir", _fileHeaderContext, 0x10000), tlsSpec("tcp/localhost:9016"), - writeService(), + sharedExecutor(1, 0x10000), + writeService(sharedExecutor), schema(), owner(), _state(), diff --git a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp index fd1984a79fe..cfc3e4373a1 100644 --- a/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp +++ b/searchcore/src/tests/proton/documentdb/feedview/feedview_test.cpp @@ -519,6 +519,7 @@ struct FixtureBase DocumentMetaStoreContext::SP _dmscReal; test::DocumentMetaStoreContextObserver::SP _dmsc; ParamsContext pc; + vespalib::ThreadStackExecutor _sharedExecutor; ExecutorThreadingService _writeServiceReal; test::ThreadingServiceObserver _writeService; documentmetastore::LidReuseDelayer _lidReuseDelayer; @@ -703,7 +704,8 @@ FixtureBase::FixtureBase(TimeStamp visibilityDelay) _dmscReal(new DocumentMetaStoreContext(std::make_shared<BucketDBOwner>())), _dmsc(new test::DocumentMetaStoreContextObserver(*_dmscReal)), pc(sc._builder->getDocumentType().getName(), "fileconfig_test"), - _writeServiceReal(), + _sharedExecutor(1, 0x10000), + _writeServiceReal(_sharedExecutor), _writeService(_writeServiceReal), _lidReuseDelayer(_writeService, _dmsc->get()), _commitTimeTracker(visibilityDelay), diff --git a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp index d07c29ead69..b11525bae3d 100644 --- a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp +++ b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp @@ -201,6 +201,7 @@ struct FixtureBase { int heartbeatCount; int outstandingMoveOps; DocumentMetaStore::SP metaStore; + vespalib::ThreadStackExecutor sharedExecutor; ExecutorThreadingService writeService; documentmetastore::LidReuseDelayer lidReuseDelayer; CommitTimeTracker commitTimeTracker; @@ -214,10 +215,10 @@ struct FixtureBase { metaStore(new DocumentMetaStore(std::make_shared<BucketDBOwner>(), DocumentMetaStore::getFixedName(), search::GrowStrategy(), - DocumentMetaStore::IGidCompare::SP( - new DocumentMetaStore::DefaultGidCompare), + std::make_shared<DocumentMetaStore::DefaultGidCompare>(), subDbType)), - writeService(), + sharedExecutor(1, 0x10000), + writeService(sharedExecutor), lidReuseDelayer(writeService, *metaStore), commitTimeTracker(fastos::TimeStamp()), feedview() diff --git a/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/lidreusedelayer_test.cpp b/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/lidreusedelayer_test.cpp index 89764a562e6..d305751f7c2 100644 --- a/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/lidreusedelayer_test.cpp +++ b/searchcore/src/tests/proton/documentmetastore/lidreusedelayer/lidreusedelayer_test.cpp @@ -143,13 +143,15 @@ public: class Fixture { public: + vespalib::ThreadStackExecutor _sharedExecutor; ExecutorThreadingService _writeServiceReal; test::ThreadingServiceObserver _writeService; MyMetaStore _store; documentmetastore::LidReuseDelayer _lidReuseDelayer; Fixture() - : _writeServiceReal(), + : _sharedExecutor(1, 0x10000), + _writeServiceReal(_sharedExecutor), _writeService(_writeServiceReal), _store(), _lidReuseDelayer(_writeService, _store) diff --git a/searchcore/src/tests/proton/index/fusionrunner_test.cpp b/searchcore/src/tests/proton/index/fusionrunner_test.cpp index 9a1ddee4278..8f9944e178e 100644 --- a/searchcore/src/tests/proton/index/fusionrunner_test.cpp +++ b/searchcore/src/tests/proton/index/fusionrunner_test.cpp @@ -62,6 +62,7 @@ class Test : public vespalib::TestApp { FixedSourceSelector::UP _selector; FusionSpec _fusion_spec; DummyFileHeaderContext _fileHeaderContext; + vespalib::ThreadStackExecutor _sharedExecutor; ExecutorThreadingService _threadingService; IndexManager::MaintainerOperations _ops; @@ -84,7 +85,8 @@ public: _selector(), _fusion_spec(), _fileHeaderContext(), - _threadingService(), + _sharedExecutor(1, 0x10000), + _threadingService(_sharedExecutor), _ops(_fileHeaderContext, TuneFileIndexManager(), 0, _threadingService) diff --git a/searchcore/src/tests/proton/index/indexmanager_test.cpp b/searchcore/src/tests/proton/index/indexmanager_test.cpp index 841c69289bf..9abd3e6cb39 100644 --- a/searchcore/src/tests/proton/index/indexmanager_test.cpp +++ b/searchcore/src/tests/proton/index/indexmanager_test.cpp @@ -100,6 +100,7 @@ struct Fixture { SerialNum _serial_num; IndexManagerDummyReconfigurer _reconfigurer; DummyFileHeaderContext _fileHeaderContext; + vespalib::ThreadStackExecutor _sharedExecutor; ExecutorThreadingService _writeService; std::unique_ptr<IndexManager> _index_manager; Schema _schema; @@ -109,7 +110,8 @@ struct Fixture { : _serial_num(0), _reconfigurer(), _fileHeaderContext(), - _writeService(), + _sharedExecutor(1, 0x10000), + _writeService(_sharedExecutor), _index_manager(), _schema(getSchema()), _builder(_schema) diff --git a/searchcore/src/tests/proton/server/visibility_handler/visibility_handler_test.cpp b/searchcore/src/tests/proton/server/visibility_handler/visibility_handler_test.cpp index 5b5bea412f7..33ee3eb6105 100644 --- a/searchcore/src/tests/proton/server/visibility_handler/visibility_handler_test.cpp +++ b/searchcore/src/tests/proton/server/visibility_handler/visibility_handler_test.cpp @@ -63,6 +63,7 @@ class Fixture { public: MyGetSerialNum _getSerialNum; + vespalib::ThreadStackExecutor _sharedExecutor; ExecutorThreadingService _writeServiceReal; ThreadingServiceObserver _writeService; std::shared_ptr<MyFeedView> _feedViewReal; @@ -72,7 +73,8 @@ public: Fixture() : _getSerialNum(), - _writeServiceReal(), + _sharedExecutor(1, 0x10000), + _writeServiceReal(_sharedExecutor), _writeService(_writeServiceReal), _feedViewReal(std::make_shared<MyFeedView>()), _feedView(_feedViewReal), |