diff options
23 files changed, 43 insertions, 51 deletions
diff --git a/config/src/vespa/config/common/configmanager.cpp b/config/src/vespa/config/common/configmanager.cpp index a73e8caf206..f15880fea01 100644 --- a/config/src/vespa/config/common/configmanager.cpp +++ b/config/src/vespa/config/common/configmanager.cpp @@ -3,9 +3,8 @@ #include "exceptions.h" #include "configholder.h" #include <vespa/vespalib/util/atomic.h> -#include <memory> #include <thread> -#include <chrono> +#include <sstream> #include <vespa/log/log.h> LOG_SETUP(".config.common.configmanager"); diff --git a/config/src/vespa/config/frt/protocol.cpp b/config/src/vespa/config/frt/protocol.cpp index ccc56fd51b9..b089af71782 100644 --- a/config/src/vespa/config/frt/protocol.cpp +++ b/config/src/vespa/config/frt/protocol.cpp @@ -3,6 +3,7 @@ #include <lz4.h> #include <vespa/vespalib/util/stringfmt.h> #include <vespa/vespalib/data/slime/slime.h> +#include <sstream> #include <vespa/log/log.h> LOG_SETUP(".config.frt.protocol"); diff --git a/document/src/vespa/document/fieldvalue/mapfieldvalue.cpp b/document/src/vespa/document/fieldvalue/mapfieldvalue.cpp index a2bc5b97299..2b37c43be55 100644 --- a/document/src/vespa/document/fieldvalue/mapfieldvalue.cpp +++ b/document/src/vespa/document/fieldvalue/mapfieldvalue.cpp @@ -5,6 +5,7 @@ #include "iteratorhandler.h" #include <vespa/document/base/exceptions.h> #include <vespa/vespalib/util/xmlstream.h> +#include <ostream> #include <vespa/log/log.h> LOG_SETUP(".document.fieldvalue.map"); @@ -208,8 +209,7 @@ MapFieldValue::compare(const FieldValue& other) const } void -MapFieldValue::print(std::ostream& out, bool verbose, - const std::string& indent) const +MapFieldValue::print(std::ostream& out, bool verbose, const std::string& indent) const { out << "Map("; diff --git a/document/src/vespa/document/update/addfieldpathupdate.cpp b/document/src/vespa/document/update/addfieldpathupdate.cpp index 656ee4580a0..0f8b730367e 100644 --- a/document/src/vespa/document/update/addfieldpathupdate.cpp +++ b/document/src/vespa/document/update/addfieldpathupdate.cpp @@ -6,12 +6,10 @@ #include <vespa/document/serialization/vespadocumentdeserializer.h> #include <vespa/vespalib/objects/nbostream.h> #include <vespa/vespalib/util/exceptions.h> -#include <vespa/log/log.h> +#include <ostream> using vespalib::nbostream; -LOG_SETUP(".document.update.fieldpathupdate"); - namespace document { using namespace fieldvalue; @@ -53,7 +51,6 @@ private: ModificationStatus AddIteratorHandler::doModify(FieldValue &fv) { - LOG(spam, "Adding values to %s", fv.toString().c_str()); if (fv.inherits(CollectionFieldValue::classId)) { CollectionFieldValue &cf = static_cast<CollectionFieldValue &>(fv); for (std::size_t i = 0; i < _values.size(); ++i) { diff --git a/document/src/vespa/document/update/fieldpathupdate.cpp b/document/src/vespa/document/update/fieldpathupdate.cpp index 37672ac0b1d..11ed5f08c93 100644 --- a/document/src/vespa/document/update/fieldpathupdate.cpp +++ b/document/src/vespa/document/update/fieldpathupdate.cpp @@ -4,8 +4,9 @@ #include <vespa/document/fieldvalue/iteratorhandler.h> #include <vespa/document/select/parser.h> #include <vespa/document/util/serializableexceptions.h> -#include <vespa/log/log.h> +#include <ostream> +#include <vespa/log/log.h> LOG_SETUP(".document.update.fieldpathupdate"); using vespalib::make_string; diff --git a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp index 0849a93acbc..6c63e33c745 100644 --- a/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/documentprotocol.cpp @@ -4,16 +4,15 @@ #include "routablefactories51.h" #include "routablefactories52.h" #include "routingpolicyfactories.h" -#include <vespa/document/repo/documenttyperepo.h> +#include "routablerepository.h" +#include "routingpolicyrepository.h" +#include "replymerger.h" #include <vespa/document/util/stringutil.h> #include <vespa/documentapi/documentapi.h> -#include <vespa/documentapi/messagebus/replymerger.h> #include <vespa/messagebus/emptyreply.h> -#include <vespa/messagebus/routing/routingcontext.h> -#include <vespa/vespalib/component/versionspecification.h> #include <vespa/vespalib/util/exceptions.h> -#include "routablerepository.h" -#include "routingpolicyrepository.h" +#include <sstream> + #include <vespa/log/log.h> LOG_SETUP(".documentprotocol"); diff --git a/documentapi/src/vespa/documentapi/messagebus/routablerepository.cpp b/documentapi/src/vespa/documentapi/messagebus/routablerepository.cpp index 4572b2bbcc6..32956ff23bd 100644 --- a/documentapi/src/vespa/documentapi/messagebus/routablerepository.cpp +++ b/documentapi/src/vespa/documentapi/messagebus/routablerepository.cpp @@ -4,6 +4,8 @@ #include <vespa/documentapi/loadtypes/loadtypeset.h> #include <vespa/document/util/stringutil.h> #include <vespa/vespalib/util/exceptions.h> +#include <sstream> + #include <vespa/log/log.h> LOG_SETUP(".routablerepository"); @@ -11,9 +13,7 @@ namespace documentapi { RoutableRepository::VersionMap::VersionMap() : _factoryVersions() -{ - // empty -} +{ } bool RoutableRepository::VersionMap::putFactory(const vespalib::VersionSpecification &version, diff --git a/fnet/src/vespa/fnet/scheduler.cpp b/fnet/src/vespa/fnet/scheduler.cpp index 71f02754a92..dd7a3246090 100644 --- a/fnet/src/vespa/fnet/scheduler.cpp +++ b/fnet/src/vespa/fnet/scheduler.cpp @@ -2,6 +2,7 @@ #include "scheduler.h" #include "task.h" +#include <sstream> #include <vespa/log/log.h> LOG_SETUP(".fnet.scheduler"); diff --git a/juniper/src/vespa/juniper/Matcher.cpp b/juniper/src/vespa/juniper/Matcher.cpp index 2eeac3417af..76460323f9b 100644 --- a/juniper/src/vespa/juniper/Matcher.cpp +++ b/juniper/src/vespa/juniper/Matcher.cpp @@ -6,14 +6,10 @@ #include "juniperdebug.h" #include "sumdesc.h" #include "Matcher.h" -#include "foreach_utils.h" -#include "SummaryConfig.h" -#include "querynode.h" -#include "mcand.h" -#include "matchobject.h" #include "result.h" #include "juniperparams.h" #include "config.h" +#include <sstream> #include <vespa/log/log.h> LOG_SETUP(".juniper.matcher"); diff --git a/memfilepersistence/src/vespa/memfilepersistence/common/options.cpp b/memfilepersistence/src/vespa/memfilepersistence/common/options.cpp index 651543219ec..63e0f35c95c 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/common/options.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/common/options.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 "options.h" -#include <vespa/config-stor-memfilepersistence.h> #include <vespa/vespalib/util/exceptions.h> +#include <sstream> #include <vespa/log/log.h> LOG_SETUP(".persistence.slotfile.options"); -namespace storage { - -namespace memfile { +namespace storage::memfile { Options::Options(const vespa::config::storage::StorMemfilepersistenceConfig& newConfig, const vespa::config::content::PersistenceConfig& newPersistenceConfig) @@ -179,5 +177,3 @@ void Options::print(std::ostream& out, bool verbose, } } - -} diff --git a/memfilepersistence/src/vespa/memfilepersistence/device/mountpointlist.cpp b/memfilepersistence/src/vespa/memfilepersistence/device/mountpointlist.cpp index 3ff816c55eb..614d399ca22 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/device/mountpointlist.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/device/mountpointlist.cpp @@ -9,6 +9,7 @@ #include <vespa/vespalib/util/guard.h> #include <vespa/vespalib/text/stringtokenizer.h> #include <fstream> +#include <sstream> #include <vespa/log/log.h> LOG_SETUP(".persistence.mountpointlist"); diff --git a/memfilepersistence/src/vespa/memfilepersistence/device/partition.cpp b/memfilepersistence/src/vespa/memfilepersistence/device/partition.cpp index 3bd855553c7..9ff402a89b5 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/device/partition.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/device/partition.cpp @@ -3,13 +3,12 @@ #include "partition.h" #include "devicemanager.h" #include <vespa/vespalib/util/exceptions.h> +#include <sstream> #include <vespa/log/log.h> LOG_SETUP(".persistence.device.partition"); -namespace storage { - -namespace memfile { +namespace storage::memfile { Partition::Partition(DeviceManager& manager, uint64_t id, @@ -59,6 +58,4 @@ Partition::print(std::ostream& out, bool verbose, Device::print(out, verbose, indent); } -} // memfile - -} // storage +} diff --git a/memfilepersistence/src/vespa/memfilepersistence/device/partitionmonitor.cpp b/memfilepersistence/src/vespa/memfilepersistence/device/partitionmonitor.cpp index b0cbe4fdbf7..ebc33d40f42 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/device/partitionmonitor.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/device/partitionmonitor.cpp @@ -4,6 +4,7 @@ #include <vespa/vespalib/util/exceptions.h> #include <vespa/vespalib/stllike/asciistream.h> #include <vespa/vespalib/util/xmlstream.h> +#include <ostream> #include <vespa/log/log.h> LOG_SETUP(".persistence.device.partition.monitor"); diff --git a/memfilepersistence/src/vespa/memfilepersistence/init/filescanner.cpp b/memfilepersistence/src/vespa/memfilepersistence/init/filescanner.cpp index 3a83cee392a..e5466634283 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/init/filescanner.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/init/filescanner.cpp @@ -5,11 +5,10 @@ #include <vespa/vespalib/util/exceptions.h> #include <iomanip> -#include <vespa/log/log.h> +#include <vespa/log/bufferedlogger.h> LOG_SETUP(".persistence.memfile.filescanner"); -namespace storage { -namespace memfile { +namespace storage::memfile { FileScanner::Metrics::Metrics(framework::Clock& clock) : metrics::MetricSet("dbinit.filescan", "", @@ -238,5 +237,4 @@ FileScanner::handleBadLocation(const document::BucketId& bucket, return true; } -} // memfile -} // storage +} diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/bufferedfilewriter.cpp b/memfilepersistence/src/vespa/memfilepersistence/mapper/bufferedfilewriter.cpp index 65b92e212f5..175c156dc9d 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/mapper/bufferedfilewriter.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/bufferedfilewriter.cpp @@ -4,8 +4,9 @@ #include <vespa/vespalib/util/guard.h> #include <vespa/vespalib/io/fileutil.h> #include <vespa/vespalib/util/exceptions.h> +#include <sstream> -#include <vespa/log/log.h> +#include <vespa/log/bufferedlogger.h> LOG_SETUP(".persistence.memfile.bufferedfilewriter"); namespace storage { diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_serializer.cpp b/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_serializer.cpp index 2de4e062b5e..950acf09b28 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_serializer.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_serializer.cpp @@ -9,6 +9,7 @@ #include <vespa/memfilepersistence/spi/memfilepersistenceprovidermetrics.h> #include <vespa/vespalib/stllike/asciistream.h> #include <vespa/storageframework/generic/clock/timer.h> +#include <sstream> #include <vespa/log/log.h> LOG_SETUP(".persistence.memfilev1"); diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_verifier.cpp b/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_verifier.cpp index 236afdf9a77..66f6cdff083 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_verifier.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_verifier.cpp @@ -6,8 +6,9 @@ #include <vespa/storageframework/generic/clock/timer.h> #include <vespa/vespalib/stllike/asciistream.h> #include <vespa/vespalib/stllike/hash_set.hpp> -#include <vespa/log/log.h> +#include <sstream> +#include <vespa/log/log.h> LOG_SETUP(".persistence.memfilev1.verifier"); namespace storage::memfile { diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/memfilemapper.cpp b/memfilepersistence/src/vespa/memfilepersistence/mapper/memfilemapper.cpp index eaa20c66ca9..2d91e46c7b2 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/mapper/memfilemapper.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/memfilemapper.cpp @@ -7,8 +7,9 @@ #include <vespa/memfilepersistence/common/exceptions.h> #include <vespa/vdslib/distribution/distribution.h> #include <vespa/storageframework/generic/clock/timer.h> +#include <sstream> -#include <vespa/log/log.h> +#include <vespa/log/bufferedlogger.h> LOG_SETUP(".persistence.memfile.mapper"); namespace storage::memfile { diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.cpp b/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.cpp index 6bda3d69113..ef5c865eb5a 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.cpp @@ -6,6 +6,8 @@ #include <vespa/memfilepersistence/common/environment.h> #include <vespa/vespalib/util/exceptions.h> #include <vespa/document/util/bytebuffer.h> +#include <sstream> + #include <vespa/log/log.h> LOG_SETUP(".memfile.simpleiobuffer"); diff --git a/memfilepersistence/src/vespa/memfilepersistence/memfile/memfile.cpp b/memfilepersistence/src/vespa/memfilepersistence/memfile/memfile.cpp index 6b3f72d9187..73defc043af 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/memfile/memfile.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/memfile/memfile.cpp @@ -12,7 +12,7 @@ #include <ext/algorithm> #include <iomanip> -#include <vespa/log/log.h> +#include <vespa/log/bufferedlogger.h> LOG_SETUP(".persistence.memfile.memfile"); namespace { diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/iteratorhandler.cpp b/memfilepersistence/src/vespa/memfilepersistence/spi/iteratorhandler.cpp index a6b5b5bd782..6cb1c523325 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/spi/iteratorhandler.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/spi/iteratorhandler.cpp @@ -4,12 +4,12 @@ #include "visitorslotmatcher.h" #include "cacheevictionguard.h" #include <vespa/document/select/bodyfielddetector.h> +#include <sstream> #include <vespa/log/log.h> LOG_SETUP(".persistence.memfile.handler.iterator"); -namespace storage { -namespace memfile { +namespace storage::memfile { CachePrefetchRequirements CachePrefetchRequirements::createFromSelection(const document::DocumentTypeRepo& repo, @@ -435,4 +435,3 @@ IteratorHandler::iterate(spi::IteratorId id, uint64_t maxByteSize) } } -} diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp index d17dfdc77a4..9e580d4e234 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp @@ -6,6 +6,7 @@ #include <vespa/document/update/documentupdate.h> #include <vespa/config/helper/configgetter.hpp> #include <vespa/storageframework/generic/status/htmlstatusreporter.h> +#include <sstream> #include <vespa/log/log.h> LOG_SETUP(".memfilepersistenceprovider"); diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/operationhandler.cpp b/memfilepersistence/src/vespa/memfilepersistence/spi/operationhandler.cpp index da085ca9137..c9972dbd02b 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/spi/operationhandler.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/spi/operationhandler.cpp @@ -3,12 +3,12 @@ #include "operationhandler.h" #include <vespa/memfilepersistence/common/exceptions.h> #include <vespa/document/select/parser.h> +#include <sstream> #include <vespa/log/log.h> LOG_SETUP(".persistence.memfile.handler.operation"); -namespace storage { -namespace memfile { +namespace storage::memfile { OperationHandler::OperationHandler(Environment& env) : _env(env) @@ -283,5 +283,4 @@ OperationHandler::parseDocumentSelection( return ret; } -} // memfile -} // storage +} |