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

Bug fix 3.3/issue 5400 (#5411)

This commit is contained in:
Jan 2018-05-23 11:40:50 +02:00 committed by GitHub
parent ff9cd74ceb
commit 1e4436666d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -1,6 +1,8 @@
v3.3.10 (XXXX-XX-XX)
--------------------
* fixed issue #5400: Unexpected AQL Result
* fixe dissue #5429: Frequent 'updated local foxx repository' messages
* fixed issue #5252: Empty result if FULLTEXT() is used together with LIMIT offset

4
arangod/RocksDBEngine/RocksDBIterators.cpp
View File

@ -120,7 +120,7 @@ bool RocksDBAllIndexIterator::nextDocument(
IndexIterator::DocumentCallback const& cb, size_t limit) {
TRI_ASSERT(_trx->state()->isRunning());
if (limit == 0 || !_iterator->Valid()) {
if (limit == 0 || !_iterator->Valid() || outOfRange()) {
// No limit no data, or we are actually done. The last call should have
// returned false
TRI_ASSERT(limit > 0); // Someone called with limit == 0. Api broken
@ -138,7 +138,7 @@ bool RocksDBAllIndexIterator::nextDocument(
_iterator->Next();
}
if (!_iterator->Valid()) {
if (!_iterator->Valid() || outOfRange()) {
return false;
}
}