Default destructor and some style changes.

2 files changed, 20 insertions, 31 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp
index 04a1e23ef73..2d45d6aa02d 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.cpp
@@ -6,6 +6,7 @@
 #include "document_field_extractor.h"
 #include <vespa/document/base/exceptions.h>
 #include <vespa/document/datatype/documenttype.h>
+#include <vespa/document/fieldvalue/document.h>
 #include <vespa/searchcore/proton/attribute/imported_attributes_repo.h>
 #include <vespa/searchcore/proton/common/attrupdate.h>
 #include <vespa/searchlib/attribute/attributevector.hpp>
@@ -221,8 +222,8 @@ class PutTask : public vespalib::Executor::Task
     std::vector<FieldValue::UP> _fieldValues;
 public:
     PutTask(const AttributeWriter::WriteContext &wc, SerialNum serialNum, std::shared_ptr<DocumentFieldExtractor> fieldExtractor, uint32_t lid, bool immediateCommit, bool allAttributes, AttributeWriter::OnWriteDoneType onWriteDone);
-    virtual ~PutTask() override;
-    virtual void run() override;
+    ~PutTask() override;
+    void run() override;
 };
 
 PutTask::PutTask(const AttributeWriter::WriteContext &wc, SerialNum serialNum, std::shared_ptr<DocumentFieldExtractor> fieldExtractor, uint32_t lid, bool immediateCommit, bool allAttributes, AttributeWriter::OnWriteDoneType onWriteDone)
@@ -245,9 +246,7 @@ PutTask::PutTask(const AttributeWriter::WriteContext &wc, SerialNum serialNum, s
     }
 }
 
-PutTask::~PutTask()
-{
-}
+PutTask::~PutTask() = default;
 
 void
 PutTask::run()
@@ -274,8 +273,8 @@ class RemoveTask : public vespalib::Executor::Task
     std::remove_reference_t<AttributeWriter::OnWriteDoneType> _onWriteDone;
 public:
     RemoveTask(const AttributeWriter::WriteContext &wc, SerialNum serialNum, uint32_t lid, bool immediateCommit, AttributeWriter::OnWriteDoneType onWriteDone);
-    virtual ~RemoveTask() override;
-    virtual void run() override;
+    ~RemoveTask() override;
+    void run() override;
 };
 
 
@@ -288,9 +287,7 @@ RemoveTask::RemoveTask(const AttributeWriter::WriteContext &wc, SerialNum serial
 {
 }
 
-RemoveTask::~RemoveTask()
-{
-}
+RemoveTask::~RemoveTask() = default;
 
 void
 RemoveTask::run()
@@ -325,8 +322,8 @@ public:
           _immediateCommit(immediateCommit),
           _onWriteDone(onWriteDone)
     {}
-    virtual ~BatchRemoveTask() override {}
-    virtual void run() override {
+    ~BatchRemoveTask() override {}
+    void run() override {
         for (auto field : _writeCtx.getFields()) {
             auto &attr = field.getAttribute();
             if (attr.getStatus().getLastSyncToken() < _serialNum) {
@@ -348,8 +345,8 @@ class CommitTask : public vespalib::Executor::Task
     std::remove_reference_t<AttributeWriter::OnWriteDoneType> _onWriteDone;
 public:
     CommitTask(const AttributeWriter::WriteContext &wc, SerialNum serialNum, AttributeWriter::OnWriteDoneType onWriteDone);
-    virtual ~CommitTask() override;
-    virtual void run() override;
+    ~CommitTask() override;
+    void run() override;
 };
 
 
@@ -360,9 +357,7 @@ CommitTask::CommitTask(const AttributeWriter::WriteContext &wc, SerialNum serial
 {
 }
 
-CommitTask::~CommitTask()
-{
-}
+CommitTask::~CommitTask() = default;
 
 void
 CommitTask::run()
@@ -426,8 +421,7 @@ AttributeWriter::internalPut(SerialNum serialNum, const Document &doc, DocumentI
 }
 
 void
-AttributeWriter::internalRemove(SerialNum serialNum, DocumentIdT lid,
-                                bool immediateCommit,
+AttributeWriter::internalRemove(SerialNum serialNum, DocumentIdT lid, bool immediateCommit,
                                 OnWriteDoneType onWriteDone)
 {
     for (const auto &wc : _writeContexts) {
@@ -469,12 +463,8 @@ void
 AttributeWriter::put(SerialNum serialNum, const Document &doc, DocumentIdT lid,
                      bool immediateCommit, OnWriteDoneType onWriteDone)
 {
-    LOG(spam,
-        "Handle put: serial(%" PRIu64 "), docId(%s), lid(%u), document(%s)",
-        serialNum,
-        doc.getId().toString().c_str(),
-        lid,
-        doc.toString(true).c_str());
+    LOG(spam, "Handle put: serial(%" PRIu64 "), docId(%s), lid(%u), document(%s)",
+        serialNum, doc.getId().toString().c_str(), lid, doc.toString(true).c_str());
     internalPut(serialNum, doc, lid, immediateCommit, true, onWriteDone);
 }
 
@@ -482,12 +472,8 @@ void
 AttributeWriter::update(SerialNum serialNum, const Document &doc, DocumentIdT lid,
                         bool immediateCommit, OnWriteDoneType onWriteDone)
 {
-    LOG(spam,
-        "Handle update: serial(%" PRIu64 "), docId(%s), lid(%u), document(%s)",
-        serialNum,
-        doc.getId().toString().c_str(),
-        lid,
-        doc.toString(true).c_str());
+    LOG(spam, "Handle update: serial(%" PRIu64 "), docId(%s), lid(%u), document(%s)",
+        serialNum, doc.getId().toString().c_str(), lid, doc.toString(true).c_str());
     internalPut(serialNum, doc, lid, immediateCommit, false, onWriteDone);
 }
 
diff --git a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.h b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.h
index f7e89a0a435..bed2a7cb23d 100644
--- a/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.h
+++ b/searchcore/src/vespa/searchcore/proton/attribute/attribute_writer.h
@@ -4,6 +4,9 @@
 #include "i_attribute_manager.h"
 #include "i_attribute_writer.h"
 #include <vespa/searchcore/proton/common/commit_time_tracker.h>
+#include <vespa/document/base/fieldpath.h>
+
+namespace document { class DocumentType; }
 
 namespace proton {