Wipe refactoring + Toc/Remote Wipe #158
+3,476
−1,330
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1 @@ | ||
| 5.17.4-rc |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,120 @@ | ||
| /* | ||
| * (C) Copyright 1996- ECMWF. | ||
| * | ||
| * This software is licensed under the terms of the Apache Licence Version 2.0 | ||
| * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. | ||
| * In applying this licence, ECMWF does not waive the privileges and immunities | ||
| * granted to it by virtue of its status as an intergovernmental organisation nor | ||
| * does it submit to any jurisdiction. | ||
| */ | ||
|
|
||
| #include "fdb5/api/helpers/WipeIterator.h" | ||
|
|
||
| #include "eckit/log/Log.h" | ||
| #include "eckit/serialisation/Stream.h" | ||
|
|
||
| #include "fdb5/LibFdb5.h" | ||
|
|
||
| using namespace eckit; | ||
| namespace fdb5 { | ||
|
|
||
| //---------------------------------------------------------------------------------------------------------------------- | ||
|
|
||
| std::ostream& operator<<(std::ostream& s, const WipeElementType& t) { | ||
| switch (t) { | ||
| case WipeElementType::WIPE_CATALOGUE_INFO: | ||
| s << "WIPE_CATALOGUE_INFO"; | ||
| break; | ||
| case WipeElementType::WIPE_CATALOGUE: | ||
| s << "WIPE_CATALOGUE"; | ||
| break; | ||
| case WipeElementType::WIPE_CATALOGUE_SAFE: | ||
| s << "WIPE_CATALOGUE_SAFE"; | ||
| break; | ||
| case WipeElementType::WIPE_CATALOGUE_AUX: | ||
| s << "WIPE_CATALOGUE_AUX"; | ||
| break; | ||
| case WipeElementType::WIPE_STORE_INFO: | ||
| s << "WIPE_STORE_INFO"; | ||
| break; | ||
| case WipeElementType::WIPE_STORE: | ||
| s << "WIPE_STORE"; | ||
| break; | ||
| case WipeElementType::WIPE_STORE_URI: | ||
| s << "WIPE_STORE_URI"; | ||
| break; | ||
| case WipeElementType::WIPE_STORE_AUX: | ||
| s << "WIPE_STORE_AUX"; | ||
| break; | ||
| } | ||
| s << "(" << ((int)t) << ")"; | ||
| return s; | ||
| } | ||
|
|
||
| WipeElement::WipeElement(WipeElementType type, const std::string& msg, eckit::URI uri) : | ||
| type_(type), msg_(msg), uris_({uri}) {} | ||
|
|
||
| WipeElement::WipeElement(WipeElementType type, const std::string& msg, const std::vector<eckit::URI>& uris) : | ||
| type_(type), msg_(msg), uris_(uris) {} | ||
|
|
||
| WipeElement::WipeElement(eckit::Stream& s) { | ||
| unsigned char t; | ||
| s >> t; | ||
| type_ = static_cast<WipeElementType>(t); | ||
| s >> msg_; | ||
| size_t numURIs; | ||
| s >> numURIs; | ||
| for (size_t i = 0; i < numURIs; i++) { | ||
| uris_.push_back(s); | ||
| } | ||
| } | ||
|
|
||
| void WipeElement::print(std::ostream& out) const { | ||
|
|
||
| LOG_DEBUG_LIB(LibFdb5) << "Wipe(type=" << type_ << ",msg=" << msg_ << ",uris=["; | ||
|
Contributor
There was a problem hiding this comment. Oof. This is unpleasant inside ::print(), as this method is typically called in the middle of ostream output. Which results in info/error/debug output becoming interleaved on the terminal. A but unpleasant. |
||
| std::string sep = ""; | ||
| for (const auto& uri : uris_) { | ||
| LOG_DEBUG_LIB(LibFdb5) << sep << std::endl << " " << uri; | ||
| sep = ","; | ||
| } | ||
| LOG_DEBUG_LIB(LibFdb5) << "])" << std::endl; | ||
|
|
||
|
|
||
| out << msg_ << std::endl; | ||
| if (type_ != WIPE_CATALOGUE_INFO && type_ != WIPE_STORE_INFO) { | ||
| if (uris_.size() > 0) { | ||
| for (const auto& uri : uris_) { | ||
| out << " " << uri.asString() << std::endl; | ||
| } | ||
| out << std::endl; | ||
| } | ||
| else { | ||
| out << " - NONE -" << std::endl; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| size_t encodeSizeString(const std::string& s) { | ||
| return (1 + 4 + s.size()); | ||
| } | ||
|
|
||
| size_t WipeElement::encodeSize() const { | ||
| // size_t aux = 0; | ||
| // for (const auto& l : uris_) { | ||
| // aux += 256; | ||
| // } | ||
| return 1 + 4 + encodeSizeString(msg_) + 1 + 4 + (256 * uris_.size()); | ||
| } | ||
|
|
||
| void WipeElement::encode(eckit::Stream& s) const { | ||
| s << static_cast<unsigned char>(type_); | ||
| s << msg_; | ||
| s << uris_.size(); | ||
| for (const auto& uri : uris_) { | ||
| s << uri; | ||
| } | ||
| } | ||
|
|
||
| //---------------------------------------------------------------------------------------------------------------------- | ||
|
|
||
| } // namespace fdb5 | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * (C) Copyright 1996- ECMWF. | ||
| * | ||
| * This software is licensed under the terms of the Apache Licence Version 2.0 | ||
| * which can be obtained at http://www.apache.org/licenses/LICENSE-2.0. | ||
| * In applying this licence, ECMWF does not waive the privileges and immunities | ||
| * granted to it by virtue of its status as an intergovernmental organisation nor | ||
| * does it submit to any jurisdiction. | ||
| */ | ||
|
|
||
| #include "fdb5/api/helpers/WipeIterator.h" | ||
|
|
||
| #include "eckit/serialisation/Stream.h" | ||
|
|
||
| namespace fdb5 { | ||
|
|
||
| //---------------------------------------------------------------------------------------------------------------------- | ||
|
|
||
| WipeElement::WipeElement(WipeElementType type, const std::string& msg, eckit::URI uri) : | ||
| type_(type), msg_(msg), uris_({uri}) {} | ||
|
|
||
| WipeElement::WipeElement(WipeElementType type, const std::string& msg) : type_(type), msg_(msg), uris_({}) {} | ||
|
|
||
| WipeElement::WipeElement(WipeElementType type, const std::string& msg, std::set<eckit::URI>&& uris) : | ||
| type_(type), msg_(msg), uris_(std::move(uris)) {} | ||
|
|
||
| WipeElement::WipeElement(eckit::Stream& s) { | ||
| unsigned char t; | ||
| s >> t; | ||
| type_ = static_cast<WipeElementType>(t); | ||
| s >> msg_; | ||
| size_t numURIs; | ||
| s >> numURIs; | ||
| for (size_t i = 0; i < numURIs; i++) { | ||
| uris_.insert(eckit::URI{s}); | ||
| } | ||
| } | ||
|
|
||
| void WipeElement::print(std::ostream& out) const { | ||
| // out << "Wipe(type=" << type_ << ",msg=" << msg_ << ",uris=["; | ||
| // std::string sep = ""; | ||
| // for (const auto& uri : uris_) { | ||
| // out << sep << uri; | ||
| // sep = ","; | ||
| // } | ||
| // out << "])"; | ||
|
Comment on lines
+40
to
+46
|
||
| out << msg_ << std::endl; | ||
| if (type_ != WIPE_CATALOGUE_INFO && type_ != WIPE_STORE_INFO) { | ||
| if (uris_.size() > 0) { | ||
| for (const auto& uri : uris_) { | ||
| out << " " << uri.asString() << std::endl; | ||
| } | ||
| out << std::endl; | ||
| } | ||
| else { | ||
| out << " - NONE -" << std::endl; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| size_t encodeSizeString(const std::string& s) { | ||
| return (1 + 4 + s.size()); | ||
|
Contributor
There was a problem hiding this comment. What is the 1 and the 4 for? |
||
| } | ||
|
|
||
| size_t WipeElement::encodeSize() const { | ||
| size_t aux = 0; | ||
|
Member
There was a problem hiding this comment. So... aux here is the estimated size of all the uris combined? Why is it called aux? |
||
| for (const auto& l : uris_) { | ||
| aux += 256; | ||
|
Contributor
There was a problem hiding this comment. Surely this should add the length of the URI? Or something dependent on that. |
||
| } | ||
| return 1 + 4 + encodeSizeString(msg_) + 1 + 4 + aux; | ||
| } | ||
|
|
||
| void WipeElement::encode(eckit::Stream& s) const { | ||
| s << static_cast<unsigned char>(type_); | ||
| s << msg_; | ||
| s << uris_.size(); | ||
| for (const auto& uri : uris_) { | ||
| s << uri; | ||
| } | ||
| } | ||
|
|
||
| //---------------------------------------------------------------------------------------------------------------------- | ||
|
|
||
| } // namespace fdb5 | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I assume this file should be deleted? It is a (older/newer) copy of src/fdb5/api/helpers/WipeIterator.cc