From ed40426f09a37e53de48b98bf4ad673fca80f085 Mon Sep 17 00:00:00 2001 From: jsteemann Date: Thu, 23 Mar 2017 12:18:24 +0100 Subject: [PATCH 1/2] increase default timeout from 30 to 900 seconds --- arangod/Transaction/Methods.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arangod/Transaction/Methods.h b/arangod/Transaction/Methods.h index 2d55191409..72e6520b4d 100644 --- a/arangod/Transaction/Methods.h +++ b/arangod/Transaction/Methods.h @@ -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; From 5d82e260ff394ab4309c69b3bf53df26e6b97efb Mon Sep 17 00:00:00 2001 From: jsteemann Date: Thu, 23 Mar 2017 12:25:42 +0100 Subject: [PATCH 2/2] added test for issue #2392 --- CHANGELOG | 2 ++ js/server/tests/aql/aql-arithmetic.js | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index 57243cc920..c0f6c34930 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -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 diff --git a/js/server/tests/aql/aql-arithmetic.js b/js/server/tests/aql/aql-arithmetic.js index 897f4243d2..3efb46f38f 100644 --- a/js/server/tests/aql/aql-arithmetic.js +++ b/js/server/tests/aql/aql-arithmetic.js @@ -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 ////////////////////////////////////////////////////////////////////////////////