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

return has more

This commit is contained in:
Simon Grätzer 2019-11-06 18:26:02 +01:00
parent cebf0fbb1a
commit 359723add4
No known key found for this signature in database
GPG Key ID: E4736AA091116E5C
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arangod/Aql/UnsortedGatherExecutor.cpp
View File

@ -102,6 +102,11 @@ std::pair<ExecutionState, NoStats> UnsortedGatherExecutor::produceRows(OutputAql
_currentDependency = x;
NoStats stats;
if (output.isFull()) {
return {ExecutionState::HASMORE, stats};
}
size_t numWaiting = 0;
for (x = 0; x < _numberDependencies; ++x) {
if (_upstream[x] == ExecutionState::HASMORE) {

3
tests/js/server/aql/aql-optimizer-collect-aggregate.js
View File

@ -1871,6 +1871,9 @@ function optimizerAggregateResultsSuite () {
if (typeof actual === 'number') {
actual = actual.toFixed(6);
}
expected.sort();
actual.sort();
assertEqual(expected, actual, query);
plan = AQL_EXPLAIN(query).plan;

2
tests/js/server/aql/aql-subquery.js
View File

@ -418,7 +418,7 @@ function ahuacatlSubqueryTestSuite () {
assertEqual(scannedIndex, 0);
assertEqual(filtered, 3960000);
if (isCoordinator) {
assertEqual(httpRequests, 8007);
assertTrue(httpRequests <= 8007 + 1);
} else {
assertEqual(httpRequests, 0);
}