Improve naming of classes used to handle bucket info requests.

2 files changed, 7 insertions, 7 deletions

diff --git a/storage/src/vespa/storage/bucketdb/bucketmanager.cpp b/storage/src/vespa/storage/bucketdb/bucketmanager.cpp
index 5a0aaedea22..5e7cf4af046 100644
--- a/storage/src/vespa/storage/bucketdb/bucketmanager.cpp
+++ b/storage/src/vespa/storage/bucketdb/bucketmanager.cpp
@@ -266,7 +266,7 @@ void BucketManager::run(framework::ThreadHandle& thread)
     framework::MilliSecTime timeToCheckMinUsedBits(0);
     while (!thread.interrupted()) {
         bool didWork = false;
-        BucketInfoMap infoReqs;
+        BucketInfoRequestMap infoReqs;
         {
             vespalib::MonitorGuard monitor(_workerMonitor);
             infoReqs.swap(_bucketInfoRequests);
@@ -499,7 +499,7 @@ BucketManager::leaveQueueProtectedSection(ScopedQueueDispatchGuard& queueGuard)
 
 bool
 BucketManager::processRequestBucketInfoCommands(document::BucketSpace bucketSpace,
-                                                BucketInfoList &reqs)
+                                                BucketInfoRequestList &reqs)
 {
     if (reqs.empty()) return false;
 
diff --git a/storage/src/vespa/storage/bucketdb/bucketmanager.h b/storage/src/vespa/storage/bucketdb/bucketmanager.h
index 474c716686e..3b71230a8ed 100644
--- a/storage/src/vespa/storage/bucketdb/bucketmanager.h
+++ b/storage/src/vespa/storage/bucketdb/bucketmanager.h
@@ -37,9 +37,9 @@ class BucketManager : public StorageLinkQueued,
 {
 public:
     /** Type used for message queues */
-    using CommandList = std::list<std::shared_ptr<api::StorageCommand> >;
-    using BucketInfoList = std::list<std::shared_ptr<api::RequestBucketInfoCommand> >;
-    using BucketInfoMap = std::unordered_map<document::BucketSpace, BucketInfoList, document::BucketSpace::hash>;
+    using CommandList = std::list<std::shared_ptr<api::StorageCommand>>;
+    using BucketInfoRequestList = std::list<std::shared_ptr<api::RequestBucketInfoCommand>>;
+    using BucketInfoRequestMap = std::unordered_map<document::BucketSpace, BucketInfoRequestList, document::BucketSpace::hash>;
 
 private:
     config::ConfigUri _configUri;
@@ -47,7 +47,7 @@ private:
     uint32_t _chunkLevel;
     mutable vespalib::Lock _stateAccess;
     framework::MemoryToken::UP _bucketDBMemoryToken;
-    BucketInfoMap _bucketInfoRequests;
+    BucketInfoRequestMap _bucketInfoRequests;
 
     /**
      * We have our own thread running, which we use to send messages down.
@@ -133,7 +133,7 @@ private:
 
     bool onRequestBucketInfo(const std::shared_ptr<api::RequestBucketInfoCommand>&) override;
     bool processRequestBucketInfoCommands(document::BucketSpace bucketSpace,
-                                          BucketInfoList &reqs);
+                                          BucketInfoRequestList &reqs);
 
     /**
      * Enqueue reply and add its bucket to the set of conflicting buckets iff