8000 Bug fix/non recursive plan handling by mpoeter · Pull Request #14475 · arangodb/arangodb · GitHub
[go: up one dir, main page]
Skip to content

Bug fix/non recursive plan handling #14475

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 9 commits into from
Jul 8, 2021
Merged

Bug fix/non recursive plan handling #14475

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
f5b97e9
Make ExecutionNode::walk and walkSubqueriesFirst non-recursive.
mpoeter Jul 7, 2021
af8977d
Make cost estimation and invalidation non-recursive.
mpoeter Jul 7, 2021
a5a2322
Use HashSet::find/contains instead of std::find.
mpoeter Jul 7, 2021
c662b91
Refactor serialization of execution nodes and make it non-recursive.
mpoeter Jul 7, 2021
a2a8c77
Update CHANGELOG
mpoeter Jul 7, 2021
1f89016
Adapt test do use larger number of nodes.
mpoeter Jul 7, 2021
e758a35
Apply suggestions from code review
mpoeter Jul 7, 2021
013fdb2
Adapt unit tests.
mpoeter Jul 7, 2021
1598566
Address review comments.
mpoeter Jul 8, 2021
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
Make cost estimation and invalidation non-recursive.
  • Loading branch information
@mpoeter
mpoeter committed Jul 7, 2021
commit af8977d9dd4053371fc370b3eafd0e024f159303
C6DF
23 changes: 17 additions & 6 deletions arangod/Aql/ExecutionNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,18 +652,29 @@ bool ExecutionNode::isEqualTo(ExecutionNode const& other) const {

/// @brief invalidate the cost estimation for the node and its dependencies
void ExecutionNode::invalidateCost() {
_costEstimate.invalidate();

for (auto& dep : _dependencies) {
dep->invalidateCost();
}
struct CostInvalidator : WalkerWorkerBase<ExecutionNode> {
void after(ExecutionNode* n) override {
n->_costEstimate.invalidate();
}
} invalidator;
this->walk(invalidator);
}

/// @brief estimate the cost of the node . . .
/// does not recalculate the estimate if already calculated
CostEstimate ExecutionNode::getCost() const {
if (!_costEstimate.isValid()) {
_costEstimate = estimateCost();
// Use a walker to estimate cost of all direct and indirect dependencies.
// This is necessary to avoid deeply nested recursive calls in estimateCosts
// which could result in a stack overflow.
struct CostEstimator : WalkerWorkerBase<ExecutionNode> {
void after(ExecutionNode* n) override {
if (!n->_costEstimate.isValid()) {
n->_costEstimate = n->estimateCost();
}
}
} estimator;
const_cast<ExecutionNode*>(this)->walk(estimator);
}
TRI_ASSERT(_costEstimate.estimatedCost >= 0.0);
TRI_ASSERT(_costEstimate.isValid());
Expand Down
0