diff options
| author | Henning Baldersheim <balder@oath.com> | 2018-03-21 14:31:11 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@oath.com> | 2018-04-09 14:19:49 +0200 |
| commit | 6eb0661fab0c1d878151c4aa1ad21d958523ff08 (patch) | |
| tree | 99c0a690073c9792dbca631a6eb27151bd753d39 /storage | |
| parent | 877fe5a7120e2b5084581f7c1c0f6fc2cf364820 (diff) | |
Remove unused includes.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp | 2 | ||||
| -rw-r--r-- | storage/src/vespa/storage/persistence/persistencethread.cpp | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp index 0c84010dfd9..e7a7fffc95b 100644 --- a/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp +++ b/storage/src/vespa/storage/persistence/filestorage/filestormanager.cpp @@ -14,8 +14,6 @@ #include <vespa/storage/storageutil/log.h> #include <vespa/storageapi/message/batch.h> #include <vespa/storageapi/message/bucketsplitting.h> -#include <vespa/storageapi/message/persistence.h> -#include <vespa/storageapi/message/removelocation.h> #include <vespa/storageapi/message/state.h> #include <vespa/vespalib/stllike/hash_map.hpp> #include <vespa/vespalib/util/stringfmt.h> diff --git a/storage/src/vespa/storage/persistence/persistencethread.cpp b/storage/src/vespa/storage/persistence/persistencethread.cpp index 130fb91e199..f078add35a3 100644 --- a/storage/src/vespa/storage/persistence/persistencethread.cpp +++ b/storage/src/vespa/storage/persistence/persistencethread.cpp @@ -635,8 +635,7 @@ PersistenceThread::handleJoinBuckets(api::JoinBucketsCommand& cmd) for (uint32_t i = 0; i < cmd.getSourceBuckets().size(); i++) { document::Bucket srcBucket(destBucket.getBucketSpace(), cmd.getSourceBuckets()[i]); uint16_t disk = (i == 0) ? lock1.disk : lock2.disk; - FileStorHandler::RemapInfo target(cmd.getBucket(), - _env._partition); + FileStorHandler::RemapInfo target(cmd.getBucket(), _env._partition); _env._fileStorHandler.remapQueueAfterJoin( FileStorHandler::RemapInfo(srcBucket, disk), target); @@ -645,8 +644,7 @@ PersistenceThread::handleJoinBuckets(api::JoinBucketsCommand& cmd) _env.getBucketDatabase(srcBucket.getBucketSpace()).get( srcBucket.getBucketId(), "join-remove-source")); if (entry.exist()) { - lastModified = std::max(lastModified, - entry->info.getLastModified()); + lastModified = std::max(lastModified, entry->info.getLastModified()); entry.remove(); } } |