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

arangod/Cluster/HeartbeatThread.cpp

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

arangod/V8Server/V8Traverser.cpp

@@ -592,7 +592,8 @@ std::unique_ptr<ArangoDBPathFinder::Path> TRI_RunShortestPathSearch(
   auto edgeFilterClosure = [&opts](VPackSlice 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();
     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 key = v.substr(pos + 1);
 
-    VPackBuilder tmp;
-    tmp.openObject();
-    tmp.add(Transaction::KeyString, VPackValue(key));
-    tmp.close();
+    tmpBuilder.clear();
+    tmpBuilder.openObject();
+    tmpBuilder.add(Transaction::KeyString, VPackValue(key));
+    tmpBuilder.close();
     OperationOptions opOpts;
-    OperationResult opRes = opts.trx()->document(col, tmp.slice(), opOpts);
+    OperationResult opRes = opts.trx()->document(col, tmpBuilder.slice(), opOpts);
     if (opRes.failed()) {
       return false;
     }

scripts/build-deb.sh

@@ -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 ..