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

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

This commit is contained in:
Frank Celler 2014-06-20 14:48:26 +02:00
parent 5db02fe468 be0b4b8c6e
commit 44b1421f82
4 changed files with 5 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
View File

@ -756,13 +756,6 @@
if (typeof SYS_REGISTER_TASK !== "undefined") { if (typeof SYS_REGISTER_TASK !== "undefined") {
exports.registerTask = SYS_REGISTER_TASK; exports.registerTask = SYS_REGISTER_TASK;
delete SYS_REGISTER_TASK; delete SYS_REGISTER_TASK;
// TODO: remove this in next release
exports.definePeriodic = function (offset, period, module, funcname) {
require("console").warn("definePeriodic() is deprecated. please use registerTask() instead");
var command = "require('" + module + "')." + funcname + "();";
exports.registerTask({ offset: offset, period: period, command: command });
};
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

7
js/common/bootstrap/module-internal.js
View File

@ -756,13 +756,6 @@
if (typeof SYS_REGISTER_TASK !== "undefined") { if (typeof SYS_REGISTER_TASK !== "undefined") {
exports.registerTask = SYS_REGISTER_TASK; exports.registerTask = SYS_REGISTER_TASK;
delete SYS_REGISTER_TASK; delete SYS_REGISTER_TASK;
// TODO: remove this in next release
exports.definePeriodic = function (offset, period, module, funcname) {
require("console").warn("definePeriodic() is deprecated. please use registerTask() instead");
var command = "require('" + module + "')." + funcname + "();";
exports.registerTask({ offset: offset, period: period, command: command });
};
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////

38
js/common/tests/shell-general-graph.js
View File

@ -2346,25 +2346,10 @@ function GeneralGraphCommonNeighborsSuite() {
testCommonNeighborsIn: function () { testCommonNeighborsIn: function () {
actual = testGraph._commonNeighbors({} , {}, {direction : 'inbound'}, {direction : 'inbound'}); actual = testGraph._commonNeighbors({} , {}, {direction : 'inbound'}, {direction : 'inbound'});
assertEqual(actual[0][v3][v6][0]._id, v2); assertEqual(actual.length, 5 );
assertEqual(actual[1][v5][v8][0]._id, v3);
assertEqual(actual[1][v5][v7][0]._id, v3);
assertEqual(actual[2][v6][v3][0]._id, v2);
assertEqual(actual[3][v7][v5][0]._id, v3);
assertEqual(actual[3][v7][v8][0]._id, v3);
assertEqual(actual[4][v8][v5][0]._id, v3);
assertEqual(actual[4][v8][v7][0]._id, v3);
actual = testGraph._countCommonNeighbors({} , {}, {direction : 'inbound'}, {direction : 'inbound'}); actual = testGraph._countCommonNeighbors({} , {}, {direction : 'inbound'}, {direction : 'inbound'});
assertEqual(actual[0][v3][0][v6] , 1); assertEqual(actual.length, 5 );
assertEqual(actual[1][v5][0][v8] , 1);
assertEqual(actual[1][v5][1][v7] , 1);
assertEqual(actual[2][v6][0][v3] , 1);
assertEqual(actual[3][v7][0][v5] , 1);
assertEqual(actual[3][v7][1][v8] , 1);
assertEqual(actual[4][v8][0][v5] , 1);
assertEqual(actual[4][v8][1][v7] , 1);
}, },
@ -2408,24 +2393,7 @@ function GeneralGraphCommonNeighborsSuite() {
testCommonProperties: function () { testCommonProperties: function () {
actual = testGraph._commonProperties({} ,{} ,{}); actual = testGraph._commonProperties({} ,{} ,{});
assertEqual(actual[0][v1][0]._id , v2); assertEqual(actual.length, 8 );
assertEqual(actual[1][v2][0]._id , v1);
assertEqual(actual[2][v3][0]._id , v8);
assertEqual(actual[3][v4][0]._id , v6);
assertEqual(actual[3][v4][1]._id , v8);
assertEqual(actual[3][v4][2]._id , v7);
assertEqual(actual[4][v5][0]._id , v6);
assertEqual(actual[5][v6][0]._id , v4);
assertEqual(actual[5][v6][1]._id , v8);
assertEqual(actual[5][v6][2]._id , v7);
assertEqual(actual[5][v6][3]._id , v5);
assertEqual(actual[6][v7][0]._id , v4);
assertEqual(actual[6][v7][1]._id , v6);
assertEqual(actual[6][v7][2]._id , v8);
assertEqual(actual[7][v8][0]._id , v4);
assertEqual(actual[7][v8][1]._id , v6);
assertEqual(actual[7][v8][2]._id , v7);
assertEqual(actual[7][v8][3]._id , v3);
actual = testGraph._countCommonProperties({} ,{} ,{}); actual = testGraph._countCommonProperties({} ,{} ,{});
assertEqual(actual, [ assertEqual(actual, [

4
lib/BasicsC/debugging.c
View File

@ -29,8 +29,6 @@
#include "BasicsC/locks.h" #include "BasicsC/locks.h"
#include "BasicsC/logging.h" #include "BasicsC/logging.h"
#ifdef TRI_ENABLE_FAILURE_TESTS
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// --SECTION-- private variables // --SECTION-- private variables
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@ -48,6 +46,8 @@ static char* FailurePoints;
TRI_read_write_lock_t FailurePointsLock; TRI_read_write_lock_t FailurePointsLock;
#ifdef TRI_ENABLE_FAILURE_TESTS
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// --SECTION-- private functions // --SECTION-- private functions
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------