diff options
Diffstat (limited to 'memfilepersistence')
13 files changed, 29 insertions, 59 deletions
diff --git a/memfilepersistence/src/vespa/memfilepersistence/common/environment.h b/memfilepersistence/src/vespa/memfilepersistence/common/environment.h index 0f81d61a943..93ef0768148 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/common/environment.h +++ b/memfilepersistence/src/vespa/memfilepersistence/common/environment.h @@ -18,7 +18,6 @@ #include "config_lock_guard.h" #include "config_aliases.h" #include <vespa/memfilepersistence/device/mountpointlist.h> -#include <vespa/storageframework/storageframework.h> #include <vespa/vespalib/io/fileutil.h> #include <vespa/document/bucket/bucketidfactory.h> #include <vespa/config/helper/configfetcher.h> diff --git a/memfilepersistence/src/vespa/memfilepersistence/common/options.h b/memfilepersistence/src/vespa/memfilepersistence/common/options.h index 6199bf59f37..29e46b29dce 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/common/options.h +++ b/memfilepersistence/src/vespa/memfilepersistence/common/options.h @@ -17,15 +17,13 @@ #pragma once -#include <vespa/storageframework/storageframework.h> #include <vespa/config-stor-memfilepersistence.h> #include <vespa/config-persistence.h> #include <vespa/vespalib/util/printable.h> #include <vespa/vespalib/stllike/string.h> +#include <vespa/storageframework/generic/clock/time.h> -namespace storage { - -namespace memfile { +namespace storage::memfile { struct Options : public vespalib::Printable { @@ -128,6 +126,3 @@ struct Options : public vespalib::Printable }; } - -} - diff --git a/memfilepersistence/src/vespa/memfilepersistence/common/types.h b/memfilepersistence/src/vespa/memfilepersistence/common/types.h index ab6ae1e52f8..7758e6091ac 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/common/types.h +++ b/memfilepersistence/src/vespa/memfilepersistence/common/types.h @@ -16,12 +16,11 @@ #pragma once -#include <vespa/storageframework/storageframework.h> #include <vespa/persistence/spi/bucketinfo.h> #include <vespa/document/fieldvalue/document.h> +#include <vespa/storageframework/generic/clock/time.h> -namespace storage { -namespace memfile { +namespace storage::memfile { /** * \class storage::slotfile::DataLocation @@ -193,6 +192,4 @@ protected: ~Types() {} // Noone should refer to objects as Types objects }; -} // memfile -} // storage - +} diff --git a/memfilepersistence/src/vespa/memfilepersistence/device/mountpointlist.cpp b/memfilepersistence/src/vespa/memfilepersistence/device/mountpointlist.cpp index b3751cddbed..3ff816c55eb 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/device/mountpointlist.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/device/mountpointlist.cpp @@ -7,14 +7,13 @@ #include <vespa/config/helper/configfetcher.h> #include <vespa/vespalib/io/fileutil.h> #include <vespa/vespalib/util/guard.h> +#include <vespa/vespalib/text/stringtokenizer.h> #include <fstream> #include <vespa/log/log.h> LOG_SETUP(".persistence.mountpointlist"); -namespace storage { - -namespace memfile { +namespace storage::memfile { using vespalib::getLastErrorString; using vespalib::DirPointer; @@ -642,5 +641,3 @@ MountPointList::reportXmlStatus(vespalib::xml::XmlOutputStream& xos, } } - -} // storage diff --git a/memfilepersistence/src/vespa/memfilepersistence/device/mountpointlist.h b/memfilepersistence/src/vespa/memfilepersistence/device/mountpointlist.h index f80829e8aed..08adb66f9f1 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/device/mountpointlist.h +++ b/memfilepersistence/src/vespa/memfilepersistence/device/mountpointlist.h @@ -18,7 +18,7 @@ #include "devicemanager.h" #include "directory.h" -#include <vespa/storageframework/storageframework.h> +#include <vespa/storageframework/generic/status/xmlstatusreporter.h> #include <vespa/persistence/spi/persistenceprovider.h> #include <vespa/vespalib/util/printable.h> diff --git a/memfilepersistence/src/vespa/memfilepersistence/init/filescanner.h b/memfilepersistence/src/vespa/memfilepersistence/init/filescanner.h index ff814eed19e..7d06e442400 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/init/filescanner.h +++ b/memfilepersistence/src/vespa/memfilepersistence/init/filescanner.h @@ -13,15 +13,15 @@ #include <vespa/memfilepersistence/device/mountpointlist.h> #include <vespa/memfilepersistence/mapper/bucketdirectorymapper.h> -#include <vespa/storageframework/storageframework.h> #include <vespa/metrics/metrics.h> +#include <vespa/storageframework/generic/component/component.h> +#include <vespa/storageframework/generic/clock/timer.h> namespace document { class BucketId; } -namespace storage { -namespace memfile { +namespace storage::memfile { class FileScanner : private framework::Component { public: @@ -102,6 +102,4 @@ private: std::vector<uint32_t>& path); }; -} // memfile -} // storage - +} diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/locationreadplanner.h b/memfilepersistence/src/vespa/memfilepersistence/mapper/locationreadplanner.h index d56f5f80441..55e815d88c3 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/mapper/locationreadplanner.h +++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/locationreadplanner.h @@ -12,9 +12,9 @@ #pragma once #include <vespa/memfilepersistence/common/types.h> +#include <vespa/vespalib/util/printable.h> -namespace storage { -namespace memfile { +namespace storage::memfile { class MemSlot; @@ -53,10 +53,7 @@ private: const std::vector<DataLocation>& desiredLocations, uint32_t maxGap); - void scheduleLocation(DataLocation loc, - std::vector<DataLocation>&); + void scheduleLocation(DataLocation loc, std::vector<DataLocation>&); }; -} // memfile -} // storage - +} diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_serializer.cpp b/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_serializer.cpp index d9cc0c35cc4..2de4e062b5e 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_serializer.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_serializer.cpp @@ -8,12 +8,12 @@ #include <vespa/memfilepersistence/common/exceptions.h> #include <vespa/memfilepersistence/spi/memfilepersistenceprovidermetrics.h> #include <vespa/vespalib/stllike/asciistream.h> +#include <vespa/storageframework/generic/clock/timer.h> #include <vespa/log/log.h> LOG_SETUP(".persistence.memfilev1"); -namespace storage { -namespace memfile { +namespace storage::memfile { namespace { @@ -1023,4 +1023,3 @@ MemFileV1Serializer::verify(MemFile& file, Environment& env, } } -} diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_verifier.cpp b/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_verifier.cpp index 4ba25a48950..236afdf9a77 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_verifier.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_verifier.cpp @@ -3,15 +3,14 @@ #include "memfile_v1_verifier.h" #include "memfilemapper.h" #include "simplememfileiobuffer.h" +#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> LOG_SETUP(".persistence.memfilev1.verifier"); -namespace storage { - -namespace memfile { +namespace storage::memfile { namespace { @@ -690,8 +689,4 @@ MemFileV1Verifier::verifyUniqueTimestamps( okSlots.swap(slots); } - } - -} - diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/memfilemapper.cpp b/memfilepersistence/src/vespa/memfilepersistence/mapper/memfilemapper.cpp index 4888154d3bb..eaa20c66ca9 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/mapper/memfilemapper.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/memfilemapper.cpp @@ -6,12 +6,12 @@ #include <vespa/memfilepersistence/spi/memfilepersistenceprovidermetrics.h> #include <vespa/memfilepersistence/common/exceptions.h> #include <vespa/vdslib/distribution/distribution.h> +#include <vespa/storageframework/generic/clock/timer.h> #include <vespa/log/log.h> LOG_SETUP(".persistence.memfile.mapper"); -namespace storage { -namespace memfile { +namespace storage::memfile { // Repair defined in macro, such that log entries will be unique for the various // instances calling it (different file line numbers) @@ -335,5 +335,4 @@ MemFileMapper::removeAllSlotsExcept(MemFile& file, std::vector<Timestamp>& keep) file.removeSlots(slotsToRemove); } -} // storage -} // memfile +} diff --git a/memfilepersistence/src/vespa/memfilepersistence/memfile/memfilecache.h b/memfilepersistence/src/vespa/memfilepersistence/memfile/memfilecache.h index 112c5e6c399..7b34b2eba9d 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/memfile/memfilecache.h +++ b/memfilepersistence/src/vespa/memfilepersistence/memfile/memfilecache.h @@ -22,10 +22,10 @@ #include <boost/multi_index/ordered_index.hpp> #include <boost/multi_index/sequenced_index.hpp> #include <vespa/storageframework/generic/memory/memorymanagerinterface.h> +#include <vespa/storageframework/generic/component/component.h> -namespace storage { -namespace memfile { +namespace storage::memfile { class MemFilePersistenceCacheMetrics; class Environment; // Avoid cyclic dependency with environment @@ -298,6 +298,4 @@ public: void printCacheEntriesHtml(std::ostream& out) const; }; -} // storage -} // memfile - +} diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp index a4f10688feb..d17dfdc77a4 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp @@ -3,10 +3,9 @@ #include "memfilepersistenceprovider.h" #include <vespa/memfilepersistence/common/exceptions.h> -#include <vespa/document/fieldvalue/document.h> #include <vespa/document/update/documentupdate.h> -#include <vespa/document/fieldset/fieldsetrepo.h> #include <vespa/config/helper/configgetter.hpp> +#include <vespa/storageframework/generic/status/htmlstatusreporter.h> #include <vespa/log/log.h> LOG_SETUP(".memfilepersistenceprovider"); @@ -28,8 +27,7 @@ if ((context).getTrace().shouldTrace(9)) { \ (context).getTrace().trace(9, messageToTrace); \ } -namespace storage { -namespace memfile { +namespace storage::memfile { namespace { @@ -888,5 +886,4 @@ MemFilePersistenceProvider::reportStatus(std::ostream& out, return true; } -} // memfile -} // storage +} diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.h b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.h index 724a77ec443..52e10737f33 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.h +++ b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.h @@ -12,7 +12,6 @@ #include <vespa/memfilepersistence/mapper/memfilemapper.h> #include <vespa/memfilepersistence/init/filescanner.h> #include <vespa/persistence/spi/abstractpersistenceprovider.h> -#include <vespa/storageframework/storageframework.h> #include <vespa/storageframework/generic/status/httpurlpath.h> #include <vespa/config/config.h> |