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

inquire in agency interface adjusted

This commit is contained in:
Kaveh Vahedipour 2017-01-19 13:21:15 +01:00
parent 86ea92f289
commit 8441da1be1
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arangod/Agency/AgencyComm.cpp
View File

@ -1074,7 +1074,8 @@ AgencyCommResult AgencyComm::sendTransactionWithFailover(
: timeout), : timeout),
url, builder.slice().toJson()); url, builder.slice().toJson());
if (!result.successful() && result.httpCode() != 412) { if (!result.successful() && result.httpCode() !=
(int)arangodb::rest::ResponseCode::PRECONDITION_FAILED) {
return result; return result;
} }

4
arangod/Agency/Agent.cpp
View File

@ -653,7 +653,7 @@ trans_ret_t Agent::transact(query_t const& queries) {
// Non-persistent write to non-persisted key-value store // Non-persistent write to non-persisted key-value store
trans_ret_t Agent::transient(query_t const& query) { trans_ret_t Agent::transient(query_t const& queries) {
auto ret = std::make_shared<arangodb::velocypack::Builder>(); auto ret = std::make_shared<arangodb::velocypack::Builder>();
auto leader = _constituent.leaderID(); auto leader = _constituent.leaderID();
@ -674,7 +674,7 @@ trans_ret_t Agent::transient(query_t const& query) {
} }
// Read and writes // Read and writes
for (const auto& query : VPackArrayIterator(query->slice())) { for (const auto& query : VPackArrayIterator(queries->slice())) {
if (query[0].isObject()) { if (query[0].isObject()) {
_transient.apply(query); _transient.apply(query);
} else if (query[0].isString()) { } else if (query[0].isString()) {