simplify test cases

arangodb · jsteemann · Aug 4, 2021 · Jul 21, 2021 · Jul 22, 2021 · Jul 22, 2021
commit 11b44d39efd918cfb73e13e39d18995da1d7b10c
diff --git a/arangosh/Benchmark/testcases/DocumentCreationTest.h b/arangosh/Benchmark/testcases/DocumentCreationTest.h
@@ -45,7 +45,7 @@ namespace arangodb::arangobench {
 
     void buildRequest(int threadNumber, size_t threadCounter,
                       size_t globalCounter, BenchmarkOperation::RequestData& requestData) const override {
-      requestData.url = std::string("/_api/document?collection=") + _arangobench.collection();
+      requestData.url = std::string("/_api/document?collection=") + _arangobench.collection() + "&silent=true";
       requestData.type = rest::RequestType::POST;
       using namespace arangodb::velocypack;
       requestData.payload.openObject();

diff --git a/arangosh/Benchmark/testcases/DocumentCrudTest.h b/arangosh/Benchmark/testcases/DocumentCrudTest.h
@@ -45,35 +45,28 @@ namespace arangodb::arangobench {
 
     void buildRequest(int threadNumber, size_t threadCounter,
                       size_t globalCounter, BenchmarkOperation::RequestData& requestData) const override {
-       size_t const mod = globalCounter % 5;
+      size_t keyId = static_cast<size_t>(globalCounter / 5);
+      std::string const key = "testkey" + StringUtils::itoa(keyId);
+      size_t const mod = globalCounter % 5;
 
       if (mod == 0) {
-        requestData.url = std::string("/_api/document?collection=" + _arangobench.collection());
-      } else {
-        size_t keyId = (size_t)(globalCounter / 5);
-        std::string const key = "testkey" + StringUtils::itoa(keyId);
-        requestData.url = std::string("/_api/document/" + _arangobench.collection() + "/" + key);
-      }
-      if (mod == 0) {
+        requestData.url = std::string("/_api/document?collection=" + _arangobench.collection()) + "&silent=true";
         requestData.type = rest::RequestType::POST;
-      } else if (mod == 1) {
-        requestData.type = rest::RequestType::GET;
-      } else if (mod == 2) {
-        requestData.type = rest::RequestType::PATCH;
-      } else if (mod == 3) {
-        requestData.type = rest::RequestType::GET;
-      } else if (mod == 4) {
-        requestData.type = rest::RequestType::DELETE_REQ;
       } else {
-        TRI_ASSERT(false);
-        requestData.type = rest::RequestType::GET;
+        requestData.url = std::string("/_api/document/" + _arangobench.collection() + "/" + key);
+        if (mod == 2) {
+          requestData.type = rest::RequestType::PATCH;
+        } else if (mod == 4) {
+          requestData.type = rest::RequestType::DELETE_REQ;
+        } else {
+          requestData.type = rest::RequestType::GET;
+        }
       }
          if (mod == 0 || mod == 2) {
-        uint64_t n = _arangobench.complexity();
-        size_t keyId = static_cast<size_t>(globalCounter / 5);
         using namespace arangodb::velocypack;
         requestData.payload.openObject();
-        requestData.payload.add("_key", Value(std::string("testkey") + std::to_string(keyId)));
+        requestData.payload.add(StaticStrings::KeyString, Value(key));
+        uint64_t n = _arangobench.complexity();
         for (uint64_t i = 1; i <= n; ++i) {
           bool value = (mod == 0) ? true : false;
           requestData.payload.add(std::string("value") + std::to_string(i), Value(value));
@@ -82,7 +75,6 @@ namespace arangodb::arangobench {
       }
     }
 
-    //log in only one place, this returns string for the description;
     char const* getDescription() const noexcept override {
       return "will perform a mix of insert, update, get and remove operations for documents. 20% of the operations will be single-document inserts, 20% of the operations will be single-document updates, 40% of the operations are single-document read requests, and 20% of the operations will be single-document removals. There will be a total of --requests operations. The --complexity parameter can be used to control the number of attributes for the inserted and updated documents.";
     }