From 9d7024b28d07324c46be8d3a42c165656030b1d3 Mon Sep 17 00:00:00 2001 From: Michael Hackstein Date: Wed, 14 Oct 2015 10:35:28 +0200 Subject: [PATCH] Further fixes in AQL optimizer indexes test. It tests now as expected. Some minor issues in IndexNode are still open (Sorting for non-overlapping intervals. Propagation of conditions to earlier EnumerateCollectionNodes --- js/server/tests/aql-optimizer-indexes.js | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/js/server/tests/aql-optimizer-indexes.js b/js/server/tests/aql-optimizer-indexes.js index ff838720d0..ebe69dbe8c 100644 --- a/js/server/tests/aql-optimizer-indexes.js +++ b/js/server/tests/aql-optimizer-indexes.js @@ -86,8 +86,6 @@ function optimizerIndexesTestSuite () { }); assertNotEqual(-1, plan.rules.indexOf("propagate-constant-attributes")); - require("internal").print("### 89 ###"); - require("org/arangodb/aql/explainer").explain({query: query, options: {optimizer: {rules: ["-propagate-constant-attributes"]}}}); assertEqual(2, indexNodes); var results = AQL_EXECUTE(query); @@ -764,8 +762,6 @@ function optimizerIndexesTestSuite () { if (node.type === "IndexNode") { assertEqual("skiplist", node.indexes[0].type); assertTrue(node.indexes[0].unique); - require("internal").print("###### 775"); - require("internal").print(node.indexes); } return node.type; }); @@ -797,9 +793,7 @@ function optimizerIndexesTestSuite () { var results = AQL_EXECUTE(query); assertEqual([ 1 ], results.json, query); - require("internal").print("##############798"); - require("internal").print(results.stats); - assertEqual(results.stats.scannedIndex > 0); + assertTrue(results.stats.scannedIndex > 0); assertEqual(0, results.stats.scannedFull); }, @@ -2478,8 +2472,8 @@ function optimizerIndexesTestSuite () { var results = AQL_EXECUTE(query); assertEqual([ 2 ], results.json, query); - assertEqual(0, results.stats.scannedIndex); - assertTrue(results.stats.scannedFull > 0); + assertTrue(results.stats.scannedIndex > 0); + assertEqual(0, results.stats.scannedFull); }); },