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

arangod/VocBase/Methods/Version.cpp

@@ -40,9 +40,7 @@
 using namespace arangodb;
 using namespace arangodb::methods;
 
-namespace {
+uint64_t Version::parseVersion(const char *str, size_t len) {
-
-static uint64_t parseVersion(char const* str, size_t len) {
   uint64_t result = 0;
   uint64_t tmp = 0;
   for (size_t i = 0; i < len; i++) {
@@ -67,11 +65,13 @@ static uint64_t parseVersion(char const* str, size_t len) {
   return result*100 + tmp;
 }
 
+uint64_t Version::parseVersion(const char *str) {
+  return parseVersion(str, strlen(str));
 }
 
 /// @brief "(((major * 100) + minor) * 100) + patch"
 uint64_t Version::current() {
-  return parseVersion(ARANGODB_VERSION, strlen(ARANGODB_VERSION));
+  return parseVersion(ARANGODB_VERSION);
 }
 
 VersionResult Version::check(TRI_vocbase_t* vocbase) {

arangod/VocBase/Methods/Version.h

@@ -60,7 +60,7 @@ struct VersionResult {
 };
 
 /// Code to create and initialize databases
-/// Replaces ugrade-database.js for good
+/// Replaces upgrade-database.js for good
 struct Version {
   /// @brief "(((major * 100) + minor) * 100) + patch"
   static uint64_t current();
@@ -68,6 +68,11 @@ struct Version {
   static VersionResult check(TRI_vocbase_t*);
   /// @brief write a VERSION file including all tasks
   static Result write(TRI_vocbase_t*, std::map<std::string, bool> tasks, bool sync);
+
+  static uint64_t parseVersion(const char* str);
+
+ private:
+  static uint64_t parseVersion(const char* str, size_t len);
 };
 }
 }

js/actions/_admin/foxx/app.js

@@ -55,13 +55,17 @@ function proxyLocal (method, url, qs, body, headers = {}) {
   if (body) {
     headers['content-length'] = body.length;
   }
-  const res = request({
+  const req = {
     method,
     url,
     qs,
     headers,
     body
-  });
+  };
+  if (require('internal').db._version(true)['maintainer-mode'] === 'true') {
+    req.timeout = 300;
+  }
+  const res = request(req);
   if (res.json && res.json.errorNum) {
     throw new ArangoError(res.json);
   }

js/client/modules/@arangodb/testsuites/catch.js

@@ -87,7 +87,7 @@ function catchRunner (options) {
       results.basics = {
         failed: 1,
         status: false,
-        message: 'binary "basics_suite" not found'
+        message: 'binary "arangodbtests" not found when trying to run suite "all-catch"'
       };
     }
   }
@@ -114,7 +114,7 @@ function catchRunner (options) {
       results.cache_suite = {
         failed: 1,
         status: false,
-        message: 'binary "cache_suite" not found'
+        message: 'binary "arangodbtests" not found when trying to run suite "cache_suite"'
       };
     }
   }

js/client/modules/@arangodb/testsuites/recovery.js

@@ -53,6 +53,8 @@ const testPaths = {
 function runArangodRecovery (params) {
   let argv = [];
 
+  let binary = pu.ARANGOD_BIN;
+
   if (params.setup) {
     params.options.disableMonitor = true;
     params.testDir = fs.join(params.tempDir, `${params.count}`);
@@ -98,9 +100,13 @@ function runArangodRecovery (params) {
                     }
                    )
     );
+    if (options.rr) {
+      binary = 'rr';
+      argv.unshift(pu.ARANGOD_BIN);
+    }
   }
   params.instanceInfo.pid = pu.executeAndWait(
-    pu.ARANGOD_BIN,
+    binary,
     argv,
     params.options,
     'recovery',

tests/CMakeLists.txt

@@ -141,6 +141,7 @@ set(ARANGODB_TESTS_SOURCES
   RocksDBEngine/IndexEstimatorTest.cpp
   Sharding/ShardDistributionReporterTest.cpp
   SimpleHttpClient/CommunicatorTest.cpp
+  VocBase/VersionTest.cpp
   ${IRESEARCH_TESTS_SOURCES}
 )
 

tests/VocBase/VersionTest.cpp

@@ -0,0 +1,48 @@
+////////////////////////////////////////////////////////////////////////////////
+/// DISCLAIMER
+///
+/// Copyright 2018 ArangoDB GmbH, Cologne, Germany
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+/// Copyright holder is ArangoDB GmbH, Cologne, Germany
+///
+/// @author Tobias Gödderz
+////////////////////////////////////////////////////////////////////////////////
+
+
+#include "VocBase/Methods/Version.h"
+
+#include "catch.hpp"
+
+using arangodb::methods::Version;
+
+TEST_CASE("VocBase Methods", "[Version]") {
+  CHECK( Version::parseVersion("0") == 0 );
+  CHECK( Version::parseVersion("0.0") == 0 );
+  CHECK( Version::parseVersion("0.0.0") == 0 );
+  CHECK( Version::parseVersion("99.99.99") == 999999 );
+
+  CHECK( Version::parseVersion("1.0.0") == 10000 );
+  CHECK( Version::parseVersion("2.3.4") == 20304 );
+  CHECK( Version::parseVersion("12.34.56") == 123456 );
+  CHECK( Version::parseVersion("3.4.0") == 30400 );
+  CHECK( Version::parseVersion("3.4.devel") == 30400 );
+  CHECK( Version::parseVersion("4.0.0") == 40000 );
+  CHECK( Version::parseVersion("4.0.devel") == 40000 );
+
+  CHECK( Version::parseVersion("12.3.4") == 120304 );
+  CHECK( Version::parseVersion("1.23.4") == 12304 );
+  CHECK( Version::parseVersion("1.2.34") == 10234 );
+
+}