Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2

Conflicts:
	arangod/Aql/Query.cpp

arangod/Aql/ExecutionEngine.cpp

@@ -96,7 +96,13 @@ struct Instanciator : public ExecutionNode::WalkerWorker {
         THROW_ARANGO_EXCEPTION(TRI_ERROR_NOT_IMPLEMENTED);
       }
     }
-    engine->addBlock(eb);
+    try {
+      engine->addBlock(eb);
+    }
+    catch (...) {
+      delete eb;
+      throw;
+    }
 
     // Now add dependencies:
     std::vector<ExecutionNode*> deps = en->getDependencies();
@@ -128,7 +134,11 @@ ExecutionEngine* ExecutionEngine::instanciateFromPlan (ExecutionNode* plan) {
     auto root = inst->root;
     delete inst;
 
+    root->staticAnalysis();
+    root->initialize();
+
     engine->_root = root;
+
   }
   catch (...) {
     delete engine;

arangod/Aql/Query.cpp

@@ -29,6 +29,7 @@
 
 #include "Aql/Query.h"
 #include "Aql/ExecutionBlock.h"
+#include "Aql/ExecutionEngine.h"
 #include "Aql/ExecutionPlan.h"
 #include "Aql/Parser.h"
 #include "Aql/V8Executor.h"
@@ -176,25 +177,22 @@ QueryResult Query::execute () {
     auto plan = ExecutionPlan::instanciateFromAst(parser.ast());
 
     try { 
-      auto exec = ExecutionEngine::instanciateFromPlan(plan);
+      auto engine = ExecutionEngine::instanciateFromPlan(plan->root());
 
       try {
-        exec->root()->staticAnalysis();
+        auto root = engine->root();
-
+        root->execute();
-        exec->root()->initialize();
-        exec->root()->execute();
  
         AqlItemBlock* value;
-        while (nullptr != (value = exec->root()->getOne())) {
+        while (nullptr != (value = root->getOne())) {
           std::cout << value->getValue(0, 0)->toString() << std::endl;
           delete value;
         }
 
-        exec->root()->shutdown();
+        delete engine;
-        delete exec;
       }
       catch (...) {
-        delete exec;
+        delete engine;
         delete plan;
         // TODO: convert exception code
         return QueryResult(TRI_ERROR_INTERNAL);