Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

try not to throw so many exceptions from Supervision (#7227)

This commit is contained in:
Jan 2018-11-07 15:36:41 +01:00 committed by GitHub
parent 733b2a4574
commit 7306cdaa03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 69 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
arangod/Agency/Node.cpp
View File

@ -918,6 +918,13 @@ bool Node::isInt() const {
return slice().isInt() || slice().isSmallInt();
}
bool Node::isNumber() const {
if (type() == NODE) {
return false;
}
return slice().isNumber();
}
double Node::getDouble() const {
if (type() == NODE) {
throw StoreException("Must not convert NODE type to double");
@ -926,16 +933,16 @@ double Node::getDouble() const {
}
std::pair<Node const &, bool> Node::hasAsNode(
std::string const & url) const {
std::pair<Node const&, bool> Node::hasAsNode(
std::string const& url) const {
// *this is bogus initializer
std::pair<Node const &, bool> fail_pair= {*this, false};
std::pair<Node const&, bool> fail_pair = {*this, false};
// retrieve node, throws if does not exist
try {
Node const & target(operator()(url));
std::pair<Node const &, bool> good_pair={target, true};
Node const& target(operator()(url));
std::pair<Node const&, bool> good_pair = {target, true};
return good_pair;
} catch (...) {
// do nothing, fail_pair second already false
@ -947,16 +954,16 @@ std::pair<Node const &, bool> Node::hasAsNode(
} // hasAsNode
std::pair<Node &, bool> Node::hasAsWritableNode(
std::string const & url) {
std::pair<Node&, bool> Node::hasAsWritableNode(
std::string const& url) {
// *this is bogus initializer
std::pair<Node &, bool> fail_pair= {*this, false};
std::pair<Node&, bool> fail_pair = {*this, false};
// retrieve node, throws if does not exist
try {
Node & target(operator()(url));
std::pair<Node &, bool> good_pair={target, true};
std::pair<Node&, bool> good_pair = {target, true};
return good_pair;
} catch (...) {
// do nothing, fail_pair second already false
@ -969,13 +976,13 @@ std::pair<Node &, bool> Node::hasAsWritableNode(
std::pair<NodeType, bool> Node::hasAsType(
std::string const & url) const {
std::string const& url) const {
std::pair<NodeType, bool> ret_pair={NODE, false};
std::pair<NodeType, bool> ret_pair = {NODE, false};
// retrieve node, throws if does not exist
try {
Node const & target(operator()(url));
Node const& target(operator()(url));
ret_pair.first = target.type();
ret_pair.second = true;
} catch (...) {
@ -989,7 +996,7 @@ std::pair<NodeType, bool> Node::hasAsType(
std::pair<Slice, bool> Node::hasAsSlice(
std::string const & url) const {
std::string const& url) const {
// *this is bogus initializer
std::pair<Slice, bool> ret_pair =
@ -997,7 +1004,7 @@ std::pair<Slice, bool> Node::hasAsSlice(
// retrieve node, throws if does not exist
try {
Node const & target(operator()(url));
Node const& target(operator()(url));
ret_pair.first = target.slice();
ret_pair.second = true;
} catch (...) {
@ -1011,14 +1018,16 @@ std::pair<Slice, bool> Node::hasAsSlice(
std::pair<uint64_t, bool> Node::hasAsUInt(
std::string const & url) const {
std::string const& url) const {
std::pair<uint64_t, bool> ret_pair(0, false);
// retrieve node, throws if does not exist
try {
Node const & target(operator()(url));
ret_pair.first = target.getUInt();
ret_pair.second = true;
Node const& target(operator()(url));
if (target.isNumber()) {
ret_pair.first = target.getUInt();
ret_pair.second = true;
}
} catch (...) {
// do nothing, ret_pair second already false
LOG_TOPIC(DEBUG, Logger::SUPERVISION)
@ -1030,14 +1039,16 @@ std::pair<uint64_t, bool> Node::hasAsUInt(
std::pair<bool, bool> Node::hasAsBool(
std::string const & url) const {
std::string const& url) const {
std::pair<bool, bool> ret_pair(false, false);
// retrieve node, throws if does not exist
try {
Node const & target(operator()(url));
ret_pair.first = target.getBool();
ret_pair.second = true;
Node const& target(operator()(url));
if (target.isBool()) {
ret_pair.first = target.getBool();
ret_pair.second = true;
}
} catch (...) {
// do nothing, ret_pair second already false
LOG_TOPIC(DEBUG, Logger::SUPERVISION)
@ -1049,16 +1060,18 @@ std::pair<bool, bool> Node::hasAsBool(
std::pair<std::string, bool> Node::hasAsString(
std::string const & url) const {
std::string const& url) const {
std::pair<std::string, bool> ret_pair;
ret_pair.second = false;
// retrieve node, throws if does not exist
try {
Node const & target(operator()(url));
ret_pair.first = target.getString();
ret_pair.second = true;
Node const& target(operator()(url));
if (target.isString()) {
ret_pair.first = target.getString();
ret_pair.second = true;
}
} catch (...) {
// do nothing, ret_pair second already false
LOG_TOPIC(DEBUG, Logger::SUPERVISION)
@ -1070,14 +1083,14 @@ std::pair<std::string, bool> Node::hasAsString(
std::pair<Node::Children, bool> Node::hasAsChildren(
std::string const & url) const {
std::string const& url) const {
std::pair<Children, bool> ret_pair;
ret_pair.second=false;
ret_pair.second = false;
// retrieve node, throws if does not exist
try {
Node const & target(operator()(url));
Node const& target(operator()(url));
ret_pair.first = target.children();
ret_pair.second = true;
} catch (...) {
@ -1090,13 +1103,13 @@ std::pair<Node::Children, bool> Node::hasAsChildren(
} // hasAsChildren
std::pair<void *, bool> Node::hasAsBuilder(
std::string const & url, Builder & builder, bool showHidden) const {
std::pair<void *, bool> ret_pair(nullptr, false);
std::pair<void*, bool> Node::hasAsBuilder(
std::string const& url, Builder& builder, bool showHidden) const {
std::pair<void*, bool> ret_pair(nullptr, false);
// retrieve node, throws if does not exist
try {
Node const & target(operator()(url));
Node const& target(operator()(url));
target.toBuilder(builder, showHidden);
ret_pair.second = true;
} catch (...) {
@ -1110,13 +1123,13 @@ std::pair<void *, bool> Node::hasAsBuilder(
std::pair<Builder, bool> Node::hasAsBuilder(
std::string const & url) const {
std::string const& url) const {
Builder builder;
std::pair<Builder, bool> ret_pair(builder, false);
// retrieve node, throws if does not exist
try {
Node const & target(operator()(url));
Node const& target(operator()(url));
target.toBuilder(builder);
ret_pair.first = builder; // update
ret_pair.second = true;
@ -1131,7 +1144,7 @@ std::pair<Builder, bool> Node::hasAsBuilder(
std::pair<Slice, bool> Node::hasAsArray(
std::string const & url) const {
std::string const& url) const {
// *this is bogus initializer
std::pair<Slice, bool> ret_pair =
@ -1139,7 +1152,7 @@ std::pair<Slice, bool> Node::hasAsArray(
// retrieve node, throws if does not exist
try {
Node const & target(operator()(url));
Node const& target(operator()(url));
ret_pair.first = target.getArray();
ret_pair.second = true;
} catch (...) {

27
arangod/Agency/Node.h
View File

@ -213,11 +213,14 @@ class Node {
/// @brief Part of relative path which exists
bool has(std::string const&) const;
/// @brief Is UInt
/// @brief Is Int
bool isInt() const;
/// @brief Is UInt
bool isUInt() const;
/// @brief Is number
bool isNumber() const;
/// @brief Is boolean
bool isBool() const;
@ -230,47 +233,47 @@ class Node {
/// @brief accessor to Node object
/// @return second is true if url exists, first populated if second true
std::pair<Node const &, bool> hasAsNode(std::string const &) const;
std::pair<Node const&, bool> hasAsNode(std::string const&) const;
/// @brief accessor to Node object
/// @return second is true if url exists, first populated if second true
std::pair<Node &, bool> hasAsWritableNode(std::string const &);
std::pair<Node&, bool> hasAsWritableNode(std::string const&);
/// @brief accessor to Node's type
/// @return second is true if url exists, first populated if second true
std::pair<NodeType, bool> hasAsType(std::string const &) const;
std::pair<NodeType, bool> hasAsType(std::string const&) const;
/// @brief accessor to Node's Slice value
/// @return second is true if url exists, first populated if second true
std::pair<Slice, bool> hasAsSlice(std::string const &) const;
std::pair<Slice, bool> hasAsSlice(std::string const&) const;
/// @brief accessor to Node's uint64_t value
/// @return second is true if url exists, first populated if second true
std::pair<uint64_t, bool> hasAsUInt(std::string const &) const;
std::pair<uint64_t, bool> hasAsUInt(std::string const&) const;
/// @brief accessor to Node's bool value
/// @return second is true if url exists, first populated if second true
std::pair<bool, bool> hasAsBool(std::string const &) const;
std::pair<bool, bool> hasAsBool(std::string const&) const;
/// @brief accessor to Node's std::string value
/// @return second is true if url exists, first populated if second true
std::pair<std::string, bool> hasAsString(std::string const &) const;
std::pair<std::string, bool> hasAsString(std::string const&) const;
/// @brief accessor to Node's _children
/// @return second is true if url exists, first populated if second true
std::pair<Children, bool> hasAsChildren(std::string const &) const;
std::pair<Children, bool> hasAsChildren(std::string const&) const;
/// @brief accessor to Node then write to builder
/// @return second is true if url exists, first is ignored
std::pair<void *, bool> hasAsBuilder(std::string const &, Builder&, bool showHidden = false) const;
std::pair<void *, bool> hasAsBuilder(std::string const&, Builder&, bool showHidden = false) const;
/// @brief accessor to Node's value as a Builder object
/// @return second is true if url exists, first populated if second true
std::pair<Builder, bool> hasAsBuilder(std::string const &) const;
std::pair<Builder, bool> hasAsBuilder(std::string const&) const;
/// @brief accessor to Node's Array
/// @return second is true if url exists, first populated if second true
std::pair<Slice, bool> hasAsArray(std::string const &) const;
std::pair<Slice, bool> hasAsArray(std::string const&) const;
//
// These two operator() functions could be "protected" once

5
arangod/Agency/Supervision.cpp
View File

@ -801,7 +801,10 @@ void Supervision::run() {
// Guarded by caller
bool Supervision::isShuttingDown() {
_lock.assertLockedByCurrentThread();
return _snapshot.hasAsBool("Shutdown").first;
if (_snapshot.has("Shutdown")) {
return _snapshot.hasAsBool("Shutdown").first;
}
return false;
}
// Guarded by caller