8000 Fixed BTS-562 by jsteemann · Pull Request #14800 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

Fixed BTS-562 #14800

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 1 commit into from
Sep 19, 2021
Merged

Fixed BTS-562 #14800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions CHANGELOG
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
devel
-----

* Fixed BTS-562: reduce-extraction-to-projection optimization returns null for
one attribute if nested attributes are named the same.

* Add `--datatype` startup option to arangoimport, in order to hard-code the
datatype (null/boolean/number/string) for certain attributes in the CSV/TSV import.
For example, given the following input file:
Expand Down
5 changes: 3 additions & 2 deletions arangod/Aql/AttributeNamePath.cpp
10BC0
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,9 +133,10 @@ AttributeNamePath& AttributeNamePath::shortenTo(size_t length) {
size_t numEqual = 0;
size_t commonLength = std::min(lhs.size(), rhs.size());
for (size_t i = 0; i < commonLength; ++i) {
if (lhs[i] == rhs[i]) {
++numEqual;
if (lhs[i] != rhs[i]) {
break;
}
++numEqual;
}
return numEqual;
}
Expand Down
45 changes: 43 additions & 2 deletions tests/js/server/aql/aql-optimizer-rule-reduce-extraction-to-projection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,8 +274,49 @@ function optimizerRuleTestSuite () {

assertEqual(2, found);
});
}

},

testBts562 : function () {
c.truncate();
c.insert({ foo: { attr: 1 }, bar: { attr: 2 } });

let result = AQL_EXECUTE(`FOR doc IN @@cn RETURN [ doc.foo.attr, doc.bar.attr ]`, { "@cn" : cn }).json;
assertEqual(1, result.length);
assertEqual([ 1, 2 ], result[0]);

c.truncate();
c.insert({ foo: { attr: 1 }, bar: { attr: 2 }, baz: { attr: 3 } });

result = AQL_EXECUTE(`FOR doc IN @@cn RETURN [ doc.foo.attr, doc.bar.attr, doc.baz.attr ]`, { "@cn" : cn }).json;
assertEqual(1, result.length);
assertEqual([ 1, 2, 3 ], result[0]);

c.truncate();
c.insert({ result: {} });
c.insert({ result: { status: "ok" } });

result = AQL_EXECUTE(`FOR d IN @@cn COLLECT resultStatus = d.result.status, requestStatus = d.request.status WITH COUNT INTO count SORT resultStatus RETURN { resultStatus, requestStatus, count }`, { "@cn": cn }).json;

assertEqual(2, result.length);
assertEqual({ resultStatus: null, requestStatus: null, count: 1 }, result[0]);
assertEqual({ resultStatus: "ok", requestStatus: null, count: 1 }, result[1]);

result = AQL_EXECUTE(`FOR d IN @@cn COLLECT resultStatus = d.result.status, requestOther = d.request.other WITH COUNT INTO count SORT resultStatus RETURN { resultStatus, requestOther, count }`, { "@cn" : cn }).json;
assertEqual(2, result.length);
assertEqual({ resultStatus: null, requestOther: null, count: 1 }, result[0]);
assertEqual({ resultStatus: "ok", requestOther: null, count: 1 }, result[1]);

c.truncate();
c.insert({ result: { status: "ok" }, request: { status: "ok" } });
c.insert({ result: { status: "ok" }, request: { status: "blarg" } });

result = AQL_EXECUTE(`FOR d IN @@cn COLLECT resultStatus = d.result.status, requestStatus = d.request.status WITH COUNT INTO count SORT requestStatus RETURN { resultStatus, requestStatus, count }`, { "@cn" : cn }).json;

assertEqual(2, result.length);
assertEqual({ resultStatus: "ok", requestStatus: "blarg", count: 1 }, result[0]);
assertEqual({ resultStatus: "ok", requestStatus: "ok", count: 1 }, result[1]);
},

};
}

Expand Down
0