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

issue #9794: Limit with offset results in an infinite query that can't be cancelled (#9819)

This commit is contained in:
Jan 2019-08-27 15:23:21 +02:00 committed by KVS85
parent 543faec428
commit 0935bb898e
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG
View File

@ -1,6 +1,10 @@
v3.4.8 (XXXX-XX-XX) v3.4.8 (XXXX-XX-XX)
------------------- -------------------
* Issue #9798: Limit with offset results in an infinite query that can't be cancelled.
* Agents to remove callback entries when responded to with code 404.
* Make minimum timeout for synchronous replication configurable via parameter * Make minimum timeout for synchronous replication configurable via parameter
(--cluster.synchronous-replication-timeout-minimum) and increase default value (--cluster.synchronous-replication-timeout-minimum) and increase default value
to prevent dropping followers unnecessarily. to prevent dropping followers unnecessarily.
@ -12,8 +16,6 @@ v3.4.8 (XXXX-XX-XX)
dropped. The previous implementation retried (unsuccessfully in this case) dropped. The previous implementation retried (unsuccessfully in this case)
for up to 2 hours, occupying one scheduler thread. for up to 2 hours, occupying one scheduler thread.
* Agents to remove callback entries when responded to with code 404.
* Show query string length and cacheability information in query explain output. * Show query string length and cacheability information in query explain output.
* Fixed internal issue #4378: fix bug in MoveShard::abort which causes a * Fixed internal issue #4378: fix bug in MoveShard::abort which causes a

4
arangod/Aql/IndexBlock.cpp
View File

@ -796,6 +796,10 @@ std::pair<ExecutionState, size_t> IndexBlock::skipSome(size_t atMost) {
// At least one of them is prepared and ready to read. // At least one of them is prepared and ready to read.
TRI_ASSERT(!_indexesExhausted); TRI_ASSERT(!_indexesExhausted);
_indexesExhausted = !skipIndex(atMost); _indexesExhausted = !skipIndex(atMost);
if (_indexesExhausted) {
break;
}
} }
size_t returned = _returned; size_t returned = _returned;