Merge pull request #20408 from vespa-engine/balder/keep-interface-pure

Keep interface pure.

6 files changed, 11 insertions, 32 deletions

diff --git a/searchlib/src/tests/docstore/document_store/document_store_test.cpp b/searchlib/src/tests/docstore/document_store/document_store_test.cpp
index dec7b911f65..1a6b0a5a1c6 100644
--- a/searchlib/src/tests/docstore/document_store/document_store_test.cpp
+++ b/searchlib/src/tests/docstore/document_store/document_store_test.cpp
@@ -25,6 +25,7 @@ struct NullDataStore : IDataStore {
     size_t memoryMeta() const override { return 0; }
     size_t getDiskFootprint() const override { return 0; }
     size_t getDiskBloat() const override { return 0; }
+    size_t getMaxCompactGain() const override { return 0; }
     uint64_t lastSyncToken() const override { return 0; }
     uint64_t tentativeLastSyncToken() const override { return 0; }
     vespalib::system_time getLastFlushTime() const override { return vespalib::system_time(); }
diff --git a/searchlib/src/vespa/searchlib/common/i_compactable_lid_space.h b/searchlib/src/vespa/searchlib/common/i_compactable_lid_space.h
index bb404f27709..cea251272dc 100644
--- a/searchlib/src/vespa/searchlib/common/i_compactable_lid_space.h
+++ b/searchlib/src/vespa/searchlib/common/i_compactable_lid_space.h
@@ -11,7 +11,7 @@ namespace search::common {
  * Interface for a component that has a lid space that can be compacted and shrunk.
  */     
 struct ICompactableLidSpace {
-    virtual ~ICompactableLidSpace() {}
+    virtual ~ICompactableLidSpace() = default;
 
     /**
      * Compacts the lid space down to the wanted given doc id limit.
diff --git a/searchlib/src/vespa/searchlib/docstore/idatastore.h b/searchlib/src/vespa/searchlib/docstore/idatastore.h
index b18bb0a3827..82656ad7e69 100644
--- a/searchlib/src/vespa/searchlib/docstore/idatastore.h
+++ b/searchlib/src/vespa/searchlib/docstore/idatastore.h
@@ -17,14 +17,14 @@ class IBufferVisitor;
 class IDataStoreVisitor
 {
 public:
-    virtual ~IDataStoreVisitor() { }
+    virtual ~IDataStoreVisitor() = default;
     virtual void visit(uint32_t lid, const void *buffer, size_t sz) = 0;
 };
 
 class IDataStoreVisitorProgress
 {
 public:
-    virtual ~IDataStoreVisitorProgress() { }
+    virtual ~IDataStoreVisitorProgress() = default;
     virtual void updateProgress(double progress) = 0;
 };
 
@@ -46,11 +46,7 @@ public:
      * @param dirName  The directory that will contain the data file.
      **/
     IDataStore(const vespalib::string & dirName);
-
-    /**
-     * Allow inhertitance.
-     **/
-    virtual ~IDataStore();
+     ~IDataStore() override;
 
     /**
      * Read data from the data store into a buffer.
@@ -125,7 +121,7 @@ public:
      * to avoid misuse we let the report a more conservative number here if necessary.
      * @return diskspace to be gained.
      */
-    virtual size_t getMaxCompactGain() const { return getDiskBloat(); }
+    virtual size_t getMaxCompactGain() const = 0;
 
 
     /**
diff --git a/searchlib/src/vespa/searchlib/docstore/idocumentstore.cpp b/searchlib/src/vespa/searchlib/docstore/idocumentstore.cpp
index e1558f2238b..4f9b91f3e15 100644
--- a/searchlib/src/vespa/searchlib/docstore/idocumentstore.cpp
+++ b/searchlib/src/vespa/searchlib/docstore/idocumentstore.cpp
@@ -5,10 +5,6 @@
 
 namespace search {
 
-IDocumentStore::IDocumentStore() = default;
-
-IDocumentStore::~IDocumentStore() = default;
-
 void IDocumentStore::visit(const LidVector & lids, const document::DocumentTypeRepo &repo, IDocumentVisitor & visitor) const {
     for (uint32_t lid : lids) {
         visitor.visit(lid, read(lid, repo));
diff --git a/searchlib/src/vespa/searchlib/docstore/idocumentstore.h b/searchlib/src/vespa/searchlib/docstore/idocumentstore.h
index 2a7864a6f47..0e73e4d7993 100644
--- a/searchlib/src/vespa/searchlib/docstore/idocumentstore.h
+++ b/searchlib/src/vespa/searchlib/docstore/idocumentstore.h
@@ -22,7 +22,7 @@ class IDocumentStoreReadVisitor
 {
 public:
     using DocumentSP = std::shared_ptr<document::Document>;
-    virtual ~IDocumentStoreReadVisitor() { }
+    virtual ~IDocumentStoreReadVisitor() = default;
     virtual void visit(uint32_t lid, const DocumentSP &doc) = 0;
     virtual void visit(uint32_t lid) = 0;
 };
@@ -31,14 +31,14 @@ class IDocumentStoreRewriteVisitor
 {
 public:
     using DocumentSP = std::shared_ptr<document::Document>;
-    virtual ~IDocumentStoreRewriteVisitor() { }
+    virtual ~IDocumentStoreRewriteVisitor() = default;
     virtual void visit(uint32_t lid, const DocumentSP &doc) = 0;
 };
 
 class IDocumentStoreVisitorProgress
 {
 public:
-    virtual ~IDocumentStoreVisitorProgress() { }
+    virtual ~IDocumentStoreVisitorProgress() = default;
 
     virtual void updateProgress(double progress) = 0;
 };
@@ -47,7 +47,7 @@ class IDocumentVisitor
 {
 public:
     using DocumentUP = std::unique_ptr<document::Document>;
-    virtual ~IDocumentVisitor() { }
+    virtual ~IDocumentVisitor() = default;
     virtual void visit(uint32_t lid, DocumentUP doc) = 0;
     virtual bool allowVisitCaching() const = 0;
 private:
@@ -68,17 +68,6 @@ public:
     using LidVector = std::vector<uint32_t>;
     using DocumentUP = std::unique_ptr<document::Document>;
 
-
-    /**
-     * Construct a document store.
-     *
-     * @throws vespalib::IoException if the file is corrupt or other IO problems occur.
-     * @param docMan   The document type manager to use when deserializing.
-     * @param baseDir  The path to a directory where the implementaion specific files will reside.
-     **/
-    IDocumentStore();
-    virtual ~IDocumentStore();
-
     /**
      * Make a Document from a stored serialized data blob.
      * @param lid The local ID associated with the document.
@@ -169,7 +158,7 @@ public:
      * to avoid misuse we let the report a more conservative number here if necessary.
      * @return diskspace to be gained.
      */
-    virtual size_t getMaxCompactGain() const { return getDiskBloat(); }
+    virtual size_t getMaxCompactGain() const = 0;
 
     /**
      * Returns statistics about the cache.
diff --git a/searchlib/src/vespa/searchlib/docstore/logdatastore.h b/searchlib/src/vespa/searchlib/docstore/logdatastore.h
index 0e11b88a178..f43dc96fac9 100644
--- a/searchlib/src/vespa/searchlib/docstore/logdatastore.h
+++ b/searchlib/src/vespa/searchlib/docstore/logdatastore.h
@@ -111,9 +111,6 @@ public:
     size_t getDiskBloat() const override;
     size_t getMaxCompactGain() const override;
 
-    /**
-     * Will compact the docsummary up to a lower limit of 5% bloat.
-     */
     void compact(uint64_t syncToken);
 
     const Config & getConfig() const { return _config; }