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

fixed bug in skipSome for EnumerateListBlock, and in limit node.

This commit is contained in:
James 2014-08-11 15:41:30 +02:00
parent b9cafc7c67
commit f94b2c22cc
1 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
arangod/Aql/ExecutionBlock.h
View File

@ -549,7 +549,6 @@ namespace triagens {
// will only return less than atLeast if there aren't atLeast many
// things to skip overall.
virtual size_t skipSome (size_t atLeast, size_t atMost) {
size_t skipped = 0;
if (_done) {
@ -590,7 +589,6 @@ namespace triagens {
bool skip (size_t number) {
size_t skipped = skipSome(number, number);
size_t nr = skipped;
while ( nr != 0 && skipped < number ){
nr = skipSome(number - skipped, number - skipped);
skipped += nr;
@ -1285,13 +1283,13 @@ namespace triagens {
////////////////////////////////////////////////////////////////////////////////
size_t skipSome (size_t atLeast, size_t atMost) {
size_t skipped = 0;
if (_done) {
return skipped;
}
while (skipped < atLeast) {
if (_buffer.empty()) {
if (! getBlock(DefaultBatchSize, DefaultBatchSize)){
@ -1318,30 +1316,36 @@ namespace triagens {
break;
}
case AqlValue::RANGE: {
sizeInVar = inVarReg._range->_high - inVarReg._range->_low;
sizeInVar = inVarReg._range->_high - inVarReg._range->_low + 1;
break;
}
case AqlValue::DOCVEC: {
if(_index == 0){// this is a (maybe) new DOCVEC
_DOCVECsize = 0;
//we require the total number of items
for (size_t i = 0; i < inVarReg._vector->size(); i++) {
_DOCVECsize += inVarReg._vector->at(i)->size();
}
if(_index == 0){// this is a (maybe) new DOCVEC
_DOCVECsize = 0;
//we require the total number of items
for (size_t i = 0; i < inVarReg._vector->size(); i++) {
_DOCVECsize += inVarReg._vector->at(i)->size();
}
sizeInVar = _DOCVECsize;
}
sizeInVar = _DOCVECsize;
break;
}
default: {
THROW_ARANGO_EXCEPTION(TRI_ERROR_INTERNAL);
}
}
if(atMost < sizeInVar * (cur->size() - _pos) + (sizeInVar - _index)) {
if (atMost < sizeInVar - _index) {
// eat just enough of the current block!
_index += atMost;
skipped = atMost;
}
else if (atMost < sizeInVar * (cur->size() - _pos) + (sizeInVar - _index)) {
// eat just enough of the current block!
size_t q = ((atMost - sizeInVar + _index) / sizeInVar) + 1;
_pos += q;
_index = atMost + _index - q * sizeInVar;
if (inVarReg._type == AqlValue::DOCVEC){
// handle _thisblock and _seen
_thisblock = 0;
@ -1355,7 +1359,7 @@ namespace triagens {
}
else {
// eat the whole of the current block and proceed . . .
skipped += sizeInVar * (cur->size() - _pos) + (sizeInVar - _index);
skipped += sizeInVar * (cur->size() - _pos) + (sizeInVar - _index) - 1;
_index = 0;
_thisblock = 0;
_seen = 0;
@ -1364,9 +1368,8 @@ namespace triagens {
_pos = 0;
}
}
return skipped;
}
return skipped;
}
////////////////////////////////////////////////////////////////////////////////
/// @brief create an AqlValue from the inVariable using the current _index
@ -2455,7 +2458,7 @@ namespace triagens {
if (_state == 0) {
if (_offset > 0) {
ExecutionBlock::skip(_offset);
ExecutionBlock::_dependencies[0]->skip(_offset);
_state = 1;
_count = 0;
if (_limit == 0) {