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

optimization for EnumerateCollection

This commit is contained in:
Jan Steemann 2014-08-04 11:46:19 +02:00
parent 7dc549d058
commit 06c9c719e2
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
arangod/Aql/ExecutionBlock.h
View File

@ -691,12 +691,15 @@ namespace triagens {
int execute () { int execute () {
int res = ExecutionBlock::execute(); int res = ExecutionBlock::execute();
if (res != TRI_ERROR_NO_ERROR) { if (res != TRI_ERROR_NO_ERROR) {
return res; return res;
} }
if (_allDocs.empty()) { if (_allDocs.empty()) {
_done = true; _done = true;
} }
return TRI_ERROR_NO_ERROR; return TRI_ERROR_NO_ERROR;
} }
@ -709,6 +712,7 @@ namespace triagens {
for (auto it = _allDocs.begin(); it != _allDocs.end(); ++it) { for (auto it = _allDocs.begin(); it != _allDocs.end(); ++it) {
delete *it; delete *it;
} }
_allDocs.clear(); _allDocs.clear();
return res; return res;
} }
@ -721,6 +725,7 @@ namespace triagens {
if (_done) { if (_done) {
return nullptr; return nullptr;
} }
if (_buffer.empty()) { if (_buffer.empty()) {
if (! ExecutionBlock::getBlock(1, 1000)) { if (! ExecutionBlock::getBlock(1, 1000)) {
_done = true; _done = true;
@ -785,9 +790,18 @@ namespace triagens {
auto res = new AqlItemBlock(toSend, _varOverview->nrRegs[_depth]); auto res = new AqlItemBlock(toSend, _varOverview->nrRegs[_depth]);
TRI_ASSERT(cur->getNrRegs() <= res->getNrRegs()); TRI_ASSERT(cur->getNrRegs() <= res->getNrRegs());
// only copy 1st row of registers inherited from previous frame(s)
for (RegisterId i = 0; i < cur->getNrRegs(); i++) {
res->setValue(0, i, cur->getValue(_pos, i)->clone());
}
for (size_t j = 0; j < toSend; j++) { for (size_t j = 0; j < toSend; j++) {
for (RegisterId i = 0; i < cur->getNrRegs(); i++) { if (j > 0) {
res->setValue(j, i, cur->getValue(_pos, i)->clone()); // re-use already copied aqlvalues
for (RegisterId i = 0; i < cur->getNrRegs(); i++) {
res->setValue(j, i, cur->getValue(0, i));
}
} }
// The result is in the first variable of this depth, // The result is in the first variable of this depth,
// we do not need to do a lookup in _varOverview->varInfo, // we do not need to do a lookup in _varOverview->varInfo,