summaryrefslogtreecommitdiffstats
path: root/searchcore
diff options
context:
space:
mode:
Diffstat (limited to 'searchcore')
-rw-r--r--searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.cpp6
-rw-r--r--searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.h7
2 files changed, 4 insertions, 9 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.cpp
index beaf719dc5c..de5c54bafa0 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.cpp
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.cpp
@@ -50,11 +50,7 @@ UpdateOperation::UpdateOperation(const BucketId &bucketId,
void
UpdateOperation::serializeUpdate(vespalib::nbostream &os) const
{
- if (getType() == FeedOperation::UPDATE_42) {
- _upd->serialize42(os);
- } else {
- _upd->serializeHEAD(os);
- }
+ _upd->serializeHEAD(os);
}
void
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.h b/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.h
index 7886231af82..0741357678a 100644
--- a/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.h
+++ b/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.h
@@ -15,8 +15,7 @@ class UpdateOperation : public DocumentOperation
private:
using DocumentUpdateSP = std::shared_ptr<document::DocumentUpdate>;
DocumentUpdateSP _upd;
- UpdateOperation(Type type,
- const document::BucketId &bucketId,
+ UpdateOperation(Type type, const document::BucketId &bucketId,
const storage::spi::Timestamp &timestamp,
const DocumentUpdateSP &upd);
void serializeUpdate(vespalib::nbostream &os) const;
@@ -27,12 +26,12 @@ public:
UpdateOperation(const document::BucketId &bucketId,
const storage::spi::Timestamp &timestamp,
const DocumentUpdateSP &upd);
- virtual ~UpdateOperation() {}
+ ~UpdateOperation() override {}
const DocumentUpdateSP &getUpdate() const { return _upd; }
void serialize(vespalib::nbostream &os) const override;
void deserialize(vespalib::nbostream &is, const document::DocumentTypeRepo &repo) override;
void deserializeUpdate(const document::DocumentTypeRepo &repo);
- virtual vespalib::string toString() const override;
+ vespalib::string toString() const override;
static UpdateOperation makeOldUpdate(const document::BucketId &bucketId,
const storage::spi::Timestamp &timestamp,
const DocumentUpdateSP &upd);