summaryrefslogtreecommitdiffstats
path: root/storage
diff options
context:
space:
mode:
authorTor Egge <Tor.Egge@oath.com>2017-11-07 15:13:26 +0000
committerTor Egge <Tor.Egge@oath.com>2017-11-07 15:13:26 +0000
commit2e6ca9343ff4200ad912f67d76b9f2c24b11c936 (patch)
tree8fc89a191d230a94b2c49a2b400768414e0781a9 /storage
parent0dbec7f1961d2ee2588305d6a498e710089ebe5f (diff)
Shorten namespace name.
Diffstat (limited to 'storage')
-rw-r--r--storage/src/vespa/storage/distributor/pending_bucket_space_db_transition.h2
-rw-r--r--storage/src/vespa/storage/distributor/pending_bucket_space_db_transition_entry.h2
-rw-r--r--storage/src/vespa/storage/distributor/pendingclusterstate.h2
3 files changed, 3 insertions, 3 deletions
diff --git a/storage/src/vespa/storage/distributor/pending_bucket_space_db_transition.h b/storage/src/vespa/storage/distributor/pending_bucket_space_db_transition.h
index 04c12f9dd7d..649ce676d88 100644
--- a/storage/src/vespa/storage/distributor/pending_bucket_space_db_transition.h
+++ b/storage/src/vespa/storage/distributor/pending_bucket_space_db_transition.h
@@ -21,7 +21,7 @@ class PendingClusterState;
class PendingBucketSpaceDbTransition : public BucketDatabase::MutableEntryProcessor
{
public:
- using Entry = pendingbucketspacedbtransition::Entry;
+ using Entry = dbtransition::Entry;
using EntryList = std::vector<Entry>;
private:
using Range = std::pair<uint32_t, uint32_t>;
diff --git a/storage/src/vespa/storage/distributor/pending_bucket_space_db_transition_entry.h b/storage/src/vespa/storage/distributor/pending_bucket_space_db_transition_entry.h
index a2751275ba5..ad6e0695be1 100644
--- a/storage/src/vespa/storage/distributor/pending_bucket_space_db_transition_entry.h
+++ b/storage/src/vespa/storage/distributor/pending_bucket_space_db_transition_entry.h
@@ -4,7 +4,7 @@
#include <vespa/document/bucket/bucketid.h>
#include <vespa/storage/bucketdb/bucketcopy.h>
-namespace storage::distributor::pendingbucketspacedbtransition {
+namespace storage::distributor::dbtransition {
struct Entry {
Entry(const document::BucketId& bid,
diff --git a/storage/src/vespa/storage/distributor/pendingclusterstate.h b/storage/src/vespa/storage/distributor/pendingclusterstate.h
index 657d4f28179..b742bd3bf46 100644
--- a/storage/src/vespa/storage/distributor/pendingclusterstate.h
+++ b/storage/src/vespa/storage/distributor/pendingclusterstate.h
@@ -127,7 +127,7 @@ public:
*/
void mergeInto(BucketDatabase& db);
// Get our list of information. Only used by unit test.
- const std::vector<pendingbucketspacedbtransition::Entry>& results() const;
+ const std::vector<dbtransition::Entry>& results() const;
// Adds info from a node to our list of information. Only used by unit test.
void addNodeInfo(const document::BucketId& id, const BucketCopy& copy);