Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Subquery nodes cleanup

This commit is contained in:
Markus Pfeiffer 2019-09-12 13:52:29 +01:00
parent e39b2e2f71
commit f52420ebd0
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arangod/Aql/SubqueryEndExecutionNode.cpp
View File

@ -51,7 +51,6 @@ void SubqueryEndNode::toVelocyPackHelper(VPackBuilder& nodes, unsigned flags) co
std::unique_ptr<ExecutionBlock> SubqueryEndNode::createBlock(
ExecutionEngine& engine,
std::unordered_map<ExecutionNode*, ExecutionBlock*> const& cache) const {
// // TODO: Fill me in
TRI_ASSERT(false);
return nullptr;
@ -75,11 +74,8 @@ void SubqueryEndNode::replaceOutVariable(Variable const* var) {
}
CostEstimate SubqueryEndNode::estimateCost() const {
TRI_ASSERT(!_dependencies.empty());
TRI_ASSERT(!_dependencies.size() == 1);
// Not needed?
// This is the dependency at our start node now.
CostEstimate estimate = _dependencies.at(0)->getCost();
return estimate;

11
arangod/Aql/SubqueryStartExecutionNode.cpp
View File

@ -42,7 +42,6 @@ SubqueryStartNode::SubqueryStartNode(ExecutionPlan* plan, arangodb::velocypack::
CostEstimate SubqueryStartNode::estimateCost() const {
TRI_ASSERT(!_dependencies.empty());
// TODO: Fill me in
CostEstimate estimate = _dependencies.at(0)->getCost();
return estimate;
}
@ -55,7 +54,6 @@ void SubqueryStartNode::toVelocyPackHelper(VPackBuilder& nodes, unsigned flags)
std::unique_ptr<ExecutionBlock> SubqueryStartNode::createBlock(
ExecutionEngine& engine,
std::unordered_map<ExecutionNode*, ExecutionBlock*> const& cache) const {
// TODO: fill me in
TRI_ASSERT(false);
return nullptr;
@ -67,5 +65,14 @@ ExecutionNode* SubqueryStartNode::clone(ExecutionPlan* plan, bool withDependenci
return cloneHelper(std::move(c), withDependencies, withProperties);
}
bool SubqueryStartNode::isEqualTo(SubqueryStartNode const& other) {
return ExecutionNode::isEqualTo(other);
}
bool SubqueryStartNode::isEqualTo(SubqueryStartNode const* other) {
return ExecutionNode::isEqualTo(other);
}
} // namespace aql
} // namespace arangodb

3
arangod/Aql/SubqueryStartExecutionNode.h
View File

@ -52,6 +52,9 @@ class SubqueryStartNode : public ExecutionNode {
ExecutionNode* clone(ExecutionPlan* plan, bool withDependencies,
bool withProperties) const override final;
bool isEqualTo(SubqueryStartNode const& other);
bool isEqualTo(SubqueryStartNode const* other);
};
} // namespace aql