Rename method according to review feedback.

Remove unneeded guard checks.

5 files changed, 7 insertions, 9 deletions

diff --git a/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp b/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp
index 70e1db879da..dfb1268aaa6 100644
--- a/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp
+++ b/searchcore/src/tests/proton/proton_configurer/proton_configurer_test.cpp
@@ -315,7 +315,7 @@ struct MyProtonDiskLayout : public IProtonDiskLayout
         os << "remove dbdir " << docTypeName.getName();
         _log.appendLog(os.str());
     }
-    void init(const std::set<DocTypeName> &docTypeNames) override {
+    void initAndPruneUnused(const std::set<DocTypeName> &docTypeNames) override {
         std::ostringstream os;
         os << "initial dbs ";
         bool first = true;
diff --git a/searchcore/src/vespa/searchcore/proton/server/i_proton_disk_layout.h b/searchcore/src/vespa/searchcore/proton/server/i_proton_disk_layout.h
index dc38c38cc1c..1ee521379eb 100644
--- a/searchcore/src/vespa/searchcore/proton/server/i_proton_disk_layout.h
+++ b/searchcore/src/vespa/searchcore/proton/server/i_proton_disk_layout.h
@@ -17,7 +17,7 @@ class IProtonDiskLayout
 public:
     virtual ~IProtonDiskLayout() = default;
     virtual void remove(const DocTypeName &docTypeName) = 0;
-    virtual void init(const std::set<DocTypeName> &docTypeNames) = 0;
+    virtual void initAndPruneUnused(const std::set<DocTypeName> &docTypeNames) = 0;
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp b/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp
index 1f565e14889..0b9293a4aab 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton_configurer.cpp
@@ -138,7 +138,7 @@ ProtonConfigurer::applyConfig(std::shared_ptr<ProtonConfigSnapshot> configSnapsh
     }
     const auto &bootstrapConfig = configSnapshot->getBootstrapConfig();
     const ProtonConfig &protonConfig = bootstrapConfig->getProtonConfig();
-    if (initialConfig && _diskLayout) {
+    if (initialConfig) {
         pruneInitialDocumentDBDirs(*configSnapshot);
     }
     _owner.applyConfig(bootstrapConfig);
@@ -190,7 +190,7 @@ ProtonConfigurer::pruneInitialDocumentDBDirs(const ProtonConfigSnapshot &configS
     for (const auto &ddbConfig : protonConfig.documentdb) {
         docTypeNames.emplace(ddbConfig.inputdoctypename);
     }
-    _diskLayout->init(docTypeNames);
+    _diskLayout->initAndPruneUnused(docTypeNames);
 }
 
 void
@@ -211,9 +211,7 @@ ProtonConfigurer::pruneDocumentDBs(const ProtonConfigSnapshot &configSnapshot)
         if (found == newDocTypes.end()) {
             _owner.removeDocumentDB(dbitr->first);
             DocumentDBDirectoryHolder::waitUntilDestroyed(dbitr->second.second);
-            if (_diskLayout) {
-                _diskLayout->remove(dbitr->first);
-            }
+            _diskLayout->remove(dbitr->first);
             dbitr = _documentDBs.erase(dbitr);
         } else {
             ++dbitr;
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton_disk_layout.cpp b/searchcore/src/vespa/searchcore/proton/server/proton_disk_layout.cpp
index 0e0d96a3211..1bc24d4a0e3 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton_disk_layout.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton_disk_layout.cpp
@@ -23,7 +23,7 @@ ProtonDiskLayout::remove(const DocTypeName &docTypeName)
 }
 
 void
-ProtonDiskLayout::init(const std::set<DocTypeName> &docTypeNames)
+ProtonDiskLayout::initAndPruneUnused(const std::set<DocTypeName> &docTypeNames)
 {
     (void) docTypeNames;
 }
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton_disk_layout.h b/searchcore/src/vespa/searchcore/proton/server/proton_disk_layout.h
index b7aeafb6b54..167a1900b99 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton_disk_layout.h
+++ b/searchcore/src/vespa/searchcore/proton/server/proton_disk_layout.h
@@ -21,7 +21,7 @@ public:
     ProtonDiskLayout(const vespalib::string &baseDir, const vespalib::string &tlsSpec);
     ~ProtonDiskLayout() override;
     void remove(const DocTypeName &docTypeName) override;
-    void init(const std::set<DocTypeName> &docTypeNames) override;
+    void initAndPruneUnused(const std::set<DocTypeName> &docTypeNames) override;
 };
 
 } // namespace proton