added a missing test, clean up in another (arangodb#13545)

flyarong · flyarong · Apr 10, 2021 · Feb 5, 2021 · Feb 5, 2021 · Feb 8, 2021
commit 23e0007c83b77a1153b0f5b000bf9bf000376c32
diff --git a/arangod/Pregel/Conductor.cpp b/arangod/Pregel/Conductor.cpp
@@ -237,7 +237,7 @@ bool Conductor::_startGlobalStep() {
       _state = _inErrorAbort ? ExecutionState::FATAL_ERROR : ExecutionState::DONE;
       _endTimeSecs = TRI_microtime();
       LOG_TOPIC("9e82c", INFO, Logger::PREGEL)
-          << "Done execution took" << totalRuntimeSecs() << " s";
+          << "Done, execution took: " << totalRuntimeSecs() << " s";
     }
     return false;
   }

diff --git a/tests/js/common/shell/shell-statement.js b/tests/js/common/shell/shell-statement.js
@@ -630,6 +630,9 @@ function StatementSuite () {
       });
       let result = st.execute();
       assertTrue(result.getExtra().hasOwnProperty("stats"));
+      while (result.hasNext()) {
+        result.next();
+      }
     },
 
     testProfilingSilentStreamingQueryWithBatchSize: function () {
@@ -641,6 +644,9 @@ function StatementSuite () {
       });
       let result = st.execute();
       assertTrue(result.getExtra().hasOwnProperty("stats"));
+      while (result.hasNext()) {
+        result.next();
+      }
     },
 
     testProfilingStreamingQuery: function () {
@@ -651,6 +657,9 @@ function StatementSuite () {
       });
       let result = st.execute();
       assertTrue(result.getExtra().hasOwnProperty("stats"));
+      while (result.hasNext()) {
+        result.next();
+      }
     },
 
     testProfilingStreamingQueryWithBatchSize: function () {

diff --git a/tests/js/server/shell/shell-index-parallel-drop-create.js b/tests/js/server/shell/shell-index-parallel-drop-create.js
@@ -0,0 +1,127 @@
+/*jshint globalstrict:false, strict:false */
+/*global fail, assertEqual, assertTrue */
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief test parallel index drop/create
+///
+/// DISCLAIMER
+///
+/// Copyright 2018-2019 ArangoDB GmbH, Cologne, Germany
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+/// Copyright holder is ArangoDB GmbH, Cologne, Germany
+///
+/// @author Jan Steemann
+////////////////////////////////////////////////////////////////////////////////
+
+const jsunity = require("jsunity");
+const internal = require("internal");
+const errors = internal.errors;
+const db = internal.db;
+
+function ParallelIndexCreateDropSuite() {
+  'use strict';
+  const cn = "UnitTestsCollectionIdx";
+  const tasks = require("@arangodb/tasks");
+  const tasksCompleted = () => {
+    return 0 === tasks.get().filter((task) => {
+      return (task.id.match(/^UnitTest/) || task.name.match(/^UnitTest/));
+    }).length;
+  };
+  const waitForTasks = () => {
+    const time = internal.time;
+    const start = time();
+    while (!tasksCompleted()) {
+      if (time() - start > 300) { // wait for 5 minutes maximum
+        fail("Timeout after 5 minutes");
+      }
+      internal.sleep(0.5);
+    }
+  };
+
+  const threads = 6;
+  const attrs = 5;
+
+  return {
+
+    setUpAll : function () {
+      db._drop(cn);
+      let c = db._create(cn);
+
+      // fill with some initial data
+      let docs = [];
+      for (let i = 0; i < threads; ++i) {
+        // only populate some of the attributes, to have more variance in 
+        // index creation/drop speed
+        for (let j = i; j < attrs; ++j) {
+          docs.push({ ["thread-" + i - "-attribute-" + j] : i * j });
+        }
+      }
+      c.insert(docs);
+    },
+
+    tearDownAll : function () {
+      tasks.get().forEach(function(task) {
+        if (task.id.match(/^UnitTest/) || task.name.match(/^UnitTest/)) {
+          try {
+            tasks.unregister(task);
+          } catch (err) {
+          }
+        }
+      });
+      db._drop(cn);
+    },
+
+    testCreateDropInParallel: function () {
+      let c = require("internal").db._collection(cn);
+      // lets insert the rest via tasks
+      for (let i = 0; i < threads; ++i) {
+        let command = `
+let db = require("internal").db;
+let c = db._collection("${cn}");
+for (let iteration = 0; iteration < 15; ++iteration) {
+  require("console").log("thread ${i}, iteration " + iteration);
+  let indexes = [];
+  for (let i = 0; i < ${attrs}; ++i) {
+    indexes.push(c.ensureIndex({ type: "persistent", sparse: ${i} % 2 == 0, fields: ["thread-${i}-attribute-" + i] }));
+  }
+  indexes.forEach(function(index) {
+    c.dropIndex(index);
+  });
+}
+c.insert({ _key: "done${i}", value: true });
+`;
+        tasks.register({ name: "UnitTestsIndexCreateDrop" + i, command: command });
+      }
+
+      // wait for insertion tasks to complete
+      waitForTasks();
+
+      // check that all indexes except primary are gone
+      assertEqual(1, c.indexes().length);
+      let count = threads;
+      for (let i = 0; i < threads; ++i) {
+        count += attrs <= i ? 0 : attrs - i;
+      }
+      assertEqual(count, c.count());
+      for (let i = 0; i < threads; ++i) {
+        assertTrue(c.document("done" + i).value);
+      }
+    },
+  };
+}
+
+jsunity.run(ParallelIndexCreateDropSuite);
+
+return jsunity.done();