mirror of https://gitee.com/bigwinds/arangodb
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
This commit is contained in:
commit
8d31137698
|
@ -1430,13 +1430,13 @@ int FilterBlock::getOrSkipSome (size_t atLeast,
|
||||||
else {
|
else {
|
||||||
// The current block fits into our result and is fresh and
|
// The current block fits into our result and is fresh and
|
||||||
// takes them all, so we can just hand it on:
|
// takes them all, so we can just hand it on:
|
||||||
|
skipped += cur->size();
|
||||||
if (! skipping) {
|
if (! skipping) {
|
||||||
collector.push_back(cur);
|
collector.push_back(cur);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
delete cur;
|
delete cur;
|
||||||
}
|
}
|
||||||
skipped += cur->size();
|
|
||||||
_buffer.pop_front();
|
_buffer.pop_front();
|
||||||
_chosen.clear();
|
_chosen.clear();
|
||||||
_pos = 0;
|
_pos = 0;
|
||||||
|
|
Loading…
Reference in New Issue