# Conflicts:

# js/common/modules/@arangodb/graph/graphs-generation.js # js/common/modules/@arangodb/graph/pregel-test-helpers.js # tests/js/common/shell/shell-pregel-components-nightly.js # tests/js/common/shell/shell-pregel-components.js
arangodb · Jul 6, 2022 · ffb0cf2 · ffb0cf2
1 parent 3501fef
commit ffb0cf2
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 492 deletions.
diff --git a/arangod/Aql/AqlItemBlockInputMatrix.cpp b/arangod/Aql/AqlItemBlockInputMatrix.cpp
diff --git a/arangod/Aql/AqlItemBlockInputMatrix.h b/arangod/Aql/AqlItemBlockInputMatrix.h
diff --git a/arangod/Aql/ExecutionBlockImpl.cpp b/arangod/Aql/ExecutionBlockImpl.cpp
@@ -1390,8 +1390,7 @@ auto ExecutionBlockImpl<Executor>::executeFastForward(
       auto [state, stats, skippedLocal, call] =
           executeSkipRowsRange(_lastRange, clientCall);
 
-      if constexpr (is_one_of_v<DataRange, AqlItemBlockInputMatrix,
-                                MultiAqlItemBlockInputRange>) {
+      if constexpr (std::is_same_v<DataRange, MultiAqlItemBlockInputRange>) {
         // The executor will have used all rows.
         // However we need to drop them from the input
         // here.
@@ -1409,8 +1408,7 @@ auto ExecutionBlockImpl<Executor>::executeFastForward(
       auto [state, stats, skippedLocal, call] =
           executeSkipRowsRange(_lastRange, dummy);
 
-      if constexpr (is_one_of_v<DataRange, AqlItemBlockInputMatrix,
-                                MultiAqlItemBlockInputRange>) {
+      if constexpr (std::is_same_v<DataRange, MultiAqlItemBlockInputRange>) {
         // The executor will have used all rows.
         // However we need to drop them from the input
         // here.