Merge pull request #16501 from vespa-engine/balder/less-assert-in-header-files

Less asserts in header files.

11 files changed, 26 insertions, 47 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_hold_list.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_hold_list.cpp
index 53c8bbc8ae4..b971d3eb430 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_hold_list.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/lid_hold_list.cpp
@@ -2,6 +2,7 @@
 
 #include "lid_hold_list.h"
 #include "lidstatevector.h"
+#include <cassert>
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/lidstatevector.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/lidstatevector.cpp
index d2490985e77..05b1cecd84e 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/lidstatevector.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/lidstatevector.cpp
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "lidstatevector.h"
+#include <cassert>
 
 namespace proton {
 
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/lidvectorcontext.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/lidvectorcontext.cpp
index 9a1d993aada..1dc823a6b04 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/lidvectorcontext.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/lidvectorcontext.cpp
@@ -3,6 +3,7 @@
 #include "lidvectorcontext.h"
 #include <vespa/searchlib/common/bitvector.h>
 #include <vespa/vespalib/objects/nbostream.h>
+#include <cassert>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.feedoperation.lidvectorcontext");
diff --git a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp
index baf89a55ae3..c643c338856 100644
--- a/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/bootstrapconfigmanager.cpp
@@ -7,7 +7,7 @@
 #include <vespa/config-bucketspaces.h>
 #include <vespa/searchlib/common/tunefileinfo.hpp>
 #include <vespa/vespalib/io/fileutil.h>
-
+#include <cassert>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.server.bootstrapconfigmanager");
@@ -31,7 +31,7 @@ BootstrapConfigManager::BootstrapConfigManager(const vespalib::string & configId
       _pendingConfigMutex()
 { }
 
-BootstrapConfigManager::~BootstrapConfigManager() { }
+BootstrapConfigManager::~BootstrapConfigManager() = default;
 
 
 const ConfigKeySet
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp
index 2c9249c0049..fbdff698b9b 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp
@@ -21,6 +21,7 @@
 #include <vespa/searchsummary/config/config-juniperrc.h>
 #include <vespa/vespalib/time/time_box.h>
 #include <thread>
+#include <cassert>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.server.documentdbconfigmanager");
diff --git a/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp b/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp
index c9333cde0a8..47a379b0647 100644
--- a/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/feedhandler.cpp
@@ -22,6 +22,7 @@
 #include <vespa/searchlib/transactionlog/client_session.h>
 #include <vespa/vespalib/util/exceptions.h>
 #include <vespa/vespalib/util/lambdatask.h>
+#include <cassert>
 #include <unistd.h>
 
 #include <vespa/log/log.h>
diff --git a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp
index e66043aa422..9f67058a2d7 100644
--- a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp
@@ -19,6 +19,7 @@
 #include <vespa/searchsummary/config/config-juniperrc.h>
 #include <vespa/config/helper/configgetter.hpp>
 #include <sstream>
+#include <cassert>
 #include <fcntl.h>
 
 #include <vespa/log/log.h>
@@ -56,7 +57,6 @@ makeSnapDirBaseName(SerialNum serialNum)
     return os.str();
 }
 
-
 void
 fsyncFile(const vespalib::string &fileName)
 {
@@ -93,7 +93,6 @@ save(const vespalib::string &snapDir, const Config &config)
     saveHelper(snapDir, config.defName(), config);
 }
 
-
 class ConfigFile
 {
     typedef std::shared_ptr<ConfigFile> SP;
@@ -110,13 +109,10 @@ public:
                const vespalib::string &fullName);
 
     nbostream &serialize(nbostream &stream) const;
-
     nbostream &deserialize(nbostream &stream);
-
     void save(const vespalib::string &snapDir) const;
 };
 
-
 ConfigFile::ConfigFile()
     : _name(),
       _modTime(0),
@@ -124,8 +120,7 @@ ConfigFile::ConfigFile()
 {
 }
 
-ConfigFile::~ConfigFile() {}
-
+ConfigFile::~ConfigFile() = default;
 
 ConfigFile::ConfigFile(const vespalib::string &name,
                        const vespalib::string &fullName)
@@ -144,7 +139,6 @@ ConfigFile::ConfigFile(const vespalib::string &name,
     file.Close();
 }
 
-
 nbostream &
 ConfigFile::serialize(nbostream &stream) const
 {
@@ -157,7 +151,6 @@ ConfigFile::serialize(nbostream &stream) const
     return stream;
 }
 
-
 nbostream &
 ConfigFile::deserialize(nbostream &stream)
 {
@@ -175,7 +168,6 @@ ConfigFile::deserialize(nbostream &stream)
     return stream;
 }
 
-
 void
 ConfigFile::save(const vespalib::string &snapDir) const
 {
@@ -193,21 +185,18 @@ ConfigFile::save(const vespalib::string &snapDir) const
     fsyncFile(fullName);
 }
 
-
 nbostream &
 operator<<(nbostream &stream, const ConfigFile &configFile)
 {
     return configFile.serialize(stream);
 }
 
-
 nbostream &
 operator>>(nbostream &stream, ConfigFile &configFile)
 {
     return configFile.deserialize(stream);
 }
 
-
 std::vector<vespalib::string>
 getFileList(const vespalib::string &snapDir)
 {
@@ -223,7 +212,6 @@ getFileList(const vespalib::string &snapDir)
     return res;
 }
 
-
 }
 
 FileConfigManager::FileConfigManager(const vespalib::string &baseDir,
@@ -243,11 +231,7 @@ FileConfigManager::FileConfigManager(const vespalib::string &baseDir,
     _protonConfig.reset(new ProtonConfig());
 }
 
-
-FileConfigManager::~FileConfigManager()
-{
-}
-
+FileConfigManager::~FileConfigManager() = default;
 
 SerialNum
 FileConfigManager::getBestSerialNum() const
@@ -256,7 +240,6 @@ FileConfigManager::getBestSerialNum() const
     return snap.valid ? snap.syncToken : UINT64_C(0);
 }
 
-
 SerialNum
 FileConfigManager::getOldestSerialNum() const
 {
@@ -271,7 +254,6 @@ FileConfigManager::getOldestSerialNum() const
     return res;
 }
 
-
 void
 FileConfigManager::saveConfig(const DocumentDBConfig &snapshot,
                               SerialNum serialNum)
@@ -389,7 +371,6 @@ FileConfigManager::loadConfig(const DocumentDBConfig &currentSnapshot,
     loadedSnapshot->setConfigId(_configId);
 }
 
-
 void
 FileConfigManager::removeInvalid()
 {
@@ -422,7 +403,6 @@ FileConfigManager::removeInvalid()
     (void) saveRemInvalidSnap;
 }
 
-
 void
 FileConfigManager::prune(SerialNum serialNum)
 {
@@ -448,7 +428,6 @@ FileConfigManager::prune(SerialNum serialNum)
     removeInvalid();
 }
 
-
 bool
 FileConfigManager::hasValidSerial(SerialNum serialNum) const
 {
@@ -456,7 +435,6 @@ FileConfigManager::hasValidSerial(SerialNum serialNum) const
     return snap.valid;
 }
 
-
 SerialNum
 FileConfigManager::getPrevValidSerial(SerialNum serialNum) const
 {
@@ -471,7 +449,6 @@ FileConfigManager::getPrevValidSerial(SerialNum serialNum) const
     return res;
 }
 
-
 void
 FileConfigManager::serializeConfig(SerialNum serialNum, nbostream &stream)
 {
@@ -490,7 +467,6 @@ FileConfigManager::serializeConfig(SerialNum serialNum, nbostream &stream)
     }
 }
 
-
 void
 FileConfigManager::deserializeConfig(SerialNum serialNum, nbostream &stream)
 {
@@ -525,13 +501,10 @@ FileConfigManager::deserializeConfig(SerialNum serialNum, nbostream &stream)
     }
 }
 
-
 void
 FileConfigManager::setProtonConfig(const ProtonConfigSP &protonConfig)
 {
     _protonConfig = protonConfig;
 }
 
-
-
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/memoryconfigstore.cpp b/searchcore/src/vespa/searchcore/proton/server/memoryconfigstore.cpp
index 2cf8d3c113c..6f536aa4952 100644
--- a/searchcore/src/vespa/searchcore/proton/server/memoryconfigstore.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/memoryconfigstore.cpp
@@ -1,6 +1,7 @@
 // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
 #include "memoryconfigstore.h"
+#include <cassert>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.server.memoryconfigstore");
@@ -9,7 +10,7 @@ namespace proton {
 
 MemoryConfigStore::MemoryConfigStore() : _maps(new ConfigMaps) {}
 MemoryConfigStore::MemoryConfigStore(ConfigMaps::SP maps) : _maps(maps) {}
-MemoryConfigStore::~MemoryConfigStore() { }
+MemoryConfigStore::~MemoryConfigStore() = default;
 
 ConfigStore::SerialNum
 MemoryConfigStore::getBestSerialNum() const {
@@ -77,8 +78,8 @@ MemoryConfigStore::deserializeConfig(SerialNum, vespalib::nbostream &) {
 void
 MemoryConfigStore::setProtonConfig(const ProtonConfigSP &) { }
 
-MemoryConfigStores::MemoryConfigStores() { }
-MemoryConfigStores::~MemoryConfigStores() { }
+MemoryConfigStores::MemoryConfigStores() = default;
+MemoryConfigStores::~MemoryConfigStores() = default;
 
 ConfigStore::UP
 MemoryConfigStores::getConfigStore(const std::string &type) {
diff --git a/searchcore/src/vespa/searchcore/proton/server/memoryconfigstore.h b/searchcore/src/vespa/searchcore/proton/server/memoryconfigstore.h
index f826c19d341..02c7ebe2d0c 100644
--- a/searchcore/src/vespa/searchcore/proton/server/memoryconfigstore.h
+++ b/searchcore/src/vespa/searchcore/proton/server/memoryconfigstore.h
@@ -26,19 +26,17 @@ public:
     MemoryConfigStore(ConfigMaps::SP maps);
     ~MemoryConfigStore();
 
-    virtual SerialNum getBestSerialNum() const override;
-    virtual SerialNum getOldestSerialNum() const override;
-    virtual bool hasValidSerial(SerialNum serial) const override;
-    virtual SerialNum getPrevValidSerial(SerialNum serial) const override;
-    virtual void saveConfig(const DocumentDBConfig &config,
-                            SerialNum serial) override;
-    virtual void loadConfig(const DocumentDBConfig &, SerialNum serial,
-                            DocumentDBConfig::SP &loaded_config) override;
-    virtual void removeInvalid() override;
+    SerialNum getBestSerialNum() const override;
+    SerialNum getOldestSerialNum() const override;
+    bool hasValidSerial(SerialNum serial) const override;
+    SerialNum getPrevValidSerial(SerialNum serial) const override;
+    void saveConfig(const DocumentDBConfig &config, SerialNum serial) override;
+    void loadConfig(const DocumentDBConfig &, SerialNum serial, DocumentDBConfig::SP &loaded_config) override;
+    void removeInvalid() override;
     void prune(SerialNum serial) override;
-    virtual void serializeConfig(SerialNum, vespalib::nbostream &) override;
-    virtual void deserializeConfig(SerialNum, vespalib::nbostream &) override;
-    virtual void setProtonConfig(const ProtonConfigSP &) override;
+    void serializeConfig(SerialNum, vespalib::nbostream &) override;
+    void deserializeConfig(SerialNum, vespalib::nbostream &) override;
+    void setProtonConfig(const ProtonConfigSP &) override;
 };
 
 // Holds the state of a set of MemoryConfigStore objects, making stored
diff --git a/searchcore/src/vespa/searchcore/proton/server/proton_config_fetcher.cpp b/searchcore/src/vespa/searchcore/proton/server/proton_config_fetcher.cpp
index 2108327a422..8820602d816 100644
--- a/searchcore/src/vespa/searchcore/proton/server/proton_config_fetcher.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/proton_config_fetcher.cpp
@@ -7,6 +7,7 @@
 #include <vespa/config/common/exceptions.h>
 #include <vespa/vespalib/util/exceptions.h>
 #include <thread>
+#include <cassert>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.server.proton_config_fetcher");
diff --git a/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.cpp
index b776e32e0db..08209f8b2d5 100644
--- a/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/transactionlogmanager.cpp
@@ -5,6 +5,7 @@
 #include <vespa/searchlib/transactionlog/translogclient.h>
 #include <vespa/searchcore/proton/common/eventlogger.h>
 #include <vespa/vespalib/util/exceptions.h>
+#include <cassert>
 
 #include <vespa/log/log.h>
 LOG_SETUP(".proton.server.transactionlogmanager");