summaryrefslogtreecommitdiffstats
path: root/searchlib
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2020-10-08 19:29:36 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2020-10-08 21:56:34 +0000
commita4d0cd759eed68318afebbaddbc4baddc70416e2 (patch)
treeec9e220d3f14e81e14a046e449b0bb6478edce38 /searchlib
parent56206b719c3936df7111593165bd34e45aa76ee5 (diff)
Use std::mutex for the hash lock
Diffstat (limited to 'searchlib')
-rw-r--r--searchlib/src/vespa/searchlib/docstore/visitcache.cpp4
-rw-r--r--searchlib/src/vespa/searchlib/docstore/visitcache.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/searchlib/src/vespa/searchlib/docstore/visitcache.cpp b/searchlib/src/vespa/searchlib/docstore/visitcache.cpp
index 6990a0a3ed7..c3f4214fb60 100644
--- a/searchlib/src/vespa/searchlib/docstore/visitcache.cpp
+++ b/searchlib/src/vespa/searchlib/docstore/visitcache.cpp
@@ -167,7 +167,7 @@ VisitCache::reconfigure(size_t cacheSize, const CompressionConfig &compression)
VisitCache::Cache::IdSet
-VisitCache::Cache::findSetsContaining(const LockGuard &, const KeySet & keys) const {
+VisitCache::Cache::findSetsContaining(const UniqueLock &, const KeySet & keys) const {
IdSet found;
for (uint32_t subKey : keys.getKeys()) {
const auto foundLid = _lid2Id.find(subKey);
@@ -194,7 +194,7 @@ VisitCache::Cache::readSet(const KeySet & key)
}
void
-VisitCache::Cache::locateAndInvalidateOtherSubsets(const LockGuard & cacheGuard, const KeySet & keys)
+VisitCache::Cache::locateAndInvalidateOtherSubsets(const UniqueLock & cacheGuard, const KeySet & keys)
{
// Due to the implementation of insert where the global lock is released and the fact
// that 2 overlapping keysets kan have different keys and use different ValueLock
diff --git a/searchlib/src/vespa/searchlib/docstore/visitcache.h b/searchlib/src/vespa/searchlib/docstore/visitcache.h
index 7aa264bda02..430481acd4c 100644
--- a/searchlib/src/vespa/searchlib/docstore/visitcache.h
+++ b/searchlib/src/vespa/searchlib/docstore/visitcache.h
@@ -150,12 +150,12 @@ private:
CompressedBlobSet readSet(const KeySet & keys);
void removeKey(uint32_t key);
private:
- void locateAndInvalidateOtherSubsets(const vespalib::LockGuard & cacheGuard, const KeySet & keys);
+ void locateAndInvalidateOtherSubsets(const UniqueLock & cacheGuard, const KeySet & keys);
using IdSet = vespalib::hash_set<uint64_t>;
using Parent = vespalib::cache<CacheParams>;
using LidUniqueKeySetId = vespalib::hash_map<uint32_t, uint64_t>;
using IdKeySetMap = vespalib::hash_map<uint64_t, KeySet>;
- IdSet findSetsContaining(const vespalib::LockGuard &, const KeySet & keys) const;
+ IdSet findSetsContaining(const UniqueLock &, const KeySet & keys) const;
void onInsert(const K & key) override;
void onRemove(const K & key) override;
LidUniqueKeySetId _lid2Id;