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/triAGENS/ArangoDB into devel

This commit is contained in:
Jan Steemann 2014-06-24 15:11:30 +02:00
parent c4aad1e0cd 3cc95a23fd
commit a289c9aa78
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/Ahuacatl/ahuacatl-functions.cpp
View File

@ -659,7 +659,7 @@ TRI_associative_pointer_t* TRI_CreateFunctionsAql (void) {
// graph functions
REGISTER_FUNCTION("PATHS", "GRAPH_PATHS", false, false, "c,h|s,b", &OptimisePaths);
REGISTER_FUNCTION("GRAPH_PATHS", "GENERAL_GRAPH_PATHS", false, false, "s|a", &OptimisePaths);
REGISTER_FUNCTION("GRAPH_PATHS", "GENERAL_GRAPH_PATHS", false, false, "s|a", NULL);
REGISTER_FUNCTION("SHORTEST_PATH", "GRAPH_SHORTEST_PATH", false, false, "h,h,s,s,s|a", NULL);
REGISTER_FUNCTION("GRAPH_SHORTEST_PATH", "GENERAL_GRAPH_SHORTEST_PATH", false, false, "s,als,als|a", NULL);
REGISTER_FUNCTION("GRAPH_DISTANCE_TO", "GENERAL_GRAPH_DISTANCE_TO", false, false, "s,als,als|a", NULL);

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

@ -2755,12 +2755,12 @@ function MeasurementsSuite() {
/// @brief executes the test suites
////////////////////////////////////////////////////////////////////////////////
//jsunity.run(GeneralGraphCommonNeighborsSuite);
//jsunity.run(GeneralGraphAQLQueriesSuite);
//jsunity.run(EdgesAndVerticesSuite);
//jsunity.run(GeneralGraphCreationSuite);
//jsunity.run(ChainedFluentAQLResultsSuite);
//jsunity.run(OrphanCollectionSuite);
jsunity.run(GeneralGraphCommonNeighborsSuite);
jsunity.run(GeneralGraphAQLQueriesSuite);
jsunity.run(EdgesAndVerticesSuite);
jsunity.run(GeneralGraphCreationSuite);
jsunity.run(ChainedFluentAQLResultsSuite);
jsunity.run(OrphanCollectionSuite);
jsunity.run(MeasurementsSuite);
return jsunity.done();

4
js/server/tests/ahuacatl-general-graph.js
View File

@ -560,7 +560,7 @@ function ahuacatlQueryGeneralPathsTestSuite() {
testPathsWithDirectionAnyAndMaxLength1: function () {
var actual, result = {}, i = 0, ed;
actual = getQueryResults("FOR e IN GRAPH_PATHS('bla3', 'any', false , 1 , 1) SORT e.source._key,e.destination._key RETURN [e.source._key,e.destination._key,e.edges]");
actual = getQueryResults("FOR e IN GRAPH_PATHS('bla3', {direction :'any', minLength : 1 , maxLength: 1}) SORT e.source._key,e.destination._key RETURN [e.source._key,e.destination._key,e.edges]");
actual.forEach(function (p) {
i++;
ed = "";
@ -589,7 +589,7 @@ function ahuacatlQueryGeneralPathsTestSuite() {
testInBoundPaths: function () {
var actual, result = {}, i = 0, ed;
actual = getQueryResults("FOR e IN GRAPH_PATHS('bla3', 'inbound', false, 1) SORT e.source._key,e.destination._key RETURN [e.source._key,e.destination._key,e.edges]");
actual = getQueryResults("FOR e IN GRAPH_PATHS('bla3', {direction : 'inbound', minLength : 1}) SORT e.source._key,e.destination._key RETURN [e.source._key,e.destination._key,e.edges]");
actual.forEach(function (p) {
i++;