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

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Jan Steemann 2014-10-02 10:41:20 +02:00
parent 67873e5edd f63e90e08b
commit ef15f1bb5d
2 changed files with 114 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
arangod/Aql/ExecutionNode.cpp
View File

@ -283,6 +283,50 @@ triagens::basics::Json ExecutionNode::toJson (TRI_memory_zone_t* zone,
return json;
}
////////////////////////////////////////////////////////////////////////////////
/// @brief execution Node clone utility to be called by derives
////////////////////////////////////////////////////////////////////////////////
void ExecutionNode::CloneHelper (ExecutionNode *other,
ExecutionPlan* plan,
bool withDependencies,
bool withProperties) const {
if (withProperties) {
other->_regsToClear = _regsToClear;
other->_depth = _depth;
other->_varUsageValid = _varUsageValid;
other->_varsUsedLater = _varsUsedLater;
other->_varsValid = _varsValid;
other->_varOverview = _varOverview;
}
if (withDependencies) {
cloneDependencies(plan, other, withProperties);
}
}
////////////////////////////////////////////////////////////////////////////////
/// @brief helper for cloning, use virtual clone methods for dependencies
////////////////////////////////////////////////////////////////////////////////
void ExecutionNode::cloneDependencies (ExecutionPlan* plan,
ExecutionNode* theClone,
bool withProperties) const {
auto it = _dependencies.begin();
while (it != _dependencies.end()) {
auto c = (*it)->clone(plan, true, withProperties);
try {
c->_parents.push_back(theClone);
theClone->_dependencies.push_back(c);
}
catch (...) {
delete c;
throw;
}
++it;
}
}
////////////////////////////////////////////////////////////////////////////////
/// @brief convert to a string, basically for debugging purposes
////////////////////////////////////////////////////////////////////////////////
@ -772,6 +816,9 @@ void ExecutionNode::VarOverview::after (ExecutionNode *en) {
en->_depth = depth;
en->_varOverview = *me;
std::cout << en->toJson(TRI_UNKNOWN_MEM_ZONE, false).toString() << "\n";////xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
std::cout << en->getTypeString() << "\n";
// Now find out which registers ought to be erased after this node:
if (en->getType() != ExecutionNode::RETURN) {
@ -867,9 +914,9 @@ ExecutionNode* EnumerateCollectionNode::clone (ExecutionPlan* plan,
outVariable = plan->getAst()->variables()->createVariable(outVariable);
}
auto c = new EnumerateCollectionNode(plan, _id, _vocbase, _collection, outVariable);
if (withDependencies) {
cloneDependencies(plan, c, withProperties);
}
CloneHelper (c, plan, withDependencies, withProperties);
return static_cast<ExecutionNode*>(c);
}
@ -1031,9 +1078,8 @@ ExecutionNode* EnumerateListNode::clone (ExecutionPlan* plan,
auto c = new EnumerateListNode(plan, _id, inVariable, outVariable);
if (withDependencies) {
cloneDependencies(plan, c, withProperties);
}
CloneHelper (c, plan, withDependencies, withProperties);
return static_cast<ExecutionNode*>(c);
}
@ -1095,9 +1141,9 @@ ExecutionNode* IndexRangeNode::clone (ExecutionPlan* plan,
auto c = new IndexRangeNode(plan, _id, _vocbase, _collection,
outVariable, _index, ranges, _reverse);
if (withDependencies) {
cloneDependencies(plan, c, withProperties);
}
CloneHelper (c, plan, withDependencies, withProperties);
return static_cast<ExecutionNode*>(c);
}
@ -1334,9 +1380,9 @@ ExecutionNode* CalculationNode::clone (ExecutionPlan* plan,
}
auto c = new CalculationNode(plan, _id, _expression->clone(),
outVariable);
if (withDependencies) {
cloneDependencies(plan, c, withProperties);
}
CloneHelper (c, plan, withDependencies, withProperties);
return static_cast<ExecutionNode*>(c);
}
@ -1379,9 +1425,9 @@ ExecutionNode* SubqueryNode::clone (ExecutionPlan* plan,
}
auto c = new SubqueryNode(plan, _id, _subquery->clone(plan, true, withProperties),
outVariable);
if (withDependencies) {
cloneDependencies(plan, c, withProperties);
}
CloneHelper (c, plan, withDependencies, withProperties);
return static_cast<ExecutionNode*>(c);
}
@ -1524,9 +1570,9 @@ ExecutionNode* FilterNode::clone (ExecutionPlan* plan,
inVariable = plan->getAst()->variables()->createVariable(inVariable);
}
auto c = new FilterNode(plan, _id, inVariable);
if (withDependencies) {
cloneDependencies(plan, c, withProperties);
}
CloneHelper (c, plan, withDependencies, withProperties);
return static_cast<ExecutionNode*>(c);
}
@ -1724,9 +1770,9 @@ ExecutionNode* AggregateNode::clone (ExecutionPlan* plan,
}
auto c = new AggregateNode(plan, _id, aggregateVariables, outVariable, _variableMap);
if (withDependencies) {
cloneDependencies(plan, c, withProperties);
}
CloneHelper (c, plan, withDependencies, withProperties);
return static_cast<ExecutionNode*>(c);
}
@ -1819,9 +1865,9 @@ ExecutionNode* ReturnNode::clone (ExecutionPlan* plan,
}
auto c = new ReturnNode(plan, _id, inVariable);
if (withDependencies) {
cloneDependencies(plan, c, withProperties);
}
CloneHelper (c, plan, withDependencies, withProperties);
return static_cast<ExecutionNode*>(c);
}
@ -1909,9 +1955,9 @@ ExecutionNode* RemoveNode::clone (ExecutionPlan* plan,
}
auto c = new RemoveNode(plan, _id, _vocbase, _collection, _options, inVariable, outVariable);
if (withDependencies) {
cloneDependencies(plan, c, withProperties);
}
CloneHelper (c, plan, withDependencies, withProperties);
return static_cast<ExecutionNode*>(c);
}
@ -1970,9 +2016,9 @@ ExecutionNode* InsertNode::clone (ExecutionPlan* plan,
auto c = new InsertNode(plan, _id, _vocbase, _collection,
_options, inVariable, outVariable);
if (withDependencies) {
cloneDependencies(plan,c, withProperties);
}
CloneHelper (c, plan, withDependencies, withProperties);
return static_cast<ExecutionNode*>(c);
}
@ -2039,9 +2085,9 @@ ExecutionNode* UpdateNode::clone (ExecutionPlan* plan,
}
auto c = new UpdateNode(plan, _id, _vocbase, _collection, _options, inDocVariable, inKeyVariable, outVariable);
if (withDependencies) {
cloneDependencies(plan, c, withProperties);
}
CloneHelper (c, plan, withDependencies, withProperties);
return static_cast<ExecutionNode*>(c);
}
@ -2110,9 +2156,9 @@ ExecutionNode* ReplaceNode::clone (ExecutionPlan* plan,
auto c = new ReplaceNode(plan, _id, _vocbase, _collection,
_options, inDocVariable, inKeyVariable,
outVariable);
if (withDependencies) {
cloneDependencies(plan, c, withProperties);
}
CloneHelper (c, plan, withDependencies, withProperties);
return static_cast<ExecutionNode*>(c);
}

69
arangod/Aql/ExecutionNode.h
View File

@ -338,30 +338,25 @@ namespace triagens {
virtual ExecutionNode* clone (ExecutionPlan* plan,
bool withDependencies,
bool withProperties) const = 0;
bool withProperties) const = 0;
// make class abstract
////////////////////////////////////////////////////////////////////////////////
/// @brief execution Node clone utility to be called by derives
////////////////////////////////////////////////////////////////////////////////
void CloneHelper (ExecutionNode *Other,
ExecutionPlan* plan,
bool withDependencies,
bool withProperties) const;
////////////////////////////////////////////////////////////////////////////////
/// @brief helper for cloning, use virtual clone methods for dependencies
////////////////////////////////////////////////////////////////////////////////
void cloneDependencies (ExecutionPlan* plan,
ExecutionNode* theClone,
bool withProperties) const {
auto it = _dependencies.begin();
while (it != _dependencies.end()) {
auto c = (*it)->clone(plan, true, withProperties);
try {
c->_parents.push_back(theClone);
theClone->_dependencies.push_back(c);
}
catch (...) {
delete c;
throw;
}
++it;
}
}
bool withProperties) const;
////////////////////////////////////////////////////////////////////////////////
/// @brief convert to a string, basically for debugging purposes
@ -764,9 +759,9 @@ namespace triagens {
bool withDependencies,
bool withProperties) const {
auto c = new SingletonNode(plan, _id);
if (withDependencies) {
cloneDependencies(plan, c, withProperties);
}
CloneHelper (c, plan, withDependencies, withProperties);
return static_cast<ExecutionNode*>(c);
}
@ -1267,9 +1262,9 @@ namespace triagens {
bool withDependencies,
bool withProperties) const {
auto c = new LimitNode(plan, _id, _offset, _limit);
if (withDependencies) {
cloneDependencies(plan, c, withProperties);
}
CloneHelper (c, plan, withDependencies, withProperties);
return static_cast<ExecutionNode*>(c);
}
@ -1781,9 +1776,9 @@ namespace triagens {
bool withDependencies,
bool withProperties) const {
auto c = new SortNode(plan, _id, _elements, _stable);
if (withDependencies) {
cloneDependencies(plan, c, withProperties);
}
CloneHelper (c, plan, withDependencies, withProperties);
return static_cast<ExecutionNode*>(c);
}
@ -2686,9 +2681,9 @@ namespace triagens {
bool withDependencies,
bool withProperties) const {
auto c = new NoResultsNode(plan, _id);
if (withDependencies) {
cloneDependencies(plan, c, withProperties);
}
CloneHelper (c, plan, withDependencies, withProperties);
return static_cast<ExecutionNode*>(c);
}
@ -2763,9 +2758,9 @@ namespace triagens {
bool withDependencies,
bool withProperties) const {
auto c = new RemoteNode(plan, _id, _vocbase, _collection, _server, _ownName, _queryId);
if (withDependencies) {
cloneDependencies(plan, c, withProperties);
}
CloneHelper (c, plan, withDependencies, withProperties);
return static_cast<ExecutionNode*>(c);
}
@ -2944,9 +2939,9 @@ namespace triagens {
bool withDependencies,
bool withProperties) const {
auto c = new ScatterNode(plan, _id, _vocbase, _collection);
if (withDependencies) {
cloneDependencies(plan, c, withProperties);
}
CloneHelper (c, plan, withDependencies, withProperties);
return static_cast<ExecutionNode*>(c);
}
@ -3046,9 +3041,9 @@ namespace triagens {
bool withDependencies,
bool withProperties) const {
auto c = new GatherNode(plan, _id, _vocbase, _collection);
if (withDependencies) {
cloneDependencies(plan, c, withProperties);
}
CloneHelper (c, plan, withDependencies, withProperties);
return static_cast<ExecutionNode*>(c);
}