Merge pull request #32753 from vespa-engine/toregge/deinline-docstore…

…-randreaders-destructors Deinline docstore randreaders destructors.
vespa-engine · Nov 4, 2024 · 0771e8e · 0771e8e
2 parents 3c6905d + 62892cc
commit 0771e8e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/searchlib/src/vespa/searchlib/docstore/randreaders.cpp b/searchlib/src/vespa/searchlib/docstore/randreaders.cpp
@@ -27,6 +27,8 @@ DirectIORandRead::DirectIORandRead(const std::string & fileName)
     }
 }
 
+DirectIORandRead::~DirectIORandRead() = default;
+
 FileRandRead::FSP
 DirectIORandRead::read(size_t offset, vespalib::DataBuffer & buffer, size_t sz)
 {
@@ -64,6 +66,7 @@ MMapRandRead::MMapRandRead(const std::string & fileName, int mmapFlags, int fadv
     }
 }
 
+MMapRandRead::~MMapRandRead() = default;
 
 NormalRandRead::NormalRandRead(const std::string & fileName)
     : _file(std::make_unique<FastOS_File>(fileName.c_str()))
@@ -73,6 +76,8 @@ NormalRandRead::NormalRandRead(const std::string & fileName)
     }
 }
 
+NormalRandRead::~NormalRandRead() = default;
+
 FileRandRead::FSP
 MMapRandRead::read(size_t offset, vespalib::DataBuffer & buffer, size_t sz)
 {
@@ -103,6 +108,8 @@ MMapRandReadDynamic::MMapRandReadDynamic(const std::string &fileName, int mmapFl
     remap(0);
 }
 
+MMapRandReadDynamic::~MMapRandReadDynamic() = default;
+
 void
 MMapRandReadDynamic::remap(size_t sz)
 {

diff --git a/searchlib/src/vespa/searchlib/docstore/randreaders.h b/searchlib/src/vespa/searchlib/docstore/randreaders.h
@@ -14,6 +14,7 @@ class DirectIORandRead : public FileRandRead
 {
 public:
     DirectIORandRead(const std::string & fileName);
+    ~DirectIORandRead() override;
     FSP read(size_t offset, vespalib::DataBuffer & buffer, size_t sz) override;
     int64_t getSize() const override;
 private:
@@ -27,6 +28,7 @@ class MMapRandRead : public FileRandRead
 {
 public:
     MMapRandRead(const std::string & fileName, int mmapFlags, int fadviseOptions);
+    ~MMapRandRead() override;
     FSP read(size_t offset, vespalib::DataBuffer & buffer, size_t sz) override;
     int64_t getSize() const override;
     const void * getMapping();
@@ -38,6 +40,7 @@ class MMapRandReadDynamic : public FileRandRead
 {
 public:
     MMapRandReadDynamic(const std::string & fileName, int mmapFlags, int fadviseOptions);
+    ~MMapRandReadDynamic() override;
     FSP read(size_t offset, vespalib::DataBuffer & buffer, size_t sz) override;
     int64_t getSize() const override;
 private:
@@ -54,6 +57,7 @@ class NormalRandRead : public FileRandRead
 {
 public:
     NormalRandRead(const std::string & fileName);
+    ~NormalRandRead() override;
     FSP read(size_t offset, vespalib::DataBuffer & buffer, size_t sz) override;
     int64_t getSize() const override;
 private: