- If document type has been resolved, use if for test-and-set too.

- Inline small frequently called methods.

8 files changed, 15 insertions, 45 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/common/dbdocumentid.cpp b/searchcore/src/vespa/searchcore/proton/common/dbdocumentid.cpp
index 3b1ad4afaec..b8908d7b09e 100644
--- a/searchcore/src/vespa/searchcore/proton/common/dbdocumentid.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/dbdocumentid.cpp
@@ -4,27 +4,6 @@
 
 namespace proton {
 
-DbDocumentId::DbDocumentId()
-    : _subDbId(0),
-      _lid(0)
-{
-}
-
-
-DbDocumentId::DbDocumentId(search::DocumentIdT lid)
-    : _subDbId(0),
-      _lid(lid)
-{
-}
-
-
-DbDocumentId::DbDocumentId(uint32_t subDbId, search::DocumentIdT lid)
-    : _subDbId(subDbId),
-      _lid(lid)
-{
-}
-
-
 vespalib::nbostream &
 operator<<(vespalib::nbostream &os, const DbDocumentId &dbdId)
 {
diff --git a/searchcore/src/vespa/searchcore/proton/common/dbdocumentid.h b/searchcore/src/vespa/searchcore/proton/common/dbdocumentid.h
index ec447c66490..d6f0b5b7e8f 100644
--- a/searchcore/src/vespa/searchcore/proton/common/dbdocumentid.h
+++ b/searchcore/src/vespa/searchcore/proton/common/dbdocumentid.h
@@ -15,9 +15,12 @@ private:
     uint32_t            _subDbId; // sub document db id
     search::DocumentIdT _lid;     // local document id
 public:
-    DbDocumentId();
-    DbDocumentId(search::DocumentIdT lid);
-    DbDocumentId(uint32_t subDbId, search::DocumentIdT lid);
+    DbDocumentId() noexcept: DbDocumentId(0) {}
+    DbDocumentId(search::DocumentIdT lid) noexcept : DbDocumentId(0, lid) {}
+    DbDocumentId(uint32_t subDbId, search::DocumentIdT lid) noexcept
+        : _subDbId(subDbId),
+          _lid(lid)
+    { }
     uint32_t getSubDbId() const { return _subDbId; }
     search::DocumentIdT getLid() const { return _lid; }
     bool valid() const { return _lid != 0; }
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/CMakeLists.txt b/searchcore/src/vespa/searchcore/proton/feedoperation/CMakeLists.txt
index 4f384d1894c..853ca7a0f98 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/CMakeLists.txt
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/CMakeLists.txt
@@ -5,7 +5,6 @@ vespa_add_library(searchcore_feedoperation STATIC
     createbucketoperation.cpp
     deletebucketoperation.cpp
     documentoperation.cpp
-    feedoperation.cpp
     joinbucketsoperation.cpp
     lidvectorcontext.cpp
     moveoperation.cpp
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.cpp
index 56224889b78..1f19c99a2a4 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.cpp
@@ -13,7 +13,7 @@ using vespalib::make_string;
 
 namespace proton {
 
-DocumentOperation::DocumentOperation(Type type)
+DocumentOperation::DocumentOperation(Type type) noexcept
     : FeedOperation(type),
       _bucketId(),
       _timestamp(),
@@ -26,7 +26,7 @@ DocumentOperation::DocumentOperation(Type type)
 }
 
 
-DocumentOperation::DocumentOperation(Type type, BucketId bucketId, Timestamp timestamp)
+DocumentOperation::DocumentOperation(Type type, BucketId bucketId, Timestamp timestamp) noexcept
     : FeedOperation(type),
       _bucketId(bucketId),
       _timestamp(timestamp),
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.h
index 044d44b8276..764ba1886a9 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.h
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/documentoperation.h
@@ -20,9 +20,9 @@ protected:
     storage::spi::Timestamp _prevTimestamp;
     mutable uint32_t        _serializedDocSize; // Set by serialize()/deserialize()
 
-    DocumentOperation(Type type);
+    DocumentOperation(Type type) noexcept;
 
-    DocumentOperation(Type type, document::BucketId bucketId, storage::spi::Timestamp timestamp);
+    DocumentOperation(Type type, document::BucketId bucketId, storage::spi::Timestamp timestamp) noexcept;
 
     void assertValidBucketId(const document::DocumentId &docId) const;
     void assertValidBucketId(const document::GlobalId &docId) const;
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/feedoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/feedoperation.cpp
deleted file mode 100644
index e748aefcf12..00000000000
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/feedoperation.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-
-#include "feedoperation.h"
-
-namespace proton {
-
-FeedOperation::FeedOperation(Type type)
-    : _type(type),
-      _serialNum(0)
-{
-}
-
-} // namespace proton
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/feedoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/feedoperation.h
index 10518c74340..62176eac5a0 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/feedoperation.h
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/feedoperation.h
@@ -45,8 +45,11 @@ private:
     SerialNum _serialNum;
 
 public:
-    FeedOperation(Type type);
-    virtual ~FeedOperation() {}
+    FeedOperation(Type type) noexcept
+        : _type(type),
+          _serialNum(0)
+    { }
+    virtual ~FeedOperation() = default;
     Type getType() const { return _type; }
     void setSerialNum(SerialNum serialNum) { _serialNum = serialNum; }
     SerialNum getSerialNum() const { return _serialNum; }
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.cpp
index 051e9726452..322e158f5f1 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.cpp
@@ -2,7 +2,6 @@
 #include "updateoperation.h"
 #include <vespa/document/base/exceptions.h>
 #include <vespa/document/update/documentupdate.h>
-#include <vespa/document/util/bytebuffer.h>
 #include <cassert>
 
 #include <vespa/log/log.h>