diff --git a/arangod/Aql/ExecutionBlock.h b/arangod/Aql/ExecutionBlock.h index 8e0f9b60eb..274193cd7c 100644 --- a/arangod/Aql/ExecutionBlock.h +++ b/arangod/Aql/ExecutionBlock.h @@ -35,6 +35,8 @@ #include "Aql/ExecutionNode.h" #include "Utils/transactions.h" +// #include "V8/v8.h" + using namespace triagens::basics; struct TRI_json_s; @@ -820,7 +822,6 @@ namespace triagens { for (size_t i = 0; i < result->size(); i++) { // Now build V8-Object as argument: for (size_t j = 0; j < _inVars.size(); j++) { - } } } diff --git a/arangod/Aql/Types.cpp b/arangod/Aql/Types.cpp index 13eb08637b..61c0194f6e 100644 --- a/arangod/Aql/Types.cpp +++ b/arangod/Aql/Types.cpp @@ -93,14 +93,14 @@ AqlItemBlock* AqlItemBlock::splice(std::vector& blocks) auto it = blocks.begin(); TRI_ASSERT(it != blocks.end()); size_t totalSize = (*it)->size(); - RegisterId nrRegs = (*it)->getNrVars(); + RegisterId nrRegs = (*it)->getNrRegs(); while (true) { if (++it == blocks.end()) { break; } totalSize += (*it)->size(); - TRI_ASSERT((*it)->getNrVars() == nrRegs); + TRI_ASSERT((*it)->getNrRegs() == nrRegs); } auto res = new AqlItemBlock(totalSize, nrRegs);