SORT receiving input incrementally in rows (#16428)

Co-authored-by: Jan <jsteemann@users.noreply.github.com>
arangodb · Jul 5, 2022 · 3bdaefe · 3bdaefe
1 parent 425e256
commit 3bdaefe
Show file tree

Hide file tree

Showing 12 changed files with 87 additions and 865 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,9 @@
 devel
 -----
 
+* Made the SortExecutor receive its input incrementally, instead of receiving
+  a whole matrix containing all input at once.
+
 * Optimization for index post-filtering (early pruning): in case an index
   is used for lookups, and the index covers the IndexNode's post-filter
   condition, then loading the full document from the storage engine is

diff --git a/arangod/Aql/AllRowsFetcher.cpp b/arangod/Aql/AllRowsFetcher.cpp
diff --git a/arangod/Aql/AllRowsFetcher.h b/arangod/Aql/AllRowsFetcher.h
diff --git a/arangod/Aql/ExecutionBlockImpl.cpp b/arangod/Aql/ExecutionBlockImpl.cpp
@@ -26,7 +26,6 @@
 
 #include "ExecutionBlockImpl.h"
 
-#include "Aql/AllRowsFetcher.h"
 #include "Aql/AqlCallStack.h"
 #include "Aql/AqlItemBlock.h"
 #include "Aql/CalculationExecutor.h"
@@ -869,7 +868,7 @@ static SkipRowsRangeVariant constexpr skipRowsType() {
               SingleRemoteModificationExecutor<Remove>,
               SingleRemoteModificationExecutor<Update>,
               SingleRemoteModificationExecutor<Replace>,
-              SingleRemoteModificationExecutor<Upsert>,
+              SingleRemoteModificationExecutor<Upsert>, SortExecutor,
               MaterializeExecutor<RegisterId>,
               MaterializeExecutor<std::string const&>>),
       "Unexpected executor for SkipVariants::EXECUTOR");