return has more

arangod/Aql/UnsortedGatherExecutor.cpp

@@ -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) {

tests/js/server/aql/aql-optimizer-collect-aggregate.js

@@ -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;

tests/js/server/aql/aql-subquery.js

@@ -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);
           }