8000 Allow the optimizer to use indexes by jsteemann · Pull Request #10543 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

Allow the optimizer to use indexes 8000 #10543

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 3 commits into from
Nov 26, 2019
Merged

Allow the optimizer to use indexes #10543

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
72ef351
Allow the optimizer to use indexes
jsteemann Nov 25, 2019
ad0da85
Update CHANGELOG
KVS85 Nov 26, 2019
89bdceb
Merge branch '3.5' into bug-fix-3.5/improve-index-usage-for-expansions
KVS85 Nov 26, 2019
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
4 changes: 4 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
v3.5.3 (XXXX-XX-XX)
-------------------

* Allow the optimizer to use indexes when a collection attribute is compared to
an expansion followed by an attribute name, e.g.
`doc.value IN something[*].name`.

* Fixed issue #10470: The WebUI now shows potential errors and details which
occured using _api/import (e.g. unique constraint violated).

Expand Down
3 changes: 1 addition & 2 deletions arangod/Indexes/Index.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -825,8 +825,7 @@ bool Index::canUseConditionPart(arangodb::aql::AstNode const* access,
other->type == arangodb::aql::NODE_TYPE_ATTRIBUTE_ACCESS)) {
// value IN a.b OR value IN a.b[*]
arangodb::aql::Ast::getReferencedVariables(access, variables);
if (other->type == arangodb::aql::NODE_TYPE_ATTRIBUTE_ACCESS &&
variables.find(reference) != variables.end()) {
if (variables.find(reference) != variables.end()) {
variables.clear();
arangodb::aql::Ast::getReferencedVariables(other, variables);
}
Expand Down
34 changes: 34 additions & 0 deletions tests/js/server/aql/aql-optimizer-indexes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,40 @@ function optimizerIndexesTestSuite () {
db._drop("UnitTestsCollection");
},

testIndexUsedForExpansion1 : function () {
let query = "LET test = NOOPT([{ value: 1 }, { value : 2 }]) FOR doc IN " + c.name() + " FILTER doc.value IN test[*].value SORT doc.value RETURN doc.value";

let plan = AQL_EXPLAIN(query).plan;
let nodeTypes = plan.nodes.map(function(node) {
return node.type;
});

assertEqual("SingletonNode", nodeTypes[0], query);
assertNotEqual(-1, nodeTypes.indexOf("IndexNode"), query);

let results = AQL_EXECUTE(query);
assertEqual([ 1, 2 ], results.json, query);
assertEqual(0, results.stats.scannedFull);
assertTrue(results.stats.scannedIndex > 0);
},

testIndexUsedForExpansion2 : function () {
let query = "LET test = NOOPT([1, 2]) FOR doc IN " + c.name() + " FILTER doc.value IN test[*] SORT doc.value RETURN doc.value";

let plan = AQL_EXPLAIN(query).plan;
let nodeTypes = plan.nodes.map(function(node) {
return node.type;
});

assertEqual("SingletonNode", nodeTypes[0], query);
assertNotEqual(-1, nodeTypes.indexOf("IndexNode"), query);

let results = AQL_EXECUTE(query);
assertEqual([ 1, 2 ], results.json, query);
assertEqual(0, results.stats.scannedFull);
assertTrue(results.stats.scannedIndex > 0);
},

testMultiIndexesOrCondition : function () {
let values = [
[ "abc", true, true ],
Expand Down
0