summaryrefslogtreecommitdiffstats
path: root/storage
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-08-19 11:11:10 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2022-08-19 11:11:10 +0000
commitd62601d2782f328adf40912b9909bcf4d6124961 (patch)
treeeb43661101e92b88d8c826fc41d55a5a521820f2 /storage
parente293065d80c26b2771f7977a5b6bbb5ac9906a0b (diff)
Hide hash implementation details.
Diffstat (limited to 'storage')
-rw-r--r--storage/src/tests/persistence/filestorage/operationabortingtest.cpp2
-rw-r--r--storage/src/vespa/storage/bucketdb/bucketmanager.h2
-rw-r--r--storage/src/vespa/storage/distributor/distributor_bucket_space.h4
3 files changed, 4 insertions, 4 deletions
diff --git a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp
index 1943bb62936..ecf4ddde911 100644
--- a/storage/src/tests/persistence/filestorage/operationabortingtest.cpp
+++ b/storage/src/tests/persistence/filestorage/operationabortingtest.cpp
@@ -163,7 +163,7 @@ OperationAbortingTest::validateReplies(DummyStorageLink& link, size_t repliesTot
namespace {
class ExplicitBucketSetPredicate : public AbortBucketOperationsCommand::AbortPredicate {
- using BucketSet = vespalib::hash_set<document::BucketId, document::BucketId::xxhash>;
+ using BucketSet = vespalib::hash_set<document::BucketId, document::BucketId::hash>;
BucketSet _bucketsToAbort;
bool doShouldAbort(const document::Bucket &bucket) const override;
diff --git a/storage/src/vespa/storage/bucketdb/bucketmanager.h b/storage/src/vespa/storage/bucketdb/bucketmanager.h
index 268513d8934..124acf1864c 100644
--- a/storage/src/vespa/storage/bucketdb/bucketmanager.h
+++ b/storage/src/vespa/storage/bucketdb/bucketmanager.h
@@ -54,7 +54,7 @@ private:
mutable std::mutex _queueProcessingLock;
using ReplyQueue = std::vector<api::StorageReply::SP>;
- using ConflictingBuckets = std::unordered_set<document::BucketId, document::BucketId::xxhash>;
+ using ConflictingBuckets = std::unordered_set<document::BucketId, document::BucketId::hash>;
ReplyQueue _queuedReplies;
ConflictingBuckets _conflictingBuckets;
/**
diff --git a/storage/src/vespa/storage/distributor/distributor_bucket_space.h b/storage/src/vespa/storage/distributor/distributor_bucket_space.h
index 51f8f134edd..3dfd1e1ce30 100644
--- a/storage/src/vespa/storage/distributor/distributor_bucket_space.h
+++ b/storage/src/vespa/storage/distributor/distributor_bucket_space.h
@@ -40,8 +40,8 @@ class DistributorBucketSpace {
bool _merges_inhibited;
std::shared_ptr<const lib::ClusterState> _pending_cluster_state;
std::vector<bool> _available_nodes;
- mutable vespalib::hash_map<document::BucketId, BucketOwnershipFlags, document::BucketId::xxhash> _ownerships;
- mutable vespalib::hash_map<document::BucketId, IdealServiceLayerNodesBundle, document::BucketId::xxhash> _ideal_nodes;
+ mutable vespalib::hash_map<document::BucketId, BucketOwnershipFlags, document::BucketId::hash> _ownerships;
+ mutable vespalib::hash_map<document::BucketId, IdealServiceLayerNodesBundle, document::BucketId::hash> _ideal_nodes;
void clear();
void enumerate_available_nodes();