aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGeir Storli <geirstorli@yahoo.no>2016-11-01 17:14:44 +0100
committerGitHub <noreply@github.com>2016-11-01 17:14:44 +0100
commit3d18773cf5357250cb2d35d6e8c13477db6e20a3 (patch)
treed06385754514d774b50c142d77a087b4944180c2
parentf7b0d8153a6b6ced9dbe9968b6aa427eb7dca359 (diff)
parent7aa44de797e859b87fe2b5b8c1c90cdf15ee4a8f (diff)
Merge pull request #980 from yahoo/balder/jira-5223
Keep the readguard until docsumfetching is complete to avoid identity…
-rw-r--r--searchcore/src/vespa/searchcore/proton/server/searchview.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/searchcore/src/vespa/searchcore/proton/server/searchview.cpp b/searchcore/src/vespa/searchcore/proton/server/searchview.cpp
index e73ef2549df..8ce9f88020f 100644
--- a/searchcore/src/vespa/searchcore/proton/server/searchview.cpp
+++ b/searchcore/src/vespa/searchcore/proton/server/searchview.cpp
@@ -112,11 +112,8 @@ SearchView::getDocsums(const DocsumRequest & req)
req.resultClassName.c_str(), req.hits.size());
return createEmptyReply(req);
}
- { // convert from gids to lids
- IDocumentMetaStoreContext::IReadGuard::UP readGuard =
- _matchView->getDocumentMetaStore()->getReadGuard();
- convertGidsToLids(req, readGuard->get(), _matchView->getDocIdLimit().get());
- }
+ IDocumentMetaStoreContext::IReadGuard::UP readGuard = _matchView->getDocumentMetaStore()->getReadGuard();
+ convertGidsToLids(req, readGuard->get(), _matchView->getDocIdLimit().get());
IDocsumStore::UP store(_summarySetup->createDocsumStore(req.resultClassName));
Matcher::SP matcher = _matchView->getMatcher(req.ranking);
MatchContext::UP mctx = _matchView->createContext();