Merge branch 'feature/AqlSubqueryExecutionBlockImplExecuteImplementat…

…ion' into feature/AqlSubqueryExecutionBlockImplExecuteImplementation-subqueryStartExecutor
arangodb · mchacki · Feb 29, 2020 · Jan 29, 2020 · Jan 31, 2020 · Jan 31, 2020
commit 04de92e88a9c4c46cc77759405ce9e22e186dd56
diff --git a/arangod/Aql/ExecutionBlockImpl.cpp b/arangod/Aql/ExecutionBlockImpl.cpp
@@ -141,7 +141,7 @@ constexpr bool isNewStyleExecutor =
                 TestLambdaExecutor,
                 TestLambdaSkipExecutor,  // we need one after these to avoid compile errors in non-test mode
 #endif
-                SubqueryStartExecutor, SubqueryEndExecutor, ShortestPathExecutor>;
+                SubqueryStartExecutor, SubqueryEndExecutor, ShortestPathExecutor, EnumerateListExecutor>;
 
 template <class Executor>
 ExecutionBlockImpl<Executor>::ExecutionBlockImpl(ExecutionEngine* engine,
@@ -1061,11 +1061,11 @@ static SkipRowsRangeVariant constexpr skipRowsType() {
                 "Fetcher is chosen for skipping, but has not skipRows method!");
 
   static_assert(useExecutor ==
-                    (is_one_of_v<Executor, FilterExecutor, ShortestPathExecutor, ReturnExecutor,
+                    (is_one_of_v<Executor, FilterExecutor, ShortestPathExecutor, ReturnExecutor, HashedCollectExecutor, IndexExecutor,
 #ifdef ARANGODB_USE_GOOGLE_TESTS
                                  TestLambdaSkipExecutor,
 #endif
-                                 SubqueryStartExecutor, SubqueryEndExecutor, SortedCollectExecutor>),
+                                 EnumerateListExecutor, SubqueryStartExecutor, SubqueryEndExecutor, SortedCollectExecutor>),
                 "Unexpected executor for SkipVariants::EXECUTOR");
 
   // The LimitExecutor will not work correctly with SkipVariants::FETCHER!
@@ -1187,6 +1187,7 @@ ExecutionBlockImpl<Executor>::executeWithoutTrace(AqlCallStack stack) {
       // (void)subqueryCall;
       clientCall = stack.popCall();
     }
+    ExecutorState localExecutorState = ExecutorState::DONE;
 
     // We can only have returned the following internal states
     TRI_ASSERT(_execState == ExecState::CHECKCALL || _execState == ExecState::SHADOWROWS ||
@@ -1422,6 +1423,7 @@ ExecutionBlockImpl<Executor>::executeWithoutTrace(AqlCallStack stack) {
               _outputItemRow->copyRow(shadowRow);
 
               if (shadowRow.isRelevant()) {
+                LOG_QUERY("6d337", DEBUG) << printTypeInfo() << " init executor.";
                 // We found a relevant shadow Row.
                 // We need to reset the Executor
                 // cppcheck-suppress unreadVariable

diff --git a/tests/Aql/ExecutorTestHelper.h b/tests/Aql/ExecutorTestHelper.h
@@ -294,6 +294,26 @@ struct ExecutorTestHelper {
     return *this;
   }
 
+  auto allowAnyOutputOrder(bool expected, size_t skippedRows = 0) -> ExecutorTestHelper& {
+    _unorderedOutput = expected;
+    _unorderedSkippedRows = skippedRows;
+    return *this;
+  }
+
+  /**
+   * @brief This appends an empty block after the input fully created.
+   *        It simulates a situation where the Producer lies about the
+   *        the last input with HASMORE, but it actually is not able
+   *        to produce more.
+   *
+   * @param append If this should be enabled or not
+   * @return ExecutorTestHelper& this for chaining
+   */
+  auto appendEmptyBlock(bool append) -> ExecutorTestHelper& {
+    _appendEmptyBlock = append;
+    return *this;
+  }
+
   auto run() -> void {
     ResourceMonitor monitor;
     AqlItemBlockManager itemBlockManager(&monitor, SerializationFormat::SHADOWROWS);