diff options
10 files changed, 18 insertions, 18 deletions
diff --git a/searchcore/src/apps/proton/proton.cpp b/searchcore/src/apps/proton/proton.cpp index 10e49ac0f8e..90507eee9db 100644 --- a/searchcore/src/apps/proton/proton.cpp +++ b/searchcore/src/apps/proton/proton.cpp @@ -171,7 +171,7 @@ ProtonServiceLayerProcess::getGeneration() const void ProtonServiceLayerProcess::add_external_visitors() { - _externalVisitors["searchvisitor"] = std::make_shared<streaming::SearchVisitorFactory>(_configUri, _transport, _file_distributor_connection_spec); + _externalVisitors["searchvisitor"] = std::make_shared<streaming::SearchVisitorFactory>(_configUri, &_transport, _file_distributor_connection_spec); } namespace { diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp index 35dd59a91d3..9b1c92aa8a0 100644 --- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp @@ -288,7 +288,7 @@ DocumentDBConfigManager::update(FNET_Transport & transport, const ConfigSnapshot if (snapshot.isChanged<RankProfilesConfig>(_configId, currentGeneration)) { newRankProfilesConfig = snapshot.getConfig<RankProfilesConfig>(_configId); } - RankingAssetsBuilder ranking_assets_builder(transport, _bootstrapConfig->getFiledistributorrpcConfig().connectionspec); + RankingAssetsBuilder ranking_assets_builder(&transport, _bootstrapConfig->getFiledistributorrpcConfig().connectionspec); if (snapshot.isChanged<RankingConstantsConfig>(_configId, currentGeneration)) { RankingConstantsConfigSP newRankingConstantsConfig = RankingConstantsConfigSP( snapshot.getConfig<RankingConstantsConfig>(_configId)); diff --git a/searchlib/src/vespa/searchlib/fef/ranking_assets_builder.cpp b/searchlib/src/vespa/searchlib/fef/ranking_assets_builder.cpp index cda5cfe22f5..93539233bad 100644 --- a/searchlib/src/vespa/searchlib/fef/ranking_assets_builder.cpp +++ b/searchlib/src/vespa/searchlib/fef/ranking_assets_builder.cpp @@ -23,12 +23,12 @@ namespace search::fef { constexpr vespalib::duration file_resolve_timeout = 60min; -RankingAssetsBuilder::RankingAssetsBuilder(FNET_Transport& transport, const vespalib::string& file_distributor_connection_spec) +RankingAssetsBuilder::RankingAssetsBuilder(FNET_Transport* transport, const vespalib::string& file_distributor_connection_spec) : _file_acquirer(), _time_box(vespalib::to_s(file_resolve_timeout), 5) { - if (file_distributor_connection_spec != "") { - _file_acquirer = std::make_unique<config::RpcFileAcquirer>(transport, file_distributor_connection_spec); + if (transport != nullptr && file_distributor_connection_spec != "") { + _file_acquirer = std::make_unique<config::RpcFileAcquirer>(*transport, file_distributor_connection_spec); } } diff --git a/searchlib/src/vespa/searchlib/fef/ranking_assets_builder.h b/searchlib/src/vespa/searchlib/fef/ranking_assets_builder.h index b37aad8b905..3a0b50d765a 100644 --- a/searchlib/src/vespa/searchlib/fef/ranking_assets_builder.h +++ b/searchlib/src/vespa/searchlib/fef/ranking_assets_builder.h @@ -27,7 +27,7 @@ class RankingAssetsBuilder { vespalib::string resolve_file(const vespalib::string& desc, const vespalib::string& fileref); public: - RankingAssetsBuilder(FNET_Transport& transport, const vespalib::string& file_distributor_connection_spec); + RankingAssetsBuilder(FNET_Transport* transport, const vespalib::string& file_distributor_connection_spec); ~RankingAssetsBuilder(); std::shared_ptr<const OnnxModels> build(const vespa::config::search::core::OnnxModelsConfig& config); std::shared_ptr<const RankingConstants> build(const vespa::config::search::core::RankingConstantsConfig& config); diff --git a/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp b/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp index 69f83c6e5f0..7096249815f 100644 --- a/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp +++ b/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp @@ -7,6 +7,7 @@ #include <vespa/storage/config/config-stor-server.h> #include <vespa/storage/storageserver/servicelayernode.h> #include <vespa/storageframework/defaultimplementation/clock/realclock.h> +#include <vespa/searchvisitor/searchvisitor.h> #include <vespa/log/log.h> LOG_SETUP(".storageserver.service_layer_process"); @@ -84,6 +85,7 @@ ServiceLayerProcess::set_storage_chain_builder(std::unique_ptr<IStorageChainBuil void ServiceLayerProcess::add_external_visitors() { + _externalVisitors["searchvisitor"] = std::make_shared<streaming::SearchVisitorFactory>(_configUri, nullptr, ""); } } // storage 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; }; |