Merge pull request #18300 from vespa-engine/balder/misc-cleanup

- NULL -> nullptr

3 files changed, 35 insertions, 56 deletions

diff --git a/searchcore/src/vespa/searchcore/grouping/groupingcontext.cpp b/searchcore/src/vespa/searchcore/grouping/groupingcontext.cpp
index 55e9ce16f70..01dd069b03c 100644
--- a/searchcore/src/vespa/searchcore/grouping/groupingcontext.cpp
+++ b/searchcore/src/vespa/searchcore/grouping/groupingcontext.cpp
@@ -4,17 +4,15 @@
 #include <vespa/searchlib/aggregation/predicates.h>
 #include <vespa/searchlib/aggregation/modifiers.h>
 
-namespace search {
+namespace search::grouping {
 
 using aggregation::CountFS4Hits;
 using aggregation::FS4HitSetDistributionKey;
 
-namespace grouping {
-
 void
 GroupingContext::deserialize(const char *groupSpec, uint32_t groupSpecLen)
 {
-    if ((groupSpec != NULL) && (groupSpecLen > 4)) {
+    if ((groupSpec != nullptr) && (groupSpecLen > 4)) {
         vespalib::nbostream is(groupSpec, groupSpecLen);
         vespalib::NBOSerializer nis(is);
         uint32_t numGroupings = 0;
@@ -102,6 +100,4 @@ GroupingContext::needRanking() const
     return true;
 }
 
-
-} // namespace search::grouping
-} // namespace search
+}
diff --git a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp
index 4b862b40896..04aea64fbd4 100644
--- a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.cpp
@@ -4,8 +4,6 @@
 #include "bootstrapconfig.h"
 #include <vespa/searchcore/proton/common/hw_info_sampler.h>
 #include <vespa/config/print/fileconfigwriter.h>
-#include <vespa/config/print/fileconfigsnapshotreader.h>
-#include <vespa/config/print/fileconfigsnapshotwriter.h>
 #include <vespa/config-bucketspaces.h>
 #include <vespa/document/repo/document_type_repo_factory.h>
 #include <vespa/searchcommon/common/schemaconfigurer.h>
@@ -42,7 +40,8 @@ using vespa::config::search::summary::JuniperrcConfig;
 using vespa::config::content::core::BucketspacesConfig;
 using vespalib::nbostream;
 
-typedef IndexMetaInfo::SnapshotList SnapshotList;
+using SnapshotList = IndexMetaInfo::SnapshotList;
+using Snapshot = IndexMetaInfo::Snapshot;
 using namespace std::chrono_literals;
 
 namespace proton {
@@ -74,9 +73,7 @@ fsyncFile(const vespalib::string &fileName)
 
 template <class Config>
 void
-saveHelper(const vespalib::string &snapDir,
-           const vespalib::string &name,
-           const Config &config)
+saveHelper(const vespalib::string &snapDir, const vespalib::string &name, const Config &config)
 {
     vespalib::string fileName(snapDir + "/" + name + ".cfg");
     config::FileConfigWriter writer(fileName);
@@ -105,8 +102,7 @@ public:
     ConfigFile();
     ~ConfigFile();
 
-    ConfigFile(const vespalib::string &name,
-               const vespalib::string &fullName);
+    ConfigFile(const vespalib::string &name, const vespalib::string &fullName);
 
     nbostream &serialize(nbostream &stream) const;
     nbostream &deserialize(nbostream &stream);
@@ -122,8 +118,7 @@ ConfigFile::ConfigFile()
 
 ConfigFile::~ConfigFile() = default;
 
-ConfigFile::ConfigFile(const vespalib::string &name,
-                       const vespalib::string &fullName)
+ConfigFile::ConfigFile(const vespalib::string &name, const vespalib::string &fullName)
     : _name(name),
       _modTime(0),
       _content()
@@ -142,7 +137,7 @@ ConfigFile::ConfigFile(const vespalib::string &name,
 nbostream &
 ConfigFile::serialize(nbostream &stream) const
 {
-    assert(strchr(_name.c_str(), '/') == NULL);
+    assert(strchr(_name.c_str(), '/') == nullptr);
     stream << _name;
     stream << static_cast<int64_t>(_modTime);;
     uint32_t sz = _content.size();
@@ -155,7 +150,7 @@ nbostream &
 ConfigFile::deserialize(nbostream &stream)
 {
     stream >> _name;
-    assert(strchr(_name.c_str(), '/') == NULL);
+    assert(strchr(_name.c_str(), '/') == nullptr);
     int64_t modTime;
     stream >> modTime;
     _modTime = modTime;
@@ -255,8 +250,7 @@ FileConfigManager::getOldestSerialNum() const
 }
 
 void
-FileConfigManager::saveConfig(const DocumentDBConfig &snapshot,
-                              SerialNum serialNum)
+FileConfigManager::saveConfig(const DocumentDBConfig &snapshot, SerialNum serialNum)
 {
     if (getBestSerialNum() >= serialNum) {
         LOG(warning, "Config for serial >= %" PRIu64 " already saved",
@@ -318,8 +312,7 @@ void addEmptyFile(vespalib::string snapDir, vespalib::string fileName)
 }
 
 void
-FileConfigManager::loadConfig(const DocumentDBConfig &currentSnapshot,
-                              search::SerialNum serialNum,
+FileConfigManager::loadConfig(const DocumentDBConfig &currentSnapshot, search::SerialNum serialNum,
                               DocumentDBConfig::SP &loadedSnapshot)
 {
     vespalib::string snapDirBaseName(makeSnapDirBaseName(serialNum));
@@ -333,13 +326,14 @@ FileConfigManager::loadConfig(const DocumentDBConfig &currentSnapshot,
 
     DocumentDBConfigHelper dbc(spec, _docTypeName);
 
-    typedef DocumenttypesConfig DTC;
-    typedef DocumentDBConfig::DocumenttypesConfigSP DTCSP;
-    DTCSP docTypesCfg(config::ConfigGetter<DTC>::getConfig("", spec).release());
+    using DTC = DocumenttypesConfig;
+    using DTCSP =  DocumentDBConfig::DocumenttypesConfigSP;
+    DTCSP docTypesCfg = config::ConfigGetter<DTC>::getConfig("", spec);
     std::shared_ptr<const DocumentTypeRepo> repo;
     if (currentSnapshot.getDocumenttypesConfigSP() &&
         currentSnapshot.getDocumentTypeRepoSP() &&
-        currentSnapshot.getDocumenttypesConfig() == *docTypesCfg) {
+        (currentSnapshot.getDocumenttypesConfig() == *docTypesCfg))
+    {
         docTypesCfg = currentSnapshot.getDocumenttypesConfigSP();
         repo = currentSnapshot.getDocumentTypeRepoSP();
     } else {
@@ -462,8 +456,7 @@ FileConfigManager::serializeConfig(SerialNum serialNum, nbostream &stream)
     uint32_t numConfigs = configs.size();
     stream << numConfigs;
     for (const auto &config : configs) {
-        ConfigFile file(config,
-                        snapDir + "/" + config);
+        ConfigFile file(config, snapDir + "/" + config);
         stream << file;
     }
 }
diff --git a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.h b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.h
index 1c477ffd3c8..d58d7920c67 100644
--- a/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.h
+++ b/searchcore/src/vespa/searchcore/proton/server/fileconfigmanager.h
@@ -10,17 +10,12 @@
 namespace proton {
 
 class FileConfigManager : public ConfigStore {
-public:
-    typedef std::unique_ptr<FileConfigManager> UP;
-    typedef std::shared_ptr<FileConfigManager> SP;
-    typedef search::IndexMetaInfo::Snapshot Snapshot;
-
 private:
-    vespalib::string _baseDir;
-    vespalib::string _configId;
-    vespalib::string _docTypeName;
+    vespalib::string      _baseDir;
+    vespalib::string      _configId;
+    vespalib::string      _docTypeName;
     search::IndexMetaInfo _info;
-    ProtonConfigSP _protonConfig;
+    ProtonConfigSP        _protonConfig;
 
 public:
     /**
@@ -33,14 +28,12 @@ public:
                       const vespalib::string &configId,
                       const vespalib::string &docTypeName);
 
-    virtual
-    ~FileConfigManager();
+    ~FileConfigManager() override;
 
-    virtual SerialNum getBestSerialNum() const override;
-    virtual SerialNum getOldestSerialNum() const override;
+    SerialNum getBestSerialNum() const override;
+    SerialNum getOldestSerialNum() const override;
 
-    virtual void saveConfig(const DocumentDBConfig &snapshot,
-                            SerialNum serialNum) override;
+    void saveConfig(const DocumentDBConfig &snapshot, SerialNum serialNum) override;
 
     /**
      * Load a config snapshot from disk corresponding to the given
@@ -53,23 +46,21 @@ public:
      * @param loadedSnapshot the shared pointer in which to store the
      *                       resulting config snapshot.
      */
-    virtual void loadConfig(const DocumentDBConfig &currentSnapshot,
-                            SerialNum serialNum,
-                            DocumentDBConfig::SP &loadedSnapshot) override;
+    void loadConfig(const DocumentDBConfig &currentSnapshot, SerialNum serialNum,
+                    DocumentDBConfig::SP &loadedSnapshot) override;
 
-    virtual void removeInvalid() override;
-    virtual void prune(SerialNum serialNum) override;
-    virtual bool hasValidSerial(SerialNum serialNum) const override;
+    void removeInvalid() override;
+    void prune(SerialNum serialNum) override;
+    bool hasValidSerial(SerialNum serialNum) const override;
 
-    virtual SerialNum getPrevValidSerial(SerialNum serialNum) const override;
+    SerialNum getPrevValidSerial(SerialNum serialNum) const override;
 
     /**
      * Serialize config files.
      *
      * Used for serializing config into transaction log.
      */
-    virtual void
-    serializeConfig(SerialNum serialNum, vespalib::nbostream &stream) override;
+    void serializeConfig(SerialNum serialNum, vespalib::nbostream &stream) override;
 
 
     /**
@@ -80,10 +71,9 @@ public:
      * takes precedence over the serialized config files in the
      * transaction log.
      */
-    virtual void
-    deserializeConfig(SerialNum serialNum, vespalib::nbostream &stream) override;
+    void deserializeConfig(SerialNum serialNum, vespalib::nbostream &stream) override;
 
-    virtual void setProtonConfig(const ProtonConfigSP &protonConfig) override;
+    void setProtonConfig(const ProtonConfigSP &protonConfig) override;
 };
 
 } // namespace proton