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

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

This commit is contained in:
Jan Steemann 2014-08-01 14:53:00 +02:00
parent 2f7b7ad1f1 0d434cfc21
commit 8ed4acf63f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arangod/Aql/ExecutionBlock.h
View File

@ -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++) {
}
}
}

4
arangod/Aql/Types.cpp
View File

@ -93,14 +93,14 @@ AqlItemBlock* AqlItemBlock::splice(std::vector<AqlItemBlock*>& 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);