- Remove multibit_split form config, as it is always off, but leave it for tests.

- Reduce penetration of generated StorFilestorConfig.

2 files changed, 14 insertions, 6 deletions

diff --git a/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp b/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp
index ebf320352eb..abeaf06b4ad 100644
--- a/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp
+++ b/storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp
@@ -5,6 +5,9 @@
 #include <vespa/storage/common/content_bucket_db_options.h>
 #include <vespa/storage/common/i_storage_chain_builder.h>
 #include <vespa/storage/config/config-stor-server.h>
+#include <vespa/config-persistence.h>
+#include <vespa/config-stor-filestor.h>
+#include <vespa/storage/visiting/config-stor-visitor.h>
 #include <vespa/storage/storageserver/servicelayernode.h>
 #include <vespa/storageframework/defaultimplementation/clock/realclock.h>
 #include <vespa/searchvisitor/searchvisitor.h>
diff --git a/storageserver/src/vespa/storageserver/app/servicelayerprocess.h b/storageserver/src/vespa/storageserver/app/servicelayerprocess.h
index add5a38ca9d..553fff2d55f 100644
--- a/storageserver/src/vespa/storageserver/app/servicelayerprocess.h
+++ b/storageserver/src/vespa/storageserver/app/servicelayerprocess.h
@@ -2,15 +2,20 @@
 #pragma once
 
 #include "process.h"
-#include <vespa/config-persistence.h>
-#include <vespa/config-stor-filestor.h>
 #include <vespa/storage/common/visitorfactory.h>
 #include <vespa/storage/storageserver/servicelayernodecontext.h>
-#include <vespa/storage/visiting/config-stor-visitor.h>
 #include <vespa/vespalib/util/hw_info.h>
 
 namespace config { class ConfigUri; }
 
+namespace vespa::config::content::internal {
+    class InternalStorFilestorType;
+    class InternalPersistenceType;
+}
+namespace vespa::config::content::core::internal {
+    class InternalStorVisitorType;
+}
+
 namespace storage {
 
 namespace spi { struct PersistenceProvider; }
@@ -22,9 +27,9 @@ class ServiceLayerProcess : public Process {
 protected:
     VisitorFactory::Map _externalVisitors;
 private:
-    using PersistenceConfig  = vespa::config::content::PersistenceConfig;
-    using StorVisitorConfig  = vespa::config::content::core::StorVisitorConfig;
-    using StorFilestorConfig = vespa::config::content::StorFilestorConfig;
+    using PersistenceConfig  = vespa::config::content::internal::InternalPersistenceType;
+    using StorVisitorConfig  = vespa::config::content::core::internal::InternalStorVisitorType;
+    using StorFilestorConfig = vespa::config::content::internal::InternalStorFilestorType;
 
     std::unique_ptr<config::ConfigHandle<PersistenceConfig>>  _persistence_cfg_handle;
     std::unique_ptr<config::ConfigHandle<StorVisitorConfig>>  _visitor_cfg_handle;