diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-10-18 14:54:28 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-10-18 14:54:28 +0000 |
commit | e099df397486313831f09befa1d081b178384632 (patch) | |
tree | 2a3b98ba69c25255724653df521ce0a5a38d6972 /storageapi/src | |
parent | b17c5c96e18ae04a1b39b4d0ec3dc89832038c05 (diff) |
Move join handling together with split handling.
Diffstat (limited to 'storageapi/src')
-rw-r--r-- | storageapi/src/vespa/storageapi/buckets/bucketinfo.h | 16 | ||||
-rw-r--r-- | storageapi/src/vespa/storageapi/message/internal.cpp | 10 | ||||
-rw-r--r-- | storageapi/src/vespa/storageapi/message/internal.h | 6 |
3 files changed, 14 insertions, 18 deletions
diff --git a/storageapi/src/vespa/storageapi/buckets/bucketinfo.h b/storageapi/src/vespa/storageapi/buckets/bucketinfo.h index 75d0f4f512d..5b2de4b4d61 100644 --- a/storageapi/src/vespa/storageapi/buckets/bucketinfo.h +++ b/storageapi/src/vespa/storageapi/buckets/bucketinfo.h @@ -14,21 +14,21 @@ #pragma once #include <vespa/storageapi/defs.h> -#include <vespa/vespalib/util/printable.h> #include <vespa/vespalib/util/xmlserializable.h> +#include <vespa/vespalib/stllike/string.h> namespace storage::api { class BucketInfo { Timestamp _lastModified; - uint32_t _checksum; - uint32_t _docCount; - uint32_t _totDocSize; - uint32_t _metaCount; - uint32_t _usedFileSize; - bool _ready; - bool _active; + uint32_t _checksum; + uint32_t _docCount; + uint32_t _totDocSize; + uint32_t _metaCount; + uint32_t _usedFileSize; + bool _ready; + bool _active; public: BucketInfo() noexcept; diff --git a/storageapi/src/vespa/storageapi/message/internal.cpp b/storageapi/src/vespa/storageapi/message/internal.cpp index cb52d0e1fd5..bb09a5c00c7 100644 --- a/storageapi/src/vespa/storageapi/message/internal.cpp +++ b/storageapi/src/vespa/storageapi/message/internal.cpp @@ -4,22 +4,21 @@ #include <ostream> -namespace storage { -namespace api { +namespace storage::api { InternalCommand::InternalCommand(uint32_t type) : StorageCommand(MessageType::INTERNAL), _type(type) { } -InternalCommand::~InternalCommand() { } +InternalCommand::~InternalCommand() = default; InternalReply::InternalReply(uint32_t type, const InternalCommand& cmd) : StorageReply(cmd), _type(type) { } -InternalReply::~InternalReply() { } +InternalReply::~InternalReply() = default; void InternalCommand::print(std::ostream& out, bool verbose, const std::string& indent) const @@ -42,6 +41,5 @@ InternalReply::print(std::ostream& out, bool verbose, const std::string& indent) } -} // api -} // storage +} diff --git a/storageapi/src/vespa/storageapi/message/internal.h b/storageapi/src/vespa/storageapi/message/internal.h index 17faaa264ce..4246c43a3c4 100644 --- a/storageapi/src/vespa/storageapi/message/internal.h +++ b/storageapi/src/vespa/storageapi/message/internal.h @@ -15,8 +15,7 @@ #include <vespa/storageapi/messageapi/storagecommand.h> #include <vespa/storageapi/messageapi/storagereply.h> -namespace storage { -namespace api { +namespace storage::api { /** * @class InternalCommand @@ -66,6 +65,5 @@ public: void print(std::ostream& out, bool verbose, const std::string& indent) const override; }; -} // api -} // storage +} |