Import wiredtiger: 37670c7d34260232ea2fb0088229402381454459 from branch mongodb-master

ref: 2214855baf..37670c7d34
for: 7.3.0-rc0

Revert "WT-12009 Add error code in Workgen exceptions

Author: lukech

src/third_party/wiredtiger/bench/workgen/workgen.cpp

@@ -246,9 +246,8 @@ int
 WorkloadRunner::start_table_idle_cycle(WT_CONNECTION *conn)
 {
     WT_SESSION *session;
-    int ret = conn->open_session(conn, nullptr, nullptr, &session);
-    if (ret != 0) {
-        THROW_ERRNO(ret, "Error opening a session.");
+    if (conn->open_session(conn, nullptr, nullptr, &session) != 0) {
+        THROW("Error opening a session.");
     }
 
     for (int cycle_count = 0; !stopping; ++cycle_count) {
@@ -259,11 +258,11 @@ WorkloadRunner::start_table_idle_cycle(WT_CONNECTION *conn)
         workgen_clock(&start);
 
         /* Create a table. */
-        int ret = session->create(session, uri, "key_format=S,value_format=S");
-        if (ret != 0) {
+        int ret;
+        if ((ret = session->create(session, uri, "key_format=S,value_format=S")) != 0) {
             if (ret == EBUSY)
                 continue;
-            THROW_ERRNO(ret, "Table create failed in start_table_idle_cycle.");
+            THROW("Table create failed in start_table_idle_cycle.");
         }
 
         uint64_t stop;
@@ -277,13 +276,11 @@ WorkloadRunner::start_table_idle_cycle(WT_CONNECTION *conn)
 
         /* Open and close cursor. */
         WT_CURSOR *cursor;
-        ret = session->open_cursor(session, uri, nullptr, nullptr, &cursor);
-        if (ret != 0) {
-            THROW_ERRNO(ret, "Cursor open failed.");
+        if ((ret = session->open_cursor(session, uri, nullptr, nullptr, &cursor)) != 0) {
+            THROW("Cursor open failed.");
         }
-        ret = cursor->close(cursor);
-        if (ret != 0) {
-            THROW_ERRNO(ret, "Cursor close failed.");
+        if ((ret = cursor->close(cursor)) != 0) {
+            THROW("Cursor close failed.");
         }
 
         workgen_clock(&stop);
@@ -303,7 +300,7 @@ WorkloadRunner::start_table_idle_cycle(WT_CONNECTION *conn)
         }
 
         if (ret != 0) {
-            THROW_ERRNO(ret, "Table drop failed in cycle_idle_tables.");
+            THROW("Table drop failed in cycle_idle_tables.");
         }
         workgen_clock(&stop);
         last_interval = ns_to_sec(stop - start);
@@ -470,9 +467,8 @@ int
 WorkloadRunner::start_tables_create(WT_CONNECTION *conn)
 {
     WT_SESSION *session;
-    int ret = conn->open_session(conn, nullptr, nullptr, &session);
-    if (ret != 0) {
-        THROW_ERRNO(ret, "Error opening a session.");
+    if (conn->open_session(conn, nullptr, nullptr, &session) != 0) {
+        THROW("Error opening a session.");
     }
 
     ContextInternal *icontext = _workload->_context->_internal;
@@ -598,9 +594,8 @@ int
 WorkloadRunner::start_tables_drop(WT_CONNECTION *conn)
 {
     WT_SESSION *session;
-    int ret = conn->open_session(conn, nullptr, nullptr, &session);
-    if (ret != 0) {
-        THROW_ERRNO(ret, "Error opening a session.");
+    if (conn->open_session(conn, nullptr, nullptr, &session) != 0) {
+        THROW("Error opening a session.");
     }
 
     ContextInternal *icontext = _workload->_context->_internal;
@@ -694,7 +689,7 @@ WorkloadRunner::start_tables_drop(WT_CONNECTION *conn)
          * removed from the shared data structures, and we know no thread is operating on them.
          */
         for (auto uri : drop_files) {
-            int ret;
+            WT_DECL_RET;
             // Spin on EBUSY. We do not expect to get stuck.
             while ((ret = session->drop(session, uri.c_str(), "checkpoint_wait=false")) == EBUSY) {
                 if (stopping)
@@ -703,7 +698,7 @@ WorkloadRunner::start_tables_drop(WT_CONNECTION *conn)
                 sleep(1);
             }
             if (ret != 0)
-                THROW_ERRNO(ret, "Table drop failed for '" << uri << "' in start_tables_drop.");
+                THROW("Table drop failed for '" << uri << "' in start_tables_drop.");
 
             VERBOSE(*_workload, "Dropped table: " << uri);
         }
@@ -915,31 +910,28 @@ ContextInternal::create_all(WT_CONNECTION *conn)
      * dynamic set of tables are marked separately during creation.
      */
     WT_SESSION *session;
-    int ret = conn->open_session(conn, nullptr, nullptr, &session);
-    if (ret != 0) {
-        THROW_ERRNO(ret, "Error opening a session.");
+    if (conn->open_session(conn, nullptr, nullptr, &session) != 0) {
+        THROW("Error opening a session.");
     }
 
+    WT_DECL_RET;
     WT_CURSOR *cursor;
-    ret = session->open_cursor(session, "metadata:", NULL, NULL, &cursor);
-    if (ret != 0) {
+    if ((ret = session->open_cursor(session, "metadata:", NULL, NULL, &cursor)) != 0) {
         /* If there is no metadata (yet), this will return ENOENT. */
         if (ret == ENOENT) {
-            THROW_ERRNO(ret, "No metadata found while extracting dynamic set of tables.");
+            THROW("No metadata found while extracting dynamic set of tables.");
         }
     }
 
     /* Walk the entries in the metadata and extract the dynamic set. */
     while ((ret = cursor->next(cursor)) == 0) {
         const char *key, *v;
-        ret = cursor->get_key(cursor, &key);
-        if (ret != 0) {
-            THROW_ERRNO(ret,
+        if ((ret = cursor->get_key(cursor, &key)) != 0) {
+            THROW(
               "Error getting the key for a metadata entry while extracting dynamic set of tables.");
         }
-        ret = cursor->get_value(cursor, &v);
-        if (ret != 0) {
-            THROW_ERRNO(ret,
+        if ((ret = cursor->get_value(cursor, &v)) != 0) {
+            THROW(
               "Error getting the value for a metadata entry while extracting dynamic set of "
               "tables.");
         }
@@ -982,7 +974,7 @@ ContextInternal::create_all(WT_CONNECTION *conn)
         }
     }
     if (ret != WT_NOTFOUND) {
-        THROW_ERRNO(ret, "Error extracting dynamic set of tables from the metadata.");
+        THROW("Error extracting dynamic set of tables from the metadata.");
     }
 
     /* Make sure each base has its mirror and vice-versa. */
@@ -1005,12 +997,11 @@ ContextInternal::create_all(WT_CONNECTION *conn)
             sleep(1);
         }
         if (ret != 0)
-            THROW_ERRNO(ret, "Table drop failed for '" << uri << "' in create_all.");
+            THROW("Table drop failed for '" << uri << "' in create_all.");
     }
 
-    ret = session->close(session, NULL);
-    if (ret != 0) {
-        THROW_ERRNO(ret, "Session close failed.");
+    if ((ret = session->close(session, NULL)) != 0) {
+        THROW("Session close failed.");
     }
 
     return (0);
@@ -1368,7 +1359,7 @@ ThreadRunner::cross_check(std::vector<ThreadRunner> &runners)
 int
 ThreadRunner::run()
 {
-    int ret;
+    WT_DECL_RET;
     ThreadOptions *options = &_thread->options;
     std::string name = options->name;
 
@@ -1607,7 +1598,7 @@ ThreadRunner::op_kv_gen(Operation *op, const tint_t tint)
 int
 ThreadRunner::op_run_setup(Operation *op)
 {
-    int ret;
+    WT_DECL_RET;
 
     if (_throttle != nullptr) {
         while (_throttle_ops >= _throttle_limit && !_in_transaction && !_stop) {
@@ -1712,7 +1703,7 @@ ThreadRunner::op_run(Operation *op)
     Track *track;
     WT_CURSOR *cursor;
     WT_ITEM item;
-    int ret;
+    WT_DECL_RET;
     bool measure_latency, own_cursor, retry_op;
     timespec start_time;
     uint64_t time_us;
@@ -3168,7 +3159,7 @@ WorkloadRunner::~WorkloadRunner()
 int
 WorkloadRunner::run(WT_CONNECTION *conn)
 {
-    int ret;
+    WT_DECL_RET;
     WorkloadOptions *options = &_workload->options;
 
     _wt_home = conn->get_home(conn);
@@ -3300,7 +3291,7 @@ WorkloadRunner::final_report(timespec &totalsecs)
 int
 WorkloadRunner::run_all(WT_CONNECTION *conn)
 {
-    int ret;
+    WT_DECL_RET;
 
     // Register signal handlers for SIGINT (Ctrl-C) and SIGTERM.
     std::signal(SIGINT, signal_handler);
@@ -3456,19 +3447,17 @@ WorkloadRunner::run_all(WT_CONNECTION *conn)
     if (options->background_compact > 0) {
         WT_SESSION *session;
 
-        int ret = conn->open_session(conn, nullptr, nullptr, &session);
-        if (ret != 0)
-            THROW_ERRNO(ret, "Error opening a session.");
+        if (conn->open_session(conn, nullptr, nullptr, &session) != 0)
+            THROW("Error opening a session.");
 
         const std::string bg_compact_cfg("background=true,free_space_target=" +
           std::to_string(options->background_compact) + "MB");
-        ret = session->compact(session, nullptr, bg_compact_cfg.c_str());
+        int ret = session->compact(session, nullptr, bg_compact_cfg.c_str());
         if (ret != 0)
             THROW_ERRNO(ret, "WT_SESSION->compact background compaction could not be enabled.");
 
-        ret = session->close(session, NULL);
-        if (ret != 0)
-            THROW_ERRNO(ret, "Session close failed.");
+        if ((ret = session->close(session, NULL)) != 0)
+            THROW("Session close failed.");
     }
 
     timespec now;

src/third_party/wiredtiger/import.data

@@ -2,5 +2,5 @@
     "vendor": "wiredtiger",
     "github": "wiredtiger/wiredtiger.git",
     "branch": "mongodb-master",
-    "commit": "2214855bafc4d9d60d853fb58273558a7b5fed7e"
+    "commit": "37670c7d34260232ea2fb0088229402381454459"
 }