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

Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel

This commit is contained in:
Max Neunhoeffer 2017-03-23 12:33:31 +01:00
parent 32953a4a97 e5543f5ea2
commit b07f302ce5
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -1,6 +1,8 @@
devel
-----
* increase default collection lock timeout from 30 to 900 seconds
* added function `db._engine()` for retrieval of storage engine information at
server runtime

2
arangod/Transaction/Methods.h
View File

@ -84,7 +84,7 @@ class Methods {
public:
/// @brief time (in seconds) that is spent waiting for a lock
static constexpr double DefaultLockTimeout = 30.0;
static constexpr double DefaultLockTimeout = 900.0;
class IndexHandle {
friend class transaction::Methods;

5
js/server/tests/aql/aql-arithmetic.js
View File

@ -54,6 +54,11 @@ function ahuacatlArithmeticTestSuite () {
tearDown : function () {
},
testConstAttributeAccess : function () {
var actual = getQueryResults("LET it = { a: 4, b: 5, c: 6 } RETURN [ it.a * 3, it.b * 4, it.c * 5 ]");
assertEqual([ [ 4 * 3, 5 * 4, 6 * 5 ] ], actual);
},
////////////////////////////////////////////////////////////////////////////////
/// @brief test unary plus
////////////////////////////////////////////////////////////////////////////////