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 compaction

This commit is contained in:
jsteemann 2016-01-18 21:18:55 +01:00
parent 41b18ade20 61f868c9f6
commit d9640d74e5
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/server/modules/@arangodb/testing.js
View File

@ -1103,10 +1103,10 @@ function performTests(options, testList, testname, remote) {
first = false; first = false;
if (options.loopEternal) { if (options.loopEternal) {
if (options.loopSleepWhen % loopCount == 0) { if (options.loopSleepWhen % loopCount === 0) {
print("sleeping...") print("sleeping...");
internal.sleep(options.loopSleepSec); sleep(options.loopSleepSec);
print("continuing.") print("continuing.");
} }
loopCount++; loopCount++;
} }

2
js/server/tests/aql-edges-cluster.js
View File

@ -1,5 +1,5 @@
/*jshint globalstrict:false, strict:false, sub: true, maxlen: 500 */ /*jshint globalstrict:false, strict:false, sub: true, maxlen: 500 */
/*global assertEqual, AQL_EXPLAIN */ /*global assertEqual, AQL_EXECUTE, AQL_EXPLAIN */
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief tests for query language, edges /// @brief tests for query language, edges
/// ///

2
js/server/tests/aql-edges-noncluster.js
View File

@ -1,5 +1,5 @@
/*jshint globalstrict:false, strict:false, sub: true, maxlen: 500 */ /*jshint globalstrict:false, strict:false, sub: true, maxlen: 500 */
/*global assertEqual, AQL_EXPLAIN */ /*global assertEqual, AQL_EXECUTE, AQL_EXPLAIN */
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief tests for query language, edges /// @brief tests for query language, edges
/// ///

2
js/server/tests/aql-hash-cluster.js
View File

@ -1,5 +1,5 @@
/*jshint globalstrict:false, strict:false, sub: true, maxlen: 500 */ /*jshint globalstrict:false, strict:false, sub: true, maxlen: 500 */
/*global assertEqual, AQL_EXPLAIN */ /*global assertEqual, AQL_EXECUTE, AQL_EXPLAIN */
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief tests for Ahuacatl, hash index queries /// @brief tests for Ahuacatl, hash index queries

2
js/server/tests/aql-hash-noncluster.js
View File

@ -1,5 +1,5 @@
/*jshint globalstrict:false, strict:false, sub: true, maxlen: 500 */ /*jshint globalstrict:false, strict:false, sub: true, maxlen: 500 */
/*global assertEqual, AQL_EXPLAIN */ /*global assertEqual, AQL_EXECUTE, AQL_EXPLAIN */
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief tests for Ahuacatl, hash index queries /// @brief tests for Ahuacatl, hash index queries

2
js/server/tests/aql-skiplist-cluster.js
View File

@ -1,5 +1,5 @@
/*jshint globalstrict:false, strict:false, maxlen: 500 */ /*jshint globalstrict:false, strict:false, maxlen: 500 */
/*global assertEqual, AQL_EXPLAIN */ /*global assertEqual, AQL_EXECUTE, AQL_EXPLAIN */
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief tests for Ahuacatl, skiplist index queries /// @brief tests for Ahuacatl, skiplist index queries

2
js/server/tests/aql-skiplist-noncluster.js
View File

@ -1,5 +1,5 @@
/*jshint globalstrict:false, strict:false, maxlen: 500 */ /*jshint globalstrict:false, strict:false, maxlen: 500 */
/*global assertEqual, AQL_EXPLAIN */ /*global assertEqual, AQL_EXECUTE, AQL_EXPLAIN */
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief tests for Ahuacatl, skiplist index queries /// @brief tests for Ahuacatl, skiplist index queries