diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-20 14:41:39 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-20 15:50:29 +0100 |
commit | 51bc810507f2067ebd2646274d3cda5cb583a620 (patch) | |
tree | cbff1f6464262c2e6b3a622db93d044bab69a532 /memfilepersistence | |
parent | 530e52e17a85836d58cac58c89b71c189c6f9873 (diff) |
Further decouple some hpp files, config and the attributevector.
Diffstat (limited to 'memfilepersistence')
4 files changed, 9 insertions, 11 deletions
diff --git a/memfilepersistence/src/tests/tools/dumpslotfiletest.cpp b/memfilepersistence/src/tests/tools/dumpslotfiletest.cpp index 112f8840e72..fe56855a894 100644 --- a/memfilepersistence/src/tests/tools/dumpslotfiletest.cpp +++ b/memfilepersistence/src/tests/tools/dumpslotfiletest.cpp @@ -1,13 +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/config/subscription/configuri.h> #include <vespa/document/base/testdocrepo.h> #include <vespa/memfilepersistence/tools/dumpslotfile.h> #include <vespa/vdstestlib/cppunit/macros.h> #include <vespa/vespalib/util/programoptions_testutils.h> #include <tests/spi/memfiletestutils.h> - +#include <vespa/config/helper/configgetter.hpp> #include <vespa/document/config/config-documenttypes.h> namespace storage { diff --git a/memfilepersistence/src/vespa/memfilepersistence/common/environment.cpp b/memfilepersistence/src/vespa/memfilepersistence/common/environment.cpp index 5afc70179b4..ff4c91026f2 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/common/environment.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/common/environment.cpp @@ -4,7 +4,7 @@ #include "environment.h" #include <vespa/vespalib/util/random.h> #include <vespa/vespalib/util/vstringfmt.h> -#include <vespa/config/config.h> +#include <vespa/config/helper/configgetter.hpp> #include <vespa/vespalib/stllike/asciistream.h> using config::ConfigGetter; diff --git a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp index 7b0954aaa5b..d415604991b 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/spi/memfilepersistenceprovider.cpp @@ -1,11 +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/document/fieldset/fieldsetrepo.h> #include <vespa/memfilepersistence/spi/memfilepersistenceprovider.h> #include <vespa/memfilepersistence/common/exceptions.h> #include <vespa/document/fieldvalue/document.h> #include <vespa/document/update/documentupdate.h> +#include <vespa/config/helper/configgetter.hpp> + #include <vespa/log/log.h> LOG_SETUP(".memfilepersistenceprovider"); diff --git a/memfilepersistence/src/vespa/memfilepersistence/tools/dumpslotfile.cpp b/memfilepersistence/src/vespa/memfilepersistence/tools/dumpslotfile.cpp index a44aa81d3ab..1893dc041b2 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/tools/dumpslotfile.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/tools/dumpslotfile.cpp @@ -1,25 +1,22 @@ // 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/config/helper/configgetter.h> #include <vespa/document/config/config-documenttypes.h> #include <vespa/document/repo/documenttyperepo.h> #include <vespa/document/document.h> -#include <vespa/log/log.h> #include <vespa/memfilepersistence/common/environment.h> -#include <vespa/memfilepersistence/device/devicemanager.h> #include <vespa/memfilepersistence/mapper/memfilemapper.h> #include <vespa/memfilepersistence/memfile/memfilecache.h> #include <vespa/memfilepersistence/spi/memfilepersistenceprovidermetrics.h> #include <vespa/memfilepersistence/tools/dumpslotfile.h> -#include <string> -#include <vespa/persistence/spi/bucketinfo.h> #include <vespa/storageframework/defaultimplementation/clock/realclock.h> #include <vespa/storageframework/defaultimplementation/component/componentregisterimpl.h> #include <vespa/storageframework/defaultimplementation/memory/nomemorymanager.h> #include <vespa/vespalib/util/programoptions.h> +#include <vespa/config/helper/configgetter.hpp> +#include <sstream> -LOG_SETUP(".vds.dumpslotfile"); using config::ConfigGetter; using document::DocumenttypesConfig; @@ -171,7 +168,6 @@ namespace { _compReg.setClock(_clock); _compReg.setMemoryManager(_memoryMan); _cache.reset(new MemFileCache(_compReg, _metrics._cache)); - LOG(debug, "Setting up document repo"); if (documentConfigId == 0) { _repo.reset(new DocumentTypeRepo(_docType)); } else { |