diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-08-03 13:31:37 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-08-03 13:31:37 +0200 |
commit | c1bd0dd140eaa0bc65852a76401e8e783a934d3a (patch) | |
tree | 330e9606721eacb374d3ef55078ddf25ce227976 /searchcore/src | |
parent | 350d9ce5166f497b985880b790c43600f811e9e4 (diff) |
Move the wait ahead of creating any tasks.
Diffstat (limited to 'searchcore/src')
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp | 2 | ||||
-rw-r--r-- | searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp index 64c717ef824..1987ba81cad 100644 --- a/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/searchable_feed_view.cpp @@ -119,7 +119,7 @@ void SearchableFeedView::performIndexPut(SerialNum serialNum, search::DocumentIdT lid, const FutureDoc & futureDoc, bool immediateCommit, OnOperationDoneType onWriteDone) { - const Document::UP & doc = std::move(futureDoc.get()); + const Document::UP & doc = futureDoc.get(); if (doc) { performIndexPut(serialNum, lid, *doc, immediateCommit, onWriteDone); } diff --git a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp index 5549cef601e..1998fe806cc 100644 --- a/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp +++ b/searchcore/src/vespa/searchcore/proton/server/storeonlyfeedview.cpp @@ -422,12 +422,10 @@ StoreOnlyFeedView::internalUpdate(FeedToken::UP token, const UpdateOperation &up FutureDoc futureDoc = promisedDoc.get_future().share(); UpdateScope updateScope(getUpdateScope(upd)); if (updateScope.hasIndexOrNonAttributeFields()) { + _pendingLidTracker.waitForConsumedLid(lid); if (updateScope._indexedFields) { updateIndexedFields(serialNum, lid, futureDoc, immediateCommit, onWriteDone); } - - _pendingLidTracker.waitForConsumedLid(lid); - if (useDocumentStore(serialNum)) { putSummary(serialNum, lid, futureDoc); } |