Grab the fallback guard in the constructor to ensure it is held fetching the postinglists and generating possible bitvector.

4 files changed, 6 insertions, 10 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper.cpp b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper.cpp
index e17c670a9d1..c0831f554de 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper.cpp
+++ b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper.cpp
@@ -10,9 +10,7 @@ GidToLidMapper::GidToLidMapper(const search::IDocumentMetaStoreContext &dmsConte
 {
 }
 
-GidToLidMapper::~GidToLidMapper()
-{
-}
+GidToLidMapper::~GidToLidMapper() = default;
 
 void
 GidToLidMapper::foreach(const search::IGidToLidMapperVisitor &visitor) const
diff --git a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper.h b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper.h
index 8a974b6d527..5229b08e765 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper.h
+++ b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper.h
@@ -16,8 +16,8 @@ class GidToLidMapper : public search::IGidToLidMapper
     search::IDocumentMetaStoreContext::IReadGuard::SP _guard;
 public:
     GidToLidMapper(const search::IDocumentMetaStoreContext &dmsContext);
-    virtual ~GidToLidMapper();
-    virtual void foreach(const search::IGidToLidMapperVisitor &visitor) const override;
+    ~GidToLidMapper() override;
+    void foreach(const search::IGidToLidMapperVisitor &visitor) const override;
 };
 
 } // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper_factory.cpp b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper_factory.cpp
index 1f4e6fc081b..fff23fab681 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper_factory.cpp
+++ b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper_factory.cpp
@@ -11,9 +11,7 @@ GidToLidMapperFactory::GidToLidMapperFactory(std::shared_ptr<const search::IDocu
 {
 }
 
-GidToLidMapperFactory::~GidToLidMapperFactory()
-{
-}
+GidToLidMapperFactory::~GidToLidMapperFactory() = default;
 
 std::unique_ptr<search::IGidToLidMapper>
 GidToLidMapperFactory::getMapper() const
diff --git a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper_factory.h b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper_factory.h
index 7fd2aa603a4..31668e8332d 100644
--- a/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper_factory.h
+++ b/searchcore/src/vespa/searchcore/proton/reference/gid_to_lid_mapper_factory.h
@@ -15,8 +15,8 @@ class GidToLidMapperFactory : public search::IGidToLidMapperFactory
     std::shared_ptr<const search::IDocumentMetaStoreContext> _dmsContext;
 public:
     GidToLidMapperFactory(std::shared_ptr<const search::IDocumentMetaStoreContext> dmsContext);
-    virtual ~GidToLidMapperFactory();
-    virtual std::unique_ptr<search::IGidToLidMapper> getMapper() const override;
+    ~GidToLidMapperFactory() override;
+    std::unique_ptr<search::IGidToLidMapper> getMapper() const override;
 };
 
 } // namespace proton