From 9a3bcfce88cf090d4e0fc915f0e584982811d8a5 Mon Sep 17 00:00:00 2001 From: Willi Goesgens Date: Mon, 13 Oct 2014 10:57:39 +0200 Subject: [PATCH] Adjust the tests expectation to the new way of not having an extra calculation node for let assignment (as introduced with #dd92042e0b1e66f767237692b7071e4bfc385b80 ) --- js/server/tests/aql-optimizer-rule-move-filters-up.js | 2 +- js/server/tests/aql-queries-optimiser-in.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/js/server/tests/aql-optimizer-rule-move-filters-up.js b/js/server/tests/aql-optimizer-rule-move-filters-up.js index 9f6238015d..0709240176 100644 --- a/js/server/tests/aql-optimizer-rule-move-filters-up.js +++ b/js/server/tests/aql-optimizer-rule-move-filters-up.js @@ -125,7 +125,7 @@ function optimizerRuleTestSuite () { testPlans : function () { var plans = [ [ "FOR i IN 1..10 FOR j IN 1..10 FILTER i > 1 RETURN i", [ "SingletonNode", "CalculationNode", "CalculationNode", "EnumerateListNode", "CalculationNode", "FilterNode", "EnumerateListNode", "ReturnNode" ] ], - [ "FOR i IN 1..10 LET x = (FOR j IN [i] RETURN j) FILTER i > 1 RETURN i", [ "SingletonNode", "CalculationNode", "EnumerateListNode", "CalculationNode", "FilterNode", "SubqueryNode", "CalculationNode", "ReturnNode" ] ], + [ "FOR i IN 1..10 LET x = (FOR j IN [i] RETURN j) FILTER i > 1 RETURN i", [ "SingletonNode", "CalculationNode", "EnumerateListNode", "CalculationNode", "FilterNode", "SubqueryNode", "ReturnNode" ] ], [ "FOR i IN 1..10 LET a = 2 * i FILTER i == 1 RETURN a", [ "SingletonNode", "CalculationNode", "EnumerateListNode", "CalculationNode", "FilterNode", "CalculationNode", "ReturnNode" ] ], [ "FOR i IN 1..10 FOR j IN 1..10 FILTER i == 1 FILTER j == 2 RETURN i", [ "SingletonNode", "CalculationNode", "CalculationNode", "EnumerateListNode", "CalculationNode", "FilterNode", "EnumerateListNode", "CalculationNode", "FilterNode", "ReturnNode" ] ] ]; diff --git a/js/server/tests/aql-queries-optimiser-in.js b/js/server/tests/aql-queries-optimiser-in.js index c74d8ba7ab..1d0a63258a 100644 --- a/js/server/tests/aql-queries-optimiser-in.js +++ b/js/server/tests/aql-queries-optimiser-in.js @@ -127,7 +127,7 @@ function ahuacatlQueryOptimiserInTestSuite () { var actual = getQueryResults(query); assertEqual(expected, actual); - assertEqual([ "SingletonNode", "SubqueryNode", "CalculationNode", "EnumerateCollectionNode", "CalculationNode", "FilterNode", "CalculationNode", "SortNode", "CalculationNode", "ReturnNode" ], explain(query)); + assertEqual([ "SingletonNode", "SubqueryNode", "CalculationNode", "EnumerateCollectionNode", "CalculationNode", "FilterNode", "CalculationNode", "SortNode", "ReturnNode" ], explain(query)); }, //////////////////////////////////////////////////////////////////////////////// @@ -195,7 +195,7 @@ function ahuacatlQueryOptimiserInTestSuite () { var actual = getQueryResults(query); assertEqual(expected, actual); - assertEqual([ "SingletonNode", "SubqueryNode", "CalculationNode", "EnumerateCollectionNode", "CalculationNode", "FilterNode", "CalculationNode", "SortNode", "CalculationNode", "ReturnNode" ], explain(query)); + assertEqual([ "SingletonNode", "SubqueryNode", "CalculationNode", "EnumerateCollectionNode", "CalculationNode", "FilterNode", "CalculationNode", "SortNode", "ReturnNode" ], explain(query)); }, //////////////////////////////////////////////////////////////////////////////// @@ -265,7 +265,7 @@ function ahuacatlQueryOptimiserInTestSuite () { var actual = getQueryResults(query); assertEqual(expected, actual); - assertEqual([ "SingletonNode", "SubqueryNode", "CalculationNode", "EnumerateCollectionNode", "CalculationNode", "FilterNode", "CalculationNode", "SortNode", "CalculationNode", "ReturnNode" ], explain(query)); + assertEqual([ "SingletonNode", "SubqueryNode", "EnumerateCollectionNode", "CalculationNode", "FilterNode", "CalculationNode", "SortNode", "CalculationNode", "ReturnNode" ], explain(query)); }, //////////////////////////////////////////////////////////////////////////////// @@ -351,7 +351,7 @@ function ahuacatlQueryOptimiserInTestSuite () { var actual = getQueryResults(query); assertEqual(expected, actual); - assertEqual([ "SingletonNode", "SubqueryNode", "CalculationNode", "EnumerateCollectionNode", "CalculationNode", "FilterNode", "CalculationNode", "SortNode", "CalculationNode", "ReturnNode" ], explain(query)); + assertEqual([ "SingletonNode", "SubqueryNode", "EnumerateCollectionNode", "CalculationNode", "FilterNode", "CalculationNode", "SortNode", "CalculationNode", "ReturnNode" ], explain(query)); internal.db._drop(en); },