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

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Andreas Streichardt 2016-06-06 10:50:10 +02:00
parent edc9de6453 9fa9d49102
commit 2da5b43730
3 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/Agency/Store.cpp
View File

@ -138,10 +138,10 @@ Store::~Store() {}
std::vector<bool> Store::apply(query_t const& query) {
std::vector<bool> applied;
MUTEX_LOCKER(storeLocker, _storeLock);
for (auto const& i : VPackArrayIterator(query->slice())) {
/*for (auto const& i : VPackArrayIterator(query->slice())) {
LOG(WARN) << i[0].typeName();
LOG(WARN) << i[0].keyAt(0).copyString();
}
} */
for (auto const& i : VPackArrayIterator(query->slice())) {
switch (i.length()) {
case 1:

64
arangod/Agency/Supervision.cpp
View File

@ -66,7 +66,7 @@ static std::string const planCoordinatorsPrefix = "/Plan/Coordinators";
std::vector<check_t> Supervision::checkDBServers() {
std::vector<check_t> ret;
Node::Children const& machinesPlanned =
Node::Children const machinesPlanned =
_snapshot(planDBServersPrefix).children();
for (auto const& machine : machinesPlanned) {
@ -138,7 +138,7 @@ std::vector<check_t> Supervision::checkDBServers() {
std::vector<check_t> Supervision::checkCoordinators() {
std::vector<check_t> ret;
Node::Children const& machinesPlanned =
Node::Children const machinesPlanned =
_snapshot(planCoordinatorsPrefix).children();
for (auto const& machine : machinesPlanned) {
@ -270,38 +270,34 @@ void Supervision::workJobs() {
Node::Children const todos = _snapshot(toDoPrefix).children();
Node::Children const pends = _snapshot(pendingPrefix).children();
if (!todos.empty()) {
for (auto const& todoEnt : todos) {
Node const& job = *todoEnt.second;
try {
std::string jobType = job("type").getString(),
jobId = job("jobId").getString(),
creator = job("creator").getString();
if (jobType == "failedServer") {
FailedServer fs(_snapshot, _agent, jobId, creator, _agencyPrefix);
} else if (jobType == "cleanOutServer") {
CleanOutServer cos(_snapshot, _agent, jobId, creator, _agencyPrefix);
}
} catch (std::exception const&) {}
}
for (auto const& todoEnt : todos) {
Node const& job = *todoEnt.second;
try {
std::string jobType = job("type").getString(),
jobId = job("jobId").getString(),
creator = job("creator").getString();
if (jobType == "failedServer") {
FailedServer fs(_snapshot, _agent, jobId, creator, _agencyPrefix);
} else if (jobType == "cleanOutServer") {
CleanOutServer cos(_snapshot, _agent, jobId, creator, _agencyPrefix);
}
} catch (std::exception const&) {}
}
if (!pends.empty()) {
for (auto const& pendEnt : pends) {
Node const& job = *pendEnt.second;
try {
std::string jobType = job("type").getString(),
jobId = job("jobId").getString(),
creator = job("creator").getString();
if (jobType == "failedServer") {
FailedServer fs(_snapshot, _agent, jobId, creator, _agencyPrefix);
} else if (jobType == "cleanOutServer") {
CleanOutServer cos(_snapshot, _agent, jobId, creator, _agencyPrefix);
}
} catch (std::exception const&) {}
}
for (auto const& pendEnt : pends) {
Node const& job = *pendEnt.second;
try {
std::string jobType = job("type").getString(),
jobId = job("jobId").getString(),
creator = job("creator").getString();
if (jobType == "failedServer") {
FailedServer fs(_snapshot, _agent, jobId, creator, _agencyPrefix);
} else if (jobType == "cleanOutServer") {
CleanOutServer cos(_snapshot, _agent, jobId, creator, _agencyPrefix);
}
} catch (std::exception const&) {}
}
}
@ -349,7 +345,7 @@ void Supervision::getUniqueIds() {
try {
latestId = std::stoul(
_agent->readDB().get(_agencyPrefix + "/Sync/LatestID").slice().toJson());
} catch (std::exception const&) {
} catch (...) {
std::this_thread::sleep_for (std::chrono::seconds(1));
continue;
}
@ -375,7 +371,7 @@ void Supervision::getUniqueIds() {
}
void Supervision::updateFromAgency() {
auto const& jobsPending =
auto const jobsPending =
_snapshot("/Supervision/Jobs/Pending").children();
for (auto const& jobent : jobsPending) {

5
js/server/tests/aql/aql-functions-numeric.js
View File

@ -46,6 +46,11 @@ function ahuacatlNumericFunctionsTestSuite () {
if (typeof(b) === 'number') {
b = b.toPrecision(8);
}
if (((a === 0) && (b === 0.0))||
((b === 0) && (a === 0.0))) {
return;
}
assertEqual(a, b);
}