diff options
author | Geir Storli <geirst@yahooinc.com> | 2023-05-10 16:31:30 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-05-10 16:31:30 +0200 |
commit | 0bd398da2e139bcbfbe0b7d234586cea11e20dab (patch) | |
tree | 0b3b59cc93b96029acd1d9129cf4fc11f77e9bf1 /streamingvisitors/src | |
parent | 394ecd111e11f2313d7388fb1860d11a22711fc4 (diff) | |
parent | be4dbaeb40561eaae6221b23da3c1e83350a71d7 (diff) |
Merge pull request #27068 from vespa-engine/toregge/setup-search-visitor-without-proton
Setup search visitor without proton process.
Diffstat (limited to 'streamingvisitors/src')
5 files changed, 10 insertions, 12 deletions
diff --git a/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp b/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp index 9b99df32d03..5fd813bfda5 100644 --- a/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp +++ b/streamingvisitors/src/tests/searchvisitor/searchvisitor_test.cpp @@ -126,7 +126,6 @@ public: framework::defaultimplementation::FakeClock _clock; StorageComponentRegisterImpl _componentRegister; std::unique_ptr<StorageComponent> _component; - FNET_Transport _transport; SearchEnvironment _env; SearchVisitorFactory _factory; std::shared_ptr<DocumentTypeRepo> _repo; @@ -161,9 +160,8 @@ public: SearchVisitorTest::SearchVisitorTest() : _componentRegister(), - _transport(), - _env(::config::ConfigUri("dir:cfg"), _transport, ""), - _factory(::config::ConfigUri("dir:cfg"), _transport, ""), + _env(::config::ConfigUri("dir:cfg"), nullptr, ""), + _factory(::config::ConfigUri("dir:cfg"), nullptr, ""), _repo(std::make_shared<DocumentTypeRepo>(readDocumenttypesConfig("cfg/documenttypes.cfg"))), _doc_type(_repo->getDocumentType("test")) { diff --git a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp index 9f33c9b2ea1..7dab92370ae 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.cpp @@ -15,7 +15,7 @@ namespace streaming { __thread SearchEnvironment::EnvMap * SearchEnvironment::_localEnvMap = nullptr; -SearchEnvironment::Env::Env(const config::ConfigUri& configUri, const Fast_NormalizeWordFolder& wf, FNET_Transport& transport, const vespalib::string& file_distributor_connection_spec) +SearchEnvironment::Env::Env(const config::ConfigUri& configUri, const Fast_NormalizeWordFolder& wf, FNET_Transport* transport, const vespalib::string& file_distributor_connection_spec) : _configId(configUri.getConfigId()), _configurer(std::make_unique<config::SimpleConfigRetriever>(createKeySet(configUri.getConfigId()), configUri.getContext()), this), _vsmAdapter(std::make_unique<VSMAdapter>(_configId, wf)), @@ -63,7 +63,7 @@ SearchEnvironment::Env::~Env() _configurer.close(); } -SearchEnvironment::SearchEnvironment(const config::ConfigUri & configUri, FNET_Transport& transport, const vespalib::string& file_distributor_connection_spec) +SearchEnvironment::SearchEnvironment(const config::ConfigUri & configUri, FNET_Transport* transport, const vespalib::string& file_distributor_connection_spec) : VisitorEnvironment(), _envMap(), _configUri(configUri), diff --git a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h index 7b9e878217b..caae62cac58 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h +++ b/streamingvisitors/src/vespa/searchvisitor/searchenvironment.h @@ -23,7 +23,7 @@ private: class Env : public config::SimpleConfigurable { public: using SP = std::shared_ptr<Env>; - Env(const config::ConfigUri& configUri, const Fast_NormalizeWordFolder& wf, FNET_Transport& transport, const vespalib::string& file_distributor_connection_spec); + Env(const config::ConfigUri& configUri, const Fast_NormalizeWordFolder& wf, FNET_Transport* transport, const vespalib::string& file_distributor_connection_spec); ~Env() override; void configure(const config::ConfigSnapshot & snapshot) override; @@ -36,7 +36,7 @@ private: std::unique_ptr<RankManager> _rankManager; std::shared_ptr<const SearchEnvironmentSnapshot> _snapshot; std::mutex _lock; - FNET_Transport& _transport; + FNET_Transport* const _transport; const vespalib::string _file_distributor_connection_spec; }; using EnvMap = vespalib::hash_map<vespalib::string, Env::SP>; @@ -49,13 +49,13 @@ private: std::mutex _lock; Fast_NormalizeWordFolder _wordFolder; config::ConfigUri _configUri; - FNET_Transport& _transport; + FNET_Transport* const _transport; vespalib::string _file_distributor_connection_spec; Env & getEnv(const vespalib::string & searchcluster); public: - SearchEnvironment(const config::ConfigUri & configUri, FNET_Transport& transport, const vespalib::string& file_distributor_connection_spec); + SearchEnvironment(const config::ConfigUri & configUri, FNET_Transport* transport, const vespalib::string& file_distributor_connection_spec); ~SearchEnvironment(); std::shared_ptr<const SearchEnvironmentSnapshot> get_snapshot(const vespalib::string& search_cluster); // Should only be used by unit tests to simulate that the calling thread is finished. diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp index f9397c7b63f..f9473167b07 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp +++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.cpp @@ -459,7 +459,7 @@ void SearchVisitor::init(const Parameters & params) VISITOR_TRACE(6, "Completed lazy VSM adapter initialization"); } -SearchVisitorFactory::SearchVisitorFactory(const config::ConfigUri & configUri, FNET_Transport& transport, const vespalib::string& file_distributor_connection_spec) +SearchVisitorFactory::SearchVisitorFactory(const config::ConfigUri & configUri, FNET_Transport* transport, const vespalib::string& file_distributor_connection_spec) : VisitorFactory(), _configUri(configUri), _env(std::make_shared<SearchEnvironment>(_configUri, transport, file_distributor_connection_spec)) diff --git a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h index e4fa756e28d..72cd08ff781 100644 --- a/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h +++ b/streamingvisitors/src/vespa/searchvisitor/searchvisitor.h @@ -496,7 +496,7 @@ class SearchVisitorFactory : public storage::VisitorFactory { storage::Visitor* makeVisitor(storage::StorageComponent&, storage::VisitorEnvironment&env, const vdslib::Parameters& params) override; public: - explicit SearchVisitorFactory(const config::ConfigUri & configUri, FNET_Transport& transport, const vespalib::string& file_distributor_connection_spec); + explicit SearchVisitorFactory(const config::ConfigUri & configUri, FNET_Transport* transport, const vespalib::string& file_distributor_connection_spec); ~SearchVisitorFactory() override; }; |