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-20 18:28:32 +02:00
parent 40e62e95a5 ba41701bf8
commit aec1ea970a
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arangod/Aql/ExecutionEngine.cpp
View File

@ -357,6 +357,7 @@ struct CoordinatorInstanciator : public WalkerWorker<ExecutionNode> {
ExecutionNode const* current = (*it).nodes.front(); ExecutionNode const* current = (*it).nodes.front();
ExecutionNode* previous = nullptr; ExecutionNode* previous = nullptr;
// TODO: fix instanciation here as in DBserver case
while (current != nullptr) { while (current != nullptr) {
auto clone = current->clone(newPlan, false, true); auto clone = current->clone(newPlan, false, true);
newPlan->registerNode(clone); newPlan->registerNode(clone);

3
arangod/Aql/ExecutionEngine.h
View File

@ -132,8 +132,11 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
int shutdown () { int shutdown () {
if (_root != nullptr) {
return _root->shutdown(); return _root->shutdown();
} }
else return 0;
}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
/// @brief getSome /// @brief getSome

1
arangod/Aql/Query.cpp
View File

@ -976,6 +976,7 @@ std::string Query::getStateString () const {
void Query::cleanupPlanAndEngine () { void Query::cleanupPlanAndEngine () {
if (_engine != nullptr) { if (_engine != nullptr) {
_engine->shutdown();
delete _engine; delete _engine;
_engine = nullptr; _engine = nullptr;
} }