Pass transport and file distributor connection spec to SearchEnvironment

in preparation for using RankingAssetsBuilder when handling config
in streaming search.

2 files changed, 9 insertions, 2 deletions

diff --git a/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp b/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp
index ab962fc78b2..69f83c6e5f0 100644
--- a/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp
+++ b/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp
@@ -7,7 +7,6 @@
 #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");
@@ -52,7 +51,7 @@ ServiceLayerProcess::shutdown()
 void
 ServiceLayerProcess::createNode()
 {
-    _externalVisitors["searchvisitor"] = std::make_shared<streaming::SearchVisitorFactory>(_configUri);
+    add_external_visitors();
     setupProvider();
     _node = std::make_unique<ServiceLayerNode>(_configUri, _context, *this, getProvider(), _externalVisitors);
     if (_storage_chain_builder) {
@@ -82,4 +81,9 @@ ServiceLayerProcess::set_storage_chain_builder(std::unique_ptr<IStorageChainBuil
     _storage_chain_builder = std::move(builder);
 }
 
+void
+ServiceLayerProcess::add_external_visitors()
+{
+}
+
 } // storage
diff --git a/storageserver/src/vespa/storageserver/app/servicelayerprocess.h b/storageserver/src/vespa/storageserver/app/servicelayerprocess.h
index f62db4c2fcf..1df7b173890 100644
--- a/storageserver/src/vespa/storageserver/app/servicelayerprocess.h
+++ b/storageserver/src/vespa/storageserver/app/servicelayerprocess.h
@@ -30,7 +30,9 @@ class ServiceLayerNode;
 class IStorageChainBuilder;
 
 class ServiceLayerProcess : public Process {
+protected:
     VisitorFactory::Map _externalVisitors;
+private:
     std::unique_ptr<ServiceLayerNode> _node;
     std::unique_ptr<IStorageChainBuilder> _storage_chain_builder;
 
@@ -51,6 +53,7 @@ public:
     StorageNodeContext& getContext() override;
     std::string getComponentName() const override;
     void set_storage_chain_builder(std::unique_ptr<IStorageChainBuilder> builder);
+    virtual void add_external_visitors();
 };
 
 } // storage