diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-14 22:58:54 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2016-12-15 13:12:36 +0100 |
commit | 2a85dc3fd5af5c33601cf04ead06c7545fa46d75 (patch) | |
tree | f46f355235fd7684a9f8a6bb562797fd985d1180 /memfilepersistence | |
parent | d9b45214d28207564329991afe70afc358fe6d12 (diff) |
Split in hash_xxx, array, lru, cache ++ in hpp files. To reduce clinon build
Diffstat (limited to 'memfilepersistence')
5 files changed, 15 insertions, 17 deletions
diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_verifier.cpp b/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_verifier.cpp index 96295cd560b..4ba25a48950 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_verifier.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/memfile_v1_verifier.cpp @@ -3,9 +3,8 @@ #include "memfile_v1_verifier.h" #include "memfilemapper.h" #include "simplememfileiobuffer.h" -#include "buffer.h" -#include <vespa/memfilepersistence/memfile/memfile.h> #include <vespa/vespalib/stllike/asciistream.h> +#include <vespa/vespalib/stllike/hash_set.hpp> #include <vespa/log/log.h> LOG_SETUP(".persistence.memfilev1.verifier"); diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.cpp b/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.cpp index 505e9c32f3b..ecb66058362 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.cpp @@ -1,10 +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 "simplememfileiobuffer.h" #include <vespa/document/repo/documenttyperepo.h> #include <vespa/memfilepersistence/common/environment.h> -#include <vespa/memfilepersistence/mapper/simplememfileiobuffer.h> #include <vespa/vespalib/util/crc.h> -#include <vespa/vespalib/stllike/hash_set.h> +#include <vespa/vespalib/stllike/hash_set.hpp> #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 6dfa983729b..62bbc7f3f4b 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/memfile/memfile.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/memfile/memfile.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/memfilepersistence/memfile/memfile.h> +#include "memfile.h" +#include "memfilecompactor.h" +#include "shared_data_location_tracker.h" #include <ext/algorithm> #include <vespa/memfilepersistence/common/exceptions.h> #include <vespa/memfilepersistence/mapper/memfilemapper.h> #include <vespa/memfilepersistence/mapper/simplememfileiobuffer.h> -#include <vespa/memfilepersistence/memfile/memfilecompactor.h> -#include <vespa/memfilepersistence/memfile/shared_data_location_tracker.h> #include <vespa/vespalib/util/crc.h> #include <vespa/memfilepersistence/common/environment.h> #include <iomanip> #include <vespa/document/util/stringutil.h> +#include <vespa/vespalib/stllike/hash_set.hpp> #include <vespa/log/log.h> LOG_SETUP(".persistence.memfile.memfile"); diff --git a/memfilepersistence/src/vespa/memfilepersistence/memfile/memfilecompactor.cpp b/memfilepersistence/src/vespa/memfilepersistence/memfile/memfilecompactor.cpp index 17bf530d450..9af6fd13264 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/memfile/memfilecompactor.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/memfile/memfilecompactor.cpp @@ -1,9 +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 "memfilecompactor.h" +#include "memfile.h" +#include <vespa/vespalib/stllike/hash_map.hpp> #include <vespa/log/log.h> -#include <vespa/memfilepersistence/memfile/memfile.h> -#include <vespa/memfilepersistence/memfile/memfilecompactor.h> -#include <algorithm> LOG_SETUP(".persistence.memfile.compactor"); @@ -19,8 +19,7 @@ struct DocumentVersionInfo { : _id(docId), _versions(1), _tombstoned(tombstoned) - { - } + { } bool newerVersionExists() const noexcept { return (_versions != 1); diff --git a/memfilepersistence/src/vespa/memfilepersistence/memfile/slotiterator.cpp b/memfilepersistence/src/vespa/memfilepersistence/memfile/slotiterator.cpp index 1780870c050..fba74aeb84d 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/memfile/slotiterator.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/memfile/slotiterator.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/memfilepersistence/memfile/slotiterator.h> +#include "slotiterator.h" #include <vespa/memfilepersistence/memfile/memfile.h> +#include <vespa/vespalib/stllike/hash_set.hpp> namespace storage { namespace memfile { |