diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-02-23 09:14:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-23 09:14:03 +0100 |
commit | 9e315f9567a20b6a5d1c9b505628c547f85cfdc9 (patch) | |
tree | da6ca17402cb5522d6fc34e1353ade85b6d5936f /searchcore/src/tests/proton/documentdb/storeonlyfeedview | |
parent | 6646b37c9c36793054e94881c52b5c675c0734fe (diff) |
Revert "Revert "Revert "Revert "Use common tranport for TlsClient""""
Diffstat (limited to 'searchcore/src/tests/proton/documentdb/storeonlyfeedview')
-rw-r--r-- | searchcore/src/tests/proton/documentdb/storeonlyfeedview/CMakeLists.txt | 1 | ||||
-rw-r--r-- | searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp | 15 |
2 files changed, 8 insertions, 8 deletions
diff --git a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/CMakeLists.txt b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/CMakeLists.txt index 3cdad86e9d7..6d94c066d20 100644 --- a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/CMakeLists.txt +++ b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/CMakeLists.txt @@ -3,6 +3,7 @@ vespa_add_executable(searchcore_storeonlyfeedview_test_app TEST SOURCES storeonlyfeedview_test.cpp DEPENDS + searchcore_test searchcore_server searchcore_feedoperation searchcore_documentmetastore diff --git a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp index b1d7ee1d0a8..acd33ab749d 100644 --- a/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp +++ b/searchcore/src/tests/proton/documentdb/storeonlyfeedview/storeonlyfeedview_test.cpp @@ -3,7 +3,6 @@ #include <vespa/document/base/documentid.h> #include <vespa/document/datatype/datatype.h> #include <vespa/searchcommon/common/schema.h> -#include <vespa/searchcore/proton/server/executorthreadingservice.h> #include <vespa/searchcore/proton/server/putdonecontext.h> #include <vespa/searchcore/proton/server/removedonecontext.h> #include <vespa/searchcore/proton/server/storeonlyfeedview.h> @@ -12,9 +11,11 @@ #include <vespa/searchcore/proton/feedoperation/pruneremoveddocumentsoperation.h> #include <vespa/searchcore/proton/reference/dummy_gid_to_lid_change_handler.h> #include <vespa/searchcore/proton/test/mock_summary_adapter.h> +#include <vespa/searchcore/proton/test/transport_helper.h> #include <vespa/searchcore/proton/test/thread_utils.h> #include <vespa/searchlib/index/docbuilder.h> #include <vespa/vespalib/util/destructor_callbacks.h> +#include <vespa/vespalib/util/size_literals.h> #include <vespa/vespalib/testkit/testapp.h> #include <vespa/log/log.h> @@ -211,8 +212,7 @@ struct FixtureBase { std::atomic<int> heartbeatCount; std::atomic<int> outstandingMoveOps; DocumentMetaStore::SP metaStore; - vespalib::ThreadStackExecutor sharedExecutor; - ExecutorThreadingService writeService; + TransportAndExecutorService _service; std::shared_ptr<PendingLidTrackerBase> pendingLidsForCommit; typename FeedViewType::UP feedview; SerialNum serial_num; @@ -226,8 +226,7 @@ struct FixtureBase { DocumentMetaStore::getFixedName(), search::GrowStrategy(), subDbType)), - sharedExecutor(1, 0x10000), - writeService(sharedExecutor), + _service(1), pendingLidsForCommit(std::make_shared<PendingLidTracker>()), feedview(), serial_num(2u) @@ -235,7 +234,7 @@ struct FixtureBase { StoreOnlyFeedView::PersistentParams params(0, 0, DocTypeName("foo"), subdb_id, subDbType); metaStore->constructFreeList(); ISummaryAdapter::SP adapter = std::make_shared<MySummaryAdapter>(removeCount, putCount, heartbeatCount); - feedview = std::make_unique<FeedViewType>(adapter, metaStore, writeService, + feedview = std::make_unique<FeedViewType>(adapter, metaStore, _service.write(), params, pendingLidsForCommit, outstandingMoveOps); } @@ -263,11 +262,11 @@ struct FixtureBase { template <typename FunctionType> void runInMasterAndSync(FunctionType func) { - test::runInMasterAndSync(writeService, func); + test::runInMasterAndSync(_service.write(), func); } template <typename FunctionType> void runInMaster(FunctionType func) { - test::runInMaster(writeService, func); + test::runInMaster(_service.write(), func); } void force_commit() { |