diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-01-04 07:58:05 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-01-04 07:58:05 +0000 |
commit | 3e55cc057f1239e695cd498cf861c0dd8d429651 (patch) | |
tree | 3b8cb91828dbaec323bda7a0fdcbf10d5615ddc6 | |
parent | 91767ed57d8f6e66b2fad8a031369220bf8d38aa (diff) |
Simplify
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp | 5 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp index 93c74a11f93..6397195da93 100644 --- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp @@ -478,7 +478,6 @@ StoreOnlyFeedView::makeUpdatedDocument(SerialNum serialNum, Lid lid, const Docum PromisedStream promisedStream) { Document::UP prevDoc = _summaryAdapter->get(lid, *_repo); - const DocumentUpdate & upd = update; Document::UP newDoc; vespalib::nbostream newStream(12345); assert(!onWriteDone->hasToken() || useDocumentStore(serialNum)); @@ -492,10 +491,10 @@ StoreOnlyFeedView::makeUpdatedDocument(SerialNum serialNum, Lid lid, const Docum // also check that this operation is marked for ignore by index // proxy. } else { - if (upd.getId() == prevDoc->getId()) { + if (update.getId() == prevDoc->getId()) { newDoc = std::move(prevDoc); if (useDocumentStore(serialNum)) { - upd.applyTo(*newDoc); + update.applyTo(*newDoc); newDoc->serialize(newStream); } } else { diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h index 636434e58a7..4c1d50232dd 100644 --- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h +++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.h @@ -189,7 +189,7 @@ private: // Ack token early if visibility delay is nonzero void considerEarlyAck(FeedToken &token); - void makeUpdatedDocument(SerialNum serialNum, Lid lid, const DocumentUpdate & upd, OnOperationDoneType onWriteDone, + void makeUpdatedDocument(SerialNum serialNum, Lid lid, const DocumentUpdate & update, OnOperationDoneType onWriteDone, PromisedDoc promisedDoc, PromisedStream promisedStream); protected: |