Remove unused Judy-based distributor bucket database

39 files changed, 15 insertions, 379 deletions

diff --git a/storage/src/tests/common/teststorageapp.h b/storage/src/tests/common/teststorageapp.h
index e82b6d9d383..14f9aad3ab0 100644
--- a/storage/src/tests/common/teststorageapp.h
+++ b/storage/src/tests/common/teststorageapp.h
@@ -19,7 +19,6 @@
 
 #include <vespa/document/base/testdocman.h>
 #include <vespa/persistence/spi/persistenceprovider.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/bucketdb/storbucketdb.h>
 #include <vespa/storage/common/doneinitializehandler.h>
 #include <vespa/storage/common/nodestateupdater.h>
diff --git a/storage/src/tests/distributor/bucketdatabasetest.h b/storage/src/tests/distributor/bucketdatabasetest.h
index 1eb8bf86add..f9429de8b1f 100644
--- a/storage/src/tests/distributor/bucketdatabasetest.h
+++ b/storage/src/tests/distributor/bucketdatabasetest.h
@@ -2,10 +2,11 @@
 #pragma once
 
 #include <vespa/fastos/fastos.h>
+#include <vespa/document/bucket/bucketid.h>
+#include <vespa/storage/bucketdb/bucketdatabase.h>
 #include <vespa/vespalib/util/document_runnable.h>
 #include <vespa/vdstestlib/cppunit/macros.h>
 #include <cppunit/extensions/HelperMacros.h>
-#include <vespa/storage/distributor/bucketdb/judybucketdatabase.h>
 #include <vespa/storage/storageutil/utils.h>
 
 #define SETUP_DATABASE_TESTS() \
diff --git a/storage/src/tests/distributor/distributortest.cpp b/storage/src/tests/distributor/distributortest.cpp
index b51c8dd3873..69591a38c45 100644
--- a/storage/src/tests/distributor/distributortest.cpp
+++ b/storage/src/tests/distributor/distributortest.cpp
@@ -5,7 +5,6 @@
 #include <memory>
 #include <boost/assign/std/vector.hpp> // for 'operator+=()'
 #include <vespa/vdstestlib/cppunit/macros.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/distributor/idealstatemetricsset.h>
 #include <vespa/storageapi/message/persistence.h>
 #include <vespa/storageapi/message/bucketsplitting.h>
diff --git a/storage/src/vespa/storage/bucketdb/CMakeLists.txt b/storage/src/vespa/storage/bucketdb/CMakeLists.txt
index 4f1f8218da1..0a971b0d099 100644
--- a/storage/src/vespa/storage/bucketdb/CMakeLists.txt
+++ b/storage/src/vespa/storage/bucketdb/CMakeLists.txt
@@ -6,7 +6,6 @@ vespa_add_library(storage_bucketdb OBJECT
     bucketdatabase.cpp
     mapbucketdatabase.cpp
     storagebucketdbinitializer.cpp
-    distrbucketdb.cpp
     storbucketdb.cpp
     judyarray.cpp
     bucketmanager.cpp
diff --git a/storage/src/vespa/storage/bucketdb/distrbucketdb.cpp b/storage/src/vespa/storage/bucketdb/distrbucketdb.cpp
deleted file mode 100644
index d3d45360149..00000000000
--- a/storage/src/vespa/storage/bucketdb/distrbucketdb.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
-#include <vespa/log/log.h>
-#include <vespa/storage/storageutil/utils.h>
-
-LOG_SETUP(".distributor.bucketdb");
-
-namespace storage {
-namespace bucketdb {
-
-void
-DistrBucketDatabase::insert(const document::BucketId& bucket,
-                            const BucketInfo& entry,
-                            const char* clientId)
-{
-    bool preExisted;
-#ifdef USE_JUDY
-    return LockableMap<JudyMultiMap<BucketInfo> >::insert(
-                bucket.toKey(), entry, clientId, preExisted);
-#else
-    return LockableMap<StdMapWrapper<document::BucketId::Type,
-        BucketInfo> >::insert(
-                bucket.toKey(), entry, clientId, preExisted);
-#endif
-}
-
-DistrBucketDatabase::WrappedEntry
-DistrBucketDatabase::get(const document::BucketId& bucket, const char* clientId,
-                         bool createIfNonExisting)
-{
-#ifdef USE_JUDY
-    return LockableMap<JudyMultiMap<BucketInfo> >::get(
-            bucket.stripUnused().toKey(), clientId, createIfNonExisting);
-#else
-    return LockableMap<StdMapWrapper<document::BucketId::Type,
-                                     BucketInfo> >::get(
-            bucket.stripUnused().toKey(), clientId, createIfNonExisting);
-#endif
-}
-
-} // storage
-
-}
diff --git a/storage/src/vespa/storage/bucketdb/distrbucketdb.h b/storage/src/vespa/storage/bucketdb/distrbucketdb.h
deleted file mode 100644
index 0df0157501c..00000000000
--- a/storage/src/vespa/storage/bucketdb/distrbucketdb.h
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#pragma once
-
-#include <vespa/storage/bucketdb/judymultimap.h>
-#include <vespa/storage/bucketdb/lockablemap.h>
-#include <vespa/storage/bucketdb/stdmapwrapper.h>
-#include <deque>
-#include <vespa/vespalib/util/printable.h>
-#include <inttypes.h>
-#include <map>
-#include <stdexcept>
-#include <vector>
-#include <vespa/vespalib/util/sync.h>
-#include <vespa/metrics/valuemetric.h>
-#include <vespa/storage/bucketdb/bucketinfo.h>
-
-#if __WORDSIZE == 64
-  #define USE_JUDY
-#endif
-
-//#undef USE_JUDY
-
-namespace storage {
-
-namespace bucketdb {
-
-class DistrBucketDatabase
-#ifdef USE_JUDY
-    : public LockableMap<JudyMultiMap<BucketInfo> >
-#else
-    : public LockableMap<StdMapWrapper<document::BucketId::Type,
-                                       BucketInfo> >
-#endif
-{
-public:
-    DistrBucketDatabase() {};
-
-    typedef BucketInfo Entry;
-
-    void insert(const document::BucketId&,
-                const BucketInfo&,
-                const char* clientId);
-
-    WrappedEntry get(const document::BucketId& bucket,
-                     const char* clientId,
-                     bool createIfNonExisting = false);
-};
-
-}
-
-}
-
-
diff --git a/storage/src/vespa/storage/common/bucketoperationlogger.cpp b/storage/src/vespa/storage/common/bucketoperationlogger.cpp
index 7ec6e2df599..ef4ab1ac8ce 100644
--- a/storage/src/vespa/storage/common/bucketoperationlogger.cpp
+++ b/storage/src/vespa/storage/common/bucketoperationlogger.cpp
@@ -2,7 +2,7 @@
 #include <vespa/fastos/fastos.h>
 #include <vespa/storage/common/bucketoperationlogger.h>
 #include <vespa/storage/bucketdb/storbucketdb.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
+#include <vespa/storage/bucketdb/bucketcopy.h>
 #include <vespa/log/log.h>
 #include <vespa/storageapi/buckets/bucketinfo.h>
 #include <vespa/storageframework/defaultimplementation/clock/realclock.h>
@@ -228,12 +228,12 @@ void logBucketDbErase(uint64_t key, const TypeTag<bucketdb::StorageBucketInfo>&)
 void
 checkAllConsistentNodesImpliesTrusted(
         const document::BucketId& bucket,
-        const distributor::BucketInfo& entry)
+        const BucketInfo& entry)
 {
     // If all copies are consistent, they should also be trusted
     if (entry.validAndConsistent() && entry.getNodeCount() > 1) {
         for (std::size_t i = 0; i < entry.getNodeCount(); ++i) {
-            const distributor::BucketCopy& copy = entry.getNodeRef(i);
+            const BucketCopy& copy = entry.getNodeRef(i);
             if (copy.trusted() == false) {
                 LOG(warning, "Bucket DB entry %s for %s is consistent, but "
                     "contains non-trusted copy %s", entry.toString().c_str(),
@@ -245,7 +245,7 @@ checkAllConsistentNodesImpliesTrusted(
 }
 
 std::size_t
-firstTrustedNode(const distributor::BucketInfo& entry)
+firstTrustedNode(const BucketInfo& entry)
 {
     for (std::size_t i = 0; i < entry.getNodeCount(); ++i) {
         const distributor::BucketCopy& copy = entry.getNodeRef(i);
@@ -259,7 +259,7 @@ firstTrustedNode(const distributor::BucketInfo& entry)
 void
 checkNotInSyncImpliesNotTrusted(
         const document::BucketId& bucket,
-        const distributor::BucketInfo& entry)
+        const BucketInfo& entry)
 {
     // If there are copies out of sync, different copies should not
     // be set to trusted
@@ -267,12 +267,12 @@ checkNotInSyncImpliesNotTrusted(
     if (trustedNode != std::numeric_limits<std::size_t>::max()) {
         // Ensure all other trusted copies match the metadata of the
         // first trusted bucket
-        const distributor::BucketCopy& trustedCopy = entry.getNodeRef(trustedNode);
+        const BucketCopy& trustedCopy = entry.getNodeRef(trustedNode);
         for (std::size_t i = 0; i < entry.getNodeCount(); ++i) {
             if (i == trustedNode) {
                 continue;
             }
-            const distributor::BucketCopy& copy = entry.getNodeRef(i);
+            const BucketCopy& copy = entry.getNodeRef(i);
             const api::BucketInfo& copyInfo = copy.getBucketInfo();
             const api::BucketInfo& trustedInfo = trustedCopy.getBucketInfo();
             if (copy.trusted()
@@ -291,10 +291,10 @@ checkNotInSyncImpliesNotTrusted(
 void
 checkInvalidImpliesNotTrusted(
         const document::BucketId& bucket,
-        const distributor::BucketInfo& entry)
+        const BucketInfo& entry)
 {
     for (std::size_t i = 0; i < entry.getNodeCount(); ++i) {
-        const distributor::BucketCopy& copy = entry.getNodeRef(i);
+        const BucketCopy& copy = entry.getNodeRef(i);
         if (!copy.valid() && copy.trusted()) {
             LOG(warning, "Bucket DB entry %s for %s has invalid copy %s "
                 "marked as trusted", entry.toString().c_str(),
@@ -305,7 +305,7 @@ checkInvalidImpliesNotTrusted(
 }
 
 void
-logBucketDbInsert(uint64_t key, const distributor::BucketInfo& entry)
+logBucketDbInsert(uint64_t key, const BucketInfo& entry)
 {
     document::BucketId bucket(document::BucketId::keyToBucketId(key));
     LOG_BUCKET_OPERATION_NO_LOCK(
@@ -318,7 +318,7 @@ logBucketDbInsert(uint64_t key, const distributor::BucketInfo& entry)
 }
 
 void
-logBucketDbErase(uint64_t key, const TypeTag<distributor::BucketInfo>&)
+logBucketDbErase(uint64_t key, const TypeTag<BucketInfo>&)
 {
     document::BucketId bucket(document::BucketId::keyToBucketId(key));
     LOG_BUCKET_OPERATION_NO_LOCK(bucket, "bucketdb erase");
diff --git a/storage/src/vespa/storage/distributor/bucketdb/CMakeLists.txt b/storage/src/vespa/storage/distributor/bucketdb/CMakeLists.txt
index f969dfd8c3f..160f1d2ad17 100644
--- a/storage/src/vespa/storage/distributor/bucketdb/CMakeLists.txt
+++ b/storage/src/vespa/storage/distributor/bucketdb/CMakeLists.txt
@@ -1,7 +1,6 @@
 # Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 vespa_add_library(storage_distributor_bucketdb OBJECT
     SOURCES
-    judybucketdatabase.cpp
     bucketdbmetricupdater.cpp
     DEPENDS
     AFTER
diff --git a/storage/src/vespa/storage/distributor/bucketdb/judybucketdatabase.cpp b/storage/src/vespa/storage/distributor/bucketdb/judybucketdatabase.cpp
deleted file mode 100644
index 62dc47f0881..00000000000
--- a/storage/src/vespa/storage/distributor/bucketdb/judybucketdatabase.cpp
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#include <vespa/fastos/fastos.h>
-#include <vespa/storage/distributor/bucketdb/judybucketdatabase.h>
-
-namespace storage {
-
-using bucketdb::DistrBucketDatabase;
-
-namespace distributor {
-
-BucketDatabase::Entry
-JudyBucketDatabase::get(const document::BucketId& bucket) const
-{
-    DistrBucketDatabase::WrappedEntry wrp = _db.get(bucket, "", false);
-    if (!wrp.exist()) {
-        return BucketDatabase::Entry();
-    } else {
-        return BucketDatabase::Entry(bucket, *wrp);
-    }
-}
-
-void
-JudyBucketDatabase::remove(const document::BucketId& bucket)
-{
-    DistrBucketDatabase::WrappedEntry wrp = _db.get(bucket, "", false);
-    if (wrp.exist()) {
-        wrp.remove();
-    }
-}
-
-void
-JudyBucketDatabase::getParents(const document::BucketId& childBucket,
-                               std::vector<Entry>& entries) const
-{
-    bucketdb::DistrBucketDatabase::EntryMap e = _db.getContained(childBucket, "");
-
-    for (bucketdb::DistrBucketDatabase::EntryMap::iterator iter = e.begin();
-         iter != e.end();
-         ++iter) {
-        entries.push_back(BucketDatabase::Entry(iter->first,
-                                                *iter->second));
-    }
-}
-
-void
-JudyBucketDatabase::getAll(const document::BucketId& bucket,
-                           std::vector<Entry>& entries) const
-{
-    bucketdb::DistrBucketDatabase::EntryMap e = _db.getAll(bucket, "");
-
-    for (bucketdb::DistrBucketDatabase::EntryMap::iterator iter = e.begin();
-         iter != e.end();
-         ++iter) {
-        entries.push_back(BucketDatabase::Entry(iter->first,
-                                                *iter->second));
-    }
-}
-
-void
-JudyBucketDatabase::update(const Entry& newEntry)
-{
-    DistrBucketDatabase::WrappedEntry wrp = _db.get(newEntry.getBucketId(), "", true);
-    (*wrp) = newEntry.getBucketInfo();
-    wrp.write();
-}
-
-namespace {
-
-class Iterator {
-public:
-    document::BucketId lastBucketId;
-    BucketDatabase::Entry lastEntry;
-
-
-    Iterator(const document::BucketId& b)
-        : lastBucketId(b) {};
-
-    DistrBucketDatabase::Decision operator()(document::BucketId::Type key,
-                                             DistrBucketDatabase::Entry& info)
-    {
-        document::BucketId bucketId(document::BucketId::keyToBucketId(key));
-
-        if (lastBucketId == bucketId) {
-            return DistrBucketDatabase::CONTINUE;
-        }
-
-        lastEntry = BucketDatabase::Entry(bucketId, info);
-        return DistrBucketDatabase::ABORT;
-    }
-
-};
-
-}
-
-void
-JudyBucketDatabase::forEach(EntryProcessor& processor,
-                            const document::BucketId& last) const
-{
-    document::BucketId curr = last;
-
-    JudyBucketDatabase& mutableSelf(const_cast<JudyBucketDatabase&>(*this));
-    Entry currEntry;
-    while ((currEntry = mutableSelf.getNextEntry(curr)).valid()) {
-        
-        bool continueProcessing = processor.process(currEntry);
-        if (!continueProcessing) {
-            break;
-        }
-        curr = currEntry.getBucketId();
-    }
-}
-
-BucketDatabase::Entry
-JudyBucketDatabase::getNextEntry(const document::BucketId& curr)
-{
-    return upperBound(curr);
-}
-
-void
-JudyBucketDatabase::forEach(MutableEntryProcessor& processor,
-                            const document::BucketId& last)
-{
-    document::BucketId curr = last;
-
-    Entry currEntry;
-    while ((currEntry = getNextEntry(curr)).valid()) {
-
-        Entry lastEntry = currEntry;
-        bool continueProcessing = processor.process(currEntry);
-        if (!(currEntry.getBucketInfo() == lastEntry.getBucketInfo())) {
-            update(currEntry);
-        }
-
-        if (!continueProcessing) {
-            break;
-        }
-        curr = currEntry.getBucketId();
-    }
-}
-
-uint64_t
-JudyBucketDatabase::size() const
-{
-    return _db.size();
-}
-
-void
-JudyBucketDatabase::clear()
-{
-    _db.clear();
-}
-
-// FIXME: mutates database! No read-only functionality for this in LocakableMap!
-document::BucketId
-JudyBucketDatabase::getAppropriateBucket(
-        uint16_t minBits,
-        const document::BucketId& bid)
-{
-    DistrBucketDatabase::WrappedEntry wrp =
-        _db.createAppropriateBucket(minBits, "", bid);
-    return wrp.getBucketId();
-}
-
-uint32_t
-JudyBucketDatabase::childCount(const document::BucketId&) const
-{
-    // Not implemented! Judy map for distributor is deprecated.
-    abort();
-}
-
-BucketDatabase::Entry
-JudyBucketDatabase::upperBound(const document::BucketId& value) const
-{
-    Iterator iter(value);
-    _db.all(iter, "", value.toKey());
-    return iter.lastEntry;
-}
-
-void
-JudyBucketDatabase::print(std::ostream& out, bool verbose,
-                          const std::string& indent) const
-{
-    (void) out; (void) verbose; (void) indent;
-}
-
-}
-}
diff --git a/storage/src/vespa/storage/distributor/bucketdb/judybucketdatabase.h b/storage/src/vespa/storage/distributor/bucketdb/judybucketdatabase.h
deleted file mode 100644
index a50a32d5937..00000000000
--- a/storage/src/vespa/storage/distributor/bucketdb/judybucketdatabase.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-#pragma once
-
-#include <vespa/storage/bucketdb/bucketdatabase.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
-
-namespace storage {
-namespace distributor {
-
-class JudyBucketDatabase : public BucketDatabase
-{
-public:
-    virtual Entry get(const document::BucketId& bucket) const;
-    virtual void remove(const document::BucketId& bucket);
-    virtual void getParents(const document::BucketId& childBucket,
-                            std::vector<Entry>& entries) const;
-    virtual void getAll(const document::BucketId& bucket,
-                        std::vector<Entry>& entries) const;
-    virtual void update(const Entry& newEntry);
-    virtual void forEach(EntryProcessor&,
-                         const document::BucketId& after) const;
-    virtual void forEach(MutableEntryProcessor&,
-                         const document::BucketId& after);
-    uint64_t size() const;
-    void clear();
-
-    // FIXME: remove! mutates internal database!
-    document::BucketId getAppropriateBucket(
-            uint16_t minBits,
-            const document::BucketId& bid);
-
-    uint32_t childCount(const document::BucketId&) const override;
-
-    Entry upperBound(const document::BucketId& bucket) const override;
-
-    virtual void print(std::ostream& out, bool verbose,
-                       const std::string& indent) const;
-
-private:
-    mutable bucketdb::DistrBucketDatabase _db;
-
-    Entry getNextEntry(const document::BucketId& id);
-};
-
-}
-}
-
diff --git a/storage/src/vespa/storage/distributor/bucketdbupdater.cpp b/storage/src/vespa/storage/distributor/bucketdbupdater.cpp
index 6ecb8dd9276..b7235c4f13d 100644
--- a/storage/src/vespa/storage/distributor/bucketdbupdater.cpp
+++ b/storage/src/vespa/storage/distributor/bucketdbupdater.cpp
@@ -6,7 +6,6 @@
 #include <vespa/storageapi/message/state.h>
 #include <vespa/storageapi/message/bucket.h>
 #include <vespa/log/log.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storageapi/message/persistence.h>
 #include <vespa/storageapi/message/removelocation.h>
 #include <vespa/storageapi/message/multioperation.h>
diff --git a/storage/src/vespa/storage/distributor/bucketdbupdater.h b/storage/src/vespa/storage/distributor/bucketdbupdater.h
index 01fae03f44d..6c50809184e 100644
--- a/storage/src/vespa/storage/distributor/bucketdbupdater.h
+++ b/storage/src/vespa/storage/distributor/bucketdbupdater.h
@@ -6,7 +6,6 @@
 #include <vespa/document/bucket/bucketid.h>
 #include <vespa/storageapi/messageapi/returncode.h>
 #include <vespa/storageapi/message/bucket.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/vdslib/state/clusterstate.h>
 #include <vespa/storage/common/storagelink.h>
 #include <vespa/storageframework/storageframework.h>
diff --git a/storage/src/vespa/storage/distributor/distributorcomponent.cpp b/storage/src/vespa/storage/distributor/distributorcomponent.cpp
index a8e5a380b8e..a2cca6a830b 100644
--- a/storage/src/vespa/storage/distributor/distributorcomponent.cpp
+++ b/storage/src/vespa/storage/distributor/distributorcomponent.cpp
@@ -4,7 +4,6 @@
 #include <vespa/log/log.h>
 #include <vespa/vdslib/distribution/distribution.h>
 #include <vespa/storageapi/messageapi/storagereply.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/common/bucketoperationlogger.h>
 
 LOG_SETUP(".distributorstoragelink");
diff --git a/storage/src/vespa/storage/distributor/distributorcomponent.h b/storage/src/vespa/storage/distributor/distributorcomponent.h
index fbf773e7fff..9efa4c5186b 100644
--- a/storage/src/vespa/storage/distributor/distributorcomponent.h
+++ b/storage/src/vespa/storage/distributor/distributorcomponent.h
@@ -6,7 +6,6 @@
 #include <vespa/vdslib/state/clusterstate.h>
 #include <vespa/storageapi/messageapi/storagecommand.h>
 #include <vespa/storageapi/buckets/bucketinfo.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/common/distributorcomponent.h>
 #include <vespa/storage/distributor/statechecker.h>
 #include <vespa/storage/storageutil/utils.h>
diff --git a/storage/src/vespa/storage/distributor/externaloperationhandler.h b/storage/src/vespa/storage/distributor/externaloperationhandler.h
index f8c88c31604..0541faa7368 100644
--- a/storage/src/vespa/storage/distributor/externaloperationhandler.h
+++ b/storage/src/vespa/storage/distributor/externaloperationhandler.h
@@ -4,7 +4,6 @@
 #include <vespa/document/bucket/bucketid.h>
 #include <vespa/document/bucket/bucketidfactory.h>
 #include <vespa/vdslib/state/clusterstate.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/distributor/distributorcomponent.h>
 #include <vespa/storage/distributor/visitormetricsset.h>
 #include <vespa/storageapi/messageapi/messagehandler.h>
diff --git a/storage/src/vespa/storage/distributor/idealstatemanager.h b/storage/src/vespa/storage/distributor/idealstatemanager.h
index 7dba4102466..0fc29cf834a 100644
--- a/storage/src/vespa/storage/distributor/idealstatemanager.h
+++ b/storage/src/vespa/storage/distributor/idealstatemanager.h
@@ -4,7 +4,6 @@
 #include <deque>
 #include <map>
 #include <set>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/distributor/distributorcomponent.h>
 #include <vespa/storage/distributor/statechecker.h>
 #include <vespa/storage/distributor/maintenance/maintenanceprioritygenerator.h>
diff --git a/storage/src/vespa/storage/distributor/messagetracker.h b/storage/src/vespa/storage/distributor/messagetracker.h
index eb41a7ccd27..991169b7ae6 100644
--- a/storage/src/vespa/storage/distributor/messagetracker.h
+++ b/storage/src/vespa/storage/distributor/messagetracker.h
@@ -4,7 +4,6 @@
 #include <vespa/storageapi/messageapi/bucketcommand.h>
 #include <vespa/storageapi/messageapi/bucketreply.h>
 #include <vespa/storage/distributor/distributormetricsset.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/common/messagesender.h>
 
 namespace storage {
diff --git a/storage/src/vespa/storage/distributor/operations/external/getoperation.cpp b/storage/src/vespa/storage/distributor/operations/external/getoperation.cpp
index 883fd3809d6..20988bcee27 100644
--- a/storage/src/vespa/storage/distributor/operations/external/getoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/external/getoperation.cpp
@@ -4,7 +4,6 @@
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/storageapi/message/persistence.h>
 #include <vespa/log/log.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/distributor/distributorcomponent.h>
 #include <vespa/storage/distributor/distributormetricsset.h>
 #include <vespa/vdslib/state/nodestate.h>
diff --git a/storage/src/vespa/storage/distributor/operations/external/getoperation.h b/storage/src/vespa/storage/distributor/operations/external/getoperation.h
index 6af02abe144..3a0c1dbebc3 100644
--- a/storage/src/vespa/storage/distributor/operations/external/getoperation.h
+++ b/storage/src/vespa/storage/distributor/operations/external/getoperation.h
@@ -3,7 +3,7 @@
 
 #include <vespa/storageapi/defs.h>
 #include <vespa/storage/distributor/operations/operation.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
+#include <vespa/storage/bucketdb/bucketcopy.h>
 #include <vespa/storageapi/messageapi/storagemessage.h>
 
 namespace document {
diff --git a/storage/src/vespa/storage/distributor/operations/external/multioperationoperation.cpp b/storage/src/vespa/storage/distributor/operations/external/multioperationoperation.cpp
index ab4bdfbd3dd..9d056eb0fd0 100644
--- a/storage/src/vespa/storage/distributor/operations/external/multioperationoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/external/multioperationoperation.cpp
@@ -2,7 +2,6 @@
 #include <vespa/fastos/fastos.h>
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/log/log.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/distributor/distributormetricsset.h>
 #include <vespa/storage/distributor/operations/external/multioperationoperation.h>
 #include <vespa/storage/distributor/operations/external/putoperation.h>
diff --git a/storage/src/vespa/storage/distributor/operations/external/putoperation.cpp b/storage/src/vespa/storage/distributor/operations/external/putoperation.cpp
index 51198043775..f4a2f9f0307 100644
--- a/storage/src/vespa/storage/distributor/operations/external/putoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/external/putoperation.cpp
@@ -4,7 +4,6 @@
 
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/log/log.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/distributor/activecopy.h>
 #include <vespa/storage/distributor/distributorcomponent.h>
 #include <vespa/storage/distributor/distributormetricsset.h>
diff --git a/storage/src/vespa/storage/distributor/operations/external/removelocationoperation.cpp b/storage/src/vespa/storage/distributor/operations/external/removelocationoperation.cpp
index 5adaa2b8cc1..9726200b588 100644
--- a/storage/src/vespa/storage/distributor/operations/external/removelocationoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/external/removelocationoperation.cpp
@@ -5,7 +5,6 @@
 #include <vespa/document/repo/documenttyperepo.h>
 #include <vespa/document/select/parser.h>
 #include <vespa/log/log.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/distributor/distributormetricsset.h>
 #include <vespa/storage/distributor/operations/external/removelocationoperation.h>
 #include <vespa/storageapi/message/removelocation.h>
diff --git a/storage/src/vespa/storage/distributor/operations/external/removeoperation.cpp b/storage/src/vespa/storage/distributor/operations/external/removeoperation.cpp
index b6d575071a2..596debf54a6 100644
--- a/storage/src/vespa/storage/distributor/operations/external/removeoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/external/removeoperation.cpp
@@ -4,7 +4,6 @@
 #include <vespa/document/fieldvalue/document.h>
 #include <vespa/storageapi/message/persistence.h>
 #include <vespa/log/log.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/distributor/distributormetricsset.h>
 
 LOG_SETUP(".distributor.operation.external.remove");
diff --git a/storage/src/vespa/storage/distributor/operations/external/statbucketoperation.cpp b/storage/src/vespa/storage/distributor/operations/external/statbucketoperation.cpp
index b3a7ec4805e..c54598b7a76 100644
--- a/storage/src/vespa/storage/distributor/operations/external/statbucketoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/external/statbucketoperation.cpp
@@ -4,7 +4,6 @@
 #include <vespa/log/log.h>
 #include <vespa/storageapi/message/bucket.h>
 #include <vespa/storageapi/message/persistence.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/distributor/distributorcomponent.h>
 #include <vespa/storage/distributor/distributormetricsset.h>
 #include <vespa/storageapi/message/stat.h>
diff --git a/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp b/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp
index 72a6dede161..656ad446da7 100644
--- a/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/external/twophaseupdateoperation.cpp
@@ -5,7 +5,6 @@
 #include <vespa/storageapi/message/bucket.h>
 #include <vespa/storageapi/message/persistence.h>
 #include <vespa/log/log.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/distributor/distributormetricsset.h>
 #include <vespa/storage/distributor/operations/external/getoperation.h>
 #include <vespa/storage/distributor/operations/external/putoperation.h>
diff --git a/storage/src/vespa/storage/distributor/operations/external/updateoperation.cpp b/storage/src/vespa/storage/distributor/operations/external/updateoperation.cpp
index 57a5c968d54..d2b29a092bc 100644
--- a/storage/src/vespa/storage/distributor/operations/external/updateoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/external/updateoperation.cpp
@@ -5,7 +5,6 @@
 #include <vespa/storageapi/message/bucket.h>
 #include <vespa/storageapi/message/persistence.h>
 #include <vespa/log/log.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/distributor/distributormetricsset.h>
 
 LOG_SETUP(".distributor.callback.doc.update");
diff --git a/storage/src/vespa/storage/distributor/operations/external/visitoroperation.h b/storage/src/vespa/storage/distributor/operations/external/visitoroperation.h
index 8329d68a80c..a0aac7918e6 100644
--- a/storage/src/vespa/storage/distributor/operations/external/visitoroperation.h
+++ b/storage/src/vespa/storage/distributor/operations/external/visitoroperation.h
@@ -3,7 +3,6 @@
 
 #include <vespa/storageapi/defs.h>
 #include <vespa/storage/distributor/operations/operation.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storageapi/messageapi/storagemessage.h>
 #include <vespa/storageapi/message/visitor.h>
 #include <vespa/storage/distributor/visitormetricsset.h>
diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/garbagecollectionoperation.cpp b/storage/src/vespa/storage/distributor/operations/idealstate/garbagecollectionoperation.cpp
index 2deab309ea4..e3430f9fa0e 100644
--- a/storage/src/vespa/storage/distributor/operations/idealstate/garbagecollectionoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/idealstate/garbagecollectionoperation.cpp
@@ -3,7 +3,6 @@
 #include <vespa/storage/distributor/operations/idealstate/garbagecollectionoperation.h>
 #include <vespa/storageapi/messageapi/storagereply.h>
 #include <vespa/storageapi/message/bucket.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/distributor/idealstatemanager.h>
 #include <vespa/storage/distributor/distributor.h>
 #include <vespa/storage/distributor/pendingmessagetracker.h>
diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/idealstateoperation.h b/storage/src/vespa/storage/distributor/operations/idealstate/idealstateoperation.h
index 29e9aa7422c..3491eacf066 100644
--- a/storage/src/vespa/storage/distributor/operations/idealstate/idealstateoperation.h
+++ b/storage/src/vespa/storage/distributor/operations/idealstate/idealstateoperation.h
@@ -6,7 +6,6 @@
 #include <vespa/storageapi/messageapi/storagereply.h>
 #include <vespa/storageapi/messageapi/maintenancecommand.h>
 #include <vespa/document/bucket/bucketid.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storageframework/generic/memory/memorymanagerinterface.h>
 
 namespace storage
diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/joinoperation.cpp b/storage/src/vespa/storage/distributor/operations/idealstate/joinoperation.cpp
index bc7322b579a..5c1f906aae7 100644
--- a/storage/src/vespa/storage/distributor/operations/idealstate/joinoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/idealstate/joinoperation.cpp
@@ -4,7 +4,6 @@
 #include <vespa/storage/distributor/operations/idealstate/joinoperation.h>
 #include <vespa/storageapi/messageapi/storagereply.h>
 #include <vespa/storageapi/message/bucketsplitting.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/distributor/idealstatemanager.h>
 #include <vespa/vdslib/state/clusterstate.h>
 #include <vespa/storage/distributor/pendingmessagetracker.h>
diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.cpp b/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.cpp
index e448192abfc..f222738cd9a 100644
--- a/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/idealstate/mergeoperation.cpp
@@ -3,7 +3,6 @@
 #include <vespa/storage/distributor/operations/idealstate/mergeoperation.h>
 #include <vespa/storageapi/messageapi/storagereply.h>
 #include <vespa/storageapi/message/bucket.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/distributor/idealstatemanager.h>
 #include <vespa/storage/distributor/operations/idealstate/removebucketoperation.h>
 
diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/removebucketoperation.cpp b/storage/src/vespa/storage/distributor/operations/idealstate/removebucketoperation.cpp
index 0db8cda367a..3d0a27f5215 100644
--- a/storage/src/vespa/storage/distributor/operations/idealstate/removebucketoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/idealstate/removebucketoperation.cpp
@@ -3,7 +3,6 @@
 #include <vespa/storage/distributor/operations/idealstate/removebucketoperation.h>
 #include <vespa/storageapi/messageapi/storagereply.h>
 #include <vespa/storageapi/message/bucket.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/distributor/idealstatemanager.h>
 #include <vespa/storage/distributor/distributor.h>
 #include <vespa/storage/distributor/pendingmessagetracker.h>
diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/splitoperation.cpp b/storage/src/vespa/storage/distributor/operations/idealstate/splitoperation.cpp
index 423039f2b0c..0a37a1d1e37 100644
--- a/storage/src/vespa/storage/distributor/operations/idealstate/splitoperation.cpp
+++ b/storage/src/vespa/storage/distributor/operations/idealstate/splitoperation.cpp
@@ -3,7 +3,6 @@
 #include <vespa/storage/distributor/operations/idealstate/splitoperation.h>
 #include <vespa/storageapi/messageapi/storagereply.h>
 #include <vespa/storageapi/message/bucketsplitting.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/vdslib/state/clusterstate.h>
 #include <vespa/storage/distributor/idealstatemanager.h>
 #include <vespa/storage/common/bucketoperationlogger.h>
diff --git a/storage/src/vespa/storage/distributor/operationtargetresolver.cpp b/storage/src/vespa/storage/distributor/operationtargetresolver.cpp
index 05255eefcb6..12cf8e0ca85 100644
--- a/storage/src/vespa/storage/distributor/operationtargetresolver.cpp
+++ b/storage/src/vespa/storage/distributor/operationtargetresolver.cpp
@@ -5,7 +5,6 @@
 #include <queue>
 #include <vespa/storage/distributor/operationtargetresolver.h>
 #include <vespa/storage/distributor/bucketdb/bucketdatabase.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/vespalib/stllike/hash_set.h>
 
 namespace storage {
diff --git a/storage/src/vespa/storage/distributor/pendingclusterstate.h b/storage/src/vespa/storage/distributor/pendingclusterstate.h
index e5542b7aaa5..5ea95c2b3e4 100644
--- a/storage/src/vespa/storage/distributor/pendingclusterstate.h
+++ b/storage/src/vespa/storage/distributor/pendingclusterstate.h
@@ -4,7 +4,6 @@
 #include <vespa/storage/common/storagelink.h>
 #include <vespa/storageapi/message/bucket.h>
 #include <vespa/storageapi/message/state.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/vdslib/distribution/distribution.h>
 #include <vespa/vespalib/util/xmlserializable.h>
 #include <vespa/storage/bucketdb/bucketdatabase.h>
diff --git a/storage/src/vespa/storage/distributor/persistencemessagetracker.h b/storage/src/vespa/storage/distributor/persistencemessagetracker.h
index 3f667c146eb..b5c3e57e05e 100644
--- a/storage/src/vespa/storage/distributor/persistencemessagetracker.h
+++ b/storage/src/vespa/storage/distributor/persistencemessagetracker.h
@@ -2,7 +2,6 @@
 #pragma once
 
 #include <vespa/storage/distributor/distributormetricsset.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/distributor/distributorcomponent.h>
 #include <vespa/storage/distributor/messagetracker.h>
 #include <vespa/storageapi/messageapi/bucketinfocommand.h>
diff --git a/storage/src/vespa/storage/distributor/statechecker.h b/storage/src/vespa/storage/distributor/statechecker.h
index 6dd7f36e2a6..48f43cbd00f 100644
--- a/storage/src/vespa/storage/distributor/statechecker.h
+++ b/storage/src/vespa/storage/distributor/statechecker.h
@@ -1,7 +1,6 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 #pragma once
 
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/common/storagecomponent.h>
 #include <vespa/storage/distributor/operations/idealstate/idealstateoperation.h>
 #include <vespa/vdslib/distribution/distribution.h>
diff --git a/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.cpp b/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.cpp
index 50f9a37e55e..99b481877ca 100644
--- a/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.cpp
+++ b/storage/src/vespa/storage/frameworkimpl/thread/deadlockdetector.cpp
@@ -4,7 +4,6 @@
 #include <vespa/storage/frameworkimpl/thread/deadlockdetector.h>
 
 #include <vespa/log/log.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/bucketdb/storbucketdb.h>
 #include <vespa/storageframework/storageframework.h>
 #include <vespa/vdslib/state/nodetype.h>
diff --git a/storage/src/vespa/storage/storageserver/storagenode.h b/storage/src/vespa/storage/storageserver/storagenode.h
index 8afe3397179..7429283808c 100644
--- a/storage/src/vespa/storage/storageserver/storagenode.h
+++ b/storage/src/vespa/storage/storageserver/storagenode.h
@@ -7,9 +7,7 @@
  *
  * This class sets up the entire storage server.
  *
- * @author H?kon Humberset
- * @date 2005-05-13
- * @version $Id: storageserver.h 131081 2011-12-16 18:44:06Z lulf $
+ * @author Håkon Humberset
  */
 
 #pragma once
@@ -25,7 +23,6 @@
 #include <vespa/document/config/config-documenttypes.h>
 #include <vespa/documentapi/loadtypes/loadtypeset.h>
 #include <vespa/metrics/metrics.h>
-#include <vespa/storage/bucketdb/distrbucketdb.h>
 #include <vespa/storage/bucketdb/storbucketdb.h>
 #include <vespa/storage/common/doneinitializehandler.h>
 #include <vespa/storage/common/storagelink.h>