diff options
Diffstat (limited to 'memfilepersistence')
17 files changed, 32 insertions, 38 deletions
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/devicemanager.cpp b/memfilepersistence/src/vespa/memfilepersistence/device/devicemanager.cpp index 2ae27f06671..ba249df2b73 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/device/devicemanager.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/device/devicemanager.cpp @@ -2,6 +2,7 @@ #include "devicemanager.h" #include <vespa/vespalib/util/exceptions.h> +#include <vespa/vespalib/util/xmlstream.h> namespace storage::memfile { diff --git a/memfilepersistence/src/vespa/memfilepersistence/device/devicemapper.cpp b/memfilepersistence/src/vespa/memfilepersistence/device/devicemapper.cpp index 8ddf215d616..fdecb38ccf0 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/device/devicemapper.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/device/devicemapper.cpp @@ -5,13 +5,12 @@ #include <vespa/vespalib/util/exceptions.h> #include <fstream> #include <sstream> +#include <sys/stat.h> #include <vespa/log/log.h> LOG_SETUP(".persistence.devicemapper"); -namespace storage { - -namespace memfile { +namespace storage::memfile { namespace { uint64_t getDevice(const std::string& path) { @@ -95,5 +94,3 @@ AdvancedDeviceMapper::getPartitionId(const std::string& fileOnFS) const } } - -} // storage 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 b5b94d29336..ebc33d40f42 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/device/partitionmonitor.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/device/partitionmonitor.cpp @@ -3,13 +3,13 @@ #include "partitionmonitor.h" #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"); -namespace storage { - -namespace memfile { +namespace storage::memfile { namespace { @@ -387,5 +387,3 @@ PartitionMonitor::overrideRealStat(uint32_t blockSize, uint32_t totalBlocks, } } - -} // storage 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/memfile/shared_data_location_tracker.h b/memfilepersistence/src/vespa/memfilepersistence/memfile/shared_data_location_tracker.h index e0b1a7b9a2a..42d3fb0b238 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/memfile/shared_data_location_tracker.h +++ b/memfilepersistence/src/vespa/memfilepersistence/memfile/shared_data_location_tracker.h @@ -2,6 +2,7 @@ #pragma once #include <vespa/memfilepersistence/common/types.h> +#include <map> namespace storage { namespace memfile { 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 +} |