Fixed constrained sort #2

goedderz · goedderz · commit 19613c510f83 · 2020-03-05T10:46:35.000+01:00
diff --git a/arangod/Aql/SortingGatherExecutor.cpp b/arangod/Aql/SortingGatherExecutor.cpp
@@ -346,6 +346,10 @@ auto SortingGatherExecutor::produceRows(typename Fetcher::DataRange& input,
     }
   }
 
+  // produceRows should not be called again when the limit is reached;
+  // the downstream limit should see to that.
+  TRI_ASSERT(!limitReached());
+
   while (!isDone(input) && !output.isFull() && !limitReached()) {
     TRI_ASSERT(!maySkip());
     auto row = nextRow(input);
@@ -360,10 +364,17 @@ auto SortingGatherExecutor::produceRows(typename Fetcher::DataRange& input,
     }
   }
 
-  if (isDone(input)) {
-    return {ExecutorState::DONE, NoStats{}, AqlCallSet{}};
-  }
-  return {ExecutorState::HASMORE, NoStats{}, AqlCallSet{}};
+  auto const state = std::invoke([&]() {
+    if (isDone(input)) {
+      return ExecutorState::DONE;
+    } else if (limitReached() && !output.getClientCall().needsFullCount()) {
+      return ExecutorState::DONE;
+    } else {
+      return ExecutorState::HASMORE;
+    }
+  });
+
+  return {state, NoStats{}, AqlCallSet{}};
 }
 
 auto SortingGatherExecutor::skipRowsRange(typename Fetcher::DataRange& input, AqlCall& call)

Original file line number	Diff line number	Diff line change
`@@ -346,6 +346,10 @@ auto SortingGatherExecutor::produceRows(typename Fetcher::DataRange& input,`
`346`	`346`	`}`
`347`	`347`	`}`
`348`	`348`
	`349`	`+ // produceRows should not be called again when the limit is reached;`
	`350`	`+ // the downstream limit should see to that.`
	`351`	`+ TRI_ASSERT(!limitReached());`
	`352`	`+`
`349`	`353`	`while (!isDone(input) && !output.isFull() && !limitReached()) {`
`350`	`354`	`TRI_ASSERT(!maySkip());`
`351`	`355`	`auto row = nextRow(input);`
`@@ -360,10 +364,17 @@ auto SortingGatherExecutor::produceRows(typename Fetcher::DataRange& input,`
`360`	`364`	`}`
`361`	`365`	`}`
`362`	`366`
`363`		`- if (isDone(input)) {`
`364`		`- return {ExecutorState::DONE, NoStats{}, AqlCallSet{}};`
`365`		`- }`
`366`		`- return {ExecutorState::HASMORE, NoStats{}, AqlCallSet{}};`
	`367`	`+ auto const state = std::invoke([&]() {`
	`368`	`+ if (isDone(input)) {`
	`369`	`+ return ExecutorState::DONE;`
	`370`	`+ } else if (limitReached() && !output.getClientCall().needsFullCount()) {`
	`371`	`+ return ExecutorState::DONE;`
	`372`	`+ } else {`
	`373`	`+ return Exec 5DD7 utorState::HASMORE;`
	`374`	`+ }`
	`375`	`+ });`
	`376`	`+`
	`377`	`+ return {state, NoStats{}, AqlCallSet{}};`
`367`	`378`	`}`
`368`	`379`
`369`	`380`	`auto SortingGatherExecutor::skipRowsRange(typename Fetcher::DataRange& input, AqlCall& call)`