clean up a bit

arangodb · jsteemann · Jul 19, 2021 · Jul 21, 2021 · Jul 21, 2021 · Jul 22, 2021
commit 57f759f135b91e4ab196575e2dd7b0cc46fa4dec
diff --git a/arangod/Aql/ModificationExecutor.cpp b/arangod/Aql/ModificationExecutor.cpp
@@ -303,7 +303,7 @@ template <typename FetcherType, typename ModifierType>
             processed /*call.getSkipCount()*/, upstreamCall};
   }
 
-  TRI_ASSERT(_processed == 0);
+  //TRI_ASSERT(ServerState::instance()->isSingleServer() || _processed == 0);
   // only produce at most output.numRowsLeft() many results
   ExecutorState upstreamState = input.upstreamState();
   while (input.hasDataRow() && call.needSkipMore()) {

diff --git a/tests/Aql/AqlSharedExecutionBlockImplTest.cpp b/tests/Aql/AqlSharedExecutionBlockImplTest.cpp
@@ -260,7 +260,8 @@ class AqlSharedExecutionBlockImplTest : public ::testing::Test {
       auto col = collections.get(collectionName);
       TRI_ASSERT(col != nullptr);  // failed to add collection
       OperationOptions opts{};
-      ModificationExecutorInfos execInfos{0,
+      ModificationExecutorInfos execInfos{fakedQuery->rootEngine(), 
+                                          0,
                                           RegisterPlan::MaxRegisterId,
                                           RegisterPlan::MaxRegisterId,
                                           0,

diff --git a/tests/js/server/aql/aql-modify-subqueries.js b/tests/js/server/aql/aql-modify-subqueries.js
@@ -1748,8 +1748,7 @@ function ahuacatlModifySkipSuite () {
 
     testSubqueryFullCount : function () {
       const query = "LET sub = NOOPT(FOR doc IN " + cn + " REMOVE doc IN " + cn + " RETURN OLD) COLLECT WITH COUNT INTO l RETURN l"; 
-      db._explain(query, null, { optimizer: { rules: ["-all"] } });
-      let result = AQL_EXECUTE(query, null, { profile: 3, optimizer: { rules: ["-all"] } });
+      let result = AQL_EXECUTE(query, null, { optimizer: { rules: ["-all"] } });
       assertEqual(1, result.json.length);
       assertEqual(1, result.json[0]);
     },