diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-02-03 13:48:51 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-02-05 11:31:59 +0000 |
commit | 88798d4e0191eecb4aac41091d643ce5b30ea6d4 (patch) | |
tree | d9525cf87ed93549cc1c05557fe5ccf339c2c34c /storageserver | |
parent | 545f30567215d601c3a4d7a757519e88d143396c (diff) |
- Remove multibit_split form config, as it is always off, but leave it for tests.
- Reduce penetration of generated StorFilestorConfig.
Diffstat (limited to 'storageserver')
-rw-r--r-- | storageserver/src/vespa/storageserver/app/servicelayerprocess.cpp | 3 | ||||
-rw-r--r-- | storageserver/src/vespa/storageserver/app/servicelayerprocess.h | 17 |
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; |