8000 Move subqueries down by dhly-etc · Pull Request #11135 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

Move subqueries down #11135

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Feb 20, 2020
Merged

Move subqueries down #11135

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
33c659e
Move subqueries down.
Feb 18, 2020
3107608
Add tests.
Feb 18, 2020
90bb13f
Merge branch 'devel' into feature/move-subqueries-down
Feb 18, 2020
002212d
Merge branch 'devel' into feature/move-subqueries-down
Feb 19, 2020
6998d27
Adjust test for cluster.
Feb 19, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add tests.
  • Loading branch information
Dan Larkin-York committed Feb 18, 2020
commit 3107608d9d776db2a14c13237b6854043ca2107a
133 changes: 128 additions & 5 deletions tests/js/server/aql/aql-optimizer-rule-move-calculations-down.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,12 @@ function optimizerRuleTestSuite () {
"FOR i IN 1..10 LET result = IS_STRING(i) LIMIT 1 RETURN result",
"FOR i IN 1..10 LET result = IS_STRING(i) SORT i RETURN result",
"FOR i IN 1..10 LET result = PUSH(i, i + 1) LET x = (FOR j IN result RETURN j) RETURN x",
"FOR i IN 1..10 LET result = (RETURN i + 1) FILTER i < 5 RETURN result",
"FOR i IN 1..10 LET a = (RETURN i + 1) LET b = (RETURN i + 2) FILTER i < 2 LET c = b FILTER i < 10 RETURN c",
"FOR i IN 1..10 LET result = (RETURN IS_STRING(i)) FILTER i < 2 RETURN result",
"FOR i IN 1..10 LET result = (RETURN IS_STRING(i)) LIMIT 1 RETURN result",
"FOR i IN 1..10 LET result = (RETURN IS_STRING(i)) SORT i RETURN result",
"FOR i IN 1..10 LET result = (RETURN PUSH(i, i + 1)) LET x = (FOR j IN result RETURN j) RETURN x",
];

queries.forEach(function(query) {
Expand Down Expand Up @@ -110,7 +116,17 @@ function optimizerRuleTestSuite () {
"FOR i IN 1..10 FILTER i < 10 LET result = IS_STRING(i) FOR j IN 1..2 RETURN j",
"FOR i IN 1..10 LET result = IS_STRING(i) COLLECT r = result RETURN r",
"FOR i IN 1..10 LET result = MAX(i) FILTER result < 3 RETURN result",
"FOR i IN 1..10 LET result = RAND() FILTER i < 10 RETURN result"
"FOR i IN 1..10 LET result = RAND() FILTER i < 10 RETURN result",
"LET a = (RETURN PASSTHRU(39)) FOR i IN 1..10 RETURN a",
"FOR i IN 1..10 LET result = (RETURN i < 5) FILTER result RETURN i",
"FOR i IN 1..10 LET result = (RETURN i + 1) SORT result RETURN i",
"FOR i IN 1..10 LET result = (RETURN i + 1) LET test = (FOR j IN 1..result RETURN j) RETURN test",
"FOR i IN 1..10 LIMIT 2 LET result = (RETURN i < 5) RETURN i",
"FOR i IN 1..10 LET result = (RETURN IS_STRING(i)) FOR j IN 1..2 RETURN j",
"FOR i IN 1..10 FILTER i < 10 LET result = (RETURN IS_STRING(i)) FOR j IN 1..2 RETURN j",
"FOR i IN 1..10 LET result = (RETURN IS_STRING(i)) COLLECT r = result RETURN r",
"FOR i IN 1..10 LET result = (RETURN MAX(i)) FILTER result < 3 RETURN result",
"FOR i IN 1..10 LET result = (RETURN RAND()) FILTER i < 10 RETURN result"
];

queries.forEach(function(query) {
Expand All @@ -132,7 +148,15 @@ function optimizerRuleTestSuite () {
"FOR i IN 1..10 LET result = IS_STRING(i) LET test = result + 1 LIMIT 1 RETURN test",
"FOR i IN 1..10 LET result = IS_STRING(i) SORT i RETURN result",
"FOR i IN 1..10 LET result = i + 1 LET test = (FOR j IN 1..2 RETURN j) RETURN result IN test",
"FOR i IN 1..10 LET v = i * 2 LIMIT 2 LET result = v < 5 RETURN v"
"FOR i IN 1..10 LET v = i * 2 LIMIT 2 LET result = v < 5 RETURN v",
"FOR i IN 1..10 LET result = (RETURN IS_STRING(i)) FILTER i < 10 RETURN result",
"FOR i IN 1..10 LET result = (RETURN IS_STRING(i)) FILTER i < 10 FILTER i > 2 RETURN result",
"FOR i IN 1..10 LET result = (RETURN IS_STRING(i)) FILTER i < 2 LIMIT 1 RETURN result",
"FOR i IN 1..10 LET result = (RETURN IS_STRING(i)) LIMIT 1 RETURN result",
"FOR i IN 1..10 LET result = (RETURN IS_STRING(i)) LET test = (RETURN result + 1) LIMIT 1 RETURN test",
"FOR i IN 1..10 LET result = (RETURN IS_STRING(i)) SORT i RETURN result",
"FOR i IN 1..10 LET result = (RETURN i + 1) LET test = (FOR j IN 1..2 RETURN j) RETURN result IN test",
"FOR i IN 1..10 LET v = (RETURN i * 2) LIMIT 2 LET result = (RETURN v < 5) RETURN v"
];

queries.forEach(function(query) {
Expand All @@ -153,7 +177,14 @@ function optimizerRuleTestSuite () {
[ "FOR i IN 1..10 LET result = IS_STRING(i) LIMIT 1 RETURN result", [ "SingletonNode","CalculationNode","EnumerateListNode","LimitNode","CalculationNode","ReturnNode" ] ],
[ "FOR i IN 1..10 LET result = IS_STRING(i) LET test = result + 1 LIMIT 1 RETURN test", [ "SingletonNode","CalculationNode","EnumerateListNode","LimitNode","CalculationNode","CalculationNode","ReturnNode" ] ] ,
[ "FOR i IN 1..10 LET result = IS_STRING(i) SORT i RETURN result", [ "SingletonNode","CalculationNode","EnumerateListNode","SortNode","CalculationNode","ReturnNode" ] ],
[ "FOR i IN 1..10 LET v = i * 2 LIMIT 2 LET result = v < 5 RETURN v", [ "SingletonNode","CalculationNode","EnumerateListNode","LimitNode","CalculationNode","CalculationNode","ReturnNode" ] ]
[ "FOR i IN 1..10 LET v = i * 2 LIMIT 2 LET result = v < 5 RETURN v", [ "SingletonNode","CalculationNode","EnumerateListNode","LimitNode","CalculationNode","CalculationNode","ReturnNode" ] ],
[ "FOR i IN 1..10 LET result = (RETURN IS_STRING(i)) FILTER i < 10 RETURN result", [ "SingletonNode", "CalculationNode", "EnumerateListNode", "CalculationNode", "FilterNode", "SubqueryNode", "ReturnNode" ] ],
[ "FOR i IN 1..10 LET result = (RETURN IS_STRING(i)) FILTER i < 10 FILTER i > 2 RETURN result", [ "SingletonNode","CalculationNode","EnumerateListNode","CalculationNode","FilterNode","CalculationNode","FilterNode","SubqueryNode","ReturnNode" ] ],
[ "FOR i IN 1..10 LET result = (RETURN IS_STRING(i)) FILTER i < 2 LIMIT 1 RETURN result", [ "SingletonNode","CalculationNode","EnumerateListNode","CalculationNode","FilterNode","LimitNode","SubqueryNode","ReturnNode" ] ],
[ "FOR i IN 1..10 LET result = (RETURN IS_STRING(i)) LIMIT 1 RETURN result", [ "SingletonNode","CalculationNode","EnumerateListNode","LimitNode","SubqueryNode","ReturnNode" ] ],
[ "FOR i IN 1..10 LET result = (RETURN IS_STRING(i)) LET test = (RETURN result + 1) LIMIT 1 RETURN test", [ "SingletonNode","CalculationNode","EnumerateListNode","LimitNode","SubqueryNode","SubqueryNode","ReturnNode" ] ] ,
[ "FOR i IN 1..10 LET result = (RETURN IS_STRING(i)) SORT i RETURN result", [ "SingletonNode","CalculationNode","EnumerateListNode","SortNode","SubqueryNode","ReturnNode" ] ],
[ "FOR i IN 1..10 LET v = (RETURN i * 2) LIMIT 2 LET result = (RETURN v < 5) RETURN v", [ "SingletonNode","CalculationNode","EnumerateListNode","LimitNode","SubqueryNode","SubqueryNode","ReturnNode" ] ]
];

plans.forEach(function(plan) {
Expand Down Expand Up @@ -182,7 +213,21 @@ function optimizerRuleTestSuite () {
[ "FOR i IN 1..10 LET a = SUM(1..i) LET b = MIN(1..i) FILTER i == 3 RETURN [ a, b ]", [ [ 6, 1 ] ] ],
[ "FOR i IN 1..10 LET a = SUM(1..i) LIMIT 3 RETURN a", [ 1, 3, 6 ] ],
[ "FOR i IN 1..10 LET a = SUM(1..i) LIMIT 3 FILTER a > 2 RETURN a", [ 3, 6 ] ],
[ "FOR i IN 1..10 LET a = SUM(1..i) LIMIT 5 FILTER i > 2 RETURN a", [ 6, 10, 15 ] ]
[ "FOR i IN 1..10 LET a = SUM(1..i) LIMIT 5 FILTER i > 2 RETURN a", [ 6, 10, 15 ] ],
[ "FOR i IN 1..10 LET a = (RETURN i + 1) FILTER i < 4 RETURN a[0]", [ 2, 3, 4 ] ],
[ "FOR i IN 1..10 LET a = (RETURN i + 1) FILTER i < 7 FILTER i > 1 RETURN a[0]", [ 3, 4, 5, 6, 7 ] ],
[ "FOR i IN 1..10 LET a = (RETURN i + 1) LIMIT 4 RETURN a[0]", [ 2, 3, 4, 5 ] ],
[ "FOR i IN 1..10 LET a = (RETURN i + 1) LET b = (RETURN a[0] + 1) FILTER i < 3 RETURN b[0]", [ 3, 4 ] ],
[ "FOR i IN 1..10 LET a = (RETURN i + 1) LET b = (RETURN a[0] + 1) LIMIT 4 RETURN b[0]", [ 3, 4, 5, 6 ] ],
[ "FOR i IN 1..10 LET a = (RETURN i + 1) LET b = (RETURN a[0] + 1) FILTER i < 5 LIMIT 4 RETURN b[0]", [ 3, 4, 5, 6 ] ],
[ "FOR i IN 1..10 LET a = (RETURN i + 1) LET x = (FOR j IN 1..i RETURN j) RETURN a[0] - 1 IN x ? 1 : 0", [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 ] ],
[ "FOR i IN 1..10 LET a = (RETURN i + 1) LET x = (FOR j IN 1..i RETURN j) RETURN a[0] IN x ? 1 : 0", [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ] ],
[ "FOR i IN 1..10 LET a = (RETURN MAX(1..i)) FILTER i > 4 RETURN a[0]", [ 5, 6, 7, 8, 9, 10 ] ],
[ "FOR i IN 1..10 LET a = (RETURN SUM(1..i)) FILTER i == 3 RETURN a[0]", [ 6 ] ],
[ "FOR i IN 1..10 LET a = (RETURN SUM(1..i)) LET b = (RETURN MIN(1..i)) FILTER i == 3 RETURN [ a[0], b[0] ]", [ [ 6, 1 ] ] ],
[ "FOR i IN 1..10 LET a = (RETURN SUM(1..i)) LIMIT 3 RETURN a[0]", [ 1, 3, 6 ] ],
[ "FOR i IN 1..10 LET a = (RETURN SUM(1..i)) LIMIT 3 FILTER a[0] > 2 RETURN a[0]", [ 3, 6 ] ],
[ "FOR i IN 1..10 LET a = (RETURN SUM(1..i)) LIMIT 5 FILTER i > 2 RETURN a[0]", [ 6, 10, 15 ] ]
];

queries.forEach(function(query) {
Expand Down Expand Up @@ -260,7 +305,85 @@ function optimizerRuleTestSuite () {

assertEqual(resultDisabled.json, expected, query);
assertEqual(resultEnabled.json, expected, query);
}
},

testCollection4 : function () {
var expected = [ ];
for (var i = 0; i < 100; ++i) {
expected.push("test" + i + "-" + i);
}

var query = "FOR i IN " + cn + " LET result = (RETURN CONCAT(i._key, '-', i.value)) SORT i.value RETURN result[0]";
var planDisabled = AQL_EXPLAIN(query, { }, paramDisabled);
var planEnabled = AQL_EXPLAIN(query, { }, paramEnabled);

var resultDisabled = AQL_EXECUTE(query, { }, paramDisabled);
var resultEnabled = AQL_EXECUTE(query, { }, paramEnabled);

assertEqual(-1, planDisabled.plan.rules.indexOf(ruleName), query[0]);
assertNotEqual(-1, planEnabled.plan.rules.indexOf(ruleName), query[0]);

assertEqual(resultDisabled.json, expected, query[0]);
assertEqual(resultEnabled.json, expected, query[0]);
},

////////////////////////////////////////////////////////////////////////////////
/// @brief test results
////////////////////////////////////////////////////////////////////////////////

testCollection5 : function () {
var expected = [ "test43-43", "test44-44" ];

var query = "FOR i IN " + cn + " LET result = (RETURN CONCAT(i._key, '-', i.value)) FILTER i.value > 42 SORT i.value LIMIT 2 RETURN result[0]";
var planDisabled = AQL_EXPLAIN(query, { }, paramDisabled);
var planEnabled = AQL_EXPLAIN(query, { }, paramEnabled);

var resultDisabled = AQL_EXECUTE(query, { }, paramDisabled);
var resultEnabled = AQL_EXECUTE(query, { }, paramEnabled);

assertEqual(-1, planDisabled.plan.rules.indexOf(ruleName), query);
assertNotEqual(-1, planEnabled.plan.rules.indexOf(ruleName), query);

assertEqual(resultDisabled.json, expected, query);
assertEqual(resultEnabled.json, expected, query);
},

testCollection6 : function () {
var expected = [ "test0-0", "test1-1" ];

var query = "FOR i IN " + cn + " LET result = (RETURN CONCAT(i._key, '-', i.value)) SORT i.value LIMIT 2 RETURN result[0]";
var planDisabled = AQL_EXPLAIN(query, { }, paramDisabled);
var planEnabled = AQL_EXPLAIN(query, { }, paramEnabled);

var resultDisabled = AQL_EXECUTE(query, { }, paramDisabled);
var resultEnabled = AQL_EXECUTE(query, { }, paramEnabled);

assertEqual(-1, planDisabled.plan.rules.indexOf(ruleName), query);
assertNotEqual(-1, planEnabled.plan.rules.indexOf(ruleName), query);

assertEqual(resultDisabled.json, expected, query);
assertEqual(resultEnabled.json, expected, query);
},

testModify: function () {
var expected = [];
for (var i = 0; i < 10; ++i) {
expected.push("test" + i + "-" + i);
}

var query = "FOR i IN 0..100 LET result = (UPDATE {_key: CONCAT('test', TO_STRING(i))} WITH {updated: true} IN " + cn + " RETURN CONCAT(NEW._key, '-', NEW.value)) LIMIT 10 RETURN result[0]";
var planDisabled = AQL_EXPLAIN(query, {}, paramDisabled);
var planEnabled = AQL_EXPLAIN(query, {}, paramEnabled);

var resultDisabled = AQL_EXECUTE(query, {}, paramDisabled);
var resultEnabled = AQL_EXECUTE(query, {}, paramEnabled);

assertEqual(-1, planDisabled.plan.rules.indexOf(ruleName), query[0]);
assertEqual(-1, planEnabled.plan.rules.indexOf(ruleName), query[0]);

assertEqual(resultDisabled.json, expected, query[0]);
assertEqual(resultEnabled.json, expected, query[0]);
},

};
}
Expand Down
0