summaryrefslogtreecommitdiffstats
path: root/searchcore/src/tests/proton/matching
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2021-02-14 17:01:58 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2021-02-14 17:01:58 +0000
commit66e66d08e509a4eabf394442bcd7e733e228fb25 (patch)
treee9aa07ff8e2debfc93c5e430377848779b315cd5 /searchcore/src/tests/proton/matching
parent76b1a42ae483ae66a2d1e43ef749f41661754e1c (diff)
When making callbacks like notifying about new bucket show the gurad that is held.
Then this guard can used instead of possibly making a deadlock if trying to take it yourself.
Diffstat (limited to 'searchcore/src/tests/proton/matching')
-rw-r--r--searchcore/src/tests/proton/matching/matching_test.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/searchcore/src/tests/proton/matching/matching_test.cpp b/searchcore/src/tests/proton/matching/matching_test.cpp
index 0278aba41d9..f68e4956e15 100644
--- a/searchcore/src/tests/proton/matching/matching_test.cpp
+++ b/searchcore/src/tests/proton/matching/matching_test.cpp
@@ -13,6 +13,7 @@
#include <vespa/searchcore/proton/matching/querynodes.h>
#include <vespa/searchcore/proton/matching/sessionmanager.h>
#include <vespa/searchcore/proton/matching/viewresolver.h>
+#include <vespa/searchcore/proton/bucketdb/bucket_db_owner.h>
#include <vespa/searchlib/aggregation/aggregation.h>
#include <vespa/searchlib/aggregation/grouping.h>
#include <vespa/searchlib/aggregation/perdocexpression.h>
@@ -377,7 +378,7 @@ MyWorld::MyWorld()
searchContext(),
attributeContext(),
sessionManager(),
- metaStore(std::make_shared<BucketDBOwner>()),
+ metaStore(std::make_shared<bucketdb::BucketDBOwner>()),
matchingStats(),
clock(),
queryLimiter()