diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-03 08:39:54 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2017-06-06 09:12:38 +0200 |
commit | fdfc2ee5b03c00caa4c655a4ba3dab5554ba354a (patch) | |
tree | c1be9b153b2bf4ce5bdf2661a452c2250a2f9e98 /memfilepersistence | |
parent | 02a2201dbce24db2586d94f37a6093192a0da691 (diff) |
Hide the implementation details.
Diffstat (limited to 'memfilepersistence')
3 files changed, 20 insertions, 20 deletions
diff --git a/memfilepersistence/src/vespa/memfilepersistence/common/types.cpp b/memfilepersistence/src/vespa/memfilepersistence/common/types.cpp index f02423cb194..2bc85fbc422 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/common/types.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/common/types.cpp @@ -1,11 +1,11 @@ // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. #include "types.h" -#include <sstream> #include <vespa/vespalib/util/exceptions.h> +#include <cassert> +#include <sstream> -namespace storage { -namespace memfile { +namespace storage::memfile { const framework::MicroSecTime Types::MAX_TIMESTAMP(framework::MicroSecTime::max()); const framework::MicroSecTime Types::UNSET_TIMESTAMP(0); @@ -34,5 +34,17 @@ operator<<(std::ostream& os, const DataLocation& loc) return os; } -} // memfile -} // storage +const char* +Types::getMemFileFlagName(MemFileFlag flag) { + switch (flag) { + case FILE_EXIST: return "FILE_EXIST"; + case HEADER_BLOCK_READ: return "HEADER_BLOCK_READ"; + case BODY_BLOCK_READ: return "BODY_BLOCK_READ"; + case BUCKET_INFO_OUTDATED: return "BUCKET_INFO_OUTDATED"; + case SLOTS_ALTERED: return "SLOTS_ALTERED"; + case LEGAL_MEMFILE_FLAGS: assert(false); // Not a single flag + default: return "INVALID"; + } +} + +} diff --git a/memfilepersistence/src/vespa/memfilepersistence/common/types.h b/memfilepersistence/src/vespa/memfilepersistence/common/types.h index 7758e6091ac..c1f29571037 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/common/types.h +++ b/memfilepersistence/src/vespa/memfilepersistence/common/types.h @@ -173,21 +173,9 @@ struct Types { } } - static const char* getMemFileFlagName(MemFileFlag flag) { - switch (flag) { - case FILE_EXIST: return "FILE_EXIST"; - case HEADER_BLOCK_READ: return "HEADER_BLOCK_READ"; - case BODY_BLOCK_READ: return "BODY_BLOCK_READ"; - case BUCKET_INFO_OUTDATED: return "BUCKET_INFO_OUTDATED"; - case SLOTS_ALTERED: return "SLOTS_ALTERED"; - case LEGAL_MEMFILE_FLAGS: assert(false); // Not a single flag - default: return "INVALID"; - } - } - - static void verifyLegalFlags(uint32_t flags, uint32_t legal, - const char* operation); + static const char* getMemFileFlagName(MemFileFlag flag); + static void verifyLegalFlags(uint32_t flags, uint32_t legal, const char* operation); protected: ~Types() {} // Noone should refer to objects as Types objects }; diff --git a/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.cpp b/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.cpp index ccf63ed3504..6bda3d69113 100644 --- a/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.cpp +++ b/memfilepersistence/src/vespa/memfilepersistence/mapper/simplememfileiobuffer.cpp @@ -5,8 +5,8 @@ #include <vespa/document/datatype/documenttype.h> #include <vespa/memfilepersistence/common/environment.h> #include <vespa/vespalib/util/exceptions.h> +#include <vespa/document/util/bytebuffer.h> #include <vespa/log/log.h> - LOG_SETUP(".memfile.simpleiobuffer"); namespace storage::memfile { |