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

- Reduce penetration of generated StorFilestorConfig.

6 files changed, 18 insertions, 14 deletions

diff --git a/storage/src/tests/bucketdb/bucketmanagertest.cpp b/storage/src/tests/bucketdb/bucketmanagertest.cpp
index 6173a43e25e..92547a83d25 100644
--- a/storage/src/tests/bucketdb/bucketmanagertest.cpp
+++ b/storage/src/tests/bucketdb/bucketmanagertest.cpp
@@ -5,7 +5,6 @@
 #include <tests/common/teststorageapp.h>
 #include <vespa/config/helper/configgetter.hpp>
 #include <vespa/document/config/config-documenttypes.h>
-#include <vespa/document/config/documenttypes_config_fwd.h>
 #include <vespa/document/datatype/documenttype.h>
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/document/repo/documenttyperepo.h>
@@ -24,6 +23,7 @@
 #include <vespa/vdslib/state/random.h>
 #include <vespa/vespalib/gtest/gtest.h>
 #include <vespa/vespalib/stllike/asciistream.h>
+#include <vespa/config-stor-filestor.h>
 #include <future>
 
 #include <vespa/log/log.h>
@@ -158,7 +158,7 @@ void BucketManagerTest::setupTestEnvironment(bool fakePersistenceLayer, bool noD
         _bottom = bottom.get();
         _top->push_back(std::move(bottom));
     } else {
-        using vespa::config::content::StorFilestorConfig;
+        using StorFilestorConfig = vespa::config::content::internal::InternalStorFilestorType;
         auto bottom = std::make_unique<FileStorManager>(*config_from<StorFilestorConfig>(config_uri),
                                                         _node->getPersistenceProvider(), _node->getComponentRegister(),
                                                         *_node, _node->get_host_info());
diff --git a/storage/src/tests/persistence/common/filestortestfixture.cpp b/storage/src/tests/persistence/common/filestortestfixture.cpp
index 86015bee4e7..6581fb9f7b1 100644
--- a/storage/src/tests/persistence/common/filestortestfixture.cpp
+++ b/storage/src/tests/persistence/common/filestortestfixture.cpp
@@ -12,6 +12,7 @@
 #include <vespa/storage/persistence/messages.h>
 #include <vespa/storageapi/message/bucket.h>
 #include <vespa/vdslib/state/clusterstate.h>
+#include <vespa/config-stor-filestor.h>
 #include <sstream>
 
 using storage::spi::test::makeSpiBucket;
@@ -75,7 +76,7 @@ FileStorTestFixture::TestFileStorComponents::TestFileStorComponents(
       manager(nullptr)
 {
     injector.inject(top);
-    using vespa::config::content::StorFilestorConfig;
+    using StorFilestorConfig = vespa::config::content::internal::InternalStorFilestorType;
     auto config = config_from<StorFilestorConfig>(config::ConfigUri(fixture._config->getConfigId()));
     auto fsm = std::make_unique<FileStorManager>(*config, fixture._node->getPersistenceProvider(),
                                                  fixture._node->getComponentRegister(), *fixture._node, fixture._node->get_host_info());
diff --git a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
index 4846c90397a..1ccd51d3f06 100644
--- a/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
+++ b/storage/src/tests/persistence/filestorage/filestormanagertest.cpp
@@ -34,6 +34,7 @@
 #include <vespa/vespalib/gtest/gtest.h>
 #include <vespa/vespalib/util/gate.h>
 #include <vespa/vespalib/util/size_literals.h>
+#include <vespa/config-stor-filestor.h>
 #include <atomic>
 #include <thread>
 
@@ -46,7 +47,7 @@ using namespace storage::api;
 using storage::spi::test::makeSpiBucket;
 using document::test::makeDocumentBucket;
 using vespalib::IDestructorCallback;
-using vespa::config::content::StorFilestorConfig;
+using StorFilestorConfig = vespa::config::content::internal::InternalStorFilestorType;
 using vespa::config::content::StorFilestorConfigBuilder;
 using namespace ::testing;
 
@@ -281,7 +282,7 @@ struct PersistenceHandlerComponents : public FileStorHandlerComponents {
     {
         StorFilestorConfig cfg;
         persistenceHandler =
-                std::make_unique<PersistenceHandler>(executor, component, cfg,
+                std::make_unique<PersistenceHandler>(executor, component, 4_Mi, false,
                                                      test._node->getPersistenceProvider(),
                                                      *filestorHandler, bucketOwnershipNotifier,
                                                      *metrics.threads[0]);
@@ -746,12 +747,11 @@ TEST_F(FileStorManagerTest, priority) {
 
     ServiceLayerComponent component(_node->getComponentRegister(), "test");
     BucketOwnershipNotifier bucketOwnershipNotifier(component, c.messageSender);
-    StorFilestorConfig cfg;
-    PersistenceHandler persistenceHandler(_node->executor(), component, cfg, _node->getPersistenceProvider(),
+    PersistenceHandler persistenceHandler(_node->executor(), component, 4_Mi, false, _node->getPersistenceProvider(),
                                           filestorHandler, bucketOwnershipNotifier, *metrics.threads[0]);
     std::unique_ptr<DiskThread> thread(createThread(persistenceHandler, filestorHandler, component));
 
-    PersistenceHandler persistenceHandler2(_node->executor(), component, cfg, _node->getPersistenceProvider(),
+    PersistenceHandler persistenceHandler2(_node->executor(), component, 4_Mi, false, _node->getPersistenceProvider(),
                                            filestorHandler, bucketOwnershipNotifier, *metrics.threads[1]);
     std::unique_ptr<DiskThread> thread2(createThread(persistenceHandler2, filestorHandler, component));
 
diff --git a/storage/src/tests/persistence/persistencetestutils.cpp b/storage/src/tests/persistence/persistencetestutils.cpp
index d215448dfbc..a599b1d380a 100644
--- a/storage/src/tests/persistence/persistencetestutils.cpp
+++ b/storage/src/tests/persistence/persistencetestutils.cpp
@@ -14,7 +14,6 @@
 #include <vespa/vespalib/objects/nbostream.h>
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/vespalib/util/sequencedtaskexecutor.h>
-#include <vespa/config-stor-filestor.h>
 #include <filesystem>
 #include <thread>
 
@@ -45,6 +44,9 @@ struct ConfigReader : public T::Subscriber
     void configure(const T& c) { config = c; }
 };
 
+constexpr bool ENABLE_MULTIBIT_SPLIT = true;
+constexpr uint32_t MERGE_CHUNK_SIZE = 4_Mi;
+
 }
 
 PersistenceTestEnvironment::PersistenceTestEnvironment(const std::string & rootOfRoot)
@@ -111,8 +113,8 @@ PersistenceTestUtils::PersistenceTestUtils()
       _persistenceHandler()
 {
     setupExecutor(1);
-    vespa::config::content::StorFilestorConfig cfg;
-    _persistenceHandler = std::make_unique<PersistenceHandler>(*_sequenceTaskExecutor, _env->_component, cfg,
+    _persistenceHandler = std::make_unique<PersistenceHandler>(*_sequenceTaskExecutor, _env->_component,
+                                                               MERGE_CHUNK_SIZE, ENABLE_MULTIBIT_SPLIT,
                                                                getPersistenceProvider(), getEnv()._fileStorHandler,
                                                                _bucketOwnershipNotifier, getEnv()._metrics);
 }
diff --git a/storage/src/tests/persistence/persistencethread_splittest.cpp b/storage/src/tests/persistence/persistencethread_splittest.cpp
index 41e86dfd160..b9f012e046c 100644
--- a/storage/src/tests/persistence/persistencethread_splittest.cpp
+++ b/storage/src/tests/persistence/persistencethread_splittest.cpp
@@ -224,9 +224,9 @@ PersistenceThreadSplitTest::doTest(SplitCase splitCase)
         expected.insert(ost.str());
     }
     std::set<std::string> actual;
-    for (uint32_t i=0; i<reply.getSplitInfo().size(); ++i) {
+    for (auto & info : reply.getSplitInfo()) {
         std::ostringstream ost;
-        document::BucketId b(reply.getSplitInfo()[i].first);
+        document::BucketId b(info.first);
         ost << b << " - " << b.getUsedBits();
         actual.insert(ost.str());
     }
diff --git a/storage/src/tests/visiting/visitormanagertest.cpp b/storage/src/tests/visiting/visitormanagertest.cpp
index 64d2042b61a..09457038b70 100644
--- a/storage/src/tests/visiting/visitormanagertest.cpp
+++ b/storage/src/tests/visiting/visitormanagertest.cpp
@@ -22,6 +22,7 @@
 #include <vespa/config/common/exceptions.h>
 #include <vespa/vespalib/gtest/gtest.h>
 #include <vespa/vespalib/objects/nbostream.h>
+#include <vespa/config-stor-filestor.h>
 #include <gmock/gmock.h>
 #include <optional>
 #include <thread>
@@ -98,7 +99,7 @@ VisitorManagerTest::initializeTest(bool defer_manager_thread_start)
                                                defer_manager_thread_start);
     _manager = vm.get();
     _top->push_back(std::move(vm));
-    using vespa::config::content::StorFilestorConfig;
+    using StorFilestorConfig = vespa::config::content::internal::InternalStorFilestorType;
     auto filestor_cfg = config_from<StorFilestorConfig>(config::ConfigUri(config.getConfigId()));
     _top->push_back(std::make_unique<FileStorManager>(*filestor_cfg, _node->getPersistenceProvider(),
                                                       _node->getComponentRegister(), *_node, _node->get_host_info()));