Ensure that all durations are initialized.

8 files changed, 18 insertions, 40 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/common/commit_time_tracker.h b/searchcore/src/vespa/searchcore/proton/common/commit_time_tracker.h
index 02bf87f0a08..dda9d43ce67 100644
--- a/searchcore/src/vespa/searchcore/proton/common/commit_time_tracker.h
+++ b/searchcore/src/vespa/searchcore/proton/common/commit_time_tracker.h
@@ -17,13 +17,9 @@ private:
 
 public:
     CommitTimeTracker(vespalib::duration visibilityDelay);
-
     bool needCommit() const;
-
     void setVisibilityDelay(vespalib::duration visibilityDelay);
-
     bool hasVisibilityDelay() const { return _visibilityDelay != vespalib::duration::zero(); }
-
     void setReplayDone() { _replayDone = true; }
 };
 
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/lidreusedelayer.cpp b/searchcore/src/vespa/searchcore/proton/documentmetastore/lidreusedelayer.cpp
index 3824516eec3..bf1ea25b589 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/lidreusedelayer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/lidreusedelayer.cpp
@@ -22,9 +22,7 @@ LidReuseDelayer::LidReuseDelayer(IThreadingService &writeService,
 }
 
 
-LidReuseDelayer::~LidReuseDelayer()
-{
-}
+LidReuseDelayer::~LidReuseDelayer() = default;
 
 
 bool
diff --git a/searchcore/src/vespa/searchcore/proton/documentmetastore/lidreusedelayer.h b/searchcore/src/vespa/searchcore/proton/documentmetastore/lidreusedelayer.h
index cb42e4ce152..df142890207 100644
--- a/searchcore/src/vespa/searchcore/proton/documentmetastore/lidreusedelayer.h
+++ b/searchcore/src/vespa/searchcore/proton/documentmetastore/lidreusedelayer.h
@@ -4,23 +4,9 @@
 
 #include "ilidreusedelayer.h"
 
-namespace searchcorespi
-{
-
-namespace index
-{
-
-struct IThreadingService;
+namespace searchcorespi::index { struct IThreadingService; }
 
-}
-
-}
-
-namespace proton
-{
-
-namespace documentmetastore
-{
+namespace proton::documentmetastore {
 
 struct IStore;
 
@@ -46,15 +32,13 @@ class LidReuseDelayer : public ILidReuseDelayer
 public:
     LidReuseDelayer(searchcorespi::index::IThreadingService &writeService,
                     IStore &documentMetaStore);
-    virtual ~LidReuseDelayer();
-    virtual bool delayReuse(uint32_t lid) override;
-    virtual bool delayReuse(const std::vector<uint32_t> &lids) override;
-    virtual void setImmediateCommit(bool immediateCommit) override;
-    virtual bool getImmediateCommit() const override;
-    virtual void setHasIndexedOrAttributeFields(bool hasIndexedOrAttributeFields) override;
-    virtual std::vector<uint32_t> getReuseLids() override;
+    ~LidReuseDelayer() override;
+    bool delayReuse(uint32_t lid) override;
+    bool delayReuse(const std::vector<uint32_t> &lids) override;
+    void setImmediateCommit(bool immediateCommit) override;
+    bool getImmediateCommit() const override;
+    void setHasIndexedOrAttributeFields(bool hasIndexedOrAttributeFields) override;
+    std::vector<uint32_t> getReuseLids() override;
 };
 
 }
-
-}
diff --git a/searchcore/src/vespa/searchcore/proton/server/document_db_maintenance_config.cpp b/searchcore/src/vespa/searchcore/proton/server/document_db_maintenance_config.cpp
index 976b5b3e763..b967e745b1f 100644
--- a/searchcore/src/vespa/searchcore/proton/server/document_db_maintenance_config.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/document_db_maintenance_config.cpp
@@ -116,7 +116,7 @@ DocumentDBMaintenanceConfig::DocumentDBMaintenanceConfig()
     : _pruneRemovedDocuments(),
       _heartBeat(),
       _sessionCachePruneInterval(900s),
-      _visibilityDelay(0),
+      _visibilityDelay(vespalib::duration::zero()),
       _lidSpaceCompaction(),
       _attributeUsageFilterConfig(),
       _attributeUsageSampleInterval(60s),
diff --git a/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer.h b/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer.h
index a2ae11346f5..66ab54cf4a6 100644
--- a/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer.h
+++ b/searchcore/src/vespa/searchcore/proton/server/document_subdb_initializer.h
@@ -45,7 +45,7 @@ public:
         return _documentMetaStoreInitTask;
     }
 
-    virtual void run() override;
+    void run() override;
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp
index b15f72b5391..7a1989c8d7b 100644
--- a/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/documentdbconfigmanager.cpp
@@ -104,7 +104,7 @@ buildMaintenanceConfig(const BootstrapConfig::SP &bootstrapConfig,
     typedef ProtonConfig::Documentdb DdbConfig;
     ProtonConfig &proton(bootstrapConfig->getProtonConfig());
 
-    vespalib::duration visibilityDelay;
+    vespalib::duration visibilityDelay = vespalib::duration::zero();
     bool isDocumentTypeGlobal = false;
     // Use document type to find document db config in proton config
     uint32_t index;
diff --git a/searchcore/src/vespa/searchcore/proton/server/visibilityhandler.cpp b/searchcore/src/vespa/searchcore/proton/server/visibilityhandler.cpp
index fd2ad017a28..58000348ecf 100644
--- a/searchcore/src/vespa/searchcore/proton/server/visibilityhandler.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/visibilityhandler.cpp
@@ -15,7 +15,7 @@ VisibilityHandler::VisibilityHandler(const IGetSerialNum & serial,
     : _serial(serial),
       _writeService(writeService),
       _feedView(feedView),
-      _visibilityDelay(0),
+      _visibilityDelay(vespalib::duration::zero()),
       _lastCommitSerialNum(0),
       _lock()
 {
@@ -23,7 +23,7 @@ VisibilityHandler::VisibilityHandler(const IGetSerialNum & serial,
 
 void VisibilityHandler::commit()
 {
-    if (_visibilityDelay > vespalib::duration::zero()) {
+    if (hasVisibilityDelay()) {
         if (_writeService.master().isCurrentThread()) {
             performCommit(true);
         } else {
@@ -35,7 +35,7 @@ void VisibilityHandler::commit()
 
 void VisibilityHandler::commitAndWait()
 {
-    if (_visibilityDelay > vespalib::duration::zero()) {
+    if (hasVisibilityDelay()) {
         if (_writeService.master().isCurrentThread()) {
             performCommit(false);
         } else {
diff --git a/searchcore/src/vespa/searchcore/proton/server/visibilityhandler.h b/searchcore/src/vespa/searchcore/proton/server/visibilityhandler.h
index 370af482c6a..3bcdca5fc40 100644
--- a/searchcore/src/vespa/searchcore/proton/server/visibilityhandler.h
+++ b/searchcore/src/vespa/searchcore/proton/server/visibilityhandler.h
@@ -27,9 +27,9 @@ public:
                       const FeedViewHolder &feedView);
     void setVisibilityDelay(vespalib::duration visibilityDelay) { _visibilityDelay = visibilityDelay; }
     vespalib::duration getVisibilityDelay() const { return _visibilityDelay; }
-    bool hasVisibilityDelay() const { return _visibilityDelay > vespalib::duration::zero(); }
+    bool hasVisibilityDelay() const { return _visibilityDelay != vespalib::duration::zero(); }
     void commit() override;
-    virtual void commitAndWait() override;
+    void commitAndWait() override;
 private:
     bool startCommit(const std::lock_guard<std::mutex> &unused, bool force);
     void performCommit(bool force);