diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-05-31 17:27:13 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-05-31 17:27:13 +0200 |
commit | 7dfca798161801a075652c725ba342778a96aa2f (patch) | |
tree | 85673f83072e1df75ef4852b8b8bbaa378273490 /storage | |
parent | b29592fccdb22460bbb8c59ad6dd81d6cd173cde (diff) |
Does not need fastos.h
Diffstat (limited to 'storage')
43 files changed, 107 insertions, 168 deletions
diff --git a/storage/src/vespa/storage/common/hostreporter/cpureporter.cpp b/storage/src/vespa/storage/common/hostreporter/cpureporter.cpp index 59c0f1c36f3..66eb891840e 100644 --- a/storage/src/vespa/storage/common/hostreporter/cpureporter.cpp +++ b/storage/src/vespa/storage/common/hostreporter/cpureporter.cpp @@ -1,14 +1,13 @@ // 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 "cpureporter.h" +#include "kernelmetrictool.h" -#include <vespa/log/log.h> #include <vespa/vespalib/io/fileutil.h> #include <vespa/vespalib/stllike/string.h> #include <vespa/vespalib/text/stringtokenizer.h> -#include "kernelmetrictool.h" #include <array> +#include <vespa/log/log.h> LOG_SETUP(".cpureporter"); namespace storage { diff --git a/storage/src/vespa/storage/common/hostreporter/diskreporter.cpp b/storage/src/vespa/storage/common/hostreporter/diskreporter.cpp index 23db7137033..0faf400e6d7 100644 --- a/storage/src/vespa/storage/common/hostreporter/diskreporter.cpp +++ b/storage/src/vespa/storage/common/hostreporter/diskreporter.cpp @@ -1,5 +1,4 @@ // 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 "diskreporter.h" #include "kernelmetrictool.h" diff --git a/storage/src/vespa/storage/common/hostreporter/hostinfo.cpp b/storage/src/vespa/storage/common/hostreporter/hostinfo.cpp index f34b459fc51..4571c6883b3 100644 --- a/storage/src/vespa/storage/common/hostreporter/hostinfo.cpp +++ b/storage/src/vespa/storage/common/hostreporter/hostinfo.cpp @@ -1,5 +1,4 @@ // 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 "hostinfo.h" #include "hostreporter.h" diff --git a/storage/src/vespa/storage/common/hostreporter/memreporter.cpp b/storage/src/vespa/storage/common/hostreporter/memreporter.cpp index 862e1c6a8ed..cb66337ec4c 100644 --- a/storage/src/vespa/storage/common/hostreporter/memreporter.cpp +++ b/storage/src/vespa/storage/common/hostreporter/memreporter.cpp @@ -1,5 +1,4 @@ // 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 "memreporter.h" #include "kernelmetrictool.h" diff --git a/storage/src/vespa/storage/common/hostreporter/networkreporter.cpp b/storage/src/vespa/storage/common/hostreporter/networkreporter.cpp index 04a10699d0f..744cd583a8e 100644 --- a/storage/src/vespa/storage/common/hostreporter/networkreporter.cpp +++ b/storage/src/vespa/storage/common/hostreporter/networkreporter.cpp @@ -1,5 +1,5 @@ // 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 "networkreporter.h" #include "kernelmetrictool.h" #include <vespa/vespalib/text/stringtokenizer.h> diff --git a/storage/src/vespa/storage/common/hostreporter/versionreporter.cpp b/storage/src/vespa/storage/common/hostreporter/versionreporter.cpp index 670f4ef6369..5df7122ddec 100644 --- a/storage/src/vespa/storage/common/hostreporter/versionreporter.cpp +++ b/storage/src/vespa/storage/common/hostreporter/versionreporter.cpp @@ -1,5 +1,5 @@ // 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 "versionreporter.h" #include <vespa/vespalib/component/vtag.h> diff --git a/storage/src/vespa/storage/distributor/bucketgctimecalculator.cpp b/storage/src/vespa/storage/distributor/bucketgctimecalculator.cpp index 85627ddf38f..62a6ec4f3c8 100644 --- a/storage/src/vespa/storage/distributor/bucketgctimecalculator.cpp +++ b/storage/src/vespa/storage/distributor/bucketgctimecalculator.cpp @@ -1,10 +1,8 @@ // 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/bucketgctimecalculator.h> +#include "bucketgctimecalculator.h" -namespace storage { -namespace distributor { +namespace storage::distributor { bool BucketGcTimeCalculator::shouldGc(const document::BucketId& b, @@ -27,7 +25,4 @@ BucketGcTimeCalculator::shouldGc(const document::BucketId& b, return lastRunAt < (newestValid - _checkInterval); } - -} // distributor -} // storage - +} diff --git a/storage/src/vespa/storage/distributor/bucketlistmerger.cpp b/storage/src/vespa/storage/distributor/bucketlistmerger.cpp index 894a8717c8a..02bcf47e56e 100644 --- a/storage/src/vespa/storage/distributor/bucketlistmerger.cpp +++ b/storage/src/vespa/storage/distributor/bucketlistmerger.cpp @@ -1,6 +1,6 @@ // 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/bucketlistmerger.h> + +#include "bucketlistmerger.h" using namespace storage::distributor; diff --git a/storage/src/vespa/storage/distributor/clusterinformation.cpp b/storage/src/vespa/storage/distributor/clusterinformation.cpp index b6d0b19cb2b..bf37b0051e1 100644 --- a/storage/src/vespa/storage/distributor/clusterinformation.cpp +++ b/storage/src/vespa/storage/distributor/clusterinformation.cpp @@ -1,11 +1,10 @@ // 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/clusterinformation.h> + +#include "clusterinformation.h" #include <vespa/vdslib/distribution/distribution.h> #include <vespa/vdslib/state/clusterstate.h> -namespace storage { -namespace distributor { +namespace storage::distributor { bool ClusterInformation::ownsBucket(const document::BucketId& bucketId) const @@ -53,4 +52,3 @@ ClusterInformation::getStorageNodeCount() const } } -} diff --git a/storage/src/vespa/storage/distributor/distributor.cpp b/storage/src/vespa/storage/distributor/distributor.cpp index fdda56cea55..11ba7604684 100644 --- a/storage/src/vespa/storage/distributor/distributor.cpp +++ b/storage/src/vespa/storage/distributor/distributor.cpp @@ -1,18 +1,18 @@ // 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/log/log.h> -#include <vespa/storage/distributor/distributor.h> +// +#include "distributor.h" +#include "blockingoperationstarter.h" +#include "throttlingoperationstarter.h" +#include "idealstatemetricsset.h" +#include "ownership_transfer_safe_time_point_calculator.h" +#include "managed_bucket_space_repo.h" #include <vespa/storage/bucketdb/mapbucketdatabase.h> #include <vespa/storage/distributor/maintenance/simplemaintenancescanner.h> #include <vespa/storage/distributor/maintenance/simplebucketprioritydatabase.h> -#include <vespa/storage/distributor/blockingoperationstarter.h> -#include <vespa/storage/distributor/throttlingoperationstarter.h> -#include <vespa/storage/distributor/idealstatemetricsset.h> -#include <vespa/storage/distributor/ownership_transfer_safe_time_point_calculator.h> -#include <vespa/storage/distributor/managed_bucket_space_repo.h> #include <vespa/storage/common/nodestateupdater.h> #include <vespa/storage/common/hostreporter/hostinfo.h> +#include <vespa/log/log.h> LOG_SETUP(".distributor-main"); namespace storage { diff --git a/storage/src/vespa/storage/distributor/distributor_host_info_reporter.cpp b/storage/src/vespa/storage/distributor/distributor_host_info_reporter.cpp index 0c739c65425..915d90b5676 100644 --- a/storage/src/vespa/storage/distributor/distributor_host_info_reporter.cpp +++ b/storage/src/vespa/storage/distributor/distributor_host_info_reporter.cpp @@ -1,8 +1,8 @@ // 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/distributor_host_info_reporter.h> -#include <vespa/storage/distributor/min_replica_provider.h> -#include <vespa/storage/distributor/pendingmessagetracker.h> + +#include "distributor_host_info_reporter.h" +#include "min_replica_provider.h" +#include "pendingmessagetracker.h" #include <set> diff --git a/storage/src/vespa/storage/distributor/distributormessagesender.cpp b/storage/src/vespa/storage/distributor/distributormessagesender.cpp index d7b970baadd..efb18662ba2 100644 --- a/storage/src/vespa/storage/distributor/distributormessagesender.cpp +++ b/storage/src/vespa/storage/distributor/distributormessagesender.cpp @@ -1,11 +1,9 @@ // 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/distributormessagesender.h> -#include <vespa/storageapi/messageapi/storagecommand.h> -namespace storage { +#include "distributormessagesender.h" +#include <vespa/storageapi/messageapi/storagecommand.h> -namespace distributor { +namespace storage::distributor { uint64_t DistributorMessageSender::sendToNode( @@ -27,7 +25,5 @@ DistributorMessageSender::sendToNode( return msgId; } - } -} diff --git a/storage/src/vespa/storage/distributor/latency_statistics_provider.cpp b/storage/src/vespa/storage/distributor/latency_statistics_provider.cpp index 7207c4745fc..adca5773f31 100644 --- a/storage/src/vespa/storage/distributor/latency_statistics_provider.cpp +++ b/storage/src/vespa/storage/distributor/latency_statistics_provider.cpp @@ -1,6 +1,6 @@ // 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/latency_statistics_provider.h> + +#include "latency_statistics_provider.h" #include <ostream> namespace storage { diff --git a/storage/src/vespa/storage/distributor/maintenance/maintenancescheduler.cpp b/storage/src/vespa/storage/distributor/maintenance/maintenancescheduler.cpp index 5dd9567044d..8865d0443bd 100644 --- a/storage/src/vespa/storage/distributor/maintenance/maintenancescheduler.cpp +++ b/storage/src/vespa/storage/distributor/maintenance/maintenancescheduler.cpp @@ -1,12 +1,11 @@ // 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/maintenance/maintenancescheduler.h> -#include <vespa/storage/distributor/maintenance/maintenanceoperationgenerator.h> + +#include "maintenancescheduler.h" +#include "maintenanceoperationgenerator.h" #include <vespa/storage/distributor/operationstarter.h> #include <vespa/storage/distributor/operations/idealstate/idealstateoperation.h> -namespace storage { -namespace distributor { +namespace storage::distributor { MaintenanceScheduler::MaintenanceScheduler( MaintenanceOperationGenerator& operationGenerator, @@ -102,4 +101,3 @@ MaintenanceScheduler::startOperation(const PrioritizedBucket& bucket) } } -} diff --git a/storage/src/vespa/storage/distributor/maintenance/node_maintenance_stats_tracker.cpp b/storage/src/vespa/storage/distributor/maintenance/node_maintenance_stats_tracker.cpp index f107efc8d93..7a873a73bb2 100644 --- a/storage/src/vespa/storage/distributor/maintenance/node_maintenance_stats_tracker.cpp +++ b/storage/src/vespa/storage/distributor/maintenance/node_maintenance_stats_tracker.cpp @@ -1,10 +1,9 @@ // 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/maintenance/node_maintenance_stats_tracker.h> + +#include "node_maintenance_stats_tracker.h" #include <ostream> -namespace storage { -namespace distributor { +namespace storage::distributor { const NodeMaintenanceStats NodeMaintenanceStatsTracker::_emptyStats; @@ -23,6 +22,5 @@ operator<<(std::ostream& os, const NodeMaintenanceStats& stats) NodeMaintenanceStatsTracker::NodeMaintenanceStatsTracker() {} NodeMaintenanceStatsTracker::~NodeMaintenanceStatsTracker() {} -} // distributor -} // storage +} diff --git a/storage/src/vespa/storage/distributor/maintenance/prioritizedbucket.cpp b/storage/src/vespa/storage/distributor/maintenance/prioritizedbucket.cpp index 9f6c14a171a..72cac9b882e 100644 --- a/storage/src/vespa/storage/distributor/maintenance/prioritizedbucket.cpp +++ b/storage/src/vespa/storage/distributor/maintenance/prioritizedbucket.cpp @@ -1,10 +1,9 @@ // 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 "prioritizedbucket.h" #include <iostream> -#include <vespa/storage/distributor/maintenance/prioritizedbucket.h> -namespace storage { -namespace distributor { +namespace storage::distributor { const PrioritizedBucket PrioritizedBucket::INVALID = PrioritizedBucket(); @@ -16,4 +15,3 @@ operator<<(std::ostream& os, const PrioritizedBucket& bucket) } } -} diff --git a/storage/src/vespa/storage/distributor/maintenance/simplebucketprioritydatabase.cpp b/storage/src/vespa/storage/distributor/maintenance/simplebucketprioritydatabase.cpp index 93369faa32e..23774cbc3c1 100644 --- a/storage/src/vespa/storage/distributor/maintenance/simplebucketprioritydatabase.cpp +++ b/storage/src/vespa/storage/distributor/maintenance/simplebucketprioritydatabase.cpp @@ -1,11 +1,10 @@ // 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/maintenance/simplebucketprioritydatabase.h> + +#include "simplebucketprioritydatabase.h" #include <iostream> #include <sstream> -namespace storage { -namespace distributor { +namespace storage::distributor { SimpleBucketPriorityDatabase::~SimpleBucketPriorityDatabase() { @@ -140,4 +139,3 @@ SimpleBucketPriorityDatabase::toString() const } } -} diff --git a/storage/src/vespa/storage/distributor/managed_bucket_space_component.cpp b/storage/src/vespa/storage/distributor/managed_bucket_space_component.cpp index f847390a0ce..8f5055da557 100644 --- a/storage/src/vespa/storage/distributor/managed_bucket_space_component.cpp +++ b/storage/src/vespa/storage/distributor/managed_bucket_space_component.cpp @@ -1,10 +1,8 @@ // 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/managed_bucket_space_component.h> +#include "managed_bucket_space_component.h" -namespace storage { -namespace distributor { +namespace storage::distributor { ManagedBucketSpaceComponent::ManagedBucketSpaceComponent( DistributorInterface& distributor, @@ -16,5 +14,4 @@ ManagedBucketSpaceComponent::ManagedBucketSpaceComponent( { } -} // distributor -} // storage +} diff --git a/storage/src/vespa/storage/distributor/nodeinfo.cpp b/storage/src/vespa/storage/distributor/nodeinfo.cpp index 52c16dbb08d..65163037cec 100644 --- a/storage/src/vespa/storage/distributor/nodeinfo.cpp +++ b/storage/src/vespa/storage/distributor/nodeinfo.cpp @@ -1,10 +1,8 @@ // 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/nodeinfo.h> -namespace storage { +#include "nodeinfo.h" -namespace distributor { +namespace storage::distributor { NodeInfo::NodeInfo(const framework::Clock& clock) : _clock(clock) {} @@ -81,5 +79,3 @@ NodeInfo::getNode(uint16_t idx) const } } - -} diff --git a/storage/src/vespa/storage/distributor/operations/external/getoperation.cpp b/storage/src/vespa/storage/distributor/operations/external/getoperation.cpp index bbbcc4dd7e4..05c90ad9584 100644 --- a/storage/src/vespa/storage/distributor/operations/external/getoperation.cpp +++ b/storage/src/vespa/storage/distributor/operations/external/getoperation.cpp @@ -1,17 +1,15 @@ // 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/operations/external/getoperation.h> -#include <vespa/document/fieldvalue/document.h> -#include <vespa/storageapi/message/persistence.h> -#include <vespa/log/log.h> +#include "getoperation.h" #include <vespa/storage/distributor/distributorcomponent.h> #include <vespa/storage/distributor/distributormetricsset.h> +#include <vespa/storageapi/message/persistence.h> #include <vespa/vdslib/state/nodestate.h> +#include <vespa/document/fieldvalue/document.h> +#include <vespa/log/log.h> LOG_SETUP(".distributor.callback.doc.get"); -namespace storage { -namespace distributor { +namespace storage::distributor { GetOperation::GroupId::GroupId(const document::BucketId& id, uint32_t checksum, @@ -283,6 +281,4 @@ GetOperation::hasConsistentCopies() const return _responses.size() == 1; } -} // distributor -} // storage - +} diff --git a/storage/src/vespa/storage/distributor/operations/external/updateoperation.cpp b/storage/src/vespa/storage/distributor/operations/external/updateoperation.cpp index d2b29a092bc..ec4dd75197b 100644 --- a/storage/src/vespa/storage/distributor/operations/external/updateoperation.cpp +++ b/storage/src/vespa/storage/distributor/operations/external/updateoperation.cpp @@ -1,12 +1,12 @@ // 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/operations/external/updateoperation.h> -#include <vespa/document/fieldvalue/document.h> + +#include "updateoperation.h" +#include <vespa/storage/distributor/distributormetricsset.h> #include <vespa/storageapi/message/bucket.h> #include <vespa/storageapi/message/persistence.h> -#include <vespa/log/log.h> -#include <vespa/storage/distributor/distributormetricsset.h> +#include <vespa/document/fieldvalue/document.h> +#include <vespa/log/log.h> LOG_SETUP(".distributor.callback.doc.update"); diff --git a/storage/src/vespa/storage/distributor/operations/idealstate/idealstateoperation.cpp b/storage/src/vespa/storage/distributor/operations/idealstate/idealstateoperation.cpp index 257e9e53d4f..22c71d60f9f 100644 --- a/storage/src/vespa/storage/distributor/operations/idealstate/idealstateoperation.cpp +++ b/storage/src/vespa/storage/distributor/operations/idealstate/idealstateoperation.cpp @@ -1,13 +1,12 @@ // 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/operations/idealstate/idealstateoperation.h> +#include "idealstateoperation.h" #include <vespa/storage/distributor/idealstatemanager.h> -#include <vespa/log/log.h> -#include <vespa/storageapi/messageapi/maintenancecommand.h> #include <vespa/storage/distributor/pendingmessagetracker.h> #include <vespa/storage/distributor/idealstatemetricsset.h> #include <vespa/storage/distributor/pendingmessagetracker.h> +#include <vespa/storageapi/messageapi/maintenancecommand.h> +#include <vespa/log/log.h> LOG_SETUP(".distributor.operation"); using 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 5c1f906aae7..29e65bfcc00 100644 --- a/storage/src/vespa/storage/distributor/operations/idealstate/joinoperation.cpp +++ b/storage/src/vespa/storage/distributor/operations/idealstate/joinoperation.cpp @@ -1,12 +1,12 @@ // 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/operations/idealstate/joinoperation.h> +#include "joinoperation.h" +#include <vespa/storage/distributor/idealstatemanager.h> +#include <vespa/storage/distributor/pendingmessagetracker.h> #include <vespa/storageapi/messageapi/storagereply.h> #include <vespa/storageapi/message/bucketsplitting.h> -#include <vespa/storage/distributor/idealstatemanager.h> #include <vespa/vdslib/state/clusterstate.h> -#include <vespa/storage/distributor/pendingmessagetracker.h> + #include <vespa/log/log.h> LOG_SETUP(".distributor.operation.idealstate.join"); diff --git a/storage/src/vespa/storage/distributor/operations/operation.cpp b/storage/src/vespa/storage/distributor/operations/operation.cpp index 7a1929115d3..37e997d6080 100644 --- a/storage/src/vespa/storage/distributor/operations/operation.cpp +++ b/storage/src/vespa/storage/distributor/operations/operation.cpp @@ -1,21 +1,15 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/* $Id$ */ - -#include <vespa/fastos/fastos.h> +#include "operation.h" #include <vespa/storage/common/distributorcomponent.h> -#include <vespa/storage/distributor/operations/operation.h> #include <vespa/storageapi/messageapi/storagemessage.h> #include <vespa/storageapi/messageapi/storagecommand.h> #include <vespa/storageapi/messageapi/storagereply.h> #include <vespa/log/log.h> - LOG_SETUP(".distributor.callback"); -namespace storage { - -namespace distributor { +namespace storage::distributor { Operation::Operation() : _startTime(0) @@ -52,4 +46,3 @@ Operation::copyMessageSettings(const api::StorageCommand& source, api::StorageCo } -} diff --git a/storage/src/vespa/storage/distributor/sentmessagemap.cpp b/storage/src/vespa/storage/distributor/sentmessagemap.cpp index 0848de69981..7efbd3f55d2 100644 --- a/storage/src/vespa/storage/distributor/sentmessagemap.cpp +++ b/storage/src/vespa/storage/distributor/sentmessagemap.cpp @@ -1,15 +1,13 @@ // 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/sentmessagemap.h> -#include <vespa/log/log.h> +#include "sentmessagemap.h" + #include <vespa/storage/distributor/operations/operation.h> +#include <vespa/log/log.h> LOG_SETUP(".distributor.callback.map"); -namespace storage { - -namespace distributor { +namespace storage::distributor { SentMessageMap::SentMessageMap() : _map() @@ -92,5 +90,3 @@ SentMessageMap::clear() } } - -} diff --git a/storage/src/vespa/storage/distributor/statecheckers.cpp b/storage/src/vespa/storage/distributor/statecheckers.cpp index 096611e03e1..4d12318cb8f 100644 --- a/storage/src/vespa/storage/distributor/statecheckers.cpp +++ b/storage/src/vespa/storage/distributor/statecheckers.cpp @@ -1,9 +1,7 @@ // 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/statecheckers.h> -#include <vespa/log/log.h> -#include <vespa/storage/distributor/activecopy.h> +#include "statecheckers.h" +#include "activecopy.h" #include <vespa/storage/distributor/operations/idealstate/splitoperation.h> #include <vespa/storage/distributor/operations/idealstate/joinoperation.h> #include <vespa/storage/distributor/operations/idealstate/removebucketoperation.h> @@ -14,6 +12,7 @@ #include <vespa/storage/common/bucketoperationlogger.h> #include <vespa/vespalib/stllike/asciistream.h> +#include <vespa/log/log.h> LOG_SETUP(".distributor.operation.checkers"); namespace storage { diff --git a/storage/src/vespa/storage/distributor/statusreporterdelegate.cpp b/storage/src/vespa/storage/distributor/statusreporterdelegate.cpp index ecd880f2876..e2222d6fcdc 100644 --- a/storage/src/vespa/storage/distributor/statusreporterdelegate.cpp +++ b/storage/src/vespa/storage/distributor/statusreporterdelegate.cpp @@ -1,10 +1,8 @@ // 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/statusreporterdelegate.h> +#include "statusreporterdelegate.h" -namespace storage { -namespace distributor { +namespace storage::distributor { StatusReporterDelegate::StatusReporterDelegate( framework::ComponentRegister& compReg, @@ -38,5 +36,5 @@ StatusReporterDelegate::registerStatusPage() _component.registerStatusPage(*this); } -} // distributor -} // storage +} + diff --git a/storage/src/vespa/storage/storageserver/bouncer.cpp b/storage/src/vespa/storage/storageserver/bouncer.cpp index 598d84b934d..6ea898c344c 100644 --- a/storage/src/vespa/storage/storageserver/bouncer.cpp +++ b/storage/src/vespa/storage/storageserver/bouncer.cpp @@ -1,12 +1,11 @@ // 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/storageserver/bouncer.h> +#include "bouncer.h" -#include <vespa/log/log.h> #include <vespa/storageapi/message/state.h> #include <vespa/storageapi/message/persistence.h> +#include <vespa/log/log.h> LOG_SETUP(".bouncer"); namespace storage { diff --git a/storage/src/vespa/storage/storageserver/distributornodecontext.cpp b/storage/src/vespa/storage/storageserver/distributornodecontext.cpp index f44f7ecbbf2..b378ca8efa4 100644 --- a/storage/src/vespa/storage/storageserver/distributornodecontext.cpp +++ b/storage/src/vespa/storage/storageserver/distributornodecontext.cpp @@ -1,7 +1,6 @@ // 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/storageserver/distributornodecontext.h> +#include "distributornodecontext.h" namespace storage { diff --git a/storage/src/vespa/storage/storageserver/documentapiconverter.cpp b/storage/src/vespa/storage/storageserver/documentapiconverter.cpp index c2965bcddd5..ae789891852 100644 --- a/storage/src/vespa/storage/storageserver/documentapiconverter.cpp +++ b/storage/src/vespa/storage/storageserver/documentapiconverter.cpp @@ -1,6 +1,5 @@ // 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/storageserver/documentapiconverter.h> +#include "documentapiconverter.h" #include <vespa/documentapi/documentapi.h> #include <vespa/storageapi/message/visitor.h> #include <vespa/storageapi/message/datagram.h> @@ -14,10 +13,10 @@ #include <vespa/storageapi/message/batch.h> #include <vespa/messagebus/errorcode.h> #include <vespa/storageapi/messageapi/returncode.h> -#include <vespa/log/log.h> #include <vespa/vdslib/container/documentlist.h> #include <vespa/document/bucket/bucketidfactory.h> +#include <vespa/log/log.h> LOG_SETUP(".documentapiconverter"); namespace storage { diff --git a/storage/src/vespa/storage/storageserver/framework.cpp b/storage/src/vespa/storage/storageserver/framework.cpp index 1bdd3ad9e04..781f5cb0e77 100644 --- a/storage/src/vespa/storage/storageserver/framework.cpp +++ b/storage/src/vespa/storage/storageserver/framework.cpp @@ -1,7 +1,6 @@ // 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/storageserver/framework.h> +#include "framework.h" #include <vespa/storageframework/defaultimplementation/memory/prioritymemorylogic.h> diff --git a/storage/src/vespa/storage/storageserver/messagedispatcher.cpp b/storage/src/vespa/storage/storageserver/messagedispatcher.cpp index a35b2c4157d..54beb2a7ad3 100644 --- a/storage/src/vespa/storage/storageserver/messagedispatcher.cpp +++ b/storage/src/vespa/storage/storageserver/messagedispatcher.cpp @@ -1,16 +1,13 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -/* $Id$ */ +#include "messagedispatcher.h" -#include <vespa/fastos/fastos.h> -#include <vespa/storage/storageserver/messagedispatcher.h> - -#include <vespa/log/log.h> -#include <vespa/document/bucket/bucketid.h> #include <vespa/storageapi/message/state.h> #include <storageapi/messageapi/chainedcommand.h> #include <storageapi/messageapi/chainedreply.h> +#include <vespa/document/bucket/bucketid.h> +#include <vespa/log/log.h> LOG_SETUP(".message.dispatcher"); using std::shared_ptr; diff --git a/storage/src/vespa/storage/storageserver/opslogger.cpp b/storage/src/vespa/storage/storageserver/opslogger.cpp index b5d66c837c5..2a4465c62bc 100644 --- a/storage/src/vespa/storage/storageserver/opslogger.cpp +++ b/storage/src/vespa/storage/storageserver/opslogger.cpp @@ -1,11 +1,9 @@ // 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/storageserver/opslogger.h> - -#include <vespa/log/log.h> +#include "opslogger.h" #include <vespa/storageapi/message/persistence.h> +#include <vespa/log/log.h> LOG_SETUP(".operationslogger"); namespace storage { diff --git a/storage/src/vespa/storage/storageserver/priorityconverter.cpp b/storage/src/vespa/storage/storageserver/priorityconverter.cpp index ff4f2c086ce..c8cf9e5fc29 100644 --- a/storage/src/vespa/storage/storageserver/priorityconverter.cpp +++ b/storage/src/vespa/storage/storageserver/priorityconverter.cpp @@ -1,7 +1,7 @@ // 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/documentapi/messagebus/documentprotocol.h> + #include "priorityconverter.h" +#include <vespa/documentapi/messagebus/documentprotocol.h> namespace storage { diff --git a/storage/src/vespa/storage/storageserver/rpcrequestwrapper.cpp b/storage/src/vespa/storage/storageserver/rpcrequestwrapper.cpp index 46d518b90c3..797ff9260a3 100644 --- a/storage/src/vespa/storage/storageserver/rpcrequestwrapper.cpp +++ b/storage/src/vespa/storage/storageserver/rpcrequestwrapper.cpp @@ -1,7 +1,5 @@ // 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/log/log.h> -LOG_SETUP(".api.rpc.request"); + #include "rpcrequestwrapper.h" namespace storage { diff --git a/storage/src/vespa/storage/storageserver/servicelayernodecontext.cpp b/storage/src/vespa/storage/storageserver/servicelayernodecontext.cpp index afdab9b6bce..87b8c62024c 100644 --- a/storage/src/vespa/storage/storageserver/servicelayernodecontext.cpp +++ b/storage/src/vespa/storage/storageserver/servicelayernodecontext.cpp @@ -1,7 +1,6 @@ // 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/storageserver/servicelayernodecontext.h> +#include "servicelayernodecontext.h" namespace storage { diff --git a/storage/src/vespa/storage/storageserver/storagenodecontext.cpp b/storage/src/vespa/storage/storageserver/storagenodecontext.cpp index 90aefcaceae..c47ed97f879 100644 --- a/storage/src/vespa/storage/storageserver/storagenodecontext.cpp +++ b/storage/src/vespa/storage/storageserver/storagenodecontext.cpp @@ -1,7 +1,6 @@ // 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/storageserver/storagenodecontext.h> +#include "storagenodecontext.h" #include <vespa/storageframework/defaultimplementation/memory/prioritymemorylogic.h> diff --git a/storage/src/vespa/storage/storageutil/bloomfilter.cpp b/storage/src/vespa/storage/storageutil/bloomfilter.cpp index 26e9e4012d7..87498aca0d2 100644 --- a/storage/src/vespa/storage/storageutil/bloomfilter.cpp +++ b/storage/src/vespa/storage/storageutil/bloomfilter.cpp @@ -1,8 +1,8 @@ // 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 "bloomfilter.h" -#include <stdlib.h> -#include <string.h> +#include <cstdlib> +#include <cstring> BloomFilter::BloomFilter(int size, int hashes, uint32_t *buf) : _size(size), diff --git a/storage/src/vespa/storage/storageutil/palette.cpp b/storage/src/vespa/storage/storageutil/palette.cpp index 76998bd7677..f6a5c13e5b3 100644 --- a/storage/src/vespa/storage/storageutil/palette.cpp +++ b/storage/src/vespa/storage/storageutil/palette.cpp @@ -1,7 +1,6 @@ // 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/storageutil/palette.h> +#include "palette.h" #include <iostream> #include <iomanip> diff --git a/storage/src/vespa/storage/tools/analyzedistribution.cpp b/storage/src/vespa/storage/tools/analyzedistribution.cpp index 0368e46c668..a1bddac8f37 100644 --- a/storage/src/vespa/storage/tools/analyzedistribution.cpp +++ b/storage/src/vespa/storage/tools/analyzedistribution.cpp @@ -1,6 +1,6 @@ // 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/judyarray.h> #include <vespa/config/helper/configfetcher.h> #include <vespa/document/bucket/bucketidfactory.h> #include <vespa/vespalib/util/programoptions.h> @@ -8,7 +8,6 @@ #include <vespa/vdslib/distribution/distribution.h> #include <vespa/vdslib/state/clusterstate.h> #include <vespa/vdslib/state/nodestate.h> -#include <vespa/storage/bucketdb/judyarray.h> #include <iostream> #include <sstream> diff --git a/storage/src/vespa/storage/tools/storage-cmd.cpp b/storage/src/vespa/storage/tools/storage-cmd.cpp index 8b0496507c5..e73376fcbe5 100644 --- a/storage/src/vespa/storage/tools/storage-cmd.cpp +++ b/storage/src/vespa/storage/tools/storage-cmd.cpp @@ -1,9 +1,10 @@ // 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/log/log.h> -LOG_SETUP("rpc_invoke"); #include <vespa/fnet/frt/frt.h> #include <vespa/slobrok/sbmirror.h> +#include <vespa/fastos/app.h> + +#include <vespa/log/log.h> +LOG_SETUP("storage-cmd"); class RPCClient : public FastOS_Application { diff --git a/storage/src/vespa/storage/tools/throttlingsim.cpp b/storage/src/vespa/storage/tools/throttlingsim.cpp index cd9e5a29d81..9d45df9b2e5 100644 --- a/storage/src/vespa/storage/tools/throttlingsim.cpp +++ b/storage/src/vespa/storage/tools/throttlingsim.cpp @@ -1,5 +1,5 @@ // 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 "throttlingsim.h" #include <algorithm> #include <vespa/vespalib/util/stringfmt.h> diff --git a/storage/src/vespa/storage/tools/throttlingsim.h b/storage/src/vespa/storage/tools/throttlingsim.h index a7384d0f362..55fccb01acd 100644 --- a/storage/src/vespa/storage/tools/throttlingsim.h +++ b/storage/src/vespa/storage/tools/throttlingsim.h @@ -1,6 +1,8 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. + #include <vespa/vespalib/util/sync.h> #include <vespa/vespalib/util/document_runnable.h> +#include <vespa/fastos/app.h> #include <deque> #include <vector> |