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

Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api

This commit is contained in:
Simon Grätzer 2017-04-06 12:41:59 +02:00
parent fce51594ac 617e23e25a
commit 61791509d6
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arangod/Cache/Cache.cpp
View File

@ -164,9 +164,8 @@ bool Cache::isResizing() {
} }
bool Cache::isShutdown() { bool Cache::isShutdown() {
bool shutdown = false;
_state.lock(); _state.lock();
shutdown = !isOperational(); bool shutdown = !isOperational();
_state.unlock(); _state.unlock();
return shutdown; return shutdown;

2
arangod/Graph/AttributeWeightShortestPathFinder.cpp
View File

@ -106,7 +106,7 @@ void AttributeWeightShortestPathFinder::SearcherTwoThreads::lookupPeer(
// Did we find a solution on our own? This is for the // Did we find a solution on our own? This is for the
// single thread case and for the case that the other // single thread case and for the case that the other
// thread is too slow to even finish its own start vertex! // thread is too slow to even finish its own start vertex!
if (s->weight() == 0) { if (s->weight() == 0.0) {
// We have found the target, we have finished all // We have found the target, we have finished all
// vertices with a smaller weight than this one (and did // vertices with a smaller weight than this one (and did
// not succeed), so this must be a best solution: // not succeed), so this must be a best solution:

2
arangod/Graph/AttributeWeightShortestPathFinder.h
View File

@ -52,7 +52,7 @@ class AttributeWeightShortestPathFinder : public ShortestPathFinder {
arangodb::velocypack::Slice _edge; arangodb::velocypack::Slice _edge;
bool _done; bool _done;
Step() : _done(false) {} Step() : _weight(0.0), _done(false) {}
Step(arangodb::velocypack::Slice const& vert, Step(arangodb::velocypack::Slice const& vert,
arangodb::velocypack::Slice const& pred, double weig, arangodb::velocypack::Slice const& pred, double weig,