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

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
Jan Steemann 2016-05-04 13:17:21 +02:00
parent cd190edf1a 8c0b89346a
commit 06091d9238
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arangod/Aql/AqlValue.cpp
View File

@ -954,6 +954,8 @@ int AqlValue::Compare(arangodb::AqlTransaction* trx, AqlValue const& left,
size_t ritem = 0;
size_t const lsize = left._data.docvec->size();
size_t const rsize = right._data.docvec->size();
size_t lrows = left._data.docvec->at(0)->size();
size_t rrows = right._data.docvec->at(0)->size();
while (lblock < lsize && rblock < rsize) {
AqlValue const& lval = left._data.docvec->at(lblock)->getValueReference(litem, 0);
@ -964,13 +966,19 @@ int AqlValue::Compare(arangodb::AqlTransaction* trx, AqlValue const& left,
if (cmp != 0) {
return cmp;
}
if (++litem == lsize) {
if (++litem == lrows) {
litem = 0;
lblock++;
if (lblock < lsize) {
lrows = left._data.docvec->at(lblock)->size();
}
}
if (++ritem == rsize) {
if (++ritem == rrows) {
ritem = 0;
rblock++;
if (rblock < rsize) {
rrows = right._data.docvec->at(rblock)->size();
}
}
}

2
arangod/Aql/CollectBlock.cpp
View File

@ -624,8 +624,8 @@ int HashedCollectBlock::getOrSkipSome(size_t atLeast, size_t atMost,
for (auto& it2 : *(it.second)) {
delete it2;
}
delete it.second;
}
delete it.second;
}
allGroups.clear();
};