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:
Willi Goesgens 2014-10-29 13:52:42 +01:00
parent 6048b8a92b 7675012818
commit 6e29024c44
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/server/tests/aql-optimizer-rule-distribute-in-cluster.js
View File

@ -31,6 +31,7 @@
var db = require("org/arangodb").db; var db = require("org/arangodb").db;
var jsunity = require("jsunity"); var jsunity = require("jsunity");
var helper = require("org/arangodb/aql-helper"); var helper = require("org/arangodb/aql-helper");
var removeAlwaysOnClusterRules = helper.removeAlwaysOnClusterRules;
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief test suite /// @brief test suite

15
js/server/tests/aql-optimizer-rule-undistribute-remove-after-enum-coll-cluster.js
View File

@ -41,7 +41,7 @@ function optimizerRuleTestSuite () {
// various choices to control the optimizer: // various choices to control the optimizer:
var rulesNone = { optimizer: { rules: [ "-all" ] } }; var rulesNone = { optimizer: { rules: [ "-all" ] } };
var rulesAll = { optimizer: { rules: [ "+all" ] } }; var rulesAll = { optimizer: { rules: [ "+all" ] } };
var thisRuleEnabled = { optimizer: { rules: [ "-all", "+" + ruleName ] } }; var thisRuleEnabled = { optimizer: { rules: [ "-all", "+distribute-filtercalc-to-cluster", "+" + ruleName ] } };
var cn1 = "UnitTestsAqlOptimizerRuleUndist1"; var cn1 = "UnitTestsAqlOptimizerRuleUndist1";
var cn2 = "UnitTestsAqlOptimizerRuleUndist2"; var cn2 = "UnitTestsAqlOptimizerRuleUndist2";
@ -80,7 +80,7 @@ function optimizerRuleTestSuite () {
}, },
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief test that rule does not fire when it is not enabled /// @brief test that rule fires when it is enabled
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
testThisRuleEnabled : function () { testThisRuleEnabled : function () {
@ -132,17 +132,16 @@ function optimizerRuleTestSuite () {
]; ];
var expectedRules = [ "distribute-in-cluster", var expectedRules = [ "distribute-in-cluster",
"scatter-in-cluster", "scatter-in-cluster" ];
"distribute-filtercalc-to-cluster" ];
var expectedNodes = [ ["SingletonNode", var expectedNodes = [ ["SingletonNode",
"ScatterNode", "ScatterNode",
"RemoteNode", "RemoteNode",
"EnumerateCollectionNode", "EnumerateCollectionNode",
"CalculationNode",
"FilterNode",
"RemoteNode", "RemoteNode",
"GatherNode", "GatherNode",
"CalculationNode",
"FilterNode",
"DistributeNode", "DistributeNode",
"RemoteNode", "RemoteNode",
"RemoveNode", "RemoveNode",
@ -153,11 +152,11 @@ function optimizerRuleTestSuite () {
"ScatterNode", "ScatterNode",
"RemoteNode", "RemoteNode",
"EnumerateCollectionNode", "EnumerateCollectionNode",
"RemoteNode",
"GatherNode",
"CalculationNode", "CalculationNode",
"FilterNode", "FilterNode",
"CalculationNode", "CalculationNode",
"RemoteNode",
"GatherNode",
"DistributeNode", "DistributeNode",
"RemoteNode", "RemoteNode",
"RemoveNode", "RemoveNode",