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:
jsteemann 2016-04-26 11:58:19 +02:00
parent d21cdb50ad 609cebb48f
commit 57f43f1a22
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Cluster/HeartbeatThread.cpp
View File

@ -188,7 +188,7 @@ void HeartbeatThread::runDBServer() {
CONDITION_LOCKER(locker, _condition); CONDITION_LOCKER(locker, _condition);
wasNotified = _wasNotified; wasNotified = _wasNotified;
if (!wasNotified) { if (!wasNotified) {
locker.wait(static_cast<uint64_t>(remain) * 1000000); locker.wait(static_cast<uint64_t>(remain * 1000000.0));
wasNotified = _wasNotified; wasNotified = _wasNotified;
_wasNotified = false; _wasNotified = false;
} }

13
arangod/V8Server/V8Traverser.cpp
View File

@ -592,7 +592,8 @@ std::unique_ptr<ArangoDBPathFinder::Path> TRI_RunShortestPathSearch(
auto edgeFilterClosure = [&opts](VPackSlice edge) auto edgeFilterClosure = [&opts](VPackSlice edge)
-> bool { return opts.matchesEdge(edge); }; -> bool { return opts.matchesEdge(edge); };
auto vertexFilterClosure = [&opts](VPackSlice const& vertex) -> bool { VPackBuilder tmpBuilder;
auto vertexFilterClosure = [&opts, &tmpBuilder](VPackSlice const& vertex) -> bool {
std::string v = vertex.copyString(); std::string v = vertex.copyString();
size_t pos = v.find('/'); size_t pos = v.find('/');
@ -607,12 +608,12 @@ std::unique_ptr<ArangoDBPathFinder::Path> TRI_RunShortestPathSearch(
std::string col = v.substr(0, pos); std::string col = v.substr(0, pos);
std::string key = v.substr(pos + 1); std::string key = v.substr(pos + 1);
VPackBuilder tmp; tmpBuilder.clear();
tmp.openObject(); tmpBuilder.openObject();
tmp.add(Transaction::KeyString, VPackValue(key)); tmpBuilder.add(Transaction::KeyString, VPackValue(key));
tmp.close(); tmpBuilder.close();
OperationOptions opOpts; OperationOptions opOpts;
OperationResult opRes = opts.trx()->document(col, tmp.slice(), opOpts); OperationResult opRes = opts.trx()->document(col, tmpBuilder.slice(), opOpts);
if (opRes.failed()) { if (opRes.failed()) {
return false; return false;
} }

10
scripts/build-deb.sh Executable file
View File

@ -0,0 +1,10 @@
#!/bin/sh
set -e
mkdir -p build-debian
cd build-debian
cmake -DASM_OPTIMIZATIONS=Off -DETCDIR=/etc -DCMAKE_INSTALL_PREFIX=/usr -DVARDIR=/var ..
make -j12
cpack -G DEB --verbose
cd ..