diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-20 18:27:44 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-08-21 20:27:38 +0000 |
| commit | e931d5321e5717a2d6ecca32a0b8880e0e29caa3 (patch) | |
| tree | cbc1c88a6e148c452ada02eb481b925e5f2bf4e8 /searchcore | |
| parent | c389cb6654969771e2b3d41790499ec21b09c905 (diff) | |
Remove v6/v7 on c++ side too
Diffstat (limited to 'searchcore')
3 files changed, 3 insertions, 6 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/moveoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/moveoperation.cpp index 598ad1e4440..4d73d7c993f 100644 --- a/searchcore/src/vespa/searchcore/proton/feedoperation/moveoperation.cpp +++ b/searchcore/src/vespa/searchcore/proton/feedoperation/moveoperation.cpp @@ -30,7 +30,7 @@ MoveOperation::MoveOperation(const BucketId &bucketId, setDbDocumentId(DbDocumentId(targetSubDbId, 0u)); } -MoveOperation::~MoveOperation() { } +MoveOperation::~MoveOperation() = default; void MoveOperation::serialize(vespalib::nbostream &os) const diff --git a/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.cpp b/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.cpp index dc83848152c..75086f7a2dd 100644 --- a/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.cpp +++ b/searchcore/src/vespa/searchcore/proton/feedoperation/updateoperation.cpp @@ -53,9 +53,7 @@ UpdateOperation::serializeUpdate(vespalib::nbostream &os) const void UpdateOperation::deserializeUpdate(vespalib::nbostream && is, const document::DocumentTypeRepo &repo) { - _upd = (getType() == UPDATE_42) - ? DocumentUpdate::create42(repo, is) - : DocumentUpdate::createHEAD(repo, std::move(is)); + _upd = DocumentUpdate::createHEAD(repo, std::move(is)); } void diff --git a/searchcore/src/vespa/searchcore/proton/server/replaypacketdispatcher.cpp b/searchcore/src/vespa/searchcore/proton/server/replaypacketdispatcher.cpp index 447bd0d8624..92b59a678cc 100644 --- a/searchcore/src/vespa/searchcore/proton/server/replaypacketdispatcher.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/replaypacketdispatcher.cpp @@ -40,8 +40,7 @@ ReplayPacketDispatcher::replayEntry(const Packet::Entry &entry) RemoveOperation op; replay(op, is, entry); break; - } case FeedOperation::UPDATE_42: - case FeedOperation::UPDATE: { + } case FeedOperation::UPDATE: { UpdateOperation op(static_cast<FeedOperation::Type>(entry.type())); replay(op, is, entry); break; |